From a6ba58ec41451629d48e9a26a76666bfbe3f119f Mon Sep 17 00:00:00 2001
From: WindSoilder <WindSoilder@outlook.com>
Date: Mon, 5 Sep 2022 07:00:20 +0800
Subject: [PATCH 01/45] restrict plugin file name (#6479)

---
 crates/nu-parser/src/parse_keywords.rs | 74 ++++++++++++++++----------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 0069e7e285..4768dacac1 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -3197,37 +3197,55 @@ pub fn parse_register(
         nu_engine::env::env_to_strings(working_set.permanent_state, &stack).unwrap_or_default();
     let error = match signature {
         Some(signature) => arguments.and_then(|(path, encoding)| {
-            signature.map(|signature| {
-                let plugin_decl = PluginDeclaration::new(path, signature, encoding, shell);
-                working_set.add_decl(Box::new(plugin_decl));
-                working_set.mark_plugins_file_dirty();
-            })
-        }),
-        None => arguments.and_then(|(path, encoding)| {
-            get_signature(path.as_path(), &encoding, &shell, &current_envs)
-                .map_err(|err| {
-                    ParseError::LabeledError(
-                        "Error getting signatures".into(),
-                        err.to_string(),
-                        spans[0],
-                    )
-                })
-                .map(|signatures| {
-                    for signature in signatures {
-                        // create plugin command declaration (need struct impl Command)
-                        // store declaration in working set
-                        let plugin_decl = PluginDeclaration::new(
-                            path.clone(),
-                            signature,
-                            encoding.clone(),
-                            shell.clone(),
-                        );
-
-                        working_set.add_decl(Box::new(plugin_decl));
-                    }
+            // restrict plugin file name starts with `nu_plugin_`
+            let f_name = path
+                .file_name()
+                .map(|s| s.to_string_lossy().starts_with("nu_plugin_"));
 
+            if let Some(true) = f_name {
+                signature.map(|signature| {
+                    let plugin_decl = PluginDeclaration::new(path, signature, encoding, shell);
+                    working_set.add_decl(Box::new(plugin_decl));
                     working_set.mark_plugins_file_dirty();
                 })
+            } else {
+                Ok(())
+            }
+        }),
+        None => arguments.and_then(|(path, encoding)| {
+            // restrict plugin file name starts with `nu_plugin_`
+            let f_name = path
+                .file_name()
+                .map(|s| s.to_string_lossy().starts_with("nu_plugin_"));
+
+            if let Some(true) = f_name {
+                get_signature(path.as_path(), &encoding, &shell, &current_envs)
+                    .map_err(|err| {
+                        ParseError::LabeledError(
+                            "Error getting signatures".into(),
+                            err.to_string(),
+                            spans[0],
+                        )
+                    })
+                    .map(|signatures| {
+                        for signature in signatures {
+                            // create plugin command declaration (need struct impl Command)
+                            // store declaration in working set
+                            let plugin_decl = PluginDeclaration::new(
+                                path.clone(),
+                                signature,
+                                encoding.clone(),
+                                shell.clone(),
+                            );
+
+                            working_set.add_decl(Box::new(plugin_decl));
+                        }
+
+                        working_set.mark_plugins_file_dirty();
+                    })
+            } else {
+                Ok(())
+            }
         }),
     }
     .err();

From daec3fc3d322233ba4369ab9b2cac57352130bee Mon Sep 17 00:00:00 2001
From: pwygab <88221256+merelymyself@users.noreply.github.com>
Date: Mon, 5 Sep 2022 14:32:09 +0800
Subject: [PATCH 02/45] let path split keeps 'C:\' together (#6485)

* `path split` keeps 'C:\' together

* fmt

* fix clippt

* fix match arm
---
 crates/nu-command/src/path/split.rs | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/crates/nu-command/src/path/split.rs b/crates/nu-command/src/path/split.rs
index dc98a3f8ba..dc223f12a2 100644
--- a/crates/nu-command/src/path/split.rs
+++ b/crates/nu-command/src/path/split.rs
@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::path::{Component, Path};
 
 use nu_engine::CallExt;
 use nu_protocol::{engine::Command, Example, ShellError, Signature, Span, SyntaxShape, Value};
@@ -62,8 +62,7 @@ impl Command for SubCommand {
                 example: r"'C:\Users\viking\spam.txt' | path split",
                 result: Some(Value::List {
                     vals: vec![
-                        Value::test_string("C:"),
-                        Value::test_string(r"\"),
+                        Value::test_string(r"C:\"),
                         Value::test_string("Users"),
                         Value::test_string("viking"),
                         Value::test_string("spam.txt"),
@@ -108,15 +107,33 @@ fn split(path: &Path, span: Span, _: &Arguments) -> Value {
     Value::List {
         vals: path
             .components()
-            .map(|comp| {
-                let s = comp.as_os_str().to_string_lossy();
-                Value::string(s, span)
+            .filter_map(|comp| {
+                let comp = process_component(comp);
+                comp.map(|s| Value::string(s, span))
             })
             .collect(),
         span,
     }
 }
 
+#[cfg(windows)]
+fn process_component(comp: Component) -> Option<String> {
+    match comp {
+        Component::RootDir => None,
+        Component::Prefix(_) => {
+            let mut s = comp.as_os_str().to_string_lossy().to_string();
+            s.push('\\');
+            Some(s)
+        }
+        comp => Some(comp.as_os_str().to_string_lossy().to_string()),
+    }
+}
+
+#[cfg(not(windows))]
+fn process_component(comp: Component) -> Option<String> {
+    Some(comp.as_os_str().to_string_lossy().to_string())
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

From 3278d290be10ffcd636a4ee07fb6839971ac86f9 Mon Sep 17 00:00:00 2001
From: unrelentingtech <hello@unrelenting.technology>
Date: Mon, 5 Sep 2022 14:31:26 +0300
Subject: [PATCH 03/45] Avoid update_last_command_context "No command run"
 error (#6483)

* Avoid update_last_command_context "No command run" error

When using `executehostcommand` bindings without having run actual user input commands yet,
update_last_command_context is guaranteed to fail. A function has been added to reedline
that allows checking for this case.

* Update to most recent reedline

Includes bugfixes around the (SQlite) history

Co-authored-by: sholderbach <sholderbach@users.noreply.github.com>
---
 Cargo.lock                | 3 +--
 Cargo.toml                | 3 +++
 crates/nu-cli/src/repl.rs | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 962f01b7ed..44ca715769 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4078,8 +4078,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d84e8704e9eb141e73ac426c72af95eb195d4c3221a11ea92d5709f4a025adb5"
+source = "git+https://github.com/nushell/reedline?branch=main#fe889ae5c4b4fa7492cf6f138ccd4274b0f682cf"
 dependencies = [
  "chrono",
  "crossterm 0.24.0",
diff --git a/Cargo.toml b/Cargo.toml
index f0dc7df139..35a65e7022 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -121,3 +121,6 @@ debug = false
 [[bin]]
 name = "nu"
 path = "src/main.rs"
+
+[patch.crates-io]
+reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index de245e0406..c1168ce9d5 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -324,7 +324,8 @@ pub fn evaluate_repl(
             Ok(Signal::Success(s)) => {
                 let history_supports_meta =
                     matches!(config.history_file_format, HistoryFileFormat::Sqlite);
-                if history_supports_meta && !s.is_empty() {
+                if history_supports_meta && !s.is_empty() && line_editor.has_last_command_context()
+                {
                     line_editor
                         .update_last_command_context(&|mut c| {
                             c.start_timestamp = Some(chrono::Utc::now());
@@ -445,7 +446,8 @@ pub fn evaluate_repl(
                     },
                 );
 
-                if history_supports_meta && !s.is_empty() {
+                if history_supports_meta && !s.is_empty() && line_editor.has_last_command_context()
+                {
                     line_editor
                         .update_last_command_context(&|mut c| {
                             c.duration = Some(cmd_duration);

From 33e1120addaa271cba36bd58af78077595ebe60e Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Mon, 5 Sep 2022 13:33:54 +0200
Subject: [PATCH 04/45] Terminate REPL if not connected to tty input (#6480)

* Terminate REPL if not connected to tty input

If the standard input stream is not a TTY abort the REPL execution.

Solves a problem as the current REPL tries to be IO fault tolerant and
would indefinetely fail when crossterm tries to handle the STDIN.

Fixes nushell/nushell#6452

* Improve the error message
---
 Cargo.lock                |  1 +
 crates/nu-cli/Cargo.toml  |  1 +
 crates/nu-cli/src/repl.rs | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 44ca715769..520f0667f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2630,6 +2630,7 @@ dependencies = [
 name = "nu-cli"
 version = "0.67.1"
 dependencies = [
+ "atty",
  "chrono",
  "crossterm 0.24.0",
  "fancy-regex",
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 58c5642670..71e1234e4a 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -22,6 +22,7 @@ nu-ansi-term = "0.46.0"
 nu-color-config = { path = "../nu-color-config", version = "0.67.1"  }
 reedline = { version = "0.10.0", features = ["bashisms", "sqlite"]}
 
+atty = "0.2.14"
 chrono = "0.4.21"
 crossterm = "0.24.0"
 fancy-regex = "0.10.0"
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index c1168ce9d5..1275cd427e 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -43,6 +43,16 @@ pub fn evaluate_repl(
 ) -> Result<()> {
     use reedline::{FileBackedHistory, Reedline, Signal};
 
+    // Guard against invocation without a connected terminal.
+    // reedline / crossterm event polling will fail without a connected tty
+    if !atty::is(atty::Stream::Stdin) {
+        return Err(std::io::Error::new(
+            std::io::ErrorKind::NotFound,
+            "Nushell launched as interactive REPL but STDIN is not a TTY, either launch in a valid terminal or provide arguments to invoke a script!",
+        ))
+        .into_diagnostic();
+    }
+
     let mut entry_num = 0;
 
     let mut nu_prompt = NushellPrompt::new();
@@ -498,6 +508,10 @@ pub fn evaluate_repl(
                 let message = err.to_string();
                 if !message.contains("duration") {
                     println!("Error: {:?}", err);
+                    // TODO: Identify possible error cases where a hard failure is preferable
+                    // Ignoring and reporting could hide bigger problems
+                    // e.g. https://github.com/nushell/nushell/issues/6452
+                    // Alternatively only allow that expected failures let the REPL loop
                 }
                 if shell_integration {
                     run_ansi_sequence(&get_command_finished_marker(stack, engine_state))?;

From 14512988ba85706368b768ff6f6b34105fd1e158 Mon Sep 17 00:00:00 2001
From: adamijak <adamik.jakub72@gmail.com>
Date: Mon, 5 Sep 2022 16:41:06 +0200
Subject: [PATCH 05/45] Rename `all?`, `any?` and `empty?` (#6464)

Rename `all?`, `any?` and `empty?` to `all`, `any` and `is-empty` for sake of simplicity and consistency.

- More understandable for newcomers, that these commands are no special to others.
- `?` syntax did not really aprove readability. For me it made it worse.
- We can reserve `?` syntax for any other nushell feature.
---
 .github/workflows/release-pkg.nu                |  8 ++++----
 .../src/deprecated/deprecated_commands.rs       | 17 ++++++++++-------
 crates/nu-command/src/env/env_command.rs        |  2 +-
 crates/nu-command/src/filters/all.rs            |  6 +++---
 crates/nu-command/src/filters/any.rs            |  6 +++---
 crates/nu-command/src/filters/empty.rs          | 10 +++++-----
 crates/nu-command/tests/commands/all.rs         | 10 +++++-----
 crates/nu-command/tests/commands/any.rs         |  6 +++---
 crates/nu-command/tests/commands/drop.rs        |  2 +-
 crates/nu-command/tests/commands/empty.rs       |  4 ++--
 crates/nu-command/tests/commands/nu_check.rs    | 14 +++++++-------
 crates/nu-command/tests/commands/zip.rs         |  2 +-
 src/tests/test_parser.rs                        |  2 +-
 tests/shell/pipeline/commands/internal.rs       |  4 ++--
 14 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index a71831be2f..7491644e25 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -50,7 +50,7 @@ if $os in ['ubuntu-latest', 'macos-latest'] {
 # Build for Windows without static-link-openssl feature
 # ----------------------------------------------------------------------------
 if $os in ['windows-latest'] {
-    if ($flags | str trim | empty?) {
+    if ($flags | str trim | is-empty) {
         cargo build --release --all --target $target --features=extra
     } else {
         cargo build --release --all --target $target --features=extra $flags
@@ -80,7 +80,7 @@ let ver = if $os == 'windows-latest' {
 } else {
     (do -i { ./output/nu -c 'version' }) | str collect
 }
-if ($ver | str trim | empty?) {
+if ($ver | str trim | is-empty) {
     $'(ansi r)Incompatible nu binary...(ansi reset)'
 } else { $ver }
 
@@ -124,14 +124,14 @@ if $os in ['ubuntu-latest', 'macos-latest'] {
         7z a $archive *
         print $'archive: ---> ($archive)';
         let pkg = (ls -f $archive | get name)
-        if not ($pkg | empty?) {
+        if not ($pkg | is-empty) {
             echo $'::set-output name=archive::($pkg | get 0)'
         }
     }
 }
 
 def 'cargo-build-nu' [ options: string ] {
-    if ($options | str trim | empty?) {
+    if ($options | str trim | is-empty) {
         cargo build --release --all --target $target --features=extra,static-link-openssl
     } else {
         cargo build --release --all --target $target --features=extra,static-link-openssl $options
diff --git a/crates/nu-command/src/deprecated/deprecated_commands.rs b/crates/nu-command/src/deprecated/deprecated_commands.rs
index 4ba9d167a6..b1d9b9605e 100644
--- a/crates/nu-command/src/deprecated/deprecated_commands.rs
+++ b/crates/nu-command/src/deprecated/deprecated_commands.rs
@@ -5,11 +5,14 @@ use std::collections::HashMap;
 /// subcommands like `foo bar` where `foo` is still a valid command.
 /// For those, it's currently easiest to have a "stub" command that just returns an error.
 pub fn deprecated_commands() -> HashMap<String, String> {
-    let mut commands = HashMap::new();
-    commands.insert("keep".to_string(), "take".to_string());
-    commands.insert("match".to_string(), "find".to_string());
-    commands.insert("nth".to_string(), "select".to_string());
-    commands.insert("pivot".to_string(), "transpose".to_string());
-    commands.insert("unalias".to_string(), "hide".to_string());
-    commands
+    HashMap::from([
+        ("keep".to_string(), "take".to_string()),
+        ("match".to_string(), "find".to_string()),
+        ("nth".to_string(), "select".to_string()),
+        ("pivot".to_string(), "transpose".to_string()),
+        ("unalias".to_string(), "hide".to_string()),
+        ("all?".to_string(), "all".to_string()),
+        ("any?".to_string(), "any".to_string()),
+        ("empty?".to_string(), "is-empty".to_string()),
+    ])
 }
diff --git a/crates/nu-command/src/env/env_command.rs b/crates/nu-command/src/env/env_command.rs
index 20023a96d2..fa114bf11c 100644
--- a/crates/nu-command/src/env/env_command.rs
+++ b/crates/nu-command/src/env/env_command.rs
@@ -75,7 +75,7 @@ impl Command for Env {
             },
             Example {
                 description: "Check whether the env variable `MY_ENV_ABC` exists",
-                example: r#"env | any? name == MY_ENV_ABC"#,
+                example: r#"env | any name == MY_ENV_ABC"#,
                 result: Some(Value::test_bool(false)),
             },
             Example {
diff --git a/crates/nu-command/src/filters/all.rs b/crates/nu-command/src/filters/all.rs
index f34668cd85..0fab9101eb 100644
--- a/crates/nu-command/src/filters/all.rs
+++ b/crates/nu-command/src/filters/all.rs
@@ -10,7 +10,7 @@ pub struct All;
 
 impl Command for All {
     fn name(&self) -> &str {
-        "all?"
+        "all"
     }
 
     fn signature(&self) -> Signature {
@@ -35,12 +35,12 @@ impl Command for All {
         vec![
             Example {
                 description: "Find if services are running",
-                example: "echo [[status]; [UP] [UP]] | all? status == UP",
+                example: "echo [[status]; [UP] [UP]] | all status == UP",
                 result: Some(Value::test_bool(true)),
             },
             Example {
                 description: "Check that all values are even",
-                example: "echo [2 4 6 8] | all? ($it mod 2) == 0",
+                example: "echo [2 4 6 8] | all ($it mod 2) == 0",
                 result: Some(Value::test_bool(true)),
             },
         ]
diff --git a/crates/nu-command/src/filters/any.rs b/crates/nu-command/src/filters/any.rs
index 2be85de11a..b0a2592563 100644
--- a/crates/nu-command/src/filters/any.rs
+++ b/crates/nu-command/src/filters/any.rs
@@ -10,7 +10,7 @@ pub struct Any;
 
 impl Command for Any {
     fn name(&self) -> &str {
-        "any?"
+        "any"
     }
 
     fn signature(&self) -> Signature {
@@ -35,12 +35,12 @@ impl Command for Any {
         vec![
             Example {
                 description: "Find if a service is not running",
-                example: "echo [[status]; [UP] [DOWN] [UP]] | any? status == DOWN",
+                example: "echo [[status]; [UP] [DOWN] [UP]] | any status == DOWN",
                 result: Some(Value::test_bool(true)),
             },
             Example {
                 description: "Check if any of the values is odd",
-                example: "echo [2 4 1 6 8] | any? ($it mod 2) == 1",
+                example: "echo [2 4 1 6 8] | any ($it mod 2) == 1",
                 result: Some(Value::test_bool(true)),
             },
         ]
diff --git a/crates/nu-command/src/filters/empty.rs b/crates/nu-command/src/filters/empty.rs
index 5b5866887a..bb4b96efec 100644
--- a/crates/nu-command/src/filters/empty.rs
+++ b/crates/nu-command/src/filters/empty.rs
@@ -10,11 +10,11 @@ pub struct Empty;
 
 impl Command for Empty {
     fn name(&self) -> &str {
-        "empty?"
+        "is-empty"
     }
 
     fn signature(&self) -> Signature {
-        Signature::build("empty?")
+        Signature::build("is-empty")
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
@@ -41,7 +41,7 @@ impl Command for Empty {
         vec![
             Example {
                 description: "Check if a string is empty",
-                example: "'' | empty?",
+                example: "'' | is-empty",
                 result: Some(Value::Bool {
                     val: true,
                     span: Span::test_data(),
@@ -49,7 +49,7 @@ impl Command for Empty {
             },
             Example {
                 description: "Check if a list is empty",
-                example: "[] | empty?",
+                example: "[] | is-empty",
                 result: Some(Value::Bool {
                     val: true,
                     span: Span::test_data(),
@@ -58,7 +58,7 @@ impl Command for Empty {
             Example {
                 // TODO: revisit empty cell path semantics for a record.
                 description: "Check if more than one column are empty",
-                example: "[[meal size]; [arepa small] [taco '']] | empty? meal size",
+                example: "[[meal size]; [arepa small] [taco '']] | is-empty meal size",
                 result: Some(Value::Bool {
                     val: false,
                     span: Span::test_data(),
diff --git a/crates/nu-command/tests/commands/all.rs b/crates/nu-command/tests/commands/all.rs
index b597e3f4a4..2f9c231c21 100644
--- a/crates/nu-command/tests/commands/all.rs
+++ b/crates/nu-command/tests/commands/all.rs
@@ -6,7 +6,7 @@ fn checks_all_rows_are_true() {
         cwd: ".", pipeline(
         r#"
                 echo  [ "Andrés", "Andrés", "Andrés" ]
-                | all? $it == "Andrés"
+                | all $it == "Andrés"
         "#
     ));
 
@@ -18,7 +18,7 @@ fn checks_all_rows_are_false_with_param() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-                [1, 2, 3, 4] | all? { |a| $a >= 5 }
+                [1, 2, 3, 4] | all { |a| $a >= 5 }
         "#
     ));
 
@@ -30,7 +30,7 @@ fn checks_all_rows_are_true_with_param() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-                [1, 2, 3, 4] | all? { |a| $a < 5 }
+                [1, 2, 3, 4] | all { |a| $a < 5 }
         "#
     ));
 
@@ -49,7 +49,7 @@ fn checks_all_columns_of_a_table_is_true() {
                         [      Darren, Schroeder, 10/11/2013,   1    ]
                         [      Yehuda,      Katz, 10/11/2013,   1    ]
                 ]
-                | all? likes > 0
+                | all likes > 0
         "#
     ));
 
@@ -61,7 +61,7 @@ fn checks_if_all_returns_error_with_invalid_command() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-            [red orange yellow green blue purple] | all? ($it | st length) > 4
+            [red orange yellow green blue purple] | all ($it | st length) > 4
         "#
     ));
 
diff --git a/crates/nu-command/tests/commands/any.rs b/crates/nu-command/tests/commands/any.rs
index dea2f6cde1..f08ca10869 100644
--- a/crates/nu-command/tests/commands/any.rs
+++ b/crates/nu-command/tests/commands/any.rs
@@ -6,7 +6,7 @@ fn checks_any_row_is_true() {
         cwd: ".", pipeline(
         r#"
                 echo  [ "Ecuador", "USA", "New Zealand" ]
-                | any? $it == "New Zealand"
+                | any $it == "New Zealand"
         "#
     ));
 
@@ -25,7 +25,7 @@ fn checks_any_column_of_a_table_is_true() {
                         [      Darren, Schroeder, 10/11/2013,   1    ]
                         [      Yehuda,      Katz, 10/11/2013,   1    ]
                 ]
-                | any? rusty_at == 10/12/2013
+                | any rusty_at == 10/12/2013
         "#
     ));
 
@@ -37,7 +37,7 @@ fn checks_if_any_returns_error_with_invalid_command() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-            [red orange yellow green blue purple] | any? ($it | st length) > 4
+            [red orange yellow green blue purple] | any ($it | st length) > 4
         "#
     ));
 
diff --git a/crates/nu-command/tests/commands/drop.rs b/crates/nu-command/tests/commands/drop.rs
index 7a02eb09ca..8500b284bb 100644
--- a/crates/nu-command/tests/commands/drop.rs
+++ b/crates/nu-command/tests/commands/drop.rs
@@ -36,7 +36,7 @@ fn more_columns_than_table_has() {
               [3,  white]
               [8, yellow]
               [4,  white]
-            ] | drop column 3 | columns | empty?
+            ] | drop column 3 | columns | is-empty
         "#)
     );
 
diff --git a/crates/nu-command/tests/commands/empty.rs b/crates/nu-command/tests/commands/empty.rs
index 5c8c09e5d2..55852b8bcf 100644
--- a/crates/nu-command/tests/commands/empty.rs
+++ b/crates/nu-command/tests/commands/empty.rs
@@ -11,8 +11,8 @@ fn reports_emptiness() {
                      [([[check]; [{}] ])]
             ]
             | get are_empty
-            | all? {
-              empty? check
+            | all {
+              is-empty check
             }
         "#
     ));
diff --git a/crates/nu-command/tests/commands/nu_check.rs b/crates/nu-command/tests/commands/nu_check.rs
index 577f5f7004..00d5ff86e6 100644
--- a/crates/nu-command/tests/commands/nu_check.rs
+++ b/crates/nu-command/tests/commands/nu_check.rs
@@ -373,7 +373,7 @@ fn parse_script_success_with_complex_internal_stream() {
                   #ls **/* | some_filter | grep-nu search
                   #open file.txt | grep-nu search
                 ] {
-                  if ($entrada | empty?) {
+                  if ($entrada | is-empty) {
                     if ($in | column? name) {
                       grep -ihHn $search ($in | get name)
                     } else {
@@ -422,7 +422,7 @@ fn parse_script_failure_with_complex_internal_stream() {
                   #ls **/* | some_filter | grep-nu search
                   #open file.txt | grep-nu search
                 ]
-                  if ($entrada | empty?) {
+                  if ($entrada | is-empty) {
                     if ($in | column? name) {
                       grep -ihHn $search ($in | get name)
                     } else {
@@ -471,7 +471,7 @@ fn parse_script_success_with_complex_external_stream() {
                   #ls **/* | some_filter | grep-nu search
                   #open file.txt | grep-nu search
                 ] {
-                  if ($entrada | empty?) {
+                  if ($entrada | is-empty) {
                     if ($in | column? name) {
                       grep -ihHn $search ($in | get name)
                     } else {
@@ -520,7 +520,7 @@ fn parse_module_success_with_complex_external_stream() {
                   #ls **/* | some_filter | grep-nu search
                   #open file.txt | grep-nu search
                 ] {
-                  if ($entrada | empty?) {
+                  if ($entrada | is-empty) {
                     if ($in | column? name) {
                       grep -ihHn $search ($in | get name)
                     } else {
@@ -569,7 +569,7 @@ fn parse_with_flag_all_success_for_complex_external_stream() {
                   #ls **/* | some_filter | grep-nu search
                   #open file.txt | grep-nu search
                 ] {
-                  if ($entrada | empty?) {
+                  if ($entrada | is-empty) {
                     if ($in | column? name) {
                       grep -ihHn $search ($in | get name)
                     } else {
@@ -618,7 +618,7 @@ fn parse_with_flag_all_failure_for_complex_external_stream() {
                   #ls **/* | some_filter | grep-nu search
                   #open file.txt | grep-nu search
                 ] {
-                  if ($entrada | empty?) {
+                  if ($entrada | is-empty) {
                     if ($in | column? name) {
                       grep -ihHn $search ($in | get name)
                     } else {
@@ -667,7 +667,7 @@ fn parse_with_flag_all_failure_for_complex_list_stream() {
                   #ls **/* | some_filter | grep-nu search
                   #open file.txt | grep-nu search
                 ] {
-                  if ($entrada | empty?) {
+                  if ($entrada | is-empty) {
                     if ($in | column? name) {
                       grep -ihHn $search ($in | get name)
                     } else {
diff --git a/crates/nu-command/tests/commands/zip.rs b/crates/nu-command/tests/commands/zip.rs
index dc36237ddc..8631425010 100644
--- a/crates/nu-command/tests/commands/zip.rs
+++ b/crates/nu-command/tests/commands/zip.rs
@@ -8,7 +8,7 @@ export def expect [
     --to-eq,
     right
 ] {
-    $left | zip $right | all? {|row|
+    $left | zip $right | all {|row|
         $row.name.0 == $row.name.1 && $row.commits.0 == $row.commits.1
     }
 }
diff --git a/src/tests/test_parser.rs b/src/tests/test_parser.rs
index 6346b3550a..ed7986141b 100644
--- a/src/tests/test_parser.rs
+++ b/src/tests/test_parser.rs
@@ -205,7 +205,7 @@ fn equals_separates_long_flag() -> TestResult {
 fn let_env_expressions() -> TestResult {
     let env = HashMap::from([("VENV_OLD_PATH", "Foobar"), ("Path", "Quux")]);
     run_test_with_env(
-        r#"let-env Path = if (env | any? name == VENV_OLD_PATH) { $env.VENV_OLD_PATH } else { $env.Path }; echo $env.Path"#,
+        r#"let-env Path = if (env | any name == VENV_OLD_PATH) { $env.VENV_OLD_PATH } else { $env.Path }; echo $env.Path"#,
         "Foobar",
         &env,
     )
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 8a81b4bdf2..a6e7b94369 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -191,7 +191,7 @@ fn run_custom_command_with_flag() {
     let actual = nu!(
         cwd: ".",
         r#"
-        def foo [--bar:number] { if ($bar | empty?) { echo "empty" } else { echo $bar } }; foo --bar 10
+        def foo [--bar:number] { if ($bar | is-empty) { echo "empty" } else { echo $bar } }; foo --bar 10
         "#
     );
 
@@ -203,7 +203,7 @@ fn run_custom_command_with_flag_missing() {
     let actual = nu!(
         cwd: ".",
         r#"
-        def foo [--bar:number] { if ($bar | empty?) { echo "empty" } else { echo $bar } }; foo
+        def foo [--bar:number] { if ($bar | is-empty) { echo "empty" } else { echo $bar } }; foo
         "#
     );
 

From d86350af80fac5babc95513dd79d28a6338dd18b Mon Sep 17 00:00:00 2001
From: JT <547158+jntrnr@users.noreply.github.com>
Date: Tue, 6 Sep 2022 05:42:47 +1200
Subject: [PATCH 06/45] Revert "Make `$` on variable names optional (#6434)"
 (#6446)

This reverts commit 3cb9147f22966b76549db38aab521e081c0c6ef6.
---
 .../nu-command/src/dataframe/eager/append.rs  |  4 +--
 .../src/dataframe/eager/drop_nulls.rs         |  6 ++---
 crates/nu-command/src/dataframe/eager/take.rs |  4 +--
 crates/nu-parser/src/parser.rs                | 26 -------------------
 crates/nu-protocol/src/engine/engine_state.rs | 12 ++-------
 5 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/crates/nu-command/src/dataframe/eager/append.rs b/crates/nu-command/src/dataframe/eager/append.rs
index 8b0f21ea38..9d8c71a3ff 100644
--- a/crates/nu-command/src/dataframe/eager/append.rs
+++ b/crates/nu-command/src/dataframe/eager/append.rs
@@ -32,7 +32,7 @@ impl Command for AppendDF {
         vec![
             Example {
                 description: "Appends a dataframe as new columns",
-                example: r#"let a = ([['a' 'b']; [1 2] [3 4]] | into df);
+                example: r#"let a = ([[a b]; [1 2] [3 4]] | into df);
     $a | append $a"#,
                 result: Some(
                     NuDataFrame::try_from_columns(vec![
@@ -59,7 +59,7 @@ impl Command for AppendDF {
             },
             Example {
                 description: "Appends a dataframe merging at the end of columns",
-                example: r#"let a = ([['a' 'b']; [1 2] [3 4]] | into df);
+                example: r#"let a = ([[a b]; [1 2] [3 4]] | into df);
     $a | append $a --col"#,
                 result: Some(
                     NuDataFrame::try_from_columns(vec![
diff --git a/crates/nu-command/src/dataframe/eager/drop_nulls.rs b/crates/nu-command/src/dataframe/eager/drop_nulls.rs
index f7989960d7..27bc629cd9 100644
--- a/crates/nu-command/src/dataframe/eager/drop_nulls.rs
+++ b/crates/nu-command/src/dataframe/eager/drop_nulls.rs
@@ -36,9 +36,9 @@ impl Command for DropNulls {
         vec![
             Example {
                 description: "drop null values in dataframe",
-                example: r#"let my_df = ([[a b]; [1 2] [3 0] [1 2]] | into df);
-    let res = ($my_df.b / $my_df.b);
-    let a = ($my_df | with-column $res --name 'res');
+                example: r#"let df = ([[a b]; [1 2] [3 0] [1 2]] | into df);
+    let res = ($df.b / $df.b);
+    let a = ($df | with-column $res --name res);
     $a | drop-nulls"#,
                 result: Some(
                     NuDataFrame::try_from_columns(vec![
diff --git a/crates/nu-command/src/dataframe/eager/take.rs b/crates/nu-command/src/dataframe/eager/take.rs
index 6ee189c9ca..68e3d058d7 100644
--- a/crates/nu-command/src/dataframe/eager/take.rs
+++ b/crates/nu-command/src/dataframe/eager/take.rs
@@ -38,9 +38,9 @@ impl Command for TakeDF {
         vec![
             Example {
                 description: "Takes selected rows from dataframe",
-                example: r#"let my_df = ([[a b]; [4 1] [5 2] [4 3]] | into df);
+                example: r#"let df = ([[a b]; [4 1] [5 2] [4 3]] | into df);
     let indices = ([0 2] | into df);
-    $my_df | take $indices"#,
+    $df | take $indices"#,
                 result: Some(
                     NuDataFrame::try_from_columns(vec![
                         Column::new(
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 177fa2f1e1..f92cb69e61 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -74,10 +74,6 @@ pub fn is_math_expression_like(
         return true;
     }
 
-    if bytes == b"nu" {
-        return false;
-    }
-
     let b = bytes[0];
 
     if b == b'('
@@ -119,11 +115,6 @@ pub fn is_math_expression_like(
         return true;
     }
 
-    let parsed_variable = parse_variable(working_set, span);
-    if parsed_variable.0.is_some() && parsed_variable.1.is_none() {
-        return true;
-    }
-
     false
 }
 
@@ -4027,23 +4018,6 @@ pub fn parse_value(
         return parse_variable_expr(working_set, span);
     }
 
-    let parsed_variable = parse_variable(working_set, span);
-    if parsed_variable.0.is_some() && parsed_variable.1.is_none() {
-        let var_id = parsed_variable
-            .0
-            .expect("internal error: already checked var id exists");
-        return (
-            Expression {
-                expr: Expr::Var(var_id),
-                span,
-                custom_completion: None,
-                ty: working_set.get_variable(var_id).ty.clone(),
-            },
-            None,
-        );
-    }
-    let bytes = working_set.get_span_contents(span);
-
     // Check for reserved keyword values
     match bytes {
         b"true" => {
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 5855896c86..240d06ef4a 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -1511,21 +1511,13 @@ impl<'a> StateWorkingSet<'a> {
     pub fn find_variable(&self, name: &[u8]) -> Option<VarId> {
         let mut removed_overlays = vec![];
 
-        let name = if name.starts_with(&[b'$']) {
-            name.to_vec()
-        } else {
-            let mut new_name = name.to_vec();
-            new_name.insert(0, b'$');
-            new_name
-        };
-
         for scope_frame in self.delta.scope.iter().rev() {
             for overlay_frame in scope_frame
                 .active_overlays(&mut removed_overlays)
                 .iter()
                 .rev()
             {
-                if let Some(var_id) = overlay_frame.vars.get(&name) {
+                if let Some(var_id) = overlay_frame.vars.get(name) {
                     return Some(*var_id);
                 }
             }
@@ -1537,7 +1529,7 @@ impl<'a> StateWorkingSet<'a> {
             .iter()
             .rev()
         {
-            if let Some(var_id) = overlay_frame.vars.get(&name) {
+            if let Some(var_id) = overlay_frame.vars.get(name) {
                 return Some(*var_id);
             }
         }

From f7d3ccfc70b8fa7526cf552398cd8ea4923c6bdc Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 6 Sep 2022 11:29:51 +0200
Subject: [PATCH 07/45] Pin reedline to 0.11.0 release (#6497)

Includes minor bugfixes around the history

Release notes:

https://github.com/nushell/reedline/releases/tag/v0.11.0
---
 Cargo.lock                   | 5 +++--
 Cargo.toml                   | 4 +---
 crates/nu-cli/Cargo.toml     | 2 +-
 crates/nu-command/Cargo.toml | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 520f0667f8..fc6e3d723c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4078,8 +4078,9 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.10.0"
-source = "git+https://github.com/nushell/reedline?branch=main#fe889ae5c4b4fa7492cf6f138ccd4274b0f682cf"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5559b5ab4817b0da0c6fc6814edfae537209e01d955a2f3e7595606e3d039691"
 dependencies = [
  "chrono",
  "crossterm 0.24.0",
diff --git a/Cargo.toml b/Cargo.toml
index 35a65e7022..b61d93ba09 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,7 @@ nu-system = { path = "./crates/nu-system", version = "0.67.1" }
 nu-table = { path = "./crates/nu-table", version = "0.67.1"  }
 nu-term-grid = { path = "./crates/nu-term-grid", version = "0.67.1"  }
 nu-utils = { path = "./crates/nu-utils", version = "0.67.1"  }
-reedline = { version = "0.10.0", features = ["bashisms", "sqlite"]}
+reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 rayon = "1.5.1"
 is_executable = "1.0.1"
 simplelog = "0.12.0"
@@ -122,5 +122,3 @@ debug = false
 name = "nu"
 path = "src/main.rs"
 
-[patch.crates-io]
-reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 71e1234e4a..6c5a884b01 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -20,7 +20,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.67.1"  }
 nu-utils = { path = "../nu-utils", version = "0.67.1"  }
 nu-ansi-term = "0.46.0"
 nu-color-config = { path = "../nu-color-config", version = "0.67.1"  }
-reedline = { version = "0.10.0", features = ["bashisms", "sqlite"]}
+reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 
 atty = "0.2.14"
 chrono = "0.4.21"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 6c21dfbc65..531f49a660 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -87,7 +87,7 @@ unicode-segmentation = "1.8.0"
 url = "2.2.1"
 uuid = { version = "1.1.2", features = ["v4"] }
 which = { version = "4.3.0", optional = true }
-reedline = { version = "0.10.0", features = ["bashisms", "sqlite"]}
+reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 wax = { version =  "0.5.0", features = ["diagnostics"] }
 rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
 sqlparser = { version = "0.16.0", features = ["serde"], optional = true }

From 9273bb3f721cde2cf6a05619cbc5b5cfbb92ef7f Mon Sep 17 00:00:00 2001
From: JT <547158+jntrnr@users.noreply.github.com>
Date: Wed, 7 Sep 2022 06:29:01 +1200
Subject: [PATCH 08/45] bump to 0.68 (#6501)

---
 Cargo.lock                                  | 42 ++++++++++-----------
 Cargo.toml                                  | 32 ++++++++--------
 crates/nu-cli/Cargo.toml                    | 18 ++++-----
 crates/nu-color-config/Cargo.toml           |  8 ++--
 crates/nu-command/Cargo.toml                | 28 +++++++-------
 crates/nu-engine/Cargo.toml                 | 10 ++---
 crates/nu-glob/Cargo.toml                   |  2 +-
 crates/nu-json/Cargo.toml                   |  4 +-
 crates/nu-parser/Cargo.toml                 | 10 ++---
 crates/nu-path/Cargo.toml                   |  2 +-
 crates/nu-plugin/Cargo.toml                 |  6 +--
 crates/nu-pretty-hex/Cargo.toml             |  2 +-
 crates/nu-protocol/Cargo.toml               |  8 ++--
 crates/nu-system/Cargo.lock                 |  2 +-
 crates/nu-system/Cargo.toml                 |  2 +-
 crates/nu-table/Cargo.toml                  |  4 +-
 crates/nu-term-grid/Cargo.toml              |  2 +-
 crates/nu-test-support/Cargo.toml           |  8 ++--
 crates/nu-utils/Cargo.toml                  |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml   |  4 +-
 crates/nu_plugin_example/Cargo.toml         |  6 +--
 crates/nu_plugin_gstat/Cargo.toml           |  8 ++--
 crates/nu_plugin_inc/Cargo.toml             |  6 +--
 crates/nu_plugin_query/Cargo.toml           |  8 ++--
 crates/old/nu_plugin_chart/Cargo.toml       | 14 +++----
 crates/old/nu_plugin_from_bson/Cargo.toml   | 10 ++---
 crates/old/nu_plugin_from_mp4/Cargo.toml    | 10 ++---
 crates/old/nu_plugin_from_sqlite/Cargo.toml | 10 ++---
 crates/old/nu_plugin_s3/Cargo.toml          | 10 ++---
 crates/old/nu_plugin_start/Cargo.toml       | 14 +++----
 crates/old/nu_plugin_to_bson/Cargo.toml     | 10 ++---
 crates/old/nu_plugin_to_sqlite/Cargo.toml   | 10 ++---
 crates/old/nu_plugin_tree/Cargo.toml        |  8 ++--
 samples/wasm/Cargo.toml                     |  2 +-
 34 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fc6e3d723c..e20624f0c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2576,7 +2576,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "assert_cmd",
  "chrono",
@@ -2628,7 +2628,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "atty",
  "chrono",
@@ -2657,7 +2657,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "nu-ansi-term",
  "nu-json",
@@ -2668,7 +2668,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "Inflector",
  "alphanumeric-sort",
@@ -2762,7 +2762,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "chrono",
  "nu-glob",
@@ -2775,7 +2775,7 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "doc-comment",
  "tempdir",
@@ -2783,7 +2783,7 @@ dependencies = [
 
 [[package]]
 name = "nu-json"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "fancy-regex",
  "lazy_static",
@@ -2796,7 +2796,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "chrono",
  "itertools",
@@ -2812,7 +2812,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "dirs-next",
  "dunce",
@@ -2821,7 +2821,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "bincode",
  "byte-order",
@@ -2837,7 +2837,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -2846,7 +2846,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "byte-unit",
  "chrono",
@@ -2867,7 +2867,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "atty",
  "chrono",
@@ -2884,7 +2884,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "atty",
  "nu-ansi-term",
@@ -2895,7 +2895,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "strip-ansi-escapes",
  "unicode-width",
@@ -2903,7 +2903,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "getset",
  "hamcrest2",
@@ -2918,7 +2918,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "crossterm_winapi",
  "lscolors",
@@ -2938,7 +2938,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -2946,7 +2946,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "git2",
  "nu-engine",
@@ -2956,7 +2956,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -2965,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "gjson",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index b61d93ba09..7480b81609 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ name = "nu"
 readme = "README.md"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.60"
-version = "0.67.1"
+version = "0.68.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -39,20 +39,20 @@ ctrlc = "3.2.1"
 log = "0.4"
 miette = "5.1.0"
 nu-ansi-term = "0.46.0"
-nu-cli = { path="./crates/nu-cli", version = "0.67.1"  }
-nu-color-config = { path = "./crates/nu-color-config", version = "0.67.1"  }
-nu-command = { path="./crates/nu-command", version = "0.67.1"  }
-nu-engine = { path="./crates/nu-engine", version = "0.67.1"  }
-nu-json = { path="./crates/nu-json", version = "0.67.1"  }
-nu-parser = { path="./crates/nu-parser", version = "0.67.1"  }
-nu-path = { path="./crates/nu-path", version = "0.67.1"  }
-nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.67.1"  }
-nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.67.1"  }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.67.1"  }
-nu-system = { path = "./crates/nu-system", version = "0.67.1" }
-nu-table = { path = "./crates/nu-table", version = "0.67.1"  }
-nu-term-grid = { path = "./crates/nu-term-grid", version = "0.67.1"  }
-nu-utils = { path = "./crates/nu-utils", version = "0.67.1"  }
+nu-cli = { path="./crates/nu-cli", version = "0.68.0"  }
+nu-color-config = { path = "./crates/nu-color-config", version = "0.68.0"  }
+nu-command = { path="./crates/nu-command", version = "0.68.0"  }
+nu-engine = { path="./crates/nu-engine", version = "0.68.0"  }
+nu-json = { path="./crates/nu-json", version = "0.68.0"  }
+nu-parser = { path="./crates/nu-parser", version = "0.68.0"  }
+nu-path = { path="./crates/nu-path", version = "0.68.0"  }
+nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.68.0"  }
+nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.68.0"  }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.68.0"  }
+nu-system = { path = "./crates/nu-system", version = "0.68.0" }
+nu-table = { path = "./crates/nu-table", version = "0.68.0"  }
+nu-term-grid = { path = "./crates/nu-term-grid", version = "0.68.0"  }
+nu-utils = { path = "./crates/nu-utils", version = "0.68.0"  }
 reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 rayon = "1.5.1"
 is_executable = "1.0.1"
@@ -65,7 +65,7 @@ openssl = { version = "0.10.38", features = ["vendored"], optional = true }
 signal-hook = { version = "0.3.14", default-features = false }
 
 [dev-dependencies]
-nu-test-support = { path="./crates/nu-test-support", version = "0.67.1"  }
+nu-test-support = { path="./crates/nu-test-support", version = "0.68.0"  }
 tempfile = "3.2.0"
 assert_cmd = "2.0.2"
 pretty_assertions = "1.0.0"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 6c5a884b01..20ff1e3152 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.67.1"
+version = "0.68.0"
 
 [dev-dependencies]
-nu-test-support = { path="../nu-test-support", version = "0.67.1"  }
-nu-command = { path = "../nu-command", version = "0.67.1" }
+nu-test-support = { path="../nu-test-support", version = "0.68.0"  }
+nu-command = { path = "../nu-command", version = "0.68.0" }
 rstest = {version = "0.15.0", default-features = false}
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.67.1"  }
-nu-path = { path = "../nu-path", version = "0.67.1"  }
-nu-parser = { path = "../nu-parser", version = "0.67.1"  }
-nu-protocol = { path = "../nu-protocol", version = "0.67.1"  }
-nu-utils = { path = "../nu-utils", version = "0.67.1"  }
+nu-engine = { path = "../nu-engine", version = "0.68.0"  }
+nu-path = { path = "../nu-path", version = "0.68.0"  }
+nu-parser = { path = "../nu-parser", version = "0.68.0"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.0"  }
+nu-utils = { path = "../nu-utils", version = "0.68.0"  }
 nu-ansi-term = "0.46.0"
-nu-color-config = { path = "../nu-color-config", version = "0.67.1"  }
+nu-color-config = { path = "../nu-color-config", version = "0.68.0"  }
 reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 
 atty = "0.2.14"
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 28208195d4..89d93abf6b 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,11 +5,11 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.67.1"
+version = "0.68.0"
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.67.1"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.0"  }
 nu-ansi-term = "0.46.0"
-nu-json = { path = "../nu-json", version = "0.67.1"  }
-nu-table = { path = "../nu-table", version = "0.67.1"  }
+nu-json = { path = "../nu-json", version = "0.68.0"  }
+nu-table = { path = "../nu-table", version = "0.68.0"  }
 serde = { version="1.0.123", features=["derive"] }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 531f49a660..629d5b28c1 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,25 +5,25 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
 edition = "2021"
 license = "MIT"
 name = "nu-command"
-version = "0.67.1"
+version = "0.68.0"
 build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-color-config = { path = "../nu-color-config", version = "0.67.1"  }
-nu-engine = { path = "../nu-engine", version = "0.67.1"  }
-nu-glob = { path = "../nu-glob", version = "0.67.1" }
-nu-json = { path = "../nu-json", version = "0.67.1"  }
-nu-parser = { path = "../nu-parser", version = "0.67.1"  }
-nu-path = { path = "../nu-path", version = "0.67.1"  }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.67.1"  }
-nu-protocol = { path = "../nu-protocol", version = "0.67.1"  }
-nu-system = { path = "../nu-system", version = "0.67.1"  }
-nu-table = { path = "../nu-table", version = "0.67.1"  }
-nu-term-grid = { path = "../nu-term-grid", version = "0.67.1"  }
-nu-test-support = { path = "../nu-test-support", version = "0.67.1"  }
-nu-utils = { path = "../nu-utils", version = "0.67.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.68.0"  }
+nu-engine = { path = "../nu-engine", version = "0.68.0"  }
+nu-glob = { path = "../nu-glob", version = "0.68.0" }
+nu-json = { path = "../nu-json", version = "0.68.0"  }
+nu-parser = { path = "../nu-parser", version = "0.68.0"  }
+nu-path = { path = "../nu-path", version = "0.68.0"  }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.68.0"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.0"  }
+nu-system = { path = "../nu-system", version = "0.68.0"  }
+nu-table = { path = "../nu-table", version = "0.68.0"  }
+nu-term-grid = { path = "../nu-term-grid", version = "0.68.0"  }
+nu-test-support = { path = "../nu-test-support", version = "0.68.0"  }
+nu-utils = { path = "../nu-utils", version = "0.68.0" }
 nu-ansi-term = "0.46.0"
 num-format = { version = "0.4.0" }
 
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 91d6335929..a606565317 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,13 +5,13 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.67.1"
+version = "0.68.0"
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.67.1"  }
-nu-path = { path = "../nu-path", version = "0.67.1"  }
-nu-glob = { path = "../nu-glob", version = "0.67.1" }
-nu-utils = { path = "../nu-utils", version = "0.67.1"  }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.68.0"  }
+nu-path = { path = "../nu-path", version = "0.68.0"  }
+nu-glob = { path = "../nu-glob", version = "0.68.0" }
+nu-utils = { path = "../nu-utils", version = "0.68.0"  }
 
 chrono = { version="0.4.21", features=["serde"] }
 sysinfo = "0.25.2"
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index ce43daa8e0..a598d17a6e 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.67.1"
+version = "0.68.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 e23895fc0b..0f38122295 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.67.1"
+version = "0.68.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -21,5 +21,5 @@ num-traits = "0.2.14"
 serde = "1.0"
 
 [dev-dependencies]
-nu-path = { path="../nu-path", version = "0.67.1" }
+nu-path = { path="../nu-path", version = "0.68.0" }
 serde_json = "1.0"
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 0af4ee2658..cc6069a4fa 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.67.1"
+version = "0.68.0"
 
 [dependencies]
 chrono = "0.4.21"
@@ -13,10 +13,10 @@ itertools = "0.10"
 miette = "5.1.0"
 thiserror = "1.0.31"
 serde_json = "1.0"
-nu-path = {path = "../nu-path", version = "0.67.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.67.1" }
-nu-plugin = { path = "../nu-plugin", optional = true, version = "0.67.1"  }
-nu-engine = { path = "../nu-engine", version = "0.67.1" }
+nu-path = {path = "../nu-path", version = "0.68.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.0" }
+nu-plugin = { path = "../nu-plugin", optional = true, version = "0.68.0"  }
+nu-engine = { path = "../nu-engine", version = "0.68.0" }
 log = "0.4"
 
 [features]
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 9f2d7a033b..e2e482ae8b 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.67.1"
+version = "0.68.0"
 
 [dependencies]
 dirs-next = "2.0.0"
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 31fc2c8741..89082ee501 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.67.1"
+version = "0.68.0"
 
 [dependencies]
 bincode = "1.3.3"
-nu-protocol = { path = "../nu-protocol", version = "0.67.1"  }
-nu-engine = { path = "../nu-engine", version = "0.67.1"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.0"  }
+nu-engine = { path = "../nu-engine", version = "0.68.0"  }
 serde = {version = "1.0.143", features = ["derive"]}
 serde_json = { version = "1.0"}
 byte-order = "0.3.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 2f2ebfdd5d..e1467d9204 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.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 4f24929be6..09b37cd2eb 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.67.1"
+version = "0.68.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.67.1"  }
-nu-path = { path = "../nu-path", version = "0.67.1"  }
-nu-json = { path = "../nu-json", version = "0.67.1"  }
+nu-utils = { path = "../nu-utils", version = "0.68.0"  }
+nu-path = { path = "../nu-path", version = "0.68.0"  }
+nu-json = { path = "../nu-json", version = "0.68.0"  }
 
 byte-unit = "4.0.9"
 chrono = { version="0.4.21", features=["serde"] }
diff --git a/crates/nu-system/Cargo.lock b/crates/nu-system/Cargo.lock
index 347da50f98..427869c687 100644
--- a/crates/nu-system/Cargo.lock
+++ b/crates/nu-system/Cargo.lock
@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.67.1"
+version = "0.68.0"
 dependencies = [
  "errno",
  "libproc",
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index aabd50e472..0724b40773 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.67.1"
+version = "0.68.0"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index c1159f8643..f24476974b 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.67.1"
+version = "0.68.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -14,7 +14,7 @@ path = "src/main.rs"
 
 [dependencies]
 nu-ansi-term = "0.46.0"
-nu-protocol = { path = "../nu-protocol", version = "0.67.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.0" }
 strip-ansi-escapes = "0.1.1"
 atty = "0.2.14"
 tabled = { version = "0.8.0", features = ["color"] }
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index b4cf1dc503..9127f3e241 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.67.1"
+version = "0.68.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 28b501a32d..69254b981f 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2018"
 license = "MIT"
 name = "nu-test-support"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-path = { path="../nu-path", version = "0.67.1"  }
-nu-glob = { path = "../nu-glob", version = "0.67.1" }
-nu-utils = { path="../nu-utils", version = "0.67.1"  }
+nu-path = { path="../nu-path", version = "0.68.0"  }
+nu-glob = { path = "../nu-glob", version = "0.68.0" }
+nu-utils = { path="../nu-utils", version = "0.68.0"  }
 lazy_static = "1.4.0"
 num-format = "0.4.0"
 
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index d2139c7ee1..8c1a977ff1 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
 edition = "2021"
 license = "MIT"
 name = "nu-utils"
-version = "0.67.1"
+version = "0.68.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 82656d4977..a9e3256ff5 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.67.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.67.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.68.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.0", features = ["plugin"] }
 serde = { version = "1.0", features = ["derive"] }
 typetag = "0.1.8"
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 6451a9d733..d116192c59 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,8 +5,8 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.67.1"
+version = "0.68.0"
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1", features = ["plugin"]}
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0", features = ["plugin"]}
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index c439055b33..9ad08375c1 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-engine = { path="../nu-engine", version = "0.67.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-engine = { path="../nu-engine", version = "0.68.0" }
 
 git2 = "0.15.0"
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index f9d5444adb..654712dd5c 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,13 +5,13 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1", features = ["plugin"]}
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0", features = ["plugin"]}
 
 semver = "0.11.0"
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 518a02fdee..29fa9fcc08 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-engine = { path="../nu-engine", version = "0.67.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-engine = { path="../nu-engine", version = "0.68.0" }
 gjson = "0.8.0"
 scraper = "0.13.0"
 sxd-document = "0.3.2"
diff --git a/crates/old/nu_plugin_chart/Cargo.toml b/crates/old/nu_plugin_chart/Cargo.toml
index 1ca902c8ff..01ca6986ad 100644
--- a/crates/old/nu_plugin_chart/Cargo.toml
+++ b/crates/old/nu_plugin_chart/Cargo.toml
@@ -4,18 +4,18 @@ description = "A plugin to display charts"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_chart"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-data = { path="../nu-data", version = "0.67.1" }
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-source = { path="../nu-source", version = "0.67.1" }
-nu-value-ext = { path="../nu-value-ext", version = "0.67.1" }
+nu-data = { path="../nu-data", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-source = { path="../nu-source", version = "0.68.0" }
+nu-value-ext = { path="../nu-value-ext", version = "0.68.0" }
 
 crossterm = "0.19.0"
 tui = { version="0.15.0", default-features=false, features=["crossterm"] }
diff --git a/crates/old/nu_plugin_from_bson/Cargo.toml b/crates/old/nu_plugin_from_bson/Cargo.toml
index b2885b5324..c322c1d1ef 100644
--- a/crates/old/nu_plugin_from_bson/Cargo.toml
+++ b/crates/old/nu_plugin_from_bson/Cargo.toml
@@ -4,7 +4,7 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_bson"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
@@ -12,9 +12,9 @@ doctest = false
 [dependencies]
 bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
 bson = { version = "2.0.1", features = [ "chrono-0_4" ] }
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-source = { path="../nu-source", version = "0.67.1" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-source = { path="../nu-source", version = "0.68.0" }
 
 [build-dependencies]
diff --git a/crates/old/nu_plugin_from_mp4/Cargo.toml b/crates/old/nu_plugin_from_mp4/Cargo.toml
index 4209563aad..83fbbfc1c0 100644
--- a/crates/old/nu_plugin_from_mp4/Cargo.toml
+++ b/crates/old/nu_plugin_from_mp4/Cargo.toml
@@ -4,16 +4,16 @@ description = "A converter plugin to the mp4 format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_mp4"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-source = { path="../nu-source", version = "0.67.1" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-source = { path="../nu-source", version = "0.68.0" }
 tempfile = "3.2.0"
 mp4 = "0.9.0"
 
diff --git a/crates/old/nu_plugin_from_sqlite/Cargo.toml b/crates/old/nu_plugin_from_sqlite/Cargo.toml
index c6c6a66ff3..f00892aa02 100644
--- a/crates/old/nu_plugin_from_sqlite/Cargo.toml
+++ b/crates/old/nu_plugin_from_sqlite/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_sqlite"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
 bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-source = { path="../nu-source", version = "0.67.1" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-source = { path="../nu-source", version = "0.68.0" }
 tempfile = "3.2.0"
 
 [dependencies.rusqlite]
diff --git a/crates/old/nu_plugin_s3/Cargo.toml b/crates/old/nu_plugin_s3/Cargo.toml
index 0bd5af77c0..86d3d41c33 100644
--- a/crates/old/nu_plugin_s3/Cargo.toml
+++ b/crates/old/nu_plugin_s3/Cargo.toml
@@ -4,17 +4,17 @@ description = "An S3 plugin for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_s3"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
 futures = { version="0.3.12", features=["compat", "io-compat"] }
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-source = { path="../nu-source", version = "0.67.1" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-source = { path="../nu-source", version = "0.68.0" }
 s3handler = "0.7.5"
 
 [build-dependencies]
diff --git a/crates/old/nu_plugin_start/Cargo.toml b/crates/old/nu_plugin_start/Cargo.toml
index 0ac7ff1b89..4df22022ed 100644
--- a/crates/old/nu_plugin_start/Cargo.toml
+++ b/crates/old/nu_plugin_start/Cargo.toml
@@ -4,17 +4,17 @@ description = "A plugin to open files/URLs directly from Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_start"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
 glob = "0.3.0"
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-source = { path="../nu-source", version = "0.67.1" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-source = { path="../nu-source", version = "0.68.0" }
 url = "2.2.0"
 webbrowser = "0.5.5"
 
@@ -22,5 +22,5 @@ webbrowser = "0.5.5"
 open = "1.4.0"
 
 [build-dependencies]
-nu-errors = { version = "0.67.1", path="../nu-errors" }
-nu-source = { version = "0.67.1", path="../nu-source" }
+nu-errors = { version = "0.68.0", path="../nu-errors" }
+nu-source = { version = "0.68.0", path="../nu-source" }
diff --git a/crates/old/nu_plugin_to_bson/Cargo.toml b/crates/old/nu_plugin_to_bson/Cargo.toml
index 410d46cfc4..fcc1984614 100644
--- a/crates/old/nu_plugin_to_bson/Cargo.toml
+++ b/crates/old/nu_plugin_to_bson/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_to_bson"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
 bson = { version = "2.0.1", features = [ "chrono-0_4" ] }
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-source = { path="../nu-source", version = "0.67.1" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-source = { path="../nu-source", version = "0.68.0" }
 num-traits = "0.2.14"
 
 [features]
diff --git a/crates/old/nu_plugin_to_sqlite/Cargo.toml b/crates/old/nu_plugin_to_sqlite/Cargo.toml
index b49cdfee5e..75cf91cbbe 100644
--- a/crates/old/nu_plugin_to_sqlite/Cargo.toml
+++ b/crates/old/nu_plugin_to_sqlite/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the SQLite format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_to_sqlite"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
 hex = "0.4.2"
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
-nu-source = { path="../nu-source", version = "0.67.1" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-source = { path="../nu-source", version = "0.68.0" }
 tempfile = "3.2.0"
 
 [dependencies.rusqlite]
diff --git a/crates/old/nu_plugin_tree/Cargo.toml b/crates/old/nu_plugin_tree/Cargo.toml
index b0fe59088c..484e1cf16b 100644
--- a/crates/old/nu_plugin_tree/Cargo.toml
+++ b/crates/old/nu_plugin_tree/Cargo.toml
@@ -4,16 +4,16 @@ description = "Tree viewer plugin for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_tree"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 doctest = false
 
 [dependencies]
 derive-new = "0.5.8"
-nu-errors = { path="../nu-errors", version = "0.67.1" }
-nu-plugin = { path="../nu-plugin", version = "0.67.1" }
-nu-protocol = { path="../nu-protocol", version = "0.67.1" }
+nu-errors = { path="../nu-errors", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.0" }
+nu-protocol = { path="../nu-protocol", version = "0.68.0" }
 ptree = { version = "0.4.0", default-features = false }
 
 
diff --git a/samples/wasm/Cargo.toml b/samples/wasm/Cargo.toml
index 2e2bdb302d..94f0695fa6 100644
--- a/samples/wasm/Cargo.toml
+++ b/samples/wasm/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Nu authors"]
 edition = "2018"
 name = "wasm"
-version = "0.67.1"
+version = "0.68.0"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

From b0e5723a68d77b42d756879ab7773fdee81f8924 Mon Sep 17 00:00:00 2001
From: JT <547158+jntrnr@users.noreply.github.com>
Date: Wed, 7 Sep 2022 06:42:11 +1200
Subject: [PATCH 09/45] move back to old names for upcoming release

---
 .github/workflows/release-pkg.nu | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index 7491644e25..a71831be2f 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -50,7 +50,7 @@ if $os in ['ubuntu-latest', 'macos-latest'] {
 # Build for Windows without static-link-openssl feature
 # ----------------------------------------------------------------------------
 if $os in ['windows-latest'] {
-    if ($flags | str trim | is-empty) {
+    if ($flags | str trim | empty?) {
         cargo build --release --all --target $target --features=extra
     } else {
         cargo build --release --all --target $target --features=extra $flags
@@ -80,7 +80,7 @@ let ver = if $os == 'windows-latest' {
 } else {
     (do -i { ./output/nu -c 'version' }) | str collect
 }
-if ($ver | str trim | is-empty) {
+if ($ver | str trim | empty?) {
     $'(ansi r)Incompatible nu binary...(ansi reset)'
 } else { $ver }
 
@@ -124,14 +124,14 @@ if $os in ['ubuntu-latest', 'macos-latest'] {
         7z a $archive *
         print $'archive: ---> ($archive)';
         let pkg = (ls -f $archive | get name)
-        if not ($pkg | is-empty) {
+        if not ($pkg | empty?) {
             echo $'::set-output name=archive::($pkg | get 0)'
         }
     }
 }
 
 def 'cargo-build-nu' [ options: string ] {
-    if ($options | str trim | is-empty) {
+    if ($options | str trim | empty?) {
         cargo build --release --all --target $target --features=extra,static-link-openssl
     } else {
         cargo build --release --all --target $target --features=extra,static-link-openssl $options

From c902d8bc0ca5c527c279426ebfae064ce789ac3b Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 7 Sep 2022 10:27:33 +0800
Subject: [PATCH 10/45] bump dev version to v0.68.1 (#6504)

---
 Cargo.lock                                  | 42 ++++++++++-----------
 Cargo.toml                                  | 32 ++++++++--------
 crates/nu-cli/Cargo.toml                    | 18 ++++-----
 crates/nu-color-config/Cargo.toml           |  8 ++--
 crates/nu-command/Cargo.toml                | 28 +++++++-------
 crates/nu-engine/Cargo.toml                 | 10 ++---
 crates/nu-glob/Cargo.toml                   |  2 +-
 crates/nu-json/Cargo.toml                   |  4 +-
 crates/nu-parser/Cargo.toml                 | 10 ++---
 crates/nu-path/Cargo.toml                   |  2 +-
 crates/nu-plugin/Cargo.toml                 |  6 +--
 crates/nu-pretty-hex/Cargo.toml             |  2 +-
 crates/nu-protocol/Cargo.toml               |  8 ++--
 crates/nu-system/Cargo.lock                 |  2 +-
 crates/nu-system/Cargo.toml                 |  2 +-
 crates/nu-table/Cargo.toml                  |  4 +-
 crates/nu-term-grid/Cargo.toml              |  2 +-
 crates/nu-test-support/Cargo.toml           |  8 ++--
 crates/nu-utils/Cargo.toml                  |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml   |  4 +-
 crates/nu_plugin_example/Cargo.toml         |  6 +--
 crates/nu_plugin_gstat/Cargo.toml           |  8 ++--
 crates/nu_plugin_inc/Cargo.toml             |  6 +--
 crates/nu_plugin_query/Cargo.toml           |  8 ++--
 crates/old/nu_plugin_chart/Cargo.toml       | 14 +++----
 crates/old/nu_plugin_from_bson/Cargo.toml   | 10 ++---
 crates/old/nu_plugin_from_mp4/Cargo.toml    | 10 ++---
 crates/old/nu_plugin_from_sqlite/Cargo.toml | 10 ++---
 crates/old/nu_plugin_s3/Cargo.toml          | 10 ++---
 crates/old/nu_plugin_start/Cargo.toml       | 14 +++----
 crates/old/nu_plugin_to_bson/Cargo.toml     | 10 ++---
 crates/old/nu_plugin_to_sqlite/Cargo.toml   | 10 ++---
 crates/old/nu_plugin_tree/Cargo.toml        |  8 ++--
 samples/wasm/Cargo.toml                     |  2 +-
 34 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e20624f0c8..aaf74b424c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2576,7 +2576,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "assert_cmd",
  "chrono",
@@ -2628,7 +2628,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "atty",
  "chrono",
@@ -2657,7 +2657,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "nu-ansi-term",
  "nu-json",
@@ -2668,7 +2668,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "Inflector",
  "alphanumeric-sort",
@@ -2762,7 +2762,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "chrono",
  "nu-glob",
@@ -2775,7 +2775,7 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "doc-comment",
  "tempdir",
@@ -2783,7 +2783,7 @@ dependencies = [
 
 [[package]]
 name = "nu-json"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "fancy-regex",
  "lazy_static",
@@ -2796,7 +2796,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "chrono",
  "itertools",
@@ -2812,7 +2812,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "dirs-next",
  "dunce",
@@ -2821,7 +2821,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "bincode",
  "byte-order",
@@ -2837,7 +2837,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -2846,7 +2846,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "byte-unit",
  "chrono",
@@ -2867,7 +2867,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "atty",
  "chrono",
@@ -2884,7 +2884,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "atty",
  "nu-ansi-term",
@@ -2895,7 +2895,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "strip-ansi-escapes",
  "unicode-width",
@@ -2903,7 +2903,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "getset",
  "hamcrest2",
@@ -2918,7 +2918,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "crossterm_winapi",
  "lscolors",
@@ -2938,7 +2938,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -2946,7 +2946,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "git2",
  "nu-engine",
@@ -2956,7 +2956,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -2965,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "gjson",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index 7480b81609..5b358f82b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ name = "nu"
 readme = "README.md"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.60"
-version = "0.68.0"
+version = "0.68.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -39,20 +39,20 @@ ctrlc = "3.2.1"
 log = "0.4"
 miette = "5.1.0"
 nu-ansi-term = "0.46.0"
-nu-cli = { path="./crates/nu-cli", version = "0.68.0"  }
-nu-color-config = { path = "./crates/nu-color-config", version = "0.68.0"  }
-nu-command = { path="./crates/nu-command", version = "0.68.0"  }
-nu-engine = { path="./crates/nu-engine", version = "0.68.0"  }
-nu-json = { path="./crates/nu-json", version = "0.68.0"  }
-nu-parser = { path="./crates/nu-parser", version = "0.68.0"  }
-nu-path = { path="./crates/nu-path", version = "0.68.0"  }
-nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.68.0"  }
-nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.68.0"  }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.68.0"  }
-nu-system = { path = "./crates/nu-system", version = "0.68.0" }
-nu-table = { path = "./crates/nu-table", version = "0.68.0"  }
-nu-term-grid = { path = "./crates/nu-term-grid", version = "0.68.0"  }
-nu-utils = { path = "./crates/nu-utils", version = "0.68.0"  }
+nu-cli = { path="./crates/nu-cli", version = "0.68.1"  }
+nu-color-config = { path = "./crates/nu-color-config", version = "0.68.1"  }
+nu-command = { path="./crates/nu-command", version = "0.68.1"  }
+nu-engine = { path="./crates/nu-engine", version = "0.68.1"  }
+nu-json = { path="./crates/nu-json", version = "0.68.1"  }
+nu-parser = { path="./crates/nu-parser", version = "0.68.1"  }
+nu-path = { path="./crates/nu-path", version = "0.68.1"  }
+nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.68.1"  }
+nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.68.1"  }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.68.1"  }
+nu-system = { path = "./crates/nu-system", version = "0.68.1" }
+nu-table = { path = "./crates/nu-table", version = "0.68.1"  }
+nu-term-grid = { path = "./crates/nu-term-grid", version = "0.68.1"  }
+nu-utils = { path = "./crates/nu-utils", version = "0.68.1"  }
 reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 rayon = "1.5.1"
 is_executable = "1.0.1"
@@ -65,7 +65,7 @@ openssl = { version = "0.10.38", features = ["vendored"], optional = true }
 signal-hook = { version = "0.3.14", default-features = false }
 
 [dev-dependencies]
-nu-test-support = { path="./crates/nu-test-support", version = "0.68.0"  }
+nu-test-support = { path="./crates/nu-test-support", version = "0.68.1"  }
 tempfile = "3.2.0"
 assert_cmd = "2.0.2"
 pretty_assertions = "1.0.0"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 20ff1e3152..a2782b1c14 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.68.0"
+version = "0.68.1"
 
 [dev-dependencies]
-nu-test-support = { path="../nu-test-support", version = "0.68.0"  }
-nu-command = { path = "../nu-command", version = "0.68.0" }
+nu-test-support = { path="../nu-test-support", version = "0.68.1"  }
+nu-command = { path = "../nu-command", version = "0.68.1" }
 rstest = {version = "0.15.0", default-features = false}
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.68.0"  }
-nu-path = { path = "../nu-path", version = "0.68.0"  }
-nu-parser = { path = "../nu-parser", version = "0.68.0"  }
-nu-protocol = { path = "../nu-protocol", version = "0.68.0"  }
-nu-utils = { path = "../nu-utils", version = "0.68.0"  }
+nu-engine = { path = "../nu-engine", version = "0.68.1"  }
+nu-path = { path = "../nu-path", version = "0.68.1"  }
+nu-parser = { path = "../nu-parser", version = "0.68.1"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.1"  }
+nu-utils = { path = "../nu-utils", version = "0.68.1"  }
 nu-ansi-term = "0.46.0"
-nu-color-config = { path = "../nu-color-config", version = "0.68.0"  }
+nu-color-config = { path = "../nu-color-config", version = "0.68.1"  }
 reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 
 atty = "0.2.14"
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 89d93abf6b..afc8a742ba 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,11 +5,11 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.68.0"
+version = "0.68.1"
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.68.0"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.1"  }
 nu-ansi-term = "0.46.0"
-nu-json = { path = "../nu-json", version = "0.68.0"  }
-nu-table = { path = "../nu-table", version = "0.68.0"  }
+nu-json = { path = "../nu-json", version = "0.68.1"  }
+nu-table = { path = "../nu-table", version = "0.68.1"  }
 serde = { version="1.0.123", features=["derive"] }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 629d5b28c1..7092f58c6e 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,25 +5,25 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
 edition = "2021"
 license = "MIT"
 name = "nu-command"
-version = "0.68.0"
+version = "0.68.1"
 build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-color-config = { path = "../nu-color-config", version = "0.68.0"  }
-nu-engine = { path = "../nu-engine", version = "0.68.0"  }
-nu-glob = { path = "../nu-glob", version = "0.68.0" }
-nu-json = { path = "../nu-json", version = "0.68.0"  }
-nu-parser = { path = "../nu-parser", version = "0.68.0"  }
-nu-path = { path = "../nu-path", version = "0.68.0"  }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.68.0"  }
-nu-protocol = { path = "../nu-protocol", version = "0.68.0"  }
-nu-system = { path = "../nu-system", version = "0.68.0"  }
-nu-table = { path = "../nu-table", version = "0.68.0"  }
-nu-term-grid = { path = "../nu-term-grid", version = "0.68.0"  }
-nu-test-support = { path = "../nu-test-support", version = "0.68.0"  }
-nu-utils = { path = "../nu-utils", version = "0.68.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.68.1"  }
+nu-engine = { path = "../nu-engine", version = "0.68.1"  }
+nu-glob = { path = "../nu-glob", version = "0.68.1" }
+nu-json = { path = "../nu-json", version = "0.68.1"  }
+nu-parser = { path = "../nu-parser", version = "0.68.1"  }
+nu-path = { path = "../nu-path", version = "0.68.1"  }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.68.1"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.1"  }
+nu-system = { path = "../nu-system", version = "0.68.1"  }
+nu-table = { path = "../nu-table", version = "0.68.1"  }
+nu-term-grid = { path = "../nu-term-grid", version = "0.68.1"  }
+nu-test-support = { path = "../nu-test-support", version = "0.68.1"  }
+nu-utils = { path = "../nu-utils", version = "0.68.1" }
 nu-ansi-term = "0.46.0"
 num-format = { version = "0.4.0" }
 
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index a606565317..c09ff7fc2d 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,13 +5,13 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.68.0"
+version = "0.68.1"
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.68.0"  }
-nu-path = { path = "../nu-path", version = "0.68.0"  }
-nu-glob = { path = "../nu-glob", version = "0.68.0" }
-nu-utils = { path = "../nu-utils", version = "0.68.0"  }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.68.1"  }
+nu-path = { path = "../nu-path", version = "0.68.1"  }
+nu-glob = { path = "../nu-glob", version = "0.68.1" }
+nu-utils = { path = "../nu-utils", version = "0.68.1"  }
 
 chrono = { version="0.4.21", features=["serde"] }
 sysinfo = "0.25.2"
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index a598d17a6e..bd706cc55b 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.68.0"
+version = "0.68.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 0f38122295..991492338a 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.68.0"
+version = "0.68.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -21,5 +21,5 @@ num-traits = "0.2.14"
 serde = "1.0"
 
 [dev-dependencies]
-nu-path = { path="../nu-path", version = "0.68.0" }
+nu-path = { path="../nu-path", version = "0.68.1" }
 serde_json = "1.0"
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index cc6069a4fa..0fed89a3e9 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.68.0"
+version = "0.68.1"
 
 [dependencies]
 chrono = "0.4.21"
@@ -13,10 +13,10 @@ itertools = "0.10"
 miette = "5.1.0"
 thiserror = "1.0.31"
 serde_json = "1.0"
-nu-path = {path = "../nu-path", version = "0.68.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.68.0" }
-nu-plugin = { path = "../nu-plugin", optional = true, version = "0.68.0"  }
-nu-engine = { path = "../nu-engine", version = "0.68.0" }
+nu-path = {path = "../nu-path", version = "0.68.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.1" }
+nu-plugin = { path = "../nu-plugin", optional = true, version = "0.68.1"  }
+nu-engine = { path = "../nu-engine", version = "0.68.1" }
 log = "0.4"
 
 [features]
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index e2e482ae8b..83c72fbb6d 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.68.0"
+version = "0.68.1"
 
 [dependencies]
 dirs-next = "2.0.0"
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 89082ee501..674ace1e58 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.68.0"
+version = "0.68.1"
 
 [dependencies]
 bincode = "1.3.3"
-nu-protocol = { path = "../nu-protocol", version = "0.68.0"  }
-nu-engine = { path = "../nu-engine", version = "0.68.0"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.1"  }
+nu-engine = { path = "../nu-engine", version = "0.68.1"  }
 serde = {version = "1.0.143", features = ["derive"]}
 serde_json = { version = "1.0"}
 byte-order = "0.3.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index e1467d9204..aa00361dec 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.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 09b37cd2eb..e21aed853b 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.68.0"
+version = "0.68.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.68.0"  }
-nu-path = { path = "../nu-path", version = "0.68.0"  }
-nu-json = { path = "../nu-json", version = "0.68.0"  }
+nu-utils = { path = "../nu-utils", version = "0.68.1"  }
+nu-path = { path = "../nu-path", version = "0.68.1"  }
+nu-json = { path = "../nu-json", version = "0.68.1"  }
 
 byte-unit = "4.0.9"
 chrono = { version="0.4.21", features=["serde"] }
diff --git a/crates/nu-system/Cargo.lock b/crates/nu-system/Cargo.lock
index 427869c687..c4c215ec99 100644
--- a/crates/nu-system/Cargo.lock
+++ b/crates/nu-system/Cargo.lock
@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.68.0"
+version = "0.68.1"
 dependencies = [
  "errno",
  "libproc",
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 0724b40773..4b96b9232c 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.68.0"
+version = "0.68.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index f24476974b..74e0a536e2 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.68.0"
+version = "0.68.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -14,7 +14,7 @@ path = "src/main.rs"
 
 [dependencies]
 nu-ansi-term = "0.46.0"
-nu-protocol = { path = "../nu-protocol", version = "0.68.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.1" }
 strip-ansi-escapes = "0.1.1"
 atty = "0.2.14"
 tabled = { version = "0.8.0", features = ["color"] }
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 9127f3e241..90d016f5aa 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.68.0"
+version = "0.68.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 69254b981f..943adcdf12 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2018"
 license = "MIT"
 name = "nu-test-support"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-path = { path="../nu-path", version = "0.68.0"  }
-nu-glob = { path = "../nu-glob", version = "0.68.0" }
-nu-utils = { path="../nu-utils", version = "0.68.0"  }
+nu-path = { path="../nu-path", version = "0.68.1"  }
+nu-glob = { path = "../nu-glob", version = "0.68.1" }
+nu-utils = { path="../nu-utils", version = "0.68.1"  }
 lazy_static = "1.4.0"
 num-format = "0.4.0"
 
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 8c1a977ff1..30d9842d8d 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
 edition = "2021"
 license = "MIT"
 name = "nu-utils"
-version = "0.68.0"
+version = "0.68.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index a9e3256ff5..84ac9d1449 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.68.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.68.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.68.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.1", features = ["plugin"] }
 serde = { version = "1.0", features = ["derive"] }
 typetag = "0.1.8"
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index d116192c59..0084a98bce 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,8 +5,8 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.68.0"
+version = "0.68.1"
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0", features = ["plugin"]}
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1", features = ["plugin"]}
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 9ad08375c1..1b991a127e 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-engine = { path="../nu-engine", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-engine = { path="../nu-engine", version = "0.68.1" }
 
 git2 = "0.15.0"
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 654712dd5c..209ee72a68 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,13 +5,13 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0", features = ["plugin"]}
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1", features = ["plugin"]}
 
 semver = "0.11.0"
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 29fa9fcc08..31bf65ab99 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-engine = { path="../nu-engine", version = "0.68.0" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-engine = { path="../nu-engine", version = "0.68.1" }
 gjson = "0.8.0"
 scraper = "0.13.0"
 sxd-document = "0.3.2"
diff --git a/crates/old/nu_plugin_chart/Cargo.toml b/crates/old/nu_plugin_chart/Cargo.toml
index 01ca6986ad..e9da0fa68f 100644
--- a/crates/old/nu_plugin_chart/Cargo.toml
+++ b/crates/old/nu_plugin_chart/Cargo.toml
@@ -4,18 +4,18 @@ description = "A plugin to display charts"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_chart"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-data = { path="../nu-data", version = "0.68.0" }
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-source = { path="../nu-source", version = "0.68.0" }
-nu-value-ext = { path="../nu-value-ext", version = "0.68.0" }
+nu-data = { path="../nu-data", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-source = { path="../nu-source", version = "0.68.1" }
+nu-value-ext = { path="../nu-value-ext", version = "0.68.1" }
 
 crossterm = "0.19.0"
 tui = { version="0.15.0", default-features=false, features=["crossterm"] }
diff --git a/crates/old/nu_plugin_from_bson/Cargo.toml b/crates/old/nu_plugin_from_bson/Cargo.toml
index c322c1d1ef..f69a91ab51 100644
--- a/crates/old/nu_plugin_from_bson/Cargo.toml
+++ b/crates/old/nu_plugin_from_bson/Cargo.toml
@@ -4,7 +4,7 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_bson"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
@@ -12,9 +12,9 @@ doctest = false
 [dependencies]
 bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
 bson = { version = "2.0.1", features = [ "chrono-0_4" ] }
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-source = { path="../nu-source", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-source = { path="../nu-source", version = "0.68.1" }
 
 [build-dependencies]
diff --git a/crates/old/nu_plugin_from_mp4/Cargo.toml b/crates/old/nu_plugin_from_mp4/Cargo.toml
index 83fbbfc1c0..1c6727daf6 100644
--- a/crates/old/nu_plugin_from_mp4/Cargo.toml
+++ b/crates/old/nu_plugin_from_mp4/Cargo.toml
@@ -4,16 +4,16 @@ description = "A converter plugin to the mp4 format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_mp4"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-source = { path="../nu-source", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-source = { path="../nu-source", version = "0.68.1" }
 tempfile = "3.2.0"
 mp4 = "0.9.0"
 
diff --git a/crates/old/nu_plugin_from_sqlite/Cargo.toml b/crates/old/nu_plugin_from_sqlite/Cargo.toml
index f00892aa02..35968022a3 100644
--- a/crates/old/nu_plugin_from_sqlite/Cargo.toml
+++ b/crates/old/nu_plugin_from_sqlite/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_sqlite"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
 bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-source = { path="../nu-source", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-source = { path="../nu-source", version = "0.68.1" }
 tempfile = "3.2.0"
 
 [dependencies.rusqlite]
diff --git a/crates/old/nu_plugin_s3/Cargo.toml b/crates/old/nu_plugin_s3/Cargo.toml
index 86d3d41c33..3239a79bdb 100644
--- a/crates/old/nu_plugin_s3/Cargo.toml
+++ b/crates/old/nu_plugin_s3/Cargo.toml
@@ -4,17 +4,17 @@ description = "An S3 plugin for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_s3"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
 futures = { version="0.3.12", features=["compat", "io-compat"] }
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-source = { path="../nu-source", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-source = { path="../nu-source", version = "0.68.1" }
 s3handler = "0.7.5"
 
 [build-dependencies]
diff --git a/crates/old/nu_plugin_start/Cargo.toml b/crates/old/nu_plugin_start/Cargo.toml
index 4df22022ed..70858ca977 100644
--- a/crates/old/nu_plugin_start/Cargo.toml
+++ b/crates/old/nu_plugin_start/Cargo.toml
@@ -4,17 +4,17 @@ description = "A plugin to open files/URLs directly from Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_start"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
 glob = "0.3.0"
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-source = { path="../nu-source", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-source = { path="../nu-source", version = "0.68.1" }
 url = "2.2.0"
 webbrowser = "0.5.5"
 
@@ -22,5 +22,5 @@ webbrowser = "0.5.5"
 open = "1.4.0"
 
 [build-dependencies]
-nu-errors = { version = "0.68.0", path="../nu-errors" }
-nu-source = { version = "0.68.0", path="../nu-source" }
+nu-errors = { version = "0.68.1", path="../nu-errors" }
+nu-source = { version = "0.68.1", path="../nu-source" }
diff --git a/crates/old/nu_plugin_to_bson/Cargo.toml b/crates/old/nu_plugin_to_bson/Cargo.toml
index fcc1984614..a1e85faa99 100644
--- a/crates/old/nu_plugin_to_bson/Cargo.toml
+++ b/crates/old/nu_plugin_to_bson/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_to_bson"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
 bson = { version = "2.0.1", features = [ "chrono-0_4" ] }
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-source = { path="../nu-source", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-source = { path="../nu-source", version = "0.68.1" }
 num-traits = "0.2.14"
 
 [features]
diff --git a/crates/old/nu_plugin_to_sqlite/Cargo.toml b/crates/old/nu_plugin_to_sqlite/Cargo.toml
index 75cf91cbbe..1ef5cf77f1 100644
--- a/crates/old/nu_plugin_to_sqlite/Cargo.toml
+++ b/crates/old/nu_plugin_to_sqlite/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the SQLite format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_to_sqlite"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
 hex = "0.4.2"
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
-nu-source = { path="../nu-source", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-source = { path="../nu-source", version = "0.68.1" }
 tempfile = "3.2.0"
 
 [dependencies.rusqlite]
diff --git a/crates/old/nu_plugin_tree/Cargo.toml b/crates/old/nu_plugin_tree/Cargo.toml
index 484e1cf16b..5a2ee429a3 100644
--- a/crates/old/nu_plugin_tree/Cargo.toml
+++ b/crates/old/nu_plugin_tree/Cargo.toml
@@ -4,16 +4,16 @@ description = "Tree viewer plugin for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_tree"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 doctest = false
 
 [dependencies]
 derive-new = "0.5.8"
-nu-errors = { path="../nu-errors", version = "0.68.0" }
-nu-plugin = { path="../nu-plugin", version = "0.68.0" }
-nu-protocol = { path="../nu-protocol", version = "0.68.0" }
+nu-errors = { path="../nu-errors", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.1" }
+nu-protocol = { path="../nu-protocol", version = "0.68.1" }
 ptree = { version = "0.4.0", default-features = false }
 
 
diff --git a/samples/wasm/Cargo.toml b/samples/wasm/Cargo.toml
index 94f0695fa6..63aa3908af 100644
--- a/samples/wasm/Cargo.toml
+++ b/samples/wasm/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Nu authors"]
 edition = "2018"
 name = "wasm"
-version = "0.68.0"
+version = "0.68.1"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

From 247fff424d1ccdcfc848512880fb072fd1c2eb15 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 7 Sep 2022 11:36:42 +0800
Subject: [PATCH 11/45] update to nu v0.68 for release workflow (#6505)

---
 .github/workflows/release-pkg.nu | 8 ++++----
 .github/workflows/release.yml    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index a71831be2f..7491644e25 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -50,7 +50,7 @@ if $os in ['ubuntu-latest', 'macos-latest'] {
 # Build for Windows without static-link-openssl feature
 # ----------------------------------------------------------------------------
 if $os in ['windows-latest'] {
-    if ($flags | str trim | empty?) {
+    if ($flags | str trim | is-empty) {
         cargo build --release --all --target $target --features=extra
     } else {
         cargo build --release --all --target $target --features=extra $flags
@@ -80,7 +80,7 @@ let ver = if $os == 'windows-latest' {
 } else {
     (do -i { ./output/nu -c 'version' }) | str collect
 }
-if ($ver | str trim | empty?) {
+if ($ver | str trim | is-empty) {
     $'(ansi r)Incompatible nu binary...(ansi reset)'
 } else { $ver }
 
@@ -124,14 +124,14 @@ if $os in ['ubuntu-latest', 'macos-latest'] {
         7z a $archive *
         print $'archive: ---> ($archive)';
         let pkg = (ls -f $archive | get name)
-        if not ($pkg | empty?) {
+        if not ($pkg | is-empty) {
             echo $'::set-output name=archive::($pkg | get 0)'
         }
     }
 }
 
 def 'cargo-build-nu' [ options: string ] {
-    if ($options | str trim | empty?) {
+    if ($options | str trim | is-empty) {
         cargo build --release --all --target $target --features=extra,static-link-openssl
     } else {
         cargo build --release --all --target $target --features=extra,static-link-openssl $options
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d6b91da0a..f9438edb5d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -70,9 +70,9 @@ jobs:
         target: ${{ matrix.target }}
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v2
+      uses: hustcer/setup-nu@v2.1
       with:
-        version: 0.67.0
+        version: 0.68.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

From 2030e25ddc65e110ef4b53be48784b44063647ef Mon Sep 17 00:00:00 2001
From: JayceFayne <13365789+JayceFayne@users.noreply.github.com>
Date: Wed, 7 Sep 2022 10:16:55 +0200
Subject: [PATCH 12/45] fix typo (#6508)

---
 crates/nu-command/src/strings/str_/distance.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/strings/str_/distance.rs b/crates/nu-command/src/strings/str_/distance.rs
index 1073b9ba8a..a2d940b4e5 100644
--- a/crates/nu-command/src/strings/str_/distance.rs
+++ b/crates/nu-command/src/strings/str_/distance.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
     }
 
     fn usage(&self) -> &str {
-        "compare to strings and return the edit distance/levenshtein distance"
+        "compare two strings and return the edit distance/levenshtein distance"
     }
 
     fn search_terms(&self) -> Vec<&str> {

From 80624267fd0d2ad94346cde7d462ccc05f74e4e0 Mon Sep 17 00:00:00 2001
From: nibon7 <nibon7@163.com>
Date: Wed, 7 Sep 2022 16:40:44 +0800
Subject: [PATCH 13/45] Pass `TERM` environment var to clear (#6500)

* Pass `TERM` environment var to clear

* don't panic

* use IOErrorSpanned instead of IOError
---
 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 fdc540bd63..2de74d231f 100644
--- a/crates/nu-command/src/platform/clear.rs
+++ b/crates/nu-command/src/platform/clear.rs
@@ -23,24 +23,31 @@ impl Command for Clear {
 
     fn run(
         &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
+        engine_state: &EngineState,
+        stack: &mut Stack,
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let span = call.head;
+
         if cfg!(windows) {
             CommandSys::new("cmd")
                 .args(["/C", "cls"])
                 .status()
-                .expect("failed to execute process");
+                .map_err(|e| ShellError::IOErrorSpanned(e.to_string(), span))?;
         } else if cfg!(unix) {
-            CommandSys::new("/bin/sh")
-                .args(["-c", "clear"])
+            let mut cmd = CommandSys::new("/bin/sh");
+
+            if let Some(Value::String { val, .. }) = stack.get_env_var(engine_state, "TERM") {
+                cmd.env("TERM", val);
+            }
+
+            cmd.args(["-c", "clear"])
                 .status()
-                .expect("failed to execute process");
+                .map_err(|e| ShellError::IOErrorSpanned(e.to_string(), span))?;
         }
 
-        Ok(Value::Nothing { span: call.head }.into_pipeline_data())
+        Ok(Value::Nothing { span }.into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {

From aa92141ad7d1d894e3c2a6eb2e0870217c3d8ba2 Mon Sep 17 00:00:00 2001
From: WindSoilder <WindSoilder@outlook.com>
Date: Wed, 7 Sep 2022 22:07:42 +0800
Subject: [PATCH 14/45] Remove `--encoding` argument during register plugin
 (#6486)

* first implement new plugin protocol core logic

* fix debug body construct

* fix output message from plugin

* finish plugin commands calling

* fix tests and adjust plugin_custom_value call

* fmt code

* fmt code, fix clippy

* add FIXME comment

* change from FIXME to TODO
---
 .../nu-command/src/core_commands/register.rs  | 10 +--
 crates/nu-parser/src/parse_keywords.rs        | 35 ++------
 crates/nu-plugin/src/plugin/declaration.rs    | 50 +++++------
 crates/nu-plugin/src/plugin/mod.rs            | 86 +++++++++++++------
 .../src/protocol/plugin_custom_value.rs       | 20 +++--
 crates/nu-plugin/src/serializers/json.rs      |  2 +-
 crates/nu-plugin/src/serializers/msgpack.rs   |  6 +-
 crates/nu-protocol/src/engine/command.rs      |  5 +-
 crates/nu-protocol/src/engine/engine_state.rs | 11 +--
 crates/nu-test-support/src/macros.rs          | 12 +--
 tests/plugins/core_inc.rs                     | 16 ++--
 tests/plugins/custom_values.rs                | 14 +--
 12 files changed, 142 insertions(+), 125 deletions(-)

diff --git a/crates/nu-command/src/core_commands/register.rs b/crates/nu-command/src/core_commands/register.rs
index e0750735c1..d175480b56 100644
--- a/crates/nu-command/src/core_commands/register.rs
+++ b/crates/nu-command/src/core_commands/register.rs
@@ -21,12 +21,6 @@ impl Command for Register {
                 SyntaxShape::Filepath,
                 "path of executable for plugin",
             )
-            .required_named(
-                "encoding",
-                SyntaxShape::String,
-                "Encoding used to communicate with plugin. Options: [json, msgpack]",
-                Some('e'),
-            )
             .optional(
                 "signature",
                 SyntaxShape::Any,
@@ -64,12 +58,12 @@ impl Command for Register {
         vec![
             Example {
                 description: "Register `nu_plugin_query` plugin from ~/.cargo/bin/ dir",
-                example: r#"register -e json ~/.cargo/bin/nu_plugin_query"#,
+                example: r#"register ~/.cargo/bin/nu_plugin_query"#,
                 result: None,
             },
             Example {
                 description: "Register `nu_plugin_query` plugin from `nu -c`(plugin will be available in that nu session only)",
-                example: r#"let plugin = ((which nu).path.0 | path dirname | path join 'nu_plugin_query'); nu -c $'register -e json ($plugin); version'"#,
+                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-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 4768dacac1..8ec660988e 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -3027,7 +3027,7 @@ pub fn parse_register(
     spans: &[Span],
     expand_aliases_denylist: &[usize],
 ) -> (Pipeline, Option<ParseError>) {
-    use nu_plugin::{get_signature, EncodingType, PluginDeclaration};
+    use nu_plugin::{get_signature, PluginDeclaration};
     use nu_protocol::{engine::Stack, Signature};
 
     let cwd = working_set.get_cwd();
@@ -3120,22 +3120,7 @@ pub fn parse_register(
                 }
             }
         })
-        .expect("required positional has being checked")
-        .and_then(|path| {
-            call.get_flag_expr("encoding")
-                .map(|expr| {
-                    EncodingType::try_from_bytes(working_set.get_span_contents(expr.span))
-                        .ok_or_else(|| {
-                            ParseError::IncorrectValue(
-                                "wrong encoding".into(),
-                                expr.span,
-                                "Encodings available: json, and msgpack".into(),
-                            )
-                        })
-                })
-                .expect("required named has being checked")
-                .map(|encoding| (path, encoding))
-        });
+        .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
@@ -3196,7 +3181,7 @@ pub fn parse_register(
     let current_envs =
         nu_engine::env::env_to_strings(working_set.permanent_state, &stack).unwrap_or_default();
     let error = match signature {
-        Some(signature) => arguments.and_then(|(path, encoding)| {
+        Some(signature) => arguments.and_then(|path| {
             // restrict plugin file name starts with `nu_plugin_`
             let f_name = path
                 .file_name()
@@ -3204,7 +3189,7 @@ pub fn parse_register(
 
             if let Some(true) = f_name {
                 signature.map(|signature| {
-                    let plugin_decl = PluginDeclaration::new(path, signature, encoding, shell);
+                    let plugin_decl = PluginDeclaration::new(path, signature, shell);
                     working_set.add_decl(Box::new(plugin_decl));
                     working_set.mark_plugins_file_dirty();
                 })
@@ -3212,14 +3197,14 @@ pub fn parse_register(
                 Ok(())
             }
         }),
-        None => arguments.and_then(|(path, encoding)| {
+        None => arguments.and_then(|path| {
             // restrict plugin file name starts with `nu_plugin_`
             let f_name = path
                 .file_name()
                 .map(|s| s.to_string_lossy().starts_with("nu_plugin_"));
 
             if let Some(true) = f_name {
-                get_signature(path.as_path(), &encoding, &shell, &current_envs)
+                get_signature(path.as_path(), &shell, &current_envs)
                     .map_err(|err| {
                         ParseError::LabeledError(
                             "Error getting signatures".into(),
@@ -3231,12 +3216,8 @@ pub fn parse_register(
                         for signature in signatures {
                             // create plugin command declaration (need struct impl Command)
                             // store declaration in working set
-                            let plugin_decl = PluginDeclaration::new(
-                                path.clone(),
-                                signature,
-                                encoding.clone(),
-                                shell.clone(),
-                            );
+                            let plugin_decl =
+                                PluginDeclaration::new(path.clone(), signature, shell.clone());
 
                             working_set.add_decl(Box::new(plugin_decl));
                         }
diff --git a/crates/nu-plugin/src/plugin/declaration.rs b/crates/nu-plugin/src/plugin/declaration.rs
index c47b9003f2..9657f4959d 100644
--- a/crates/nu-plugin/src/plugin/declaration.rs
+++ b/crates/nu-plugin/src/plugin/declaration.rs
@@ -1,6 +1,6 @@
-use crate::{EncodingType, EvaluatedCall};
+use crate::EvaluatedCall;
 
-use super::{call_plugin, create_command};
+use super::{call_plugin, create_command, get_plugin_encoding};
 use crate::protocol::{
     CallInfo, CallInput, PluginCall, PluginCustomValue, PluginData, PluginResponse,
 };
@@ -16,21 +16,14 @@ pub struct PluginDeclaration {
     signature: Signature,
     filename: PathBuf,
     shell: Option<PathBuf>,
-    encoding: EncodingType,
 }
 
 impl PluginDeclaration {
-    pub fn new(
-        filename: PathBuf,
-        signature: Signature,
-        encoding: EncodingType,
-        shell: Option<PathBuf>,
-    ) -> Self {
+    pub fn new(filename: PathBuf, signature: Signature, shell: Option<PathBuf>) -> Self {
         Self {
             name: signature.name.clone(),
             signature,
             filename,
-            encoding,
             shell,
         }
     }
@@ -111,17 +104,27 @@ impl Command for PluginDeclaration {
             input,
         });
 
-        let response =
-            call_plugin(&mut child, plugin_call, &self.encoding, call.head).map_err(|err| {
-                let decl = engine_state.get_decl(call.decl_id);
-                ShellError::GenericError(
-                    format!("Unable to decode call for {}", decl.name()),
-                    err.to_string(),
-                    Some(call.head),
-                    None,
-                    Vec::new(),
-                )
-            });
+        let encoding = {
+            let stdout_reader = match &mut child.stdout {
+                Some(out) => out,
+                None => {
+                    return Err(ShellError::PluginFailedToLoad(
+                        "Plugin missing stdout reader".into(),
+                    ))
+                }
+            };
+            get_plugin_encoding(stdout_reader)?
+        };
+        let response = call_plugin(&mut child, plugin_call, &encoding, call.head).map_err(|err| {
+            let decl = engine_state.get_decl(call.decl_id);
+            ShellError::GenericError(
+                format!("Unable to decode call for {}", decl.name()),
+                err.to_string(),
+                Some(call.head),
+                None,
+                Vec::new(),
+            )
+        });
 
         let pipeline_data = match response {
             Ok(PluginResponse::Value(value)) => {
@@ -134,7 +137,6 @@ impl Command for PluginDeclaration {
                         data: plugin_data.data,
                         filename: self.filename.clone(),
                         shell: self.shell.clone(),
-                        encoding: self.encoding.clone(),
                         source: engine_state.get_decl(call.decl_id).name().to_owned(),
                     }),
                     span: plugin_data.span,
@@ -158,7 +160,7 @@ impl Command for PluginDeclaration {
         pipeline_data
     }
 
-    fn is_plugin(&self) -> Option<(&PathBuf, &str, &Option<PathBuf>)> {
-        Some((&self.filename, self.encoding.to_str(), &self.shell))
+    fn is_plugin(&self) -> Option<(&PathBuf, &Option<PathBuf>)> {
+        Some((&self.filename, &self.shell))
     }
 }
diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index 194617c291..aa82633d62 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -7,9 +7,9 @@ use crate::protocol::{CallInput, LabeledError, PluginCall, PluginData, PluginRes
 use crate::EncodingType;
 use std::env;
 use std::fmt::Write;
-use std::io::BufReader;
+use std::io::{BufReader, Read, Write as WriteTrait};
 use std::path::{Path, PathBuf};
-use std::process::{Child, Command as CommandSys, Stdio};
+use std::process::{Child, ChildStdout, Command as CommandSys, Stdio};
 
 use nu_protocol::{CustomValue, ShellError, Span};
 use nu_protocol::{Signature, Value};
@@ -116,7 +116,6 @@ pub(crate) fn call_plugin(
 
 pub fn get_signature(
     path: &Path,
-    encoding: &EncodingType,
     shell: &Option<PathBuf>,
     current_envs: &HashMap<String, String>,
 ) -> Result<Vec<Signature>, ShellError> {
@@ -127,32 +126,34 @@ pub fn get_signature(
         ShellError::PluginFailedToLoad(format!("Error spawning child process: {}", err))
     })?;
 
+    let mut stdin_writer = child
+        .stdin
+        .take()
+        .ok_or_else(|| ShellError::PluginFailedToLoad("plugin missing stdin writer".into()))?;
+    let mut stdout_reader = child
+        .stdout
+        .take()
+        .ok_or_else(|| ShellError::PluginFailedToLoad("Plugin missing stdout reader".into()))?;
+    let encoding = get_plugin_encoding(&mut stdout_reader)?;
+
     // Create message to plugin to indicate that signature is required and
     // send call to plugin asking for signature
-    if let Some(mut stdin_writer) = child.stdin.take() {
-        let encoding_clone = encoding.clone();
-        std::thread::spawn(move || {
-            encoding_clone.encode_call(&PluginCall::Signature, &mut stdin_writer)
-        });
-    }
+    let encoding_clone = encoding.clone();
+    std::thread::spawn(move || {
+        encoding_clone.encode_call(&PluginCall::Signature, &mut stdin_writer)
+    });
 
     // deserialize response from plugin to extract the signature
-    let signatures = if let Some(stdout_reader) = &mut child.stdout {
-        let reader = stdout_reader;
-        let mut buf_read = BufReader::with_capacity(OUTPUT_BUFFER_SIZE, reader);
-        let response = encoding.decode_response(&mut buf_read)?;
+    let reader = stdout_reader;
+    let mut buf_read = BufReader::with_capacity(OUTPUT_BUFFER_SIZE, reader);
+    let response = encoding.decode_response(&mut buf_read)?;
 
-        match response {
-            PluginResponse::Signature(sign) => Ok(sign),
-            PluginResponse::Error(err) => Err(err.into()),
-            _ => Err(ShellError::PluginFailedToLoad(
-                "Plugin missing signature".into(),
-            )),
-        }
-    } else {
-        Err(ShellError::PluginFailedToLoad(
-            "Plugin missing stdout reader".into(),
-        ))
+    let signatures = match response {
+        PluginResponse::Signature(sign) => Ok(sign),
+        PluginResponse::Error(err) => Err(err.into()),
+        _ => Err(ShellError::PluginFailedToLoad(
+            "Plugin missing signature".into(),
+        )),
     }?;
 
     match child.wait() {
@@ -196,6 +197,24 @@ pub fn serve_plugin(plugin: &mut impl Plugin, encoder: impl PluginEncoder) {
         std::process::exit(0)
     }
 
+    // tell nushell encoding.
+    //
+    //                         1 byte
+    // encoding format: |  content-length  | content    |
+    {
+        let mut stdout = std::io::stdout();
+        let encoding = encoder.name();
+        let length = encoding.len() as u8;
+        let mut encoding_content: Vec<u8> = encoding.as_bytes().to_vec();
+        encoding_content.insert(0, length);
+        stdout
+            .write_all(&encoding_content)
+            .expect("Failed to tell nushell my encoding");
+        stdout
+            .flush()
+            .expect("Failed to tell nushell my encoding when flushing stdout");
+    }
+
     let mut stdin_buf = BufReader::with_capacity(OUTPUT_BUFFER_SIZE, std::io::stdin());
     let plugin_call = encoder.decode_call(&mut stdin_buf);
 
@@ -332,3 +351,22 @@ fn print_help(plugin: &mut impl Plugin, encoder: impl PluginEncoder) {
 
     println!("{}", help)
 }
+
+pub fn get_plugin_encoding(child_stdout: &mut ChildStdout) -> Result<EncodingType, ShellError> {
+    let mut length_buf = [0u8; 1];
+    child_stdout.read_exact(&mut length_buf).map_err(|e| {
+        ShellError::PluginFailedToLoad(format!("unable to get encoding from plugin: {e}"))
+    })?;
+
+    let mut buf = vec![0u8; length_buf[0] as usize];
+    child_stdout.read_exact(&mut buf).map_err(|e| {
+        ShellError::PluginFailedToLoad(format!("unable to get encoding from plugin: {e}"))
+    })?;
+
+    EncodingType::try_from_bytes(&buf).ok_or_else(|| {
+        let encoding_for_debug = String::from_utf8_lossy(&buf);
+        ShellError::PluginFailedToLoad(format!(
+            "get unsupported plugin encoding: {encoding_for_debug}"
+        ))
+    })
+}
diff --git a/crates/nu-plugin/src/protocol/plugin_custom_value.rs b/crates/nu-plugin/src/protocol/plugin_custom_value.rs
index a85be449e7..dbde579909 100644
--- a/crates/nu-plugin/src/protocol/plugin_custom_value.rs
+++ b/crates/nu-plugin/src/protocol/plugin_custom_value.rs
@@ -3,10 +3,7 @@ use std::path::PathBuf;
 use nu_protocol::{CustomValue, ShellError, Value};
 use serde::Serialize;
 
-use crate::{
-    plugin::{call_plugin, create_command},
-    EncodingType,
-};
+use crate::plugin::{call_plugin, create_command, get_plugin_encoding};
 
 use super::{PluginCall, PluginData, PluginResponse};
 
@@ -32,8 +29,6 @@ pub struct PluginCustomValue {
     #[serde(skip)]
     pub shell: Option<PathBuf>,
     #[serde(skip)]
-    pub encoding: EncodingType,
-    #[serde(skip)]
     pub source: String,
 }
 
@@ -72,8 +67,19 @@ impl CustomValue for PluginCustomValue {
             data: self.data.clone(),
             span,
         });
+        let encoding = {
+            let stdout_reader = match &mut child.stdout {
+                Some(out) => out,
+                None => {
+                    return Err(ShellError::PluginFailedToLoad(
+                        "Plugin missing stdout reader".into(),
+                    ))
+                }
+            };
+            get_plugin_encoding(stdout_reader)?
+        };
 
-        let response = call_plugin(&mut child, plugin_call, &self.encoding, span).map_err(|err| {
+        let response = call_plugin(&mut child, plugin_call, &encoding, span).map_err(|err| {
             ShellError::GenericError(
                 format!(
                     "Unable to decode call for {} to get base value",
diff --git a/crates/nu-plugin/src/serializers/json.rs b/crates/nu-plugin/src/serializers/json.rs
index be90100f15..6d77e11c19 100644
--- a/crates/nu-plugin/src/serializers/json.rs
+++ b/crates/nu-plugin/src/serializers/json.rs
@@ -7,7 +7,7 @@ pub struct JsonSerializer;
 
 impl PluginEncoder for JsonSerializer {
     fn name(&self) -> &str {
-        "Json Serializer"
+        "json"
     }
 
     fn encode_call(
diff --git a/crates/nu-plugin/src/serializers/msgpack.rs b/crates/nu-plugin/src/serializers/msgpack.rs
index 733561877a..20e6df5920 100644
--- a/crates/nu-plugin/src/serializers/msgpack.rs
+++ b/crates/nu-plugin/src/serializers/msgpack.rs
@@ -6,7 +6,7 @@ pub struct MsgPackSerializer;
 
 impl PluginEncoder for MsgPackSerializer {
     fn name(&self) -> &str {
-        "MsgPack Serializer"
+        "msgpack"
     }
 
     fn encode_call(
@@ -23,7 +23,7 @@ impl PluginEncoder for MsgPackSerializer {
         reader: &mut impl std::io::BufRead,
     ) -> Result<crate::protocol::PluginCall, nu_protocol::ShellError> {
         rmp_serde::from_read(reader)
-            .map_err(|err| ShellError::PluginFailedToEncode(err.to_string()))
+            .map_err(|err| ShellError::PluginFailedToDecode(err.to_string()))
     }
 
     fn encode_response(
@@ -40,7 +40,7 @@ impl PluginEncoder for MsgPackSerializer {
         reader: &mut impl std::io::BufRead,
     ) -> Result<PluginResponse, ShellError> {
         rmp_serde::from_read(reader)
-            .map_err(|err| ShellError::PluginFailedToEncode(err.to_string()))
+            .map_err(|err| ShellError::PluginFailedToDecode(err.to_string()))
     }
 }
 
diff --git a/crates/nu-protocol/src/engine/command.rs b/crates/nu-protocol/src/engine/command.rs
index 7d9d0242e6..0fa1e22799 100644
--- a/crates/nu-protocol/src/engine/command.rs
+++ b/crates/nu-protocol/src/engine/command.rs
@@ -57,9 +57,8 @@ pub trait Command: Send + Sync + CommandClone {
         false
     }
 
-    // Is a plugin command (returns plugin's path, encoding and type of shell
-    // if the declaration is a plugin)
-    fn is_plugin(&self) -> Option<(&PathBuf, &str, &Option<PathBuf>)> {
+    // Is a plugin command (returns plugin's path, type of shell if the declaration is a plugin)
+    fn is_plugin(&self) -> Option<(&PathBuf, &Option<PathBuf>)> {
         None
     }
 
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 240d06ef4a..ff5e73ceeb 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -366,8 +366,7 @@ impl EngineState {
                 self.plugin_decls().try_for_each(|decl| {
                     // A successful plugin registration already includes the plugin filename
                     // No need to check the None option
-                    let (path, encoding, shell) =
-                        decl.is_plugin().expect("plugin should have file name");
+                    let (path, shell) = decl.is_plugin().expect("plugin should have file name");
                     let mut file_name = path
                         .to_str()
                         .expect("path was checked during registration as a str")
@@ -394,14 +393,10 @@ impl EngineState {
                                 None => "".into(),
                             };
 
-                            // Each signature is stored in the plugin file with the required
-                            // encoding, shell and signature
+                            // Each signature is stored in the plugin file with the shell and signature
                             // This information will be used when loading the plugin
                             // information when nushell starts
-                            format!(
-                                "register {} -e {} {} {}\n\n",
-                                file_name, encoding, shell_str, signature
-                            )
+                            format!("register {} {} {}\n\n", file_name, shell_str, signature)
                         })
                         .map_err(|err| ShellError::PluginFailedToLoad(err.to_string()))
                         .and_then(|line| {
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 4851baf6a7..593202c998 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -225,11 +225,11 @@ macro_rules! with_exe {
 
 #[macro_export]
 macro_rules! nu_with_plugins {
-    (cwd: $cwd:expr, plugins: [$(($format:expr, $plugin_name:expr)),+$(,)?], $command:expr) => {{
-        nu_with_plugins!($cwd, [$(($format, $plugin_name)),+], $command)
+    (cwd: $cwd:expr, plugins: [$(($plugin_name:expr)),+$(,)?], $command:expr) => {{
+        nu_with_plugins!($cwd, [$(("", $plugin_name)),+], $command)
     }};
-    (cwd: $cwd:expr, plugin: ($format:expr, $plugin_name:expr), $command:expr) => {{
-        nu_with_plugins!($cwd, [($format, $plugin_name)], $command)
+    (cwd: $cwd:expr, plugin: ($plugin_name:expr), $command:expr) => {{
+        nu_with_plugins!($cwd, [("", $plugin_name)], $command)
     }};
 
     ($cwd:expr, [$(($format:expr, $plugin_name:expr)),+$(,)?], $command:expr) => {{
@@ -254,8 +254,10 @@ macro_rules! nu_with_plugins {
 
         $($crate::commands::ensure_binary_present($plugin_name);)+
 
+        // TODO: the `$format` is a dummy empty string, but `plugin_name` is repeatable
+        // just keep it here for now.  Need to find a way to remove it.
         let registrations = format!(
-            concat!($(concat!("register -e ", $format, " {};")),+),
+            concat!($(concat!("register ", $format, " {};")),+),
             $(
                 nu_path::canonicalize_with(with_exe!($plugin_name), &test_bins)
                     .unwrap_or_else(|e| {
diff --git a/tests/plugins/core_inc.rs b/tests/plugins/core_inc.rs
index 5811f24865..61f105fd57 100644
--- a/tests/plugins/core_inc.rs
+++ b/tests/plugins/core_inc.rs
@@ -6,7 +6,7 @@ use nu_test_support::playground::Playground;
 fn chooses_highest_increment_if_given_more_than_one() {
     let actual = nu_with_plugins!(
         cwd: "tests/fixtures/formats",
-        plugin: ("json", "nu_plugin_inc"),
+        plugin: ("nu_plugin_inc"),
         "open cargo_sample.toml | first 1 | inc package.version --major --minor | get package.version"
     );
 
@@ -14,7 +14,7 @@ fn chooses_highest_increment_if_given_more_than_one() {
 
     let actual = nu_with_plugins!(
         cwd: "tests/fixtures/formats",
-        plugin: ("json", "nu_plugin_inc"),
+        plugin: ("nu_plugin_inc"),
         // Regardless of order of arguments
         "open cargo_sample.toml | first 1 | inc package.version --minor --major | get package.version"
     );
@@ -35,7 +35,7 @@ fn by_one_with_field_passed() {
 
         let actual = nu_with_plugins!(
             cwd: dirs.test(),
-            plugin: ("json", "nu_plugin_inc"),
+            plugin: ("nu_plugin_inc"),
             "open sample.toml | inc package.edition | get package.edition"
         );
 
@@ -56,7 +56,7 @@ fn by_one_with_no_field_passed() {
 
         let actual = nu_with_plugins!(
             cwd: dirs.test(),
-            plugin: ("json", "nu_plugin_inc"),
+            plugin: ("nu_plugin_inc"),
             "open sample.toml | get package.contributors | inc"
         );
 
@@ -77,7 +77,7 @@ fn semversion_major_inc() {
 
         let actual = nu_with_plugins!(
             cwd: dirs.test(),
-            plugin: ("json", "nu_plugin_inc"),
+            plugin: ("nu_plugin_inc"),
             "open sample.toml | inc package.version -M | get package.version"
         );
 
@@ -98,7 +98,7 @@ fn semversion_minor_inc() {
 
         let actual = nu_with_plugins!(
             cwd: dirs.test(),
-            plugin: ("json", "nu_plugin_inc"),
+            plugin: ("nu_plugin_inc"),
             "open sample.toml | inc package.version --minor | get package.version"
         );
 
@@ -119,7 +119,7 @@ fn semversion_patch_inc() {
 
         let actual = nu_with_plugins!(
             cwd: dirs.test(),
-            plugin: ("json", "nu_plugin_inc"),
+            plugin: ("nu_plugin_inc"),
             "open sample.toml | inc package.version --patch | get package.version"
         );
 
@@ -140,7 +140,7 @@ fn semversion_without_passing_field() {
 
         let actual = nu_with_plugins!(
             cwd: dirs.test(),
-            plugin: ("json", "nu_plugin_inc"),
+            plugin: ("nu_plugin_inc"),
             "open sample.toml | get package.version | inc --patch"
         );
 
diff --git a/tests/plugins/custom_values.rs b/tests/plugins/custom_values.rs
index 946df2e6b8..6493d4f7e9 100644
--- a/tests/plugins/custom_values.rs
+++ b/tests/plugins/custom_values.rs
@@ -4,7 +4,7 @@ use nu_test_support::nu_with_plugins;
 fn can_get_custom_value_from_plugin_and_instantly_collapse_it() {
     let actual = nu_with_plugins!(
         cwd: "tests",
-        plugin: ("msgpack", "nu_plugin_custom_values"),
+        plugin: ("nu_plugin_custom_values"),
         "custom-value generate"
     );
 
@@ -15,7 +15,7 @@ fn can_get_custom_value_from_plugin_and_instantly_collapse_it() {
 fn can_get_custom_value_from_plugin_and_pass_it_over() {
     let actual = nu_with_plugins!(
         cwd: "tests",
-        plugin: ("msgpack", "nu_plugin_custom_values"),
+        plugin: ("nu_plugin_custom_values"),
         "custom-value generate | custom-value update"
     );
 
@@ -29,7 +29,7 @@ fn can_get_custom_value_from_plugin_and_pass_it_over() {
 fn can_generate_and_updated_multiple_types_of_custom_values() {
     let actual = nu_with_plugins!(
         cwd: "tests",
-        plugin: ("msgpack", "nu_plugin_custom_values"),
+        plugin: ("nu_plugin_custom_values"),
         "custom-value generate2 | custom-value update"
     );
 
@@ -43,7 +43,7 @@ fn can_generate_and_updated_multiple_types_of_custom_values() {
 fn can_get_describe_plugin_custom_values() {
     let actual = nu_with_plugins!(
         cwd: "tests",
-        plugin: ("msgpack", "nu_plugin_custom_values"),
+        plugin: ("nu_plugin_custom_values"),
         "custom-value generate | describe"
     );
 
@@ -58,7 +58,7 @@ fn can_get_describe_plugin_custom_values() {
 fn fails_if_passing_engine_custom_values_to_plugins() {
     let actual = nu_with_plugins!(
         cwd: "tests/fixtures/formats",
-        plugin: ("msgpack", "nu_plugin_custom_values"),
+        plugin: ("nu_plugin_custom_values"),
         "open-db sample.db | custom-value update"
     );
 
@@ -72,8 +72,8 @@ fn fails_if_passing_custom_values_across_plugins() {
     let actual = nu_with_plugins!(
         cwd: "tests",
         plugins: [
-            ("msgpack", "nu_plugin_custom_values"),
-            ("json", "nu_plugin_inc")
+            ("nu_plugin_custom_values"),
+            ("nu_plugin_inc")
         ],
         "custom-value generate | inc --major"
     );

From 773d1674492b616f8e0da4bb3394e6eb892503d0 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:54:28 -0500
Subject: [PATCH 15/45] update regsiter-plugins script to not use encoding
 (#6512)

---
 register-plugins.nu | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/register-plugins.nu b/register-plugins.nu
index a1e0c8fdc2..bf5c1a99f7 100644
--- a/register-plugins.nu
+++ b/register-plugins.nu
@@ -4,9 +4,9 @@ def match [input, matchers: record] {
 }
 
 # register plugin
-def register_plugin [encoding, plugin] {
+def register_plugin [plugin] {
     print $"registering ($plugin)"
-    nu -c $'register -e ($encoding) ($plugin)'
+    nu -c $'register ($plugin)'
 }
 
 # get list of all plugin files from their installed directory
@@ -15,16 +15,14 @@ let plugin_location = ((which nu).path.0 | path dirname)
 # for each plugin file, print the name and launch another instance of nushell to register it
 for plugin in (ls $"($plugin_location)/nu_plugin_*") {
     match ($plugin.name | path basename | str replace '\.exe$' '') {
-        nu_plugin_custom_values: { register_plugin msgpack $plugin.name }
-        nu_plugin_example: { register_plugin msgpack $plugin.name }
-        nu_plugin_from_parquet: { register_plugin json $plugin.name }
-        nu_plugin_gstat: { register_plugin msgpack $plugin.name }
-        nu_plugin_inc: { register_plugin json $plugin.name }
-        nu_plugin_query: { register_plugin json $plugin.name }
+        nu_plugin_custom_values: { register_plugin $plugin.name }
+        nu_plugin_example: { register_plugin $plugin.name }
+        nu_plugin_from_parquet: { register_plugin $plugin.name }
+        nu_plugin_gstat: { register_plugin $plugin.name }
+        nu_plugin_inc: { register_plugin $plugin.name }
+        nu_plugin_query: { register_plugin $plugin.name }
     }
 }
 
+# print helpful message
 print "\nplugins registered, please restart nushell"
-
-# print "\nplugin commands registered"
-# version | get installed_plugins | split row ', '

From 02f92fa5279100c5695da125cf63c2493f953abe Mon Sep 17 00:00:00 2001
From: Kangaxx-0 <85712372+Kangaxx-0@users.noreply.github.com>
Date: Wed, 7 Sep 2022 18:19:29 -0700
Subject: [PATCH 16/45] remove tests (#6515)

---
 .../nu-command/tests/commands/run_external.rs | 66 -------------------
 1 file changed, 66 deletions(-)

diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index f4fea44ff6..3dac3c3c81 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -244,72 +244,6 @@ fn failed_command_with_semicolon_will_not_execute_following_cmds_windows() {
     })
 }
 
-#[cfg(windows)]
-#[test]
-#[ignore = "fails on local Windows machines"]
-// This test case might fail based on the running shell on Windows - CMD vs PowerShell, the reason is
-//
-// Test command 1 - `dir * `
-// Test command 2 - `dir '*'`
-// Test command 3 - `dir "*"`
-//
-// In CMD, command 2 and 3 will give you an error of 'File Not Found'
-// In Poweshell, all three commands will do the path expansion with any errors whatsoever
-//
-// With current Windows CI build(Microsoft Windows 2022 with version 10.0.20348),
-// the unit test runs agaisnt PowerShell
-fn double_quote_does_not_expand_path_glob_windows() {
-    Playground::setup("double quote do not run the expansion", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("D&D_volume_1.txt"),
-            EmptyFile("D&D_volume_2.txt"),
-            EmptyFile("foo.sh"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                dir "*.txt"
-            "#
-        ));
-        assert!(actual.out.contains("D&D_volume_1.txt"));
-        assert!(actual.out.contains("D&D_volume_2.txt"));
-    })
-}
-
-#[cfg(windows)]
-#[test]
-#[ignore = "fails on local Windows machines"]
-// This test case might fail based on the running shell on Windows - CMD vs PowerShell, the reason is
-//
-// Test command 1 - `dir * `
-// Test command 2 - `dir '*'`
-// Test command 3 - `dir "*"`
-//
-// In CMD, command 2 and 3 will give you an error of 'File Not Found'
-// In Poweshell, all three commands will do the path expansion with any errors whatsoever
-//
-// With current Windows CI build(Microsoft Windows 2022 with version 10.0.20348),
-// the unit test runs agaisnt PowerShell
-fn single_quote_does_not_expand_path_glob_windows() {
-    Playground::setup("single quote do not run the expansion", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("D&D_volume_1.txt"),
-            EmptyFile("D&D_volume_2.txt"),
-            EmptyFile("foo.sh"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                dir '*.txt'
-            "#
-        ));
-        assert!(actual.out.contains("D&D_volume_1.txt"));
-        assert!(actual.out.contains("D&D_volume_2.txt"));
-    });
-}
-
 #[cfg(windows)]
 #[test]
 fn can_run_batch_files() {

From b398448cd99b146085908ca99e50742f593096b7 Mon Sep 17 00:00:00 2001
From: pwygab <88221256+merelymyself@users.noreply.github.com>
Date: Thu, 8 Sep 2022 17:27:11 +0800
Subject: [PATCH 17/45] Stop panic when typing `module spam { export def-env`
 (#6523)

* Stop `panic` when typing `module spam { export def-env`

same goes for `export extern` and `export alias`

* fmt
---
 crates/nu-parser/src/parse_keywords.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 8ec660988e..172a0c3e52 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -895,7 +895,10 @@ pub fn parse_export_in_module(
 
                 let mut result = vec![];
 
-                let decl_name = working_set.get_span_contents(spans[2]);
+                let decl_name = match spans.get(2) {
+                    Some(span) => working_set.get_span_contents(*span),
+                    None => &[],
+                };
                 let decl_name = trim_quotes(decl_name);
 
                 if let Some(decl_id) = working_set.find_decl(decl_name, &Type::Any) {
@@ -958,7 +961,10 @@ pub fn parse_export_in_module(
 
                 let mut result = vec![];
 
-                let decl_name = working_set.get_span_contents(spans[2]);
+                let decl_name = match spans.get(2) {
+                    Some(span) => working_set.get_span_contents(*span),
+                    None => &[],
+                };
                 let decl_name = trim_quotes(decl_name);
 
                 if let Some(decl_id) = working_set.find_decl(decl_name, &Type::Any) {
@@ -1021,7 +1027,10 @@ pub fn parse_export_in_module(
 
                 let mut result = vec![];
 
-                let alias_name = working_set.get_span_contents(spans[2]);
+                let alias_name = match spans.get(2) {
+                    Some(span) => working_set.get_span_contents(*span),
+                    None => &[],
+                };
                 let alias_name = trim_quotes(alias_name);
 
                 if let Some(alias_id) = working_set.find_alias(alias_name) {

From d1e1d0ac3e3d84619121fda58a016207d149a951 Mon Sep 17 00:00:00 2001
From: pwygab <88221256+merelymyself@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:29:56 +0800
Subject: [PATCH 18/45] remove panic from `lpad` and `rpad`, change truncation
 behaviour for `lpad` (#6495)

* condense `lpad` and `rpad` into `pad`

* change description

* back to original names, add change
---
 crates/nu-command/src/strings/str_/lpad.rs | 20 +++++++++++++++++---
 crates/nu-command/src/strings/str_/rpad.rs |  9 ++++++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/strings/str_/lpad.rs b/crates/nu-command/src/strings/str_/lpad.rs
index 374c02dd94..026fb55255 100644
--- a/crates/nu-command/src/strings/str_/lpad.rs
+++ b/crates/nu-command/src/strings/str_/lpad.rs
@@ -74,10 +74,10 @@ impl Command for SubCommand {
                 }),
             },
             Example {
-                description: "Use lpad to truncate a string",
+                description: "Use lpad to truncate a string to its last three characters",
                 example: "'123456789' | str lpad -l 3 -c '0'",
                 result: Some(Value::String {
-                    val: "123".to_string(),
+                    val: "789".to_string(),
                     span: Span::test_data(),
                 }),
             },
@@ -105,6 +105,13 @@ fn operate(
         column_paths: call.rest(engine_state, stack, 0)?,
     });
 
+    if options.length.expect("this exists") < 0 {
+        return Err(ShellError::UnsupportedInput(
+            String::from("The length of the string cannot be negative"),
+            call.head,
+        ));
+    }
+
     let head = call.head;
     input.map(
         move |v| {
@@ -142,7 +149,14 @@ fn action(
                 let s = *x as usize;
                 if s < val.len() {
                     Value::String {
-                        val: val.chars().take(s).collect::<String>(),
+                        val: val
+                            .chars()
+                            .rev()
+                            .take(s)
+                            .collect::<String>()
+                            .chars()
+                            .rev()
+                            .collect::<String>(),
                         span: head,
                     }
                 } else {
diff --git a/crates/nu-command/src/strings/str_/rpad.rs b/crates/nu-command/src/strings/str_/rpad.rs
index be5061cb5f..2e9f5e463d 100644
--- a/crates/nu-command/src/strings/str_/rpad.rs
+++ b/crates/nu-command/src/strings/str_/rpad.rs
@@ -74,7 +74,7 @@ impl Command for SubCommand {
                 }),
             },
             Example {
-                description: "Use rpad to truncate a string",
+                description: "Use rpad to truncate a string to its first three characters",
                 example: "'123456789' | str rpad -l 3 -c '0'",
                 result: Some(Value::String {
                     val: "123".to_string(),
@@ -105,6 +105,13 @@ fn operate(
         column_paths: call.rest(engine_state, stack, 0)?,
     });
 
+    if options.length.expect("this exists") < 0 {
+        return Err(ShellError::UnsupportedInput(
+            String::from("The length of the string cannot be negative"),
+            call.head,
+        ));
+    }
+
     let head = call.head;
     input.map(
         move |v| {

From 1adebefc3ea5dd996a3ae53e398b5cc9e6f6a602 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 8 Sep 2022 15:45:01 +0200
Subject: [PATCH 19/45] Improve wording around `all` and `any` (#6524)

* Improve wording around `all` and `any`

The role of the `predicate` for `all` and `any` was not as clear.

See #6499

* type-o

* type-o

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-command/src/filters/all.rs | 6 +++---
 crates/nu-command/src/filters/any.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/nu-command/src/filters/all.rs b/crates/nu-command/src/filters/all.rs
index 0fab9101eb..6e3ec49dad 100644
--- a/crates/nu-command/src/filters/all.rs
+++ b/crates/nu-command/src/filters/all.rs
@@ -18,17 +18,17 @@ impl Command for All {
             .required(
                 "predicate",
                 SyntaxShape::RowCondition,
-                "the predicate that must match",
+                "the predicate expression that must evaluate to a boolean",
             )
             .category(Category::Filters)
     }
 
     fn usage(&self) -> &str {
-        "Test if every element of the input matches a predicate."
+        "Test if every element of the input fulfills a predicate expression."
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["every"]
+        vec!["every", "and"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/filters/any.rs b/crates/nu-command/src/filters/any.rs
index b0a2592563..4a641136dd 100644
--- a/crates/nu-command/src/filters/any.rs
+++ b/crates/nu-command/src/filters/any.rs
@@ -18,17 +18,17 @@ impl Command for Any {
             .required(
                 "predicate",
                 SyntaxShape::RowCondition,
-                "the predicate that must match",
+                "the predicate expression that should return a boolean",
             )
             .category(Category::Filters)
     }
 
     fn usage(&self) -> &str {
-        "Tests if any element of the input matches a predicate."
+        "Tests if any element of the input fulfills a predicate expression."
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["some"]
+        vec!["some", "or"]
     }
 
     fn examples(&self) -> Vec<Example> {

From e76b3d61deef832adce76b0f73f19131de8cbc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Thu, 8 Sep 2022 23:41:49 +0300
Subject: [PATCH 20/45] Require static path for `source-env` (#6526)

---
 crates/nu-command/src/env/source_env.rs       | 132 ++++++------------
 .../nu-command/tests/commands/source_env.rs   |  32 ++---
 crates/nu-parser/src/parse_keywords.rs        |  10 +-
 crates/nu-parser/src/parser.rs                |   4 +-
 4 files changed, 60 insertions(+), 118 deletions(-)

diff --git a/crates/nu-command/src/env/source_env.rs b/crates/nu-command/src/env/source_env.rs
index 642c1ff450..6de2e07bd7 100644
--- a/crates/nu-command/src/env/source_env.rs
+++ b/crates/nu-command/src/env/source_env.rs
@@ -1,11 +1,10 @@
 use std::path::PathBuf;
 
 use nu_engine::{eval_block, find_in_dirs_env, redirect_env, CallExt};
-use nu_parser::parse;
 use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack, StateWorkingSet};
+use nu_protocol::engine::{Command, EngineState, Stack};
 use nu_protocol::{
-    Category, CliError, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Value,
+    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Value,
 };
 
 /// Source a file for environment variables.
@@ -40,96 +39,47 @@ impl Command for SourceEnv {
     ) -> Result<PipelineData, ShellError> {
         let source_filename: Spanned<String> = call.req(engine_state, caller_stack, 0)?;
 
-        if let Some(path) = find_in_dirs_env(&source_filename.item, engine_state, caller_stack)? {
-            if let Ok(content) = std::fs::read_to_string(&path) {
-                let mut parent = PathBuf::from(&path);
-                parent.pop();
+        // 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(engine_state, caller_stack, 1)?;
 
-                let mut new_engine_state = engine_state.clone();
-
-                let (block, delta) = {
-                    let mut working_set = StateWorkingSet::new(&new_engine_state);
-
-                    // Set the currently parsed directory
-                    working_set.currently_parsed_cwd = Some(parent.clone());
-
-                    let (block, err) = parse(&mut working_set, None, content.as_bytes(), true, &[]);
-
-                    if let Some(err) = err {
-                        // Because the error span points at new_engine_state, we must create the error message now
-                        let msg = format!(
-                            r#"Found this parser error: {:?}"#,
-                            CliError(&err, &working_set)
-                        );
-
-                        return Err(ShellError::GenericError(
-                            "Failed to parse content".to_string(),
-                            "cannot parse this file".to_string(),
-                            Some(source_filename.span),
-                            Some(msg),
-                            vec![],
-                        ));
-                    } else {
-                        (block, working_set.render())
-                    }
-                };
-
-                // Merge parser changes to a temporary engine state
-                new_engine_state.merge_delta(delta)?;
-
-                // Set the currently evaluated directory
-                let file_pwd = Value::String {
-                    val: parent.to_string_lossy().to_string(),
-                    span: call.head,
-                };
-
-                caller_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
-
-                // Evaluate the parsed file's block
-                let mut callee_stack = caller_stack.gather_captures(&block.captures);
-
-                let result = eval_block(
-                    &new_engine_state,
-                    &mut callee_stack,
-                    &block,
-                    input,
-                    true,
-                    true,
-                );
-
-                let result = if let Err(err) = result {
-                    // Because the error span points at new_engine_state, we must create the error message now
-                    let working_set = StateWorkingSet::new(&new_engine_state);
-
-                    let msg = format!(
-                        r#"Found this shell error: {:?}"#,
-                        CliError(&err, &working_set)
-                    );
-
-                    Err(ShellError::GenericError(
-                        "Failed to evaluate content".to_string(),
-                        "cannot evaluate this file".to_string(),
-                        Some(source_filename.span),
-                        Some(msg),
-                        vec![],
-                    ))
-                } else {
-                    result
-                };
-
-                // Merge the block's environment to the current stack
-                redirect_env(engine_state, caller_stack, &callee_stack);
-
-                // Remove the file-relative PWD
-                caller_stack.remove_env_var(engine_state, "FILE_PWD");
-
-                result
-            } else {
-                Err(ShellError::FileNotFound(source_filename.span))
-            }
+        // Set the currently evaluated directory (file-relative PWD)
+        let mut parent = if let Some(path) =
+            find_in_dirs_env(&source_filename.item, engine_state, caller_stack)?
+        {
+            PathBuf::from(&path)
         } else {
-            Err(ShellError::FileNotFound(source_filename.span))
-        }
+            return Err(ShellError::FileNotFound(source_filename.span));
+        };
+        parent.pop();
+
+        let file_pwd = Value::String {
+            val: parent.to_string_lossy().to_string(),
+            span: call.head,
+        };
+
+        caller_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
+
+        // Evaluate the block
+        let block = engine_state.get_block(block_id as usize).clone();
+        let mut callee_stack = caller_stack.gather_captures(&block.captures);
+
+        let result = eval_block(
+            engine_state,
+            &mut callee_stack,
+            &block,
+            input,
+            call.redirect_stdout,
+            call.redirect_stderr,
+        );
+
+        // Merge the block's environment to the current stack
+        redirect_env(engine_state, caller_stack, &callee_stack);
+
+        // Remove the file-relative PWD
+        caller_stack.remove_env_var(engine_state, "FILE_PWD");
+
+        result
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/tests/commands/source_env.rs b/crates/nu-command/tests/commands/source_env.rs
index c4ab9fceea..b7f3e93ac7 100644
--- a/crates/nu-command/tests/commands/source_env.rs
+++ b/crates/nu-command/tests/commands/source_env.rs
@@ -143,6 +143,7 @@ fn sources_unicode_file_in_non_utf8_dir() {
     // How do I create non-UTF-8 path???
 }
 
+#[ignore]
 #[test]
 fn can_source_dynamic_path() {
     Playground::setup("can_source_dynamic_path", |dirs, sandbox| {
@@ -269,39 +270,26 @@ fn source_env_dont_cd_overlay() {
 }
 
 #[test]
-fn source_env_nice_parse_error() {
-    Playground::setup("source_env_nice_parse_error", |dirs, sandbox| {
+fn source_env_is_scoped() {
+    Playground::setup("source_env_is_scoped", |dirs, sandbox| {
         sandbox.with_files(vec![FileWithContentToBeTrimmed(
             "spam.nu",
             r#"
-                let x
-            "#,
+                    def foo [] { 'foo' }
+                    alias bar = 'bar'
+                "#,
         )]);
 
-        let inp = &[r#"source-env spam.nu"#];
+        let inp = &[r#"source-env spam.nu"#, r#"foo"#];
 
         let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
 
-        assert!(actual.err.contains("cannot parse this file"));
-        assert!(actual.err.contains("───"));
-    })
-}
+        assert!(actual.err.contains("did you mean"));
 
-#[test]
-fn source_env_nice_shell_error() {
-    Playground::setup("source_env_nice_shell_error", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "spam.nu",
-            r#"
-                let-env FILE_PWD = 'foo'
-            "#,
-        )]);
-
-        let inp = &[r#"source-env spam.nu"#];
+        let inp = &[r#"source-env spam.nu"#, r#"bar"#];
 
         let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
 
-        assert!(actual.err.contains("cannot evaluate this file"));
-        assert!(actual.err.contains("───"));
+        assert!(actual.err.contains("did you mean"));
     })
 }
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 172a0c3e52..ebb137130e 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -2902,8 +2902,10 @@ pub fn parse_source(
     let mut error = None;
     let name = working_set.get_span_contents(spans[0]);
 
-    if name == b"source" {
-        if let Some(decl_id) = working_set.find_decl(b"source", &Type::Any) {
+    if name == b"source" || name == b"source-env" {
+        let scoped = name == b"source-env";
+
+        if let Some(decl_id) = working_set.find_decl(name, &Type::Any) {
             let cwd = working_set.get_cwd();
 
             // Is this the right call to be using here?
@@ -2958,7 +2960,7 @@ pub fn parse_source(
                                 working_set,
                                 path.file_name().and_then(|x| x.to_str()),
                                 &contents,
-                                false,
+                                scoped,
                                 expand_aliases_denylist,
                             );
 
@@ -2983,7 +2985,7 @@ pub fn parse_source(
 
                                 let mut call_with_block = call;
 
-                                // Adding this expression to the positional creates a syntax highlighting error
+                                // FIXME: Adding this expression to the positional creates a syntax highlighting error
                                 // after writing `source example.nu`
                                 call_with_block.add_positional(Expression {
                                     expr: Expr::Int(block_id as i64),
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index f92cb69e61..33e5f6e7a5 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4815,7 +4815,9 @@ pub fn parse_builtin_commands(
             (pipeline, err)
         }
         b"overlay" => parse_overlay(working_set, &lite_command.parts, expand_aliases_denylist),
-        b"source" => parse_source(working_set, &lite_command.parts, expand_aliases_denylist),
+        b"source" | b"source-env" => {
+            parse_source(working_set, &lite_command.parts, expand_aliases_denylist)
+        }
         b"export" => parse_export_in_block(working_set, lite_command, expand_aliases_denylist),
         b"hide" => parse_hide(working_set, &lite_command.parts, expand_aliases_denylist),
         #[cfg(feature = "plugin")]

From 3e0655cdbafaa7b9c9dab36ba6bd58026bf8e141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Cortier?= <bcortier@proton.me>
Date: Fri, 9 Sep 2022 07:10:04 -0400
Subject: [PATCH 21/45] build: update `cpufeatures` crate (#6527)

Version registered in Cargo.lock was yanked, suggesting a significant
issue with the older version.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aaf74b424c..1561cec7f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -703,9 +703,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
 dependencies = [
  "libc",
 ]

From 9ee4086dfa7839e2e2b8147d43d1e53af4a715b9 Mon Sep 17 00:00:00 2001
From: unrelentingtech <hello@unrelenting.technology>
Date: Fri, 9 Sep 2022 23:31:32 +0300
Subject: [PATCH 22/45] Add a 'commandline' command for manipulating the
 current buffer (#6492)

* Add a 'commandline' command for manipulating the current buffer

from `executehostcommand` keybindings. Inspired by fish:
https://fishshell.com/docs/current/cmds/commandline.html

* Update to development reedline

Includes nushell/reedline#472

Co-authored-by: sholderbach <sholderbach@users.noreply.github.com>
---
 Cargo.lock                                    |  3 +-
 Cargo.toml                                    |  2 +
 crates/nu-cli/src/repl.rs                     | 28 ++++++-
 .../src/core_commands/commandline.rs          | 84 +++++++++++++++++++
 crates/nu-command/src/core_commands/mod.rs    |  2 +
 crates/nu-command/src/default_context.rs      |  1 +
 crates/nu-protocol/src/engine/engine_state.rs | 18 +++-
 7 files changed, 131 insertions(+), 7 deletions(-)
 create mode 100644 crates/nu-command/src/core_commands/commandline.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1561cec7f7..821c5493eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4079,8 +4079,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5559b5ab4817b0da0c6fc6814edfae537209e01d955a2f3e7595606e3d039691"
+source = "git+https://github.com/nushell/reedline?branch=main#dc091e828590de6fd335af3f1d001ede851ac20a"
 dependencies = [
  "chrono",
  "crossterm 0.24.0",
diff --git a/Cargo.toml b/Cargo.toml
index 5b358f82b3..97c958e466 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -122,3 +122,5 @@ debug = false
 name = "nu"
 path = "src/main.rs"
 
+[patch.crates-io]
+reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 1275cd427e..e6e51b99ed 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -14,11 +14,11 @@ use nu_engine::{convert_env_values, eval_block};
 use nu_parser::{lex, parse};
 use nu_protocol::{
     ast::PathMember,
-    engine::{EngineState, Stack, StateWorkingSet},
+    engine::{EngineState, ReplOperation, Stack, StateWorkingSet},
     format_duration, BlockId, HistoryFileFormat, PipelineData, PositionalArg, ShellError, Span,
     Spanned, Type, Value, VarId,
 };
-use reedline::{DefaultHinter, Emacs, SqliteBackedHistory, Vi};
+use reedline::{DefaultHinter, EditCommand, Emacs, SqliteBackedHistory, Vi};
 use std::io::{self, Write};
 use std::{sync::atomic::Ordering, time::Instant};
 use strip_ansi_escapes::strip;
@@ -347,6 +347,12 @@ pub fn evaluate_repl(
                         .into_diagnostic()?; // todo: don't stop repl if error here?
                 }
 
+                engine_state
+                    .repl_buffer_state
+                    .lock()
+                    .expect("repl buffer state mutex")
+                    .replace(line_editor.current_buffer_contents().to_string());
+
                 // 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() {
@@ -489,6 +495,24 @@ pub fn evaluate_repl(
                     }
                     run_ansi_sequence(RESET_APPLICATION_MODE)?;
                 }
+
+                let mut ops = engine_state
+                    .repl_operation_queue
+                    .lock()
+                    .expect("repl op queue mutex");
+                while let Some(op) = ops.pop_front() {
+                    match op {
+                        ReplOperation::Append(s) => line_editor.run_edit_commands(&[
+                            EditCommand::MoveToEnd,
+                            EditCommand::InsertString(s),
+                        ]),
+                        ReplOperation::Insert(s) => {
+                            line_editor.run_edit_commands(&[EditCommand::InsertString(s)])
+                        }
+                        ReplOperation::Replace(s) => line_editor
+                            .run_edit_commands(&[EditCommand::Clear, EditCommand::InsertString(s)]),
+                    }
+                }
             }
             Ok(Signal::CtrlC) => {
                 // `Reedline` clears the line content. New prompt is shown
diff --git a/crates/nu-command/src/core_commands/commandline.rs b/crates/nu-command/src/core_commands/commandline.rs
new file mode 100644
index 0000000000..3561d21292
--- /dev/null
+++ b/crates/nu-command/src/core_commands/commandline.rs
@@ -0,0 +1,84 @@
+use nu_engine::CallExt;
+use nu_protocol::ast::Call;
+use nu_protocol::engine::ReplOperation;
+use nu_protocol::engine::{Command, EngineState, Stack};
+use nu_protocol::Category;
+use nu_protocol::IntoPipelineData;
+use nu_protocol::{PipelineData, ShellError, Signature, SyntaxShape, Value};
+
+#[derive(Clone)]
+pub struct Commandline;
+
+impl Command for Commandline {
+    fn name(&self) -> &str {
+        "commandline"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("commandline")
+            .switch(
+                "append",
+                "appends the string to the end of the buffer",
+                Some('a'),
+            )
+            .switch(
+                "insert",
+                "inserts the string into the buffer at the cursor position",
+                Some('i'),
+            )
+            .switch(
+                "replace",
+                "replaces the current contents of the buffer (default)",
+                Some('r'),
+            )
+            .optional(
+                "cmd",
+                SyntaxShape::String,
+                "the string to perform the operation with",
+            )
+            .category(Category::Core)
+    }
+
+    fn usage(&self) -> &str {
+        "View or modify the current command line input buffer"
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["repl", "interactive"]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        if let Some(cmd) = call.opt::<Value>(engine_state, stack, 0)? {
+            let mut ops = engine_state
+                .repl_operation_queue
+                .lock()
+                .expect("repl op queue mutex");
+            ops.push_back(if call.has_flag("append") {
+                ReplOperation::Append(cmd.as_string()?)
+            } else if call.has_flag("insert") {
+                ReplOperation::Insert(cmd.as_string()?)
+            } else {
+                ReplOperation::Replace(cmd.as_string()?)
+            });
+            Ok(Value::Nothing { span: call.head }.into_pipeline_data())
+        } else if let Some(ref cmd) = *engine_state
+            .repl_buffer_state
+            .lock()
+            .expect("repl buffer state mutex")
+        {
+            Ok(Value::String {
+                val: cmd.clone(),
+                span: call.head,
+            }
+            .into_pipeline_data())
+        } else {
+            Ok(Value::Nothing { span: call.head }.into_pipeline_data())
+        }
+    }
+}
diff --git a/crates/nu-command/src/core_commands/mod.rs b/crates/nu-command/src/core_commands/mod.rs
index 1f590f49f7..c1a40552aa 100644
--- a/crates/nu-command/src/core_commands/mod.rs
+++ b/crates/nu-command/src/core_commands/mod.rs
@@ -1,5 +1,6 @@
 mod alias;
 mod ast;
+mod commandline;
 mod debug;
 mod def;
 mod def_env;
@@ -30,6 +31,7 @@ mod version;
 
 pub use alias::Alias;
 pub use ast::Ast;
+pub use commandline::Commandline;
 pub use debug::Debug;
 pub use def::Def;
 pub use def_env::DefEnv;
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 369d7bd863..43e3d741af 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -30,6 +30,7 @@ pub fn create_default_context() -> EngineState {
         bind_command! {
             Alias,
             Ast,
+            Commandline,
             Debug,
             Def,
             DefEnv,
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index ff5e73ceeb..11f7d5cd97 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -6,16 +6,24 @@ use crate::{
 };
 use core::panic;
 use std::borrow::Borrow;
-use std::collections::HashSet;
 use std::path::Path;
 use std::path::PathBuf;
 use std::{
-    collections::HashMap,
-    sync::{atomic::AtomicBool, Arc},
+    collections::{HashMap, HashSet, VecDeque},
+    sync::{atomic::AtomicBool, Arc, Mutex},
 };
 
 static PWD_ENV: &str = "PWD";
 
+// TODO: move to different file? where?
+/// An operation to be performed with the current buffer of the interactive shell.
+#[derive(Clone)]
+pub enum ReplOperation {
+    Append(String),
+    Insert(String),
+    Replace(String),
+}
+
 /// The core global engine state. This includes all global definitions as well as any global state that
 /// will persist for the whole session.
 ///
@@ -72,6 +80,8 @@ pub struct EngineState {
     pub env_vars: EnvVars,
     pub previous_env_vars: HashMap<String, Value>,
     pub config: Config,
+    pub repl_buffer_state: Arc<Mutex<Option<String>>>,
+    pub repl_operation_queue: Arc<Mutex<VecDeque<ReplOperation>>>,
     #[cfg(feature = "plugin")]
     pub plugin_signatures: Option<PathBuf>,
     #[cfg(not(windows))]
@@ -110,6 +120,8 @@ impl EngineState {
             env_vars: EnvVars::from([(DEFAULT_OVERLAY_NAME.to_string(), HashMap::new())]),
             previous_env_vars: HashMap::new(),
             config: Config::default(),
+            repl_buffer_state: Arc::new(Mutex::new(None)),
+            repl_operation_queue: Arc::new(Mutex::new(VecDeque::new())),
             #[cfg(feature = "plugin")]
             plugin_signatures: None,
             #[cfg(not(windows))]

From 4926865c4ecc5cf3a7024dad57aea478bb16f690 Mon Sep 17 00:00:00 2001
From: Dan Davison <dandavison7@gmail.com>
Date: Sun, 11 Sep 2022 04:48:27 -0400
Subject: [PATCH 23/45] `str collect` => `str join` (#6531)

* Initialize join.rs as a copy of collect.rs

* Evolve StrCollect into StrJoin

* Replace 'str collect' with 'str join' everywhere

git ls-files | lines | par-each { |it| sed -i 's,str collect,str join,g' $it }

* Deprecate 'str collect'

* Revert "Deprecate 'str collect'"

This reverts commit 959d14203ee37ef3a1e705e1826581a51d5f6ff5.

* Change `str collect` help message to say that it is deprecated

We cannot remove `str collect` currently (i.e. via
`nu_protocol::ShellError::DeprecatedCommand` since a prominent project
uses the API:

https://github.com/pypa/virtualenv/blob/b85542c31ca8afcff317e618da434f59fa06d122/src/virtualenv/activation/nushell/activate.nu#L43
---
 .github/workflows/release-pkg.nu              |   4 +-
 crates/nu-command/src/default_context.rs      |   1 +
 crates/nu-command/src/example_test.rs         |   4 +-
 crates/nu-command/src/filters/upsert.rs       |   2 +-
 crates/nu-command/src/platform/ansi/ansi_.rs  |   8 +-
 crates/nu-command/src/platform/ansi/strip.rs  |   2 +-
 crates/nu-command/src/strings/char_.rs        |   2 +-
 crates/nu-command/src/strings/str_/collect.rs |   6 +-
 crates/nu-command/src/strings/str_/join.rs    | 106 ++++++++++++++++++
 crates/nu-command/src/strings/str_/mod.rs     |   2 +
 crates/nu-command/tests/commands/each.rs      |   2 +-
 crates/nu-command/tests/commands/flatten.rs   |   4 +-
 .../nu-command/tests/commands/move_/column.rs |  12 +-
 crates/nu-command/tests/commands/reject.rs    |   6 +-
 crates/nu-command/tests/commands/roll.rs      |   6 +-
 crates/nu-command/tests/commands/rotate.rs    |   8 +-
 crates/nu-command/tests/commands/select.rs    |   4 +-
 .../nu-command/tests/commands/skip/until.rs   |   2 +-
 .../nu-command/tests/commands/skip/while_.rs  |   2 +-
 .../nu-command/tests/commands/str_/collect.rs |   8 +-
 .../nu-command/tests/commands/take/until.rs   |   2 +-
 .../nu-command/tests/commands/take/while_.rs  |   2 +-
 crates/nu-command/tests/commands/zip.rs       |   2 +-
 .../nu-utils/src/sample_config/default_env.nu |   6 +-
 src/tests/test_bits.rs                        |  14 +--
 src/tests/test_engine.rs                      |   2 +-
 src/tests/test_parser.rs                      |  14 +--
 src/tests/test_table_operations.rs            |   2 +-
 tests/shell/pipeline/commands/internal.rs     |   6 +-
 29 files changed, 173 insertions(+), 68 deletions(-)
 create mode 100644 crates/nu-command/src/strings/str_/join.rs

diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index 7491644e25..5911b9b558 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -76,9 +76,9 @@ cp -v README.release.txt $'($dist)/README.txt'
 
 $'(char nl)Check binary release version detail:'; hr-line
 let ver = if $os == 'windows-latest' {
-    (do -i { ./output/nu.exe -c 'version' }) | str collect
+    (do -i { ./output/nu.exe -c 'version' }) | str join
 } else {
-    (do -i { ./output/nu -c 'version' }) | str collect
+    (do -i { ./output/nu -c 'version' }) | str join
 }
 if ($ver | str trim | is-empty) {
     $'(ansi r)Incompatible nu binary...(ansi reset)'
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 43e3d741af..85af4285dc 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -201,6 +201,7 @@ pub fn create_default_context() -> EngineState {
             StrDistance,
             StrDowncase,
             StrEndswith,
+            StrJoin,
             StrReplace,
             StrIndexOf,
             StrKebabCase,
diff --git a/crates/nu-command/src/example_test.rs b/crates/nu-command/src/example_test.rs
index e570136129..0180262954 100644
--- a/crates/nu-command/src/example_test.rs
+++ b/crates/nu-command/src/example_test.rs
@@ -14,7 +14,7 @@ use crate::To;
 #[cfg(test)]
 use super::{
     Ansi, Date, From, If, Into, LetEnv, Math, Path, Random, Split, SplitColumn, SplitRow, Str,
-    StrCollect, StrLength, StrReplace, Url, Wrap,
+    StrJoin, StrLength, StrReplace, Url, Wrap,
 };
 
 #[cfg(test)]
@@ -29,7 +29,7 @@ pub fn test_examples(cmd: impl Command + 'static) {
         // 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(Str));
-        working_set.add_decl(Box::new(StrCollect));
+        working_set.add_decl(Box::new(StrJoin));
         working_set.add_decl(Box::new(StrLength));
         working_set.add_decl(Box::new(StrReplace));
         working_set.add_decl(Box::new(BuildString));
diff --git a/crates/nu-command/src/filters/upsert.rs b/crates/nu-command/src/filters/upsert.rs
index beb53aa9e5..c19d20ffc5 100644
--- a/crates/nu-command/src/filters/upsert.rs
+++ b/crates/nu-command/src/filters/upsert.rs
@@ -62,7 +62,7 @@ impl Command for Upsert {
             result: Some(Value::List { vals: vec![Value::Record { cols: vec!["count".into(), "fruit".into()], vals: vec![Value::test_int(2), Value::test_string("apple")], span: Span::test_data()}], span: Span::test_data()}),
         }, Example {
             description: "Use in block form for more involved updating logic",
-            example: "echo [[project, authors]; ['nu', ['Andrés', 'JT', 'Yehuda']]] | upsert authors {|a| $a.authors | str collect ','}",
+            example: "echo [[project, authors]; ['nu', ['Andrés', 'JT', 'Yehuda']]] | upsert authors {|a| $a.authors | str join ','}",
             result: Some(Value::List { vals: vec![Value::Record { cols: vec!["project".into(), "authors".into()], vals: vec![Value::test_string("nu"), Value::test_string("Andrés,JT,Yehuda")], span: Span::test_data()}], span: Span::test_data()}),
         }]
     }
diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index 6d818a45fb..a4a8d0cfc3 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -141,7 +141,7 @@ lazy_static! {
     // Reference for ansi codes https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
     // Another good reference http://ascii-table.com/ansi-escape-sequences.php
 
-    // For setting title like `echo [(char title) (pwd) (char bel)] | str collect`
+    // For setting title like `echo [(char title) (pwd) (char bel)] | str join`
     AnsiCode{short_name: None, long_name:"title", code: "\x1b]2;".to_string()}, // ESC]2; xterm sets window title using OSC syntax escapes
 
     // Ansi Erase Sequences
@@ -258,7 +258,7 @@ following values:
     https://en.wikipedia.org/wiki/ANSI_escape_code
 
 OSC: '\x1b]' is not required for --osc parameter
-Example: echo [(ansi -o '0') 'some title' (char bel)] | str collect
+Example: echo [(ansi -o '0') 'some title' (char bel)] | str join
 Format: #
     0 Set window title and icon name
     1 Set icon name
@@ -285,14 +285,14 @@ Format: #
             Example {
                 description:
                     "Use ansi to color text (rb = red bold, gb = green bold, pb = purple bold)",
-                example: r#"echo [(ansi rb) Hello " " (ansi gb) Nu " " (ansi pb) World (ansi reset)] | str collect"#,
+                example: r#"echo [(ansi rb) Hello " " (ansi gb) Nu " " (ansi pb) World (ansi reset)] | str join"#,
                 result: Some(Value::test_string(
                     "\u{1b}[1;31mHello \u{1b}[1;32mNu \u{1b}[1;35mWorld\u{1b}[0m",
                 )),
             },
             Example {
                 description: "Use ansi to color text (italic bright yellow on red 'Hello' with green bold 'Nu' and purple bold 'World')",
-                example: r#"echo [(ansi -e '3;93;41m') Hello (ansi reset) " " (ansi gb) Nu " " (ansi pb) World (ansi reset)] | str collect"#,
+                example: r#"echo [(ansi -e '3;93;41m') Hello (ansi reset) " " (ansi gb) Nu " " (ansi pb) World (ansi reset)] | str join"#,
                 result: Some(Value::test_string(
                     "\u{1b}[3;93;41mHello\u{1b}[0m \u{1b}[1;32mNu \u{1b}[1;35mWorld\u{1b}[0m",
                 )),
diff --git a/crates/nu-command/src/platform/ansi/strip.rs b/crates/nu-command/src/platform/ansi/strip.rs
index dcf71d6857..af5b161fec 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 {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Strip ANSI escape sequences from a string",
-            example: r#"echo [ (ansi green) (ansi cursor_on) "hello" ] | str collect | ansi strip"#,
+            example: r#"echo [ (ansi green) (ansi cursor_on) "hello" ] | str join | ansi strip"#,
             result: Some(Value::test_string("hello")),
         }]
     }
diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index f0bd321dfa..b82ab82407 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -185,7 +185,7 @@ impl Command for Char {
             },
             Example {
                 description: "Output prompt character, newline and a hamburger character",
-                example: r#"echo [(char prompt) (char newline) (char hamburger)] | str collect"#,
+                example: r#"echo [(char prompt) (char newline) (char hamburger)] | str join"#,
                 result: Some(Value::test_string("\u{25b6}\n\u{2261}")),
             },
             Example {
diff --git a/crates/nu-command/src/strings/str_/collect.rs b/crates/nu-command/src/strings/str_/collect.rs
index 551594ab91..034c89502c 100644
--- a/crates/nu-command/src/strings/str_/collect.rs
+++ b/crates/nu-command/src/strings/str_/collect.rs
@@ -25,11 +25,7 @@ impl Command for StrCollect {
     }
 
     fn usage(&self) -> &str {
-        "Concatenate multiple strings into a single string, with an optional separator between each"
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["join", "concatenate"]
+        "'str collect' is deprecated. Please use 'str join' instead."
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/str_/join.rs b/crates/nu-command/src/strings/str_/join.rs
new file mode 100644
index 0000000000..fe8f659514
--- /dev/null
+++ b/crates/nu-command/src/strings/str_/join.rs
@@ -0,0 +1,106 @@
+use nu_engine::CallExt;
+use nu_protocol::ast::Call;
+use nu_protocol::engine::{Command, EngineState, Stack};
+use nu_protocol::{
+    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, SyntaxShape,
+    Value,
+};
+
+#[derive(Clone)]
+pub struct StrJoin;
+
+impl Command for StrJoin {
+    fn name(&self) -> &str {
+        "str join"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("str join")
+            .optional(
+                "separator",
+                SyntaxShape::String,
+                "optional separator to use when creating string",
+            )
+            .category(Category::Strings)
+    }
+
+    fn usage(&self) -> &str {
+        "Concatenate multiple strings into a single string, with an optional separator between each"
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["collect", "concatenate"]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let separator: Option<String> = call.opt(engine_state, stack, 0)?;
+
+        let config = engine_state.get_config();
+
+        // let output = input.collect_string(&separator.unwrap_or_default(), &config)?;
+        // Hmm, not sure what we actually want. If you don't use debug_string, Date comes out as human readable
+        // which feels funny
+        let mut strings: Vec<String> = vec![];
+
+        for value in input {
+            match value {
+                Value::Error { error } => {
+                    return Err(error);
+                }
+                value => {
+                    strings.push(value.debug_string("\n", config));
+                }
+            }
+        }
+
+        let output = if let Some(separator) = separator {
+            strings.join(&separator)
+        } else {
+            strings.join("")
+        };
+
+        Ok(Value::String {
+            val: output,
+            span: call.head,
+        }
+        .into_pipeline_data())
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Create a string from input",
+                example: "['nu', 'shell'] | str join",
+                result: Some(Value::String {
+                    val: "nushell".to_string(),
+                    span: Span::test_data(),
+                }),
+            },
+            Example {
+                description: "Create a string from input with a separator",
+                example: "['nu', 'shell'] | str join '-'",
+                result: Some(Value::String {
+                    val: "nu-shell".to_string(),
+                    span: Span::test_data(),
+                }),
+            },
+        ]
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(StrJoin {})
+    }
+}
diff --git a/crates/nu-command/src/strings/str_/mod.rs b/crates/nu-command/src/strings/str_/mod.rs
index cbe3ee0050..26744205b5 100644
--- a/crates/nu-command/src/strings/str_/mod.rs
+++ b/crates/nu-command/src/strings/str_/mod.rs
@@ -4,6 +4,7 @@ mod contains;
 mod distance;
 mod ends_with;
 mod index_of;
+mod join;
 mod length;
 mod lpad;
 mod replace;
@@ -19,6 +20,7 @@ pub use contains::SubCommand as StrContains;
 pub use distance::SubCommand as StrDistance;
 pub use ends_with::SubCommand as StrEndswith;
 pub use index_of::SubCommand as StrIndexOf;
+pub use join::*;
 pub use length::SubCommand as StrLength;
 pub use lpad::SubCommand as StrLpad;
 pub use replace::SubCommand as StrReplace;
diff --git a/crates/nu-command/tests/commands/each.rs b/crates/nu-command/tests/commands/each.rs
index 5ac0c14d91..df1ba48a65 100644
--- a/crates/nu-command/tests/commands/each.rs
+++ b/crates/nu-command/tests/commands/each.rs
@@ -65,7 +65,7 @@ fn each_implicit_it_in_block() {
     let actual = nu!(
         cwd: "tests/fixtures/formats", pipeline(
         r#"
-        echo [[foo bar]; [a b] [c d] [e f]] | each { |it| nu --testbin cococo $it.foo } | str collect
+        echo [[foo bar]; [a b] [c d] [e f]] | each { |it| nu --testbin cococo $it.foo } | str join
         "#
     ));
 
diff --git a/crates/nu-command/tests/commands/flatten.rs b/crates/nu-command/tests/commands/flatten.rs
index f5df5fa0d3..8d33fdde6f 100644
--- a/crates/nu-command/tests/commands/flatten.rs
+++ b/crates/nu-command/tests/commands/flatten.rs
@@ -11,7 +11,7 @@ fn flatten_nested_tables_with_columns() {
                  [[origin, people]; [Nu, ('nuno' | wrap name)]]
             | flatten --all | flatten --all
             | get name
-            | str collect ','
+            | str join ','
         "#
     ));
 
@@ -27,7 +27,7 @@ fn flatten_nested_tables_that_have_many_columns() {
             [[origin, people]; [USA, (echo [[name, meal]; ['Katz', 'nurepa']])]]
             | flatten --all | flatten --all
             | get meal
-            | str collect ','
+            | str join ','
         "#
     ));
 
diff --git a/crates/nu-command/tests/commands/move_/column.rs b/crates/nu-command/tests/commands/move_/column.rs
index 1430f0139c..490197db4c 100644
--- a/crates/nu-command/tests/commands/move_/column.rs
+++ b/crates/nu-command/tests/commands/move_/column.rs
@@ -26,7 +26,7 @@ fn moves_a_column_before() {
                 | rename chars
                 | get chars
                 | str trim
-                | str collect
+                | str join
             "#
         ));
 
@@ -59,9 +59,9 @@ fn moves_columns_before() {
                 | move column99 column3 --before column2
                 | rename _ chars_1 chars_2
                 | select chars_2 chars_1
-                | upsert new_col {|f| $f | transpose | get column1 | str trim | str collect}
+                | upsert new_col {|f| $f | transpose | get column1 | str trim | str join}
                 | get new_col
-                | str collect
+                | str join
             "#
         ));
 
@@ -95,9 +95,9 @@ fn moves_a_column_after() {
                 | move letters and_more --before column2
                 | rename _ chars_1 chars_2
                 | select chars_1 chars_2
-                | upsert new_col {|f| $f | transpose | get column1 | str trim | str collect}
+                | upsert new_col {|f| $f | transpose | get column1 | str trim | str join}
                 | get new_col
-                | str collect
+                | str join
             "#
         ));
 
@@ -130,7 +130,7 @@ fn moves_columns_after() {
                 | move letters and_more --after column1
                 | columns
                 | select 1 2
-                | str collect
+                | str join
             "#
         ));
 
diff --git a/crates/nu-command/tests/commands/reject.rs b/crates/nu-command/tests/commands/reject.rs
index 9060360a0e..5d35190378 100644
--- a/crates/nu-command/tests/commands/reject.rs
+++ b/crates/nu-command/tests/commands/reject.rs
@@ -13,7 +13,7 @@ fn regular_columns() {
             ]
             | reject type first_name
             | columns
-            | str collect ", "
+            | str join ", "
         "#
     ));
 
@@ -56,7 +56,7 @@ fn complex_nested_columns() {
             | reject nu."0xATYKARNU" nu.committers
             | get nu
             | columns
-            | str collect ", "
+            | str join ", "
         "#,
     ));
 
@@ -75,7 +75,7 @@ fn ignores_duplicate_columns_rejected() {
             ]
             | reject "first name" "first name"
             | columns
-            | str collect ", "
+            | str join ", "
         "#
     ));
 
diff --git a/crates/nu-command/tests/commands/roll.rs b/crates/nu-command/tests/commands/roll.rs
index 8bf419ee13..ccbd640e31 100644
--- a/crates/nu-command/tests/commands/roll.rs
+++ b/crates/nu-command/tests/commands/roll.rs
@@ -69,7 +69,7 @@ mod columns {
         format!("{} | {}", table(), pipeline(r#"
             roll left
             | columns
-            | str collect "-"
+            | str join "-"
         "#)));
 
         assert_eq!(actual.out, "origin-stars-commit_author");
@@ -82,7 +82,7 @@ mod columns {
         format!("{} | {}", table(), pipeline(r#"
             roll right --by 2
             | columns
-            | str collect "-"
+            | str join "-"
         "#)));
 
         assert_eq!(actual.out, "origin-stars-commit_author");
@@ -97,7 +97,7 @@ mod columns {
 
         let actual = nu!(
             cwd: ".",
-            format!("{} | roll right --by 3 --cells-only | columns | str collect '-' ", four_bitstring)
+            format!("{} | roll right --by 3 --cells-only | columns | str join '-' ", four_bitstring)
         );
 
         assert_eq!(actual.out, expected_value.1);
diff --git a/crates/nu-command/tests/commands/rotate.rs b/crates/nu-command/tests/commands/rotate.rs
index 7f20406215..434663695a 100644
--- a/crates/nu-command/tests/commands/rotate.rs
+++ b/crates/nu-command/tests/commands/rotate.rs
@@ -25,7 +25,7 @@ fn counter_clockwise() {
         ]
         | where column0 == EXPECTED
         | get column1 column2 column3
-        | str collect "-"
+        | str join "-"
         "#,
     ));
 
@@ -35,7 +35,7 @@ fn counter_clockwise() {
             rotate --ccw
             | where column0 == EXPECTED
             | get column1 column2 column3
-            | str collect "-"
+            | str join "-"
         "#)));
 
     assert_eq!(actual.out, expected.out);
@@ -66,7 +66,7 @@ fn clockwise() {
         ]
         | where column3 == EXPECTED
         | get column0 column1 column2
-        | str collect "-"
+        | str join "-"
         "#,
     ));
 
@@ -76,7 +76,7 @@ fn clockwise() {
             rotate
             | where column3 == EXPECTED
             | get column0 column1 column2
-            | str collect "-"
+            | str join "-"
         "#)));
 
     assert_eq!(actual.out, expected.out);
diff --git a/crates/nu-command/tests/commands/select.rs b/crates/nu-command/tests/commands/select.rs
index d8c59aa02a..ac8eed2522 100644
--- a/crates/nu-command/tests/commands/select.rs
+++ b/crates/nu-command/tests/commands/select.rs
@@ -96,7 +96,7 @@ fn column_names_with_spaces() {
             ]
             | select "last name"
             | get "last name"
-            | str collect " "
+            | str join " "
         "#
     ));
 
@@ -115,7 +115,7 @@ fn ignores_duplicate_columns_selected() {
             ]
             | select "first name" "last name" "first name"
             | columns
-            | str collect " "
+            | str join " "
         "#
     ));
 
diff --git a/crates/nu-command/tests/commands/skip/until.rs b/crates/nu-command/tests/commands/skip/until.rs
index 7ef815e98a..2a1a746eb3 100644
--- a/crates/nu-command/tests/commands/skip/until.rs
+++ b/crates/nu-command/tests/commands/skip/until.rs
@@ -36,7 +36,7 @@ fn condition_is_met() {
                 | lines
                 | skip 2
                 | str trim
-                | str collect (char nl)
+                | str join (char nl)
                 | from csv
                 | skip until "Chicken Collection" == "Red Chickens"
                 | skip 1
diff --git a/crates/nu-command/tests/commands/skip/while_.rs b/crates/nu-command/tests/commands/skip/while_.rs
index e21e364dc4..c7cd34ac82 100644
--- a/crates/nu-command/tests/commands/skip/while_.rs
+++ b/crates/nu-command/tests/commands/skip/while_.rs
@@ -36,7 +36,7 @@ fn condition_is_met() {
                 | lines
                 | skip 2
                 | str trim
-                | str collect (char nl)
+                | str join (char nl)
                 | from csv
                 | skip while "Chicken Collection" != "Red Chickens"
                 | skip 1
diff --git a/crates/nu-command/tests/commands/str_/collect.rs b/crates/nu-command/tests/commands/str_/collect.rs
index 4a4a93c1dd..820fa8d0d6 100644
--- a/crates/nu-command/tests/commands/str_/collect.rs
+++ b/crates/nu-command/tests/commands/str_/collect.rs
@@ -5,7 +5,7 @@ fn test_1() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-        echo 1..5 | into string | str collect
+        echo 1..5 | into string | str join
         "#
         )
     );
@@ -18,7 +18,7 @@ fn test_2() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-        echo [a b c d] | str collect "<sep>"
+        echo [a b c d] | str join "<sep>"
         "#
         )
     );
@@ -31,7 +31,7 @@ fn construct_a_path() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-        echo [sample txt] | str collect "."
+        echo [sample txt] | str join "."
         "#
         )
     );
@@ -44,7 +44,7 @@ fn sum_one_to_four() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-        1..4 | each { |it| $it } | into string | str collect "+" | math eval
+        1..4 | each { |it| $it } | into string | str join "+" | math eval
         "#
         )
     );
diff --git a/crates/nu-command/tests/commands/take/until.rs b/crates/nu-command/tests/commands/take/until.rs
index aa129b09cc..b1cd15f056 100644
--- a/crates/nu-command/tests/commands/take/until.rs
+++ b/crates/nu-command/tests/commands/take/until.rs
@@ -36,7 +36,7 @@ fn condition_is_met() {
                 | lines
                 | skip 2
                 | str trim
-                | str collect (char nl)
+                | str join (char nl)
                 | from csv
                 | skip while "Chicken Collection" != "Blue Chickens"
                 | take until "Chicken Collection" == "Red Chickens"
diff --git a/crates/nu-command/tests/commands/take/while_.rs b/crates/nu-command/tests/commands/take/while_.rs
index c46673dc7f..41ecc73948 100644
--- a/crates/nu-command/tests/commands/take/while_.rs
+++ b/crates/nu-command/tests/commands/take/while_.rs
@@ -36,7 +36,7 @@ fn condition_is_met() {
                 | lines
                 | skip 2
                 | str trim
-                | str collect (char nl)
+                | str join (char nl)
                 | from csv
                 | skip 1
                 | take while "Chicken Collection" != "Blue Chickens"
diff --git a/crates/nu-command/tests/commands/zip.rs b/crates/nu-command/tests/commands/zip.rs
index 8631425010..5c7693a4b1 100644
--- a/crates/nu-command/tests/commands/zip.rs
+++ b/crates/nu-command/tests/commands/zip.rs
@@ -51,7 +51,7 @@ fn zips_two_lists() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-            echo [0 2 4 6 8] | zip [1 3 5 7 9] | flatten | into string | str collect '-'
+            echo [0 2 4 6 8] | zip [1 3 5 7 9] | flatten | into string | str join '-'
         "#
     ));
 
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 61651379fc..0269f3ffc9 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -13,7 +13,7 @@ def create_left_prompt [] {
 def create_right_prompt [] {
     let time_segment = ([
         (date now | date format '%m/%d/%Y %r')
-    ] | str collect)
+    ] | str join)
 
     $time_segment
 }
@@ -36,11 +36,11 @@ let-env PROMPT_MULTILINE_INDICATOR = { "::: " }
 let-env ENV_CONVERSIONS = {
   "PATH": {
     from_string: { |s| $s | split row (char esep) | path expand -n }
-    to_string: { |v| $v | path expand -n | str collect (char esep) }
+    to_string: { |v| $v | path expand -n | str join (char esep) }
   }
   "Path": {
     from_string: { |s| $s | split row (char esep) | path expand -n }
-    to_string: { |v| $v | path expand -n | str collect (char esep) }
+    to_string: { |v| $v | path expand -n | str join (char esep) }
   }
 }
 
diff --git a/src/tests/test_bits.rs b/src/tests/test_bits.rs
index 41455eea8d..6cef4eaa9a 100644
--- a/src/tests/test_bits.rs
+++ b/src/tests/test_bits.rs
@@ -12,7 +12,7 @@ fn bits_and_negative() -> TestResult {
 
 #[test]
 fn bits_and_list() -> TestResult {
-    run_test("[1 2 3 8 9 10] | bits and 2 | str collect '.'", "0.2.2.0.0.2")
+    run_test("[1 2 3 8 9 10] | bits and 2 | str join '.'", "0.2.2.0.0.2")
 }
 
 #[test]
@@ -27,7 +27,7 @@ fn bits_or_negative() -> TestResult {
 
 #[test]
 fn bits_or_list() -> TestResult {
-    run_test("[1 2 3 8 9 10] | bits or 2 | str collect '.'", "3.2.3.10.11.10")
+    run_test("[1 2 3 8 9 10] | bits or 2 | str join '.'", "3.2.3.10.11.10")
 }
 
 #[test]
@@ -42,7 +42,7 @@ fn bits_xor_negative() -> TestResult {
 
 #[test]
 fn bits_xor_list() -> TestResult {
-    run_test("[1 2 3 8 9 10] | bits xor 2 | str collect '.'", "3.0.1.10.11.8")
+    run_test("[1 2 3 8 9 10] | bits xor 2 | str join '.'", "3.0.1.10.11.8")
 }
 
 #[test]
@@ -57,7 +57,7 @@ fn bits_shift_left_negative() -> TestResult {
 
 #[test]
 fn bits_shift_left_list() -> TestResult {
-    run_test("[1 2 7 32 9 10] | bits shl 3 | str collect '.'", "8.16.56.256.72.80")
+    run_test("[1 2 7 32 9 10] | bits shl 3 | str join '.'", "8.16.56.256.72.80")
 }
 
 #[test]
@@ -72,7 +72,7 @@ fn bits_shift_right_negative() -> TestResult {
 
 #[test]
 fn bits_shift_right_list() -> TestResult {
-    run_test("[12 98 7 64 900 10] | bits shr 3 | str collect '.'", "1.12.0.8.112.1")
+    run_test("[12 98 7 64 900 10] | bits shr 3 | str join '.'", "1.12.0.8.112.1")
 }
 
 #[test]
@@ -87,7 +87,7 @@ fn bits_rotate_left_negative() -> TestResult {
 
 #[test]
 fn bits_rotate_left_list() -> TestResult {
-    run_test("[1 2 7 32 9 10] | bits rol 3 | str collect '.'", "8.16.56.256.72.80")
+    run_test("[1 2 7 32 9 10] | bits rol 3 | str join '.'", "8.16.56.256.72.80")
 }
 
 #[test]
@@ -102,5 +102,5 @@ fn bits_rotate_right_negative() -> TestResult {
 
 #[test]
 fn bits_rotate_right_list() -> TestResult {
-    run_test("[1 2 7 32 23 10] | bits ror 60 | str collect '.'", "16.32.112.512.368.160")
+    run_test("[1 2 7 32 23 10] | bits ror 60 | str join '.'", "16.32.112.512.368.160")
 }
diff --git a/src/tests/test_engine.rs b/src/tests/test_engine.rs
index 8d2df665fe..2483119cea 100644
--- a/src/tests/test_engine.rs
+++ b/src/tests/test_engine.rs
@@ -335,7 +335,7 @@ fn in_means_input() -> TestResult {
 #[test]
 fn in_iteration() -> TestResult {
     run_test(
-        r#"[3, 4, 5] | each { echo $"hi ($in)" } | str collect"#,
+        r#"[3, 4, 5] | each { echo $"hi ($in)" } | str join"#,
         "hi 3hi 4hi 5",
     )
 }
diff --git a/src/tests/test_parser.rs b/src/tests/test_parser.rs
index ed7986141b..6dcde27a08 100644
--- a/src/tests/test_parser.rs
+++ b/src/tests/test_parser.rs
@@ -245,7 +245,7 @@ def 'call-me' [] {
     echo $CONST_A
 }
 
-[(say-hi) (call-me)] | str collect
+[(say-hi) (call-me)] | str join
 
     "#,
         "HelloHello",
@@ -266,7 +266,7 @@ def 'say-hi' [] {
     echo (call-me)
 }
 
-[(say-hi) (call-me)] | str collect
+[(say-hi) (call-me)] | str join
 
     "#,
         "HelloHello",
@@ -287,7 +287,7 @@ def 'call-me' [] {
     echo $CONST_A
 }
 
-[(call-me) (say-hi)] | str collect
+[(call-me) (say-hi)] | str join
 
     "#,
         "HelloHello",
@@ -308,7 +308,7 @@ def 'say-hi' [] {
     echo (call-me)
 }
 
-[(call-me) (say-hi)] | str collect
+[(call-me) (say-hi)] | str join
 
     "#,
         "HelloHello",
@@ -318,7 +318,7 @@ def 'say-hi' [] {
 #[test]
 fn capture_row_condition() -> TestResult {
     run_test(
-        r#"let name = "foo"; [foo] | where $'($name)' =~ $it | str collect"#,
+        r#"let name = "foo"; [foo] | where $'($name)' =~ $it | str join"#,
         "foo",
     )
 }
@@ -326,7 +326,7 @@ fn capture_row_condition() -> TestResult {
 #[test]
 fn starts_with_operator_succeeds() -> TestResult {
     run_test(
-        r#"[Moe Larry Curly] | where $it starts-with L | str collect"#,
+        r#"[Moe Larry Curly] | where $it starts-with L | str join"#,
         "Larry",
     )
 }
@@ -334,7 +334,7 @@ fn starts_with_operator_succeeds() -> TestResult {
 #[test]
 fn ends_with_operator_succeeds() -> TestResult {
     run_test(
-        r#"[Moe Larry Curly] | where $it ends-with ly | str collect"#,
+        r#"[Moe Larry Curly] | where $it ends-with ly | str join"#,
         "Curly",
     )
 }
diff --git a/src/tests/test_table_operations.rs b/src/tests/test_table_operations.rs
index ce590eafd7..5ff1e0cad5 100644
--- a/src/tests/test_table_operations.rs
+++ b/src/tests/test_table_operations.rs
@@ -23,7 +23,7 @@ fn cell_path_var2() -> TestResult {
 #[test]
 fn flatten_simple_list() -> TestResult {
     run_test(
-        "[[N, u, s, h, e, l, l]] | flatten | str collect (char nl)",
+        "[[N, u, s, h, e, l, l]] | flatten | str join (char nl)",
         "N\nu\ns\nh\ne\nl\nl",
     )
 }
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index a6e7b94369..b7a98e2e95 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -64,7 +64,7 @@ fn subexpression_properly_redirects() {
     let actual = nu!(
         cwd: ".",
         r#"
-            echo (nu --testbin cococo "hello") | str collect
+            echo (nu --testbin cococo "hello") | str join
         "#
     );
 
@@ -215,7 +215,7 @@ fn run_custom_subcommand() {
     let actual = nu!(
         cwd: ".",
         r#"
-        def "str double" [x] { echo $x $x | str collect }; str double bob
+        def "str double" [x] { echo $x $x | str join }; str double bob
         "#
     );
 
@@ -306,7 +306,7 @@ fn run_custom_command_with_rest_other_name() {
                 greeting:string,
                 ...names:string # All of the names
                 ] {
-                    echo $"($greeting), ($names | sort-by | str collect)"
+                    echo $"($greeting), ($names | sort-by | str join)"
                 }
             say-hello Salutations E D C A B
         "#

From 367f79cb4fc2f281abe608840733f78f664b34a7 Mon Sep 17 00:00:00 2001
From: Dan Davison <dandavison7@gmail.com>
Date: Sun, 11 Sep 2022 12:58:19 -0400
Subject: [PATCH 24/45] Don't compute 'did you mean' suggestions unless showing
 them to user (#6540)

---
 crates/nu-engine/src/env.rs         |  2 +-
 crates/nu-protocol/src/value/mod.rs | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index 04dbc3e27c..336828593c 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -336,7 +336,7 @@ fn get_converted_value(
             val: block_id,
             span: from_span,
             ..
-        }) = env_conversions.follow_cell_path(path_members, false)
+        }) = env_conversions.follow_cell_path_not_from_user_input(path_members, false)
         {
             let block = engine_state.get_block(block_id);
 
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index c07bf4ca7e..4d9762ba9f 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -609,6 +609,23 @@ impl Value {
         self,
         cell_path: &[PathMember],
         insensitive: bool,
+    ) -> Result<Value, ShellError> {
+        self.follow_cell_path_helper(cell_path, insensitive, true)
+    }
+
+    pub fn follow_cell_path_not_from_user_input(
+        self,
+        cell_path: &[PathMember],
+        insensitive: bool,
+    ) -> Result<Value, ShellError> {
+        self.follow_cell_path_helper(cell_path, insensitive, false)
+    }
+
+    fn follow_cell_path_helper(
+        self,
+        cell_path: &[PathMember],
+        insensitive: bool,
+        from_user_input: bool,
     ) -> Result<Value, ShellError> {
         let mut current = self;
         for member in cell_path {
@@ -673,9 +690,12 @@ impl Value {
                             }
                         }) {
                             current = found.1.clone();
-                        } else if let Some(suggestion) = did_you_mean(&cols, column_name) {
-                            return Err(ShellError::DidYouMean(suggestion, *origin_span));
                         } else {
+                            if from_user_input {
+                                if let Some(suggestion) = did_you_mean(&cols, column_name) {
+                                    return Err(ShellError::DidYouMean(suggestion, *origin_span));
+                                }
+                            }
                             return Err(ShellError::CantFindColumn(*origin_span, span));
                         }
                     }

From 2bb367f570502cd26d6b7a81425d9f3b3b9eb432 Mon Sep 17 00:00:00 2001
From: Dan Davison <dandavison7@gmail.com>
Date: Sun, 11 Sep 2022 16:14:58 -0400
Subject: [PATCH 25/45] Revert "Try again: in unix like system, set foreground
 process while running external command (#6273)" (#6542)

This reverts commit 1d18f6947ed092a5adb36c327f7eccb4436130a3.
---
 Cargo.lock                                   |   3 -
 crates/nu-command/src/system/run_external.rs |  25 ++--
 crates/nu-system/Cargo.toml                  |   4 -
 crates/nu-system/src/foreground.rs           | 117 -------------------
 crates/nu-system/src/lib.rs                  |   5 -
 crates/nu-system/src/signal.rs               |  41 -------
 src/main.rs                                  |   8 --
 7 files changed, 11 insertions(+), 192 deletions(-)
 delete mode 100644 crates/nu-system/src/foreground.rs
 delete mode 100644 crates/nu-system/src/signal.rs

diff --git a/Cargo.lock b/Cargo.lock
index 821c5493eb..a96bbd3c3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2509,7 +2509,6 @@ dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
  "libc",
- "memoffset",
 ]
 
 [[package]]
@@ -2869,13 +2868,11 @@ dependencies = [
 name = "nu-system"
 version = "0.68.1"
 dependencies = [
- "atty",
  "chrono",
  "errno",
  "libc",
  "libproc",
  "mach2",
- "nix",
  "ntapi",
  "once_cell",
  "procfs",
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index f29d0b3a52..788181f230 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -7,7 +7,6 @@ use nu_protocol::did_you_mean;
 use nu_protocol::engine::{EngineState, Stack};
 use nu_protocol::{ast::Call, engine::Command, ShellError, Signature, SyntaxShape, Value};
 use nu_protocol::{Category, Example, ListStream, PipelineData, RawStream, Span, Spanned};
-use nu_system::ForegroundProcess;
 use pathdiff::diff_paths;
 use std::collections::HashMap;
 use std::io::{BufRead, BufReader, Write};
@@ -142,7 +141,7 @@ impl ExternalCommand {
 
         let ctrlc = engine_state.ctrlc.clone();
 
-        let mut fg_process = ForegroundProcess::new(self.create_process(&input, false, head)?);
+        let mut process = self.create_process(&input, false, head)?;
         // mut is used in the windows branch only, suppress warning on other platforms
         #[allow(unused_mut)]
         let mut child;
@@ -157,7 +156,8 @@ impl ExternalCommand {
             // 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
-            match fg_process.spawn() {
+
+            match process.spawn() {
                 Err(err) => {
                     // set the default value, maybe we'll override it later
                     child = Err(err);
@@ -174,8 +174,7 @@ impl ExternalCommand {
                         .any(|&cmd| command_name_upper == cmd);
 
                     if looks_like_cmd_internal {
-                        let mut cmd_process =
-                            ForegroundProcess::new(self.create_process(&input, true, head)?);
+                        let mut cmd_process = self.create_process(&input, true, head)?;
                         child = cmd_process.spawn();
                     } else {
                         #[cfg(feature = "which-support")]
@@ -203,10 +202,8 @@ impl ExternalCommand {
                                                     item: file_name.to_string_lossy().to_string(),
                                                     span: self.name.span,
                                                 };
-                                                let mut cmd_process = ForegroundProcess::new(
-                                                    new_command
-                                                        .create_process(&input, true, head)?,
-                                                );
+                                                let mut cmd_process = new_command
+                                                    .create_process(&input, true, head)?;
                                                 child = cmd_process.spawn();
                                             }
                                         }
@@ -224,7 +221,7 @@ impl ExternalCommand {
 
         #[cfg(not(windows))]
         {
-            child = fg_process.spawn()
+            child = process.spawn()
         }
 
         match child {
@@ -276,7 +273,7 @@ impl ExternalCommand {
                     engine_state.config.use_ansi_coloring = false;
 
                     // if there is a string or a stream, that is sent to the pipe std
-                    if let Some(mut stdin_write) = child.as_mut().stdin.take() {
+                    if let Some(mut stdin_write) = child.stdin.take() {
                         std::thread::spawn(move || {
                             let input = crate::Table::run(
                                 &crate::Table,
@@ -317,7 +314,7 @@ impl ExternalCommand {
                     // and we create a ListStream that can be consumed
 
                     if redirect_stderr {
-                        let stderr = child.as_mut().stderr.take().ok_or_else(|| {
+                        let stderr = child.stderr.take().ok_or_else(|| {
                             ShellError::ExternalCommand(
                                 "Error taking stderr from external".to_string(),
                                 "Redirects need access to stderr of an external command"
@@ -356,7 +353,7 @@ impl ExternalCommand {
                     }
 
                     if redirect_stdout {
-                        let stdout = child.as_mut().stdout.take().ok_or_else(|| {
+                        let stdout = child.stdout.take().ok_or_else(|| {
                             ShellError::ExternalCommand(
                                 "Error taking stdout from external".to_string(),
                                 "Redirects need access to stdout of an external command"
@@ -394,7 +391,7 @@ impl ExternalCommand {
                         }
                     }
 
-                    match child.as_mut().wait() {
+                    match child.wait() {
                         Err(err) => Err(ShellError::ExternalCommand(
                             "External command exited with error".into(),
                             err.to_string(),
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 4b96b9232c..e59efabc59 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -16,10 +16,6 @@ path = "src/main.rs"
 [dependencies]
 libc = "0.2"
 
-[target.'cfg(target_family = "unix")'.dependencies]
-nix = "0.24"
-atty = "0.2"
-
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 procfs  = "0.14.0"
 
diff --git a/crates/nu-system/src/foreground.rs b/crates/nu-system/src/foreground.rs
deleted file mode 100644
index b9fdcc46af..0000000000
--- a/crates/nu-system/src/foreground.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use std::process::{Child, Command};
-
-/// A simple wrapper for `std::process::Command`
-///
-/// ## spawn behavior
-/// ### Unix
-/// When invoke `spawn`, current process will block `SIGTSTP`, `SIGTTOU`, `SIGTTIN`, `SIGCHLD`
-///
-/// spawned child process will get it's own process group id, and it's going to foreground(by making stdin belong's to child's process group).
-///
-/// When child is to over, unblock `SIGTSTP`, `SIGTTOU`, `SIGTTIN`, `SIGCHLD`, foreground process is back to callers' process.
-/// It bahaves something like `SignalHandler` in ion(https://gitlab.redox-os.org/redox-os/ion/-/tree/master/).
-///
-/// ### Windows
-/// It does nothing special on windows system, `spawn` is the same as [std::process::Command::spawn](std::process::Command::spawn)
-pub struct ForegroundProcess {
-    inner: Command,
-}
-
-/// A simple wrapper for `std::process::Child`
-///
-/// It can only be created by `ForegroundProcess::spawn`.
-pub struct ForegroundChild {
-    inner: Child,
-}
-
-impl ForegroundProcess {
-    pub fn new(cmd: Command) -> Self {
-        Self { inner: cmd }
-    }
-
-    pub fn spawn(&mut self) -> std::io::Result<ForegroundChild> {
-        fg_process_setup::prepare_to_foreground(&mut self.inner);
-        self.inner.spawn().map(|child| {
-            fg_process_setup::set_foreground(&child);
-            ForegroundChild { inner: child }
-        })
-    }
-}
-
-impl AsMut<Child> for ForegroundChild {
-    fn as_mut(&mut self) -> &mut Child {
-        &mut self.inner
-    }
-}
-
-impl Drop for ForegroundChild {
-    fn drop(&mut self) {
-        // It's ok to use here because we have called `set_foreground` during creation.
-        unsafe { fg_process_setup::reset_foreground_id() }
-    }
-}
-
-// It's a simpler version of fish shell's external process handling.
-#[cfg(target_family = "unix")]
-mod fg_process_setup {
-    use crate::signal::{block, unblock};
-    use nix::unistd::{self, Pid};
-    use std::os::unix::prelude::CommandExt;
-
-    pub(super) fn prepare_to_foreground(external_command: &mut std::process::Command) {
-        unsafe {
-            block();
-            // Safety:
-            // POSIX only allows async-signal-safe functions to be called.
-            // And `setpgid` is async-signal-safe function according to:
-            // https://manpages.ubuntu.com/manpages/bionic/man7/signal-safety.7.html
-            // So we're ok to invoke `libc::setpgid` inside `pre_exec`.
-            external_command.pre_exec(|| {
-                // make the command startup with new process group.
-                // The process group id must be the same as external commands' pid.
-                // Or else we'll failed to set it as foreground process.
-                // For more information, check `fork_child_for_process` function:
-                // https://github.com/fish-shell/fish-shell/blob/023042098396aa450d2c4ea1eb9341312de23126/src/exec.cpp#L398
-                if let Err(e) = unistd::setpgid(Pid::from_raw(0), Pid::from_raw(0)) {
-                    println!("ERROR: setpgid for external failed, result: {e:?}");
-                }
-                Ok(())
-            });
-        }
-    }
-
-    // If `prepare_to_foreground` function is not called, the function will fail with silence and do nothing.
-    pub(super) fn set_foreground(process: &std::process::Child) {
-        if atty::is(atty::Stream::Stdin) {
-            if let Err(e) =
-                nix::unistd::tcsetpgrp(nix::libc::STDIN_FILENO, Pid::from_raw(process.id() as i32))
-            {
-                println!("ERROR: set foreground id failed, tcsetpgrp result: {e:?}");
-            }
-        }
-    }
-
-    /// Reset foreground to current process, unblock `SIGTSTP`, `SIGTTOU`, `SIGTTIN`, `SIGCHLD`
-    ///
-    /// ## Safety
-    /// It can only be called when you have called `set_foreground`, or results in undefined behavior.
-    pub(super) unsafe fn reset_foreground_id() {
-        if atty::is(atty::Stream::Stdin) {
-            if let Err(e) = nix::unistd::tcsetpgrp(nix::libc::STDIN_FILENO, unistd::getpgrp()) {
-                println!("ERROR: reset foreground id failed, tcsetpgrp result: {e:?}");
-            }
-        }
-        unblock()
-    }
-}
-
-// TODO: investigate if we can set foreground process through windows system call.
-#[cfg(target_family = "windows")]
-mod fg_process_setup {
-
-    pub(super) fn prepare_to_foreground(_external_command: &mut std::process::Command) {}
-
-    pub(super) fn set_foreground(_process: &std::process::Child) {}
-
-    pub(super) unsafe fn reset_foreground_id() {}
-}
diff --git a/crates/nu-system/src/lib.rs b/crates/nu-system/src/lib.rs
index 40f218e7d9..1ad89d73d5 100644
--- a/crates/nu-system/src/lib.rs
+++ b/crates/nu-system/src/lib.rs
@@ -1,15 +1,10 @@
-mod foreground;
 #[cfg(any(target_os = "android", target_os = "linux"))]
 mod linux;
 #[cfg(target_os = "macos")]
 mod macos;
-#[cfg(target_family = "unix")]
-pub mod signal;
-
 #[cfg(target_os = "windows")]
 mod windows;
 
-pub use self::foreground::{ForegroundChild, ForegroundProcess};
 #[cfg(any(target_os = "android", target_os = "linux"))]
 pub use self::linux::*;
 #[cfg(target_os = "macos")]
diff --git a/crates/nu-system/src/signal.rs b/crates/nu-system/src/signal.rs
deleted file mode 100644
index bb696d34a8..0000000000
--- a/crates/nu-system/src/signal.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use nix::sys::signal::{self, SigHandler, Signal};
-
-/// Blocks the SIGTSTP/SIGTTOU/SIGTTIN/SIGCHLD signals so that the shell never receives
-/// them.
-pub fn block() {
-    let mut sigset = signal::SigSet::empty();
-    sigset.add(signal::Signal::SIGTSTP);
-    sigset.add(signal::Signal::SIGTTOU);
-    sigset.add(signal::Signal::SIGTTIN);
-    sigset.add(signal::Signal::SIGCHLD);
-    if let Err(e) = signal::sigprocmask(signal::SigmaskHow::SIG_BLOCK, Some(&sigset), None) {
-        println!("ERROR: Could not block the signals, error message: {e:?}");
-    }
-}
-
-/// Unblocks the SIGTSTP/SIGTTOU/SIGTTIN/SIGCHLD signals so children processes can be
-/// controlled
-/// by the shell.
-pub fn unblock() {
-    let mut sigset = signal::SigSet::empty();
-    sigset.add(signal::Signal::SIGTSTP);
-    sigset.add(signal::Signal::SIGTTOU);
-    sigset.add(signal::Signal::SIGTTIN);
-    sigset.add(signal::Signal::SIGCHLD);
-    if let Err(e) = signal::sigprocmask(signal::SigmaskHow::SIG_UNBLOCK, Some(&sigset), None) {
-        println!("ERROR: Could not unblock the signals, error message: {e:?}");
-    }
-}
-
-// It's referenced from `set_unique_pid` function in `ion`.
-pub fn set_terminal_leader() {
-    let stdin_is_a_tty = atty::is(atty::Stream::Stdin);
-    if stdin_is_a_tty {
-        // We have make sure that stdin is a tty, it's ok to ignore SIGTTOU.
-        unsafe {
-            if let Err(e) = signal::signal(Signal::SIGTTOU, SigHandler::SigIgn) {
-                println!("WARN: ignore SIGTTOU failed, error message: {e:?}");
-            }
-        }
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 12c67e9f92..a16c4fd1c6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -135,14 +135,6 @@ fn main() -> Result<()> {
 
     let parsed_nu_cli_args = parse_commandline_args(&nushell_commandline_args, &mut engine_state);
 
-    #[cfg(target_family = "unix")]
-    {
-        // This will block SIGTSTP, SIGTTOU, SIGTTIN, and SIGCHLD, which is required
-        // for this shell to manage its own process group / children / etc.
-        nu_system::signal::block();
-        nu_system::signal::set_terminal_leader()
-    }
-
     if let Ok(ref args) = parsed_nu_cli_args {
         set_config_path(
             &mut engine_state,

From 4490e97a13b35ed47b1ee8648f8ec8c169a0ebc3 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Mon, 12 Sep 2022 04:29:39 +0800
Subject: [PATCH 26/45] Bump dev version to v0.68.2 (#6538)

---
 Cargo.lock                                  | 42 ++++++++++-----------
 Cargo.toml                                  | 32 ++++++++--------
 crates/nu-cli/Cargo.toml                    | 18 ++++-----
 crates/nu-color-config/Cargo.toml           |  8 ++--
 crates/nu-command/Cargo.toml                | 28 +++++++-------
 crates/nu-engine/Cargo.toml                 | 10 ++---
 crates/nu-glob/Cargo.toml                   |  2 +-
 crates/nu-json/Cargo.toml                   |  4 +-
 crates/nu-parser/Cargo.toml                 | 10 ++---
 crates/nu-path/Cargo.toml                   |  2 +-
 crates/nu-plugin/Cargo.toml                 |  6 +--
 crates/nu-pretty-hex/Cargo.toml             |  2 +-
 crates/nu-protocol/Cargo.toml               |  8 ++--
 crates/nu-system/Cargo.lock                 |  2 +-
 crates/nu-system/Cargo.toml                 |  2 +-
 crates/nu-table/Cargo.toml                  |  4 +-
 crates/nu-term-grid/Cargo.toml              |  2 +-
 crates/nu-test-support/Cargo.toml           |  8 ++--
 crates/nu-utils/Cargo.toml                  |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml   |  4 +-
 crates/nu_plugin_example/Cargo.toml         |  6 +--
 crates/nu_plugin_gstat/Cargo.toml           |  8 ++--
 crates/nu_plugin_inc/Cargo.toml             |  6 +--
 crates/nu_plugin_query/Cargo.toml           |  8 ++--
 crates/old/nu_plugin_chart/Cargo.toml       | 14 +++----
 crates/old/nu_plugin_from_bson/Cargo.toml   | 10 ++---
 crates/old/nu_plugin_from_mp4/Cargo.toml    | 10 ++---
 crates/old/nu_plugin_from_sqlite/Cargo.toml | 10 ++---
 crates/old/nu_plugin_s3/Cargo.toml          | 10 ++---
 crates/old/nu_plugin_start/Cargo.toml       | 14 +++----
 crates/old/nu_plugin_to_bson/Cargo.toml     | 10 ++---
 crates/old/nu_plugin_to_sqlite/Cargo.toml   | 10 ++---
 crates/old/nu_plugin_tree/Cargo.toml        |  8 ++--
 samples/wasm/Cargo.toml                     |  2 +-
 34 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a96bbd3c3c..5c5b83df8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2575,7 +2575,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "assert_cmd",
  "chrono",
@@ -2627,7 +2627,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "atty",
  "chrono",
@@ -2656,7 +2656,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "nu-ansi-term",
  "nu-json",
@@ -2667,7 +2667,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "Inflector",
  "alphanumeric-sort",
@@ -2761,7 +2761,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "chrono",
  "nu-glob",
@@ -2774,7 +2774,7 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "doc-comment",
  "tempdir",
@@ -2782,7 +2782,7 @@ dependencies = [
 
 [[package]]
 name = "nu-json"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "fancy-regex",
  "lazy_static",
@@ -2795,7 +2795,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "chrono",
  "itertools",
@@ -2811,7 +2811,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "dirs-next",
  "dunce",
@@ -2820,7 +2820,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "bincode",
  "byte-order",
@@ -2836,7 +2836,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -2845,7 +2845,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "byte-unit",
  "chrono",
@@ -2866,7 +2866,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "chrono",
  "errno",
@@ -2881,7 +2881,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "atty",
  "nu-ansi-term",
@@ -2892,7 +2892,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "strip-ansi-escapes",
  "unicode-width",
@@ -2900,7 +2900,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "getset",
  "hamcrest2",
@@ -2915,7 +2915,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "crossterm_winapi",
  "lscolors",
@@ -2935,7 +2935,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -2943,7 +2943,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "git2",
  "nu-engine",
@@ -2953,7 +2953,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -2962,7 +2962,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "gjson",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index 97c958e466..5e6384f52f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ name = "nu"
 readme = "README.md"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.60"
-version = "0.68.1"
+version = "0.68.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -39,20 +39,20 @@ ctrlc = "3.2.1"
 log = "0.4"
 miette = "5.1.0"
 nu-ansi-term = "0.46.0"
-nu-cli = { path="./crates/nu-cli", version = "0.68.1"  }
-nu-color-config = { path = "./crates/nu-color-config", version = "0.68.1"  }
-nu-command = { path="./crates/nu-command", version = "0.68.1"  }
-nu-engine = { path="./crates/nu-engine", version = "0.68.1"  }
-nu-json = { path="./crates/nu-json", version = "0.68.1"  }
-nu-parser = { path="./crates/nu-parser", version = "0.68.1"  }
-nu-path = { path="./crates/nu-path", version = "0.68.1"  }
-nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.68.1"  }
-nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.68.1"  }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.68.1"  }
-nu-system = { path = "./crates/nu-system", version = "0.68.1" }
-nu-table = { path = "./crates/nu-table", version = "0.68.1"  }
-nu-term-grid = { path = "./crates/nu-term-grid", version = "0.68.1"  }
-nu-utils = { path = "./crates/nu-utils", version = "0.68.1"  }
+nu-cli = { path="./crates/nu-cli", version = "0.68.2"  }
+nu-color-config = { path = "./crates/nu-color-config", version = "0.68.2"  }
+nu-command = { path="./crates/nu-command", version = "0.68.2"  }
+nu-engine = { path="./crates/nu-engine", version = "0.68.2"  }
+nu-json = { path="./crates/nu-json", version = "0.68.2"  }
+nu-parser = { path="./crates/nu-parser", version = "0.68.2"  }
+nu-path = { path="./crates/nu-path", version = "0.68.2"  }
+nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.68.2"  }
+nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.68.2"  }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.68.2"  }
+nu-system = { path = "./crates/nu-system", version = "0.68.2" }
+nu-table = { path = "./crates/nu-table", version = "0.68.2"  }
+nu-term-grid = { path = "./crates/nu-term-grid", version = "0.68.2"  }
+nu-utils = { path = "./crates/nu-utils", version = "0.68.2"  }
 reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 rayon = "1.5.1"
 is_executable = "1.0.1"
@@ -65,7 +65,7 @@ openssl = { version = "0.10.38", features = ["vendored"], optional = true }
 signal-hook = { version = "0.3.14", default-features = false }
 
 [dev-dependencies]
-nu-test-support = { path="./crates/nu-test-support", version = "0.68.1"  }
+nu-test-support = { path="./crates/nu-test-support", version = "0.68.2"  }
 tempfile = "3.2.0"
 assert_cmd = "2.0.2"
 pretty_assertions = "1.0.0"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index a2782b1c14..e9ac7f5864 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.68.1"
+version = "0.68.2"
 
 [dev-dependencies]
-nu-test-support = { path="../nu-test-support", version = "0.68.1"  }
-nu-command = { path = "../nu-command", version = "0.68.1" }
+nu-test-support = { path="../nu-test-support", version = "0.68.2"  }
+nu-command = { path = "../nu-command", version = "0.68.2" }
 rstest = {version = "0.15.0", default-features = false}
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.68.1"  }
-nu-path = { path = "../nu-path", version = "0.68.1"  }
-nu-parser = { path = "../nu-parser", version = "0.68.1"  }
-nu-protocol = { path = "../nu-protocol", version = "0.68.1"  }
-nu-utils = { path = "../nu-utils", version = "0.68.1"  }
+nu-engine = { path = "../nu-engine", version = "0.68.2"  }
+nu-path = { path = "../nu-path", version = "0.68.2"  }
+nu-parser = { path = "../nu-parser", version = "0.68.2"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.2"  }
+nu-utils = { path = "../nu-utils", version = "0.68.2"  }
 nu-ansi-term = "0.46.0"
-nu-color-config = { path = "../nu-color-config", version = "0.68.1"  }
+nu-color-config = { path = "../nu-color-config", version = "0.68.2"  }
 reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 
 atty = "0.2.14"
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index afc8a742ba..9c9fb05dbe 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,11 +5,11 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.68.1"
+version = "0.68.2"
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.68.1"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.2"  }
 nu-ansi-term = "0.46.0"
-nu-json = { path = "../nu-json", version = "0.68.1"  }
-nu-table = { path = "../nu-table", version = "0.68.1"  }
+nu-json = { path = "../nu-json", version = "0.68.2"  }
+nu-table = { path = "../nu-table", version = "0.68.2"  }
 serde = { version="1.0.123", features=["derive"] }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 7092f58c6e..9915f3e711 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,25 +5,25 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
 edition = "2021"
 license = "MIT"
 name = "nu-command"
-version = "0.68.1"
+version = "0.68.2"
 build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-color-config = { path = "../nu-color-config", version = "0.68.1"  }
-nu-engine = { path = "../nu-engine", version = "0.68.1"  }
-nu-glob = { path = "../nu-glob", version = "0.68.1" }
-nu-json = { path = "../nu-json", version = "0.68.1"  }
-nu-parser = { path = "../nu-parser", version = "0.68.1"  }
-nu-path = { path = "../nu-path", version = "0.68.1"  }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.68.1"  }
-nu-protocol = { path = "../nu-protocol", version = "0.68.1"  }
-nu-system = { path = "../nu-system", version = "0.68.1"  }
-nu-table = { path = "../nu-table", version = "0.68.1"  }
-nu-term-grid = { path = "../nu-term-grid", version = "0.68.1"  }
-nu-test-support = { path = "../nu-test-support", version = "0.68.1"  }
-nu-utils = { path = "../nu-utils", version = "0.68.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.68.2"  }
+nu-engine = { path = "../nu-engine", version = "0.68.2"  }
+nu-glob = { path = "../nu-glob", version = "0.68.2" }
+nu-json = { path = "../nu-json", version = "0.68.2"  }
+nu-parser = { path = "../nu-parser", version = "0.68.2"  }
+nu-path = { path = "../nu-path", version = "0.68.2"  }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.68.2"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.2"  }
+nu-system = { path = "../nu-system", version = "0.68.2"  }
+nu-table = { path = "../nu-table", version = "0.68.2"  }
+nu-term-grid = { path = "../nu-term-grid", version = "0.68.2"  }
+nu-test-support = { path = "../nu-test-support", version = "0.68.2"  }
+nu-utils = { path = "../nu-utils", version = "0.68.2" }
 nu-ansi-term = "0.46.0"
 num-format = { version = "0.4.0" }
 
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index c09ff7fc2d..e690c596e3 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,13 +5,13 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.68.1"
+version = "0.68.2"
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.68.1"  }
-nu-path = { path = "../nu-path", version = "0.68.1"  }
-nu-glob = { path = "../nu-glob", version = "0.68.1" }
-nu-utils = { path = "../nu-utils", version = "0.68.1"  }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.68.2"  }
+nu-path = { path = "../nu-path", version = "0.68.2"  }
+nu-glob = { path = "../nu-glob", version = "0.68.2" }
+nu-utils = { path = "../nu-utils", version = "0.68.2"  }
 
 chrono = { version="0.4.21", features=["serde"] }
 sysinfo = "0.25.2"
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index bd706cc55b..78857fe3af 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.68.1"
+version = "0.68.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 991492338a..e1f2a8061b 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.68.1"
+version = "0.68.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -21,5 +21,5 @@ num-traits = "0.2.14"
 serde = "1.0"
 
 [dev-dependencies]
-nu-path = { path="../nu-path", version = "0.68.1" }
+nu-path = { path="../nu-path", version = "0.68.2" }
 serde_json = "1.0"
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 0fed89a3e9..4e2234d1b6 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.68.1"
+version = "0.68.2"
 
 [dependencies]
 chrono = "0.4.21"
@@ -13,10 +13,10 @@ itertools = "0.10"
 miette = "5.1.0"
 thiserror = "1.0.31"
 serde_json = "1.0"
-nu-path = {path = "../nu-path", version = "0.68.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.68.1" }
-nu-plugin = { path = "../nu-plugin", optional = true, version = "0.68.1"  }
-nu-engine = { path = "../nu-engine", version = "0.68.1" }
+nu-path = {path = "../nu-path", version = "0.68.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.2" }
+nu-plugin = { path = "../nu-plugin", optional = true, version = "0.68.2"  }
+nu-engine = { path = "../nu-engine", version = "0.68.2" }
 log = "0.4"
 
 [features]
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 83c72fbb6d..f46f95a47e 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.68.1"
+version = "0.68.2"
 
 [dependencies]
 dirs-next = "2.0.0"
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 674ace1e58..440b8822fb 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.68.1"
+version = "0.68.2"
 
 [dependencies]
 bincode = "1.3.3"
-nu-protocol = { path = "../nu-protocol", version = "0.68.1"  }
-nu-engine = { path = "../nu-engine", version = "0.68.1"  }
+nu-protocol = { path = "../nu-protocol", version = "0.68.2"  }
+nu-engine = { path = "../nu-engine", version = "0.68.2"  }
 serde = {version = "1.0.143", features = ["derive"]}
 serde_json = { version = "1.0"}
 byte-order = "0.3.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index aa00361dec..758ee63d1b 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.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index e21aed853b..abf29b2bdd 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.68.1"
+version = "0.68.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.68.1"  }
-nu-path = { path = "../nu-path", version = "0.68.1"  }
-nu-json = { path = "../nu-json", version = "0.68.1"  }
+nu-utils = { path = "../nu-utils", version = "0.68.2"  }
+nu-path = { path = "../nu-path", version = "0.68.2"  }
+nu-json = { path = "../nu-json", version = "0.68.2"  }
 
 byte-unit = "4.0.9"
 chrono = { version="0.4.21", features=["serde"] }
diff --git a/crates/nu-system/Cargo.lock b/crates/nu-system/Cargo.lock
index c4c215ec99..6941788c97 100644
--- a/crates/nu-system/Cargo.lock
+++ b/crates/nu-system/Cargo.lock
@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.68.1"
+version = "0.68.2"
 dependencies = [
  "errno",
  "libproc",
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index e59efabc59..1c5aa4910e 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.68.1"
+version = "0.68.2"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 74e0a536e2..1a78f46e00 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.68.1"
+version = "0.68.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -14,7 +14,7 @@ path = "src/main.rs"
 
 [dependencies]
 nu-ansi-term = "0.46.0"
-nu-protocol = { path = "../nu-protocol", version = "0.68.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.2" }
 strip-ansi-escapes = "0.1.1"
 atty = "0.2.14"
 tabled = { version = "0.8.0", features = ["color"] }
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 90d016f5aa..cc537fe455 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.68.1"
+version = "0.68.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 943adcdf12..488fe23b09 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2018"
 license = "MIT"
 name = "nu-test-support"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-path = { path="../nu-path", version = "0.68.1"  }
-nu-glob = { path = "../nu-glob", version = "0.68.1" }
-nu-utils = { path="../nu-utils", version = "0.68.1"  }
+nu-path = { path="../nu-path", version = "0.68.2"  }
+nu-glob = { path = "../nu-glob", version = "0.68.2" }
+nu-utils = { path="../nu-utils", version = "0.68.2"  }
 lazy_static = "1.4.0"
 num-format = "0.4.0"
 
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 30d9842d8d..f526f3f4a2 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
 edition = "2021"
 license = "MIT"
 name = "nu-utils"
-version = "0.68.1"
+version = "0.68.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 84ac9d1449..03b23ebadb 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.68.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.68.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.68.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.68.2", features = ["plugin"] }
 serde = { version = "1.0", features = ["derive"] }
 typetag = "0.1.8"
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 0084a98bce..433792d301 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,8 +5,8 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.68.1"
+version = "0.68.2"
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1", features = ["plugin"]}
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2", features = ["plugin"]}
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 1b991a127e..bc0553887b 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-engine = { path="../nu-engine", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-engine = { path="../nu-engine", version = "0.68.2" }
 
 git2 = "0.15.0"
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 209ee72a68..0ea1b3b765 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,13 +5,13 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1", features = ["plugin"]}
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2", features = ["plugin"]}
 
 semver = "0.11.0"
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 31bf65ab99..5a5630c914 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-engine = { path="../nu-engine", version = "0.68.1" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-engine = { path="../nu-engine", version = "0.68.2" }
 gjson = "0.8.0"
 scraper = "0.13.0"
 sxd-document = "0.3.2"
diff --git a/crates/old/nu_plugin_chart/Cargo.toml b/crates/old/nu_plugin_chart/Cargo.toml
index e9da0fa68f..b257f102e3 100644
--- a/crates/old/nu_plugin_chart/Cargo.toml
+++ b/crates/old/nu_plugin_chart/Cargo.toml
@@ -4,18 +4,18 @@ description = "A plugin to display charts"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_chart"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-data = { path="../nu-data", version = "0.68.1" }
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-source = { path="../nu-source", version = "0.68.1" }
-nu-value-ext = { path="../nu-value-ext", version = "0.68.1" }
+nu-data = { path="../nu-data", version = "0.68.2" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-source = { path="../nu-source", version = "0.68.2" }
+nu-value-ext = { path="../nu-value-ext", version = "0.68.2" }
 
 crossterm = "0.19.0"
 tui = { version="0.15.0", default-features=false, features=["crossterm"] }
diff --git a/crates/old/nu_plugin_from_bson/Cargo.toml b/crates/old/nu_plugin_from_bson/Cargo.toml
index f69a91ab51..ed3993a5ed 100644
--- a/crates/old/nu_plugin_from_bson/Cargo.toml
+++ b/crates/old/nu_plugin_from_bson/Cargo.toml
@@ -4,7 +4,7 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_bson"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
@@ -12,9 +12,9 @@ doctest = false
 [dependencies]
 bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
 bson = { version = "2.0.1", features = [ "chrono-0_4" ] }
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-source = { path="../nu-source", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-source = { path="../nu-source", version = "0.68.2" }
 
 [build-dependencies]
diff --git a/crates/old/nu_plugin_from_mp4/Cargo.toml b/crates/old/nu_plugin_from_mp4/Cargo.toml
index 1c6727daf6..7f2969b462 100644
--- a/crates/old/nu_plugin_from_mp4/Cargo.toml
+++ b/crates/old/nu_plugin_from_mp4/Cargo.toml
@@ -4,16 +4,16 @@ description = "A converter plugin to the mp4 format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_mp4"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-source = { path="../nu-source", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-source = { path="../nu-source", version = "0.68.2" }
 tempfile = "3.2.0"
 mp4 = "0.9.0"
 
diff --git a/crates/old/nu_plugin_from_sqlite/Cargo.toml b/crates/old/nu_plugin_from_sqlite/Cargo.toml
index 35968022a3..ead495b9ff 100644
--- a/crates/old/nu_plugin_from_sqlite/Cargo.toml
+++ b/crates/old/nu_plugin_from_sqlite/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_from_sqlite"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
 bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-source = { path="../nu-source", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-source = { path="../nu-source", version = "0.68.2" }
 tempfile = "3.2.0"
 
 [dependencies.rusqlite]
diff --git a/crates/old/nu_plugin_s3/Cargo.toml b/crates/old/nu_plugin_s3/Cargo.toml
index 3239a79bdb..c71ab4060d 100644
--- a/crates/old/nu_plugin_s3/Cargo.toml
+++ b/crates/old/nu_plugin_s3/Cargo.toml
@@ -4,17 +4,17 @@ description = "An S3 plugin for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_s3"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
 futures = { version="0.3.12", features=["compat", "io-compat"] }
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-source = { path="../nu-source", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-source = { path="../nu-source", version = "0.68.2" }
 s3handler = "0.7.5"
 
 [build-dependencies]
diff --git a/crates/old/nu_plugin_start/Cargo.toml b/crates/old/nu_plugin_start/Cargo.toml
index 70858ca977..061b4774fc 100644
--- a/crates/old/nu_plugin_start/Cargo.toml
+++ b/crates/old/nu_plugin_start/Cargo.toml
@@ -4,17 +4,17 @@ description = "A plugin to open files/URLs directly from Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_start"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
 glob = "0.3.0"
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-source = { path="../nu-source", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-source = { path="../nu-source", version = "0.68.2" }
 url = "2.2.0"
 webbrowser = "0.5.5"
 
@@ -22,5 +22,5 @@ webbrowser = "0.5.5"
 open = "1.4.0"
 
 [build-dependencies]
-nu-errors = { version = "0.68.1", path="../nu-errors" }
-nu-source = { version = "0.68.1", path="../nu-source" }
+nu-errors = { version = "0.68.2", path="../nu-errors" }
+nu-source = { version = "0.68.2", path="../nu-source" }
diff --git a/crates/old/nu_plugin_to_bson/Cargo.toml b/crates/old/nu_plugin_to_bson/Cargo.toml
index a1e85faa99..9c09266751 100644
--- a/crates/old/nu_plugin_to_bson/Cargo.toml
+++ b/crates/old/nu_plugin_to_bson/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the bson format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_to_bson"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
 bson = { version = "2.0.1", features = [ "chrono-0_4" ] }
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-source = { path="../nu-source", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-source = { path="../nu-source", version = "0.68.2" }
 num-traits = "0.2.14"
 
 [features]
diff --git a/crates/old/nu_plugin_to_sqlite/Cargo.toml b/crates/old/nu_plugin_to_sqlite/Cargo.toml
index 1ef5cf77f1..b53ecbedbf 100644
--- a/crates/old/nu_plugin_to_sqlite/Cargo.toml
+++ b/crates/old/nu_plugin_to_sqlite/Cargo.toml
@@ -4,17 +4,17 @@ description = "A converter plugin to the SQLite format for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_to_sqlite"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
 hex = "0.4.2"
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
-nu-source = { path="../nu-source", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
+nu-source = { path="../nu-source", version = "0.68.2" }
 tempfile = "3.2.0"
 
 [dependencies.rusqlite]
diff --git a/crates/old/nu_plugin_tree/Cargo.toml b/crates/old/nu_plugin_tree/Cargo.toml
index 5a2ee429a3..68d36a086b 100644
--- a/crates/old/nu_plugin_tree/Cargo.toml
+++ b/crates/old/nu_plugin_tree/Cargo.toml
@@ -4,16 +4,16 @@ description = "Tree viewer plugin for Nushell"
 edition = "2018"
 license = "MIT"
 name = "nu_plugin_tree"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 doctest = false
 
 [dependencies]
 derive-new = "0.5.8"
-nu-errors = { path="../nu-errors", version = "0.68.1" }
-nu-plugin = { path="../nu-plugin", version = "0.68.1" }
-nu-protocol = { path="../nu-protocol", version = "0.68.1" }
+nu-errors = { path="../nu-errors", version = "0.68.2" }
+nu-plugin = { path="../nu-plugin", version = "0.68.2" }
+nu-protocol = { path="../nu-protocol", version = "0.68.2" }
 ptree = { version = "0.4.0", default-features = false }
 
 
diff --git a/samples/wasm/Cargo.toml b/samples/wasm/Cargo.toml
index 63aa3908af..a364ff95c7 100644
--- a/samples/wasm/Cargo.toml
+++ b/samples/wasm/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Nu authors"]
 edition = "2018"
 name = "wasm"
-version = "0.68.1"
+version = "0.68.2"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

From d08212409f597dfc711deef0d7024bc5efd0f15c Mon Sep 17 00:00:00 2001
From: Aron Nopanen <aron.nopanen@gmail.com>
Date: Mon, 12 Sep 2022 16:30:20 -0700
Subject: [PATCH 27/45] Support Arrow IPC file format with dataframes (#6548)

* Add support for Arrow IPC file format

Add support for Arrow IPC file format to dataframes commands. Support
opening of Arrow IPC-format files with extension '.arrow' or '.ipc' in
the open-df command. Add a 'to arrow' command to write a dataframe to
Arrow IPC format.

* Add unit test for open-df on Arrow

* Add -t flag to open-df command

Add a `--type`/`-t` flag to the `open-df` command, to explicitly specify
the type of file being used. Allowed values are the same at the set of
allowed file extensions.
---
 Cargo.lock                                    |   2 +
 crates/nu-command/Cargo.toml                  |   1 +
 crates/nu-command/src/dataframe/eager/mod.rs  |   3 +
 crates/nu-command/src/dataframe/eager/open.rs | 108 ++++++++++++++++--
 .../src/dataframe/eager/to_arrow.rs           |  94 +++++++++++++++
 crates/nu-command/tests/commands/open.rs      |  16 +++
 tests/fixtures/formats/caco3_plastics.arrow   | Bin 0 -> 4663 bytes
 7 files changed, 214 insertions(+), 10 deletions(-)
 create mode 100644 crates/nu-command/src/dataframe/eager/to_arrow.rs
 create mode 100644 tests/fixtures/formats/caco3_plastics.arrow

diff --git a/Cargo.lock b/Cargo.lock
index 5c5b83df8a..0ddec0d76c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -167,12 +167,14 @@ dependencies = [
  "indexmap",
  "json-deserializer",
  "lexical-core",
+ "lz4",
  "multiversion",
  "num-traits",
  "parquet2",
  "simdutf8",
  "streaming-iterator",
  "strength_reduce",
+ "zstd",
 ]
 
 [[package]]
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 9915f3e711..6b1c1179ed 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -115,6 +115,7 @@ features = [
 	"dtype-struct",
 	"dtype-categorical",
 	"dynamic_groupby",
+	"ipc",
 	"is_in",
 	"json",
 	"lazy",
diff --git a/crates/nu-command/src/dataframe/eager/mod.rs b/crates/nu-command/src/dataframe/eager/mod.rs
index 1b7442ac3b..bbeb551036 100644
--- a/crates/nu-command/src/dataframe/eager/mod.rs
+++ b/crates/nu-command/src/dataframe/eager/mod.rs
@@ -18,6 +18,7 @@ mod sample;
 mod shape;
 mod slice;
 mod take;
+mod to_arrow;
 mod to_csv;
 mod to_df;
 mod to_nu;
@@ -46,6 +47,7 @@ pub use sample::SampleDF;
 pub use shape::ShapeDF;
 pub use slice::SliceDF;
 pub use take::TakeDF;
+pub use to_arrow::ToArrow;
 pub use to_csv::ToCSV;
 pub use to_df::ToDataFrame;
 pub use to_nu::ToNu;
@@ -84,6 +86,7 @@ pub fn add_eager_decls(working_set: &mut StateWorkingSet) {
         ShapeDF,
         SliceDF,
         TakeDF,
+        ToArrow,
         ToCSV,
         ToDataFrame,
         ToNu,
diff --git a/crates/nu-command/src/dataframe/eager/open.rs b/crates/nu-command/src/dataframe/eager/open.rs
index de20048009..4c9d4e2860 100644
--- a/crates/nu-command/src/dataframe/eager/open.rs
+++ b/crates/nu-command/src/dataframe/eager/open.rs
@@ -9,8 +9,8 @@ use nu_protocol::{
 use std::{fs::File, io::BufReader, path::PathBuf};
 
 use polars::prelude::{
-    CsvEncoding, CsvReader, JsonReader, LazyCsvReader, LazyFrame, ParallelStrategy, ParquetReader,
-    ScanArgsParquet, SerReader,
+    CsvEncoding, CsvReader, IpcReader, JsonReader, LazyCsvReader, LazyFrame, ParallelStrategy,
+    ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
 };
 
 #[derive(Clone)]
@@ -22,7 +22,7 @@ impl Command for OpenDataFrame {
     }
 
     fn usage(&self) -> &str {
-        "Opens csv, json or parquet file to create dataframe"
+        "Opens csv, json, arrow, or parquet file to create dataframe"
     }
 
     fn signature(&self) -> Signature {
@@ -33,6 +33,12 @@ impl Command for OpenDataFrame {
                 "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. If omitted, derive from file extension",
+                Some('t'),
+            )
             .named(
                 "delimiter",
                 SyntaxShape::String,
@@ -93,15 +99,33 @@ fn command(
 ) -> Result<PipelineData, ShellError> {
     let file: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
 
-    match file.item.extension() {
-        Some(e) => match e.to_str() {
-            Some("csv") | Some("tsv") => from_csv(engine_state, stack, call),
-            Some("parquet") => from_parquet(engine_state, stack, call),
-            Some("json") => from_json(engine_state, stack, call),
-            _ => Err(ShellError::FileNotFoundCustom(
-                "Not a csv, tsv, parquet or json file".into(),
+    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 => match file.item.extension() {
+            Some(e) => Some((
+                e.to_string_lossy().into_owned(),
+                "Invalid extension",
                 file.span,
             )),
+            None => None,
+        },
+    };
+
+    match type_id {
+        Some((e, msg, blamed)) => match e.as_str() {
+            "csv" | "tsv" => from_csv(engine_state, stack, call),
+            "parquet" => from_parquet(engine_state, stack, call),
+            "ipc" | "arrow" => from_ipc(engine_state, stack, call),
+            "json" => from_json(engine_state, stack, call),
+            _ => Err(ShellError::FileNotFoundCustom(
+                format!(
+                    "{}. Supported values: csv, tsv, parquet, ipc, arrow, json",
+                    msg
+                ),
+                blamed,
+            )),
         },
         None => Err(ShellError::FileNotFoundCustom(
             "File without extension".into(),
@@ -177,6 +201,70 @@ fn from_parquet(
     }
 }
 
+fn from_ipc(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    call: &Call,
+) -> Result<Value, ShellError> {
+    if call.has_flag("lazy") {
+        let file: String = call.req(engine_state, stack, 0)?;
+        let args = ScanArgsIpc {
+            n_rows: None,
+            cache: true,
+            rechunk: false,
+            row_count: None,
+        };
+
+        let df: NuLazyFrame = LazyFrame::scan_ipc(file, args)
+            .map_err(|e| {
+                ShellError::GenericError(
+                    "IPC reader error".into(),
+                    format!("{:?}", e),
+                    Some(call.head),
+                    None,
+                    Vec::new(),
+                )
+            })?
+            .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 opening file".into(),
+                e.to_string(),
+                Some(file.span),
+                None,
+                Vec::new(),
+            )
+        })?;
+        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(
+                    "IPC reader error".into(),
+                    format!("{:?}", e),
+                    Some(call.head),
+                    None,
+                    Vec::new(),
+                )
+            })?
+            .into();
+
+        Ok(df.into_value(call.head))
+    }
+}
+
 fn from_json(
     engine_state: &EngineState,
     stack: &mut Stack,
diff --git a/crates/nu-command/src/dataframe/eager/to_arrow.rs b/crates/nu-command/src/dataframe/eager/to_arrow.rs
new file mode 100644
index 0000000000..f3c52c5dcc
--- /dev/null
+++ b/crates/nu-command/src/dataframe/eager/to_arrow.rs
@@ -0,0 +1,94 @@
+use std::{fs::File, path::PathBuf};
+
+use nu_engine::CallExt;
+use nu_protocol::{
+    ast::Call,
+    engine::{Command, EngineState, Stack},
+    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type, Value,
+};
+use polars::prelude::{IpcWriter, SerWriter};
+
+use super::super::values::NuDataFrame;
+
+#[derive(Clone)]
+pub struct ToArrow;
+
+impl Command for ToArrow {
+    fn name(&self) -> &str {
+        "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_type(Type::Custom("dataframe".into()))
+            .output_type(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]] | into df | 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 with file name".into(),
+            e.to_string(),
+            Some(file_name.span),
+            None,
+            Vec::new(),
+        )
+    })?;
+
+    IpcWriter::new(&mut file).finish(df.as_mut()).map_err(|e| {
+        ShellError::GenericError(
+            "Error saving file".into(),
+            e.to_string(),
+            Some(file_name.span),
+            None,
+            Vec::new(),
+        )
+    })?;
+
+    let file_value = Value::String {
+        val: format!("saved {:?}", &file_name.item),
+        span: file_name.span,
+    };
+
+    Ok(PipelineData::Value(
+        Value::List {
+            vals: vec![file_value],
+            span: call.head,
+        },
+        None,
+    ))
+}
diff --git a/crates/nu-command/tests/commands/open.rs b/crates/nu-command/tests/commands/open.rs
index a6996da052..c0a1fd0cf1 100644
--- a/crates/nu-command/tests/commands/open.rs
+++ b/crates/nu-command/tests/commands/open.rs
@@ -208,6 +208,22 @@ fn parses_utf16_ini() {
     assert_eq!(actual.out, "-236")
 }
 
+#[cfg(feature = "database")]
+#[test]
+fn parses_arrow_ipc() {
+    let actual = nu!(
+        cwd: "tests/fixtures/formats", pipeline(
+        r#"
+            open-df caco3_plastics.arrow
+            | into nu
+            | first 1
+            | get origin
+        "#
+    ));
+
+    assert_eq!(actual.out, "SPAIN")
+}
+
 #[test]
 fn errors_if_file_not_found() {
     let actual = nu!(
diff --git a/tests/fixtures/formats/caco3_plastics.arrow b/tests/fixtures/formats/caco3_plastics.arrow
new file mode 100644
index 0000000000000000000000000000000000000000..13b336a8e3764d93e60d5fa51dce6004d9c92291
GIT binary patch
literal 4663
zcmeHLO>Epm6rQ%Bq-l`S(gQ!DjQEi%*m`a6de<wc631&2i~XzZElDL5LYuTJkv1$5
ze+R^c8*o8L;a0>YT%gBZ>45`MB~TAs5TZpwmFNK>4i!`?-<x@pA1kFz5fX>aX8gVP
z=9@QfW}fYFf+T6b;0SR8<-iUh280m5L*54*5ZiDa61&A9t^?v4?8C4O;zzB!aXq(P
zh&NFWpk4ue1@$<pMEwEn%cz-R3vm_wZO9V!0n}|6Z$#{crxCG7`6TZ`{0ZK6u@k=m
zv<h*oH$SsD*Pl5xw>0y{T<^rmCGD$#Hi@cyA>hq?U5Bp$_}OLr^n1tVAX6+`?LU9|
z<(b7h>_3Dt|4sbVf41N6y*_t*X7&!|PyJsz*;`z^!~Q$b|8&21qIYWRYezYCYIcE^
zU9Gzhl&EUokT;v{+aK7UF>sJZ$c$as!9kU8OSApn{QOLBX>MW5dw4H=={4wYxi4jW
zZ(;Fte`&4{QQa@s5IfC{a%q_eC`d!tc8Fndzna%Dv|rFp`A200eTbvW5aa=HN5rGX
z1O!DDb}2fnPcdF*9HYfSG5kr^4S$*S^O`1JGQ^xd$@&Vn8`@bGj6Y0E6*JBxO&-PY
zJFFZ28P*SJn)oTlzmnto_h{l#<}b5u{GVan`2Q`(?@*GW82%LNhQGpkqG>`<LZBG_
zAnS%d#d<^2#7d5THpf?wFmPMU@0bnD>1MsjOwUl08%+D(>lEh=&Mgx&-OE%CY7oyb
zri^bfe!{rI_%-8Y#!e$hvp8(0GKr4_4H?FPY-IJI8BN9EWYm;V*bVCKM5b0?X>xG1
z8%)bIxLMc3-MATtfehQtD1pC*)E1JUTFSrGA<CMIxK;0_SprU!%5Zfo>Zyj-E)ZtW
zs>dxL8Aw*GSv-+M8$wlzGV6)v*N^gm%0n8&6O3m4US$0h#t#@jWjxP_fMgOKiIOa8
zH>U#~ULavkR~rzfjCg+2QA17!&1O)qM~x_v^*EJT7$i|f%VJ?KthJ6CJX%3cm903F
ze#y3Mw`!IA%E3w+k4KHLjg@b-o8#EYG)QmRNl#>~`ToZw$q)B@{!jSjJAeI5?Ki{x
zIzLThl(Ggf!MMQqF5^dxKQdltG|xUP(RjNRWNlfGWEeEUxGl4|gSnF2X=D4HiY+q<
z)lgT3wLXg7ZK9WU7h%JY-i<D892sSp9du0Vy1{PGgj5K-<1w;<HlZbhFs`>{lx9(o
z;3ku5Gt@9nCc_CiKAuX)w(U*4uXDAb)lB|2Mp{2mCy=fuTkZV*@FQK^$Lme!KPu+=
z@`zT&lZ@th<FRhuHEAb^TPE+6l68~kqv;KH)1F88%Ev|LCo1OMy<e;10He$JEaP*G
z=3QdmX^vmCOGVd4a#V}>BgtKr>~hhuwXIyVE1KsNZKvqeur2E)$H}$o0sphO5o1}6
zhyXcmyH>P)Z9{-M9>+DUG*fMJJu@pzoq4WrY@5ez-ic=aALjKm`);vbWgKIS852g|
zDPZ9&+jc7~tXh!hrmf0CrBd(|yHsL}=dLwrN7`|IolU%Zc-#jWA7gxqvBYTJk0I;k
zjNz0EWv6O+K0>Oxh}$n9PM}jYp%q-uw`#WI7AhqVEtP^>C5B(9mCM9*3e~a?fn47z
zPV>Hboa4wpA5A_-+-}Y`j*l>0t5imOc-%WaMlDy%mgl){!7G)ls^=9vpW*|xf&e|Y
zR;bl#WWeH<Ab8}&si;U_Jv8+FXNwm`ae;Jk^y=Yr```QZt5IXW^!C0lCN6!$_U}eZ
zs$3k^VST%5$5HzR+04<4&gNs#eN=rm7dUV4#fh7~D2CPdh0o_&bG|iad2~_b?sxCq
T@7}xLz4-3!;zkM7KaBnc2=UrD

literal 0
HcmV?d00001


From 8564c5371f528137b4e175bdf189129219a26191 Mon Sep 17 00:00:00 2001
From: Kangaxx-0 <85712372+Kangaxx-0@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:38:21 -0700
Subject: [PATCH 28/45] Add more overlay use usage (#6551)

---
 .../nu-command/src/core_commands/overlay/use_.rs  |  7 +++++++
 tests/overlays/mod.rs                             | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/crates/nu-command/src/core_commands/overlay/use_.rs b/crates/nu-command/src/core_commands/overlay/use_.rs
index 816b3cc1aa..052cdb7a90 100644
--- a/crates/nu-command/src/core_commands/overlay/use_.rs
+++ b/crates/nu-command/src/core_commands/overlay/use_.rs
@@ -191,6 +191,13 @@ impl Command for OverlayUse {
                 description: "Create an overlay from a module",
                 example: r#"module spam { export def foo [] { "foo" } }
     overlay use spam
+    foo"#,
+                result: None,
+            },
+            Example {
+                description: "Create an overlay from a module and rename it",
+                example: r#"module spam { export def foo [] { "foo" } }
+    overlay use spam as spam_new
     foo"#,
                 result: None,
             },
diff --git a/tests/overlays/mod.rs b/tests/overlays/mod.rs
index f51a14d631..57cca589dd 100644
--- a/tests/overlays/mod.rs
+++ b/tests/overlays/mod.rs
@@ -17,6 +17,21 @@ fn add_overlay() {
     assert_eq!(actual_repl.out, "foo");
 }
 
+#[test]
+fn add_overlay_as_new_name() {
+    let inp = &[
+        r#"module spam { export def foo [] { "foo" } }"#,
+        r#"overlay use spam as spam_new"#,
+        r#"foo"#,
+    ];
+
+    let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
+    let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
+
+    assert_eq!(actual.out, "foo");
+    assert_eq!(actual_repl.out, "foo");
+}
+
 #[test]
 fn add_overlay_twice() {
     let inp = &[

From df6a7b6f5c733f04b32a8a7a407d3046050b975c Mon Sep 17 00:00:00 2001
From: unrelentingtech <hello@unrelenting.technology>
Date: Tue, 13 Sep 2022 15:36:53 +0300
Subject: [PATCH 29/45] shell_integration: Report current working directory as
 OSC 7 (#6481)

This is a de-facto standard supported by many terminals, originally
added to macOS Terminal.app, now also supported by VTE (GNOME),
Konsole (KDE), WezTerm, and more.
---
 Cargo.lock                |  1 +
 crates/nu-cli/Cargo.toml  |  1 +
 crates/nu-cli/src/repl.rs | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ddec0d76c..f021eac31b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2649,6 +2649,7 @@ dependencies = [
  "nu-protocol",
  "nu-test-support",
  "nu-utils",
+ "percent-encoding",
  "reedline",
  "rstest",
  "strip-ansi-escapes",
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index e9ac7f5864..e1261939fc 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -31,6 +31,7 @@ is_executable = "1.0.1"
 lazy_static = "1.4.0"
 log = "0.4"
 miette = { version = "5.1.0", features = ["fancy"] }
+percent-encoding = "2"
 strip-ansi-escapes = "0.1.1"
 sysinfo = "0.25.2"
 thiserror = "1.0.31"
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index e6e51b99ed..46a2a9b4f2 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -332,6 +332,7 @@ pub fn evaluate_repl(
 
         match input {
             Ok(Signal::Success(s)) => {
+                let hostname = sys.host_name();
                 let history_supports_meta =
                     matches!(config.history_file_format, HistoryFileFormat::Sqlite);
                 if history_supports_meta && !s.is_empty() && line_editor.has_last_command_context()
@@ -339,7 +340,7 @@ pub fn evaluate_repl(
                     line_editor
                         .update_last_command_context(&|mut c| {
                             c.start_timestamp = Some(chrono::Utc::now());
-                            c.hostname = sys.host_name();
+                            c.hostname = hostname.clone();
 
                             c.cwd = Some(StateWorkingSet::new(engine_state).get_cwd());
                             c
@@ -479,6 +480,21 @@ pub fn evaluate_repl(
                     run_ansi_sequence(&get_command_finished_marker(stack, engine_state))?;
                     if let Some(cwd) = stack.get_env_var(engine_state, "PWD") {
                         let path = cwd.as_string()?;
+
+                        // Communicate the path as OSC 7 (often used for spawning new tabs in the same dir)
+                        run_ansi_sequence(&format!(
+                            "\x1b]7;file://{}{}{}\x1b\\",
+                            percent_encoding::utf8_percent_encode(
+                                &hostname.unwrap_or_else(|| "localhost".to_string()),
+                                percent_encoding::CONTROLS
+                            ),
+                            if path.starts_with('/') { "" } else { "/" },
+                            percent_encoding::utf8_percent_encode(
+                                &path,
+                                percent_encoding::CONTROLS
+                            )
+                        ))?;
+
                         // 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(), "~")

From 12a0fe39f73e88a2be97dce3d9cbe025b10e253d Mon Sep 17 00:00:00 2001
From: pwygab <88221256+merelymyself@users.noreply.github.com>
Date: Tue, 13 Sep 2022 21:17:16 +0800
Subject: [PATCH 30/45] default to $nothing if cellpath not found (#6535)

* default to  if cellpath not found

* fmt

* add test

* fix test

* fix clippy

* move behaviour behind `-i` flag

* prevent any possibility of an unspanned error

* ignore all errors

* seperate testes

* fmt
---
 crates/nu-command/src/filters/get.rs       |  2 +-
 crates/nu-command/src/filters/select.rs    | 31 +++++++++++++++++++---
 crates/nu-command/tests/commands/select.rs | 24 +++++++++++++++++
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/filters/get.rs b/crates/nu-command/src/filters/get.rs
index fd7f52675c..42bd3f29e1 100644
--- a/crates/nu-command/src/filters/get.rs
+++ b/crates/nu-command/src/filters/get.rs
@@ -28,7 +28,7 @@ impl Command for Get {
             .rest("rest", SyntaxShape::CellPath, "additional cell paths")
             .switch(
                 "ignore-errors",
-                "return nothing if path can't be found",
+                "when there are empty cells, instead of erroring out, replace them with nothing",
                 Some('i'),
             )
             .switch(
diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs
index 7efa0fa6c4..05c40a45df 100644
--- a/crates/nu-command/src/filters/select.rs
+++ b/crates/nu-command/src/filters/select.rs
@@ -17,6 +17,11 @@ impl Command for Select {
     // FIXME: also add support for --skip
     fn signature(&self) -> Signature {
         Signature::build("select")
+            .switch(
+                "ignore-errors",
+                "when a column has empty cells, instead of erroring out, replace them with nothing",
+                Some('i'),
+            )
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
@@ -42,8 +47,9 @@ impl Command for Select {
     ) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
         let columns: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
         let span = call.head;
+        let ignore_empty = call.has_flag("ignore-errors");
 
-        select(engine_state, span, columns, input)
+        select(engine_state, span, columns, input, ignore_empty)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -67,6 +73,7 @@ fn select(
     span: Span,
     columns: Vec<CellPath>,
     input: PipelineData,
+    ignore_empty: bool,
 ) -> Result<PipelineData, ShellError> {
     let mut rows = vec![];
 
@@ -121,6 +128,7 @@ fn select(
             ..,
         ) => {
             let mut output = vec![];
+            let mut columns_with_value = Vec::new();
 
             for input_val in input_vals {
                 if !columns.is_empty() {
@@ -128,10 +136,25 @@ fn select(
                     let mut vals = vec![];
                     for path in &columns {
                         //FIXME: improve implementation to not clone
-                        let fetcher = input_val.clone().follow_cell_path(&path.members, false)?;
+                        if ignore_empty {
+                            let fetcher = input_val.clone().follow_cell_path(&path.members, false);
 
-                        cols.push(path.into_string().replace('.', "_"));
-                        vals.push(fetcher);
+                            cols.push(path.into_string().replace('.', "_"));
+                            if let Ok(fetcher) = fetcher {
+                                vals.push(fetcher);
+                                if !columns_with_value.contains(&path) {
+                                    columns_with_value.push(path);
+                                }
+                            } else {
+                                vals.push(Value::nothing(span));
+                            }
+                        } else {
+                            let fetcher =
+                                input_val.clone().follow_cell_path(&path.members, false)?;
+
+                            cols.push(path.into_string().replace('.', "_"));
+                            vals.push(fetcher);
+                        }
                     }
 
                     output.push(Value::Record { cols, vals, span })
diff --git a/crates/nu-command/tests/commands/select.rs b/crates/nu-command/tests/commands/select.rs
index ac8eed2522..76c7e190ae 100644
--- a/crates/nu-command/tests/commands/select.rs
+++ b/crates/nu-command/tests/commands/select.rs
@@ -159,3 +159,27 @@ fn selects_many_rows() {
         assert_eq!(actual.out, "2");
     });
 }
+
+#[test]
+fn select_ignores_errors_succesfully1() {
+    let actual = nu!(
+        cwd: ".", pipeline(
+        r#"
+        [{a: 1, b: 2} {a: 3, b: 5} {a: 3}] | select -i b
+            "#
+    ));
+
+    assert!(actual.err.is_empty());
+}
+
+#[test]
+fn select_ignores_errors_succesfully2() {
+    let actual = nu!(
+        cwd: ".", pipeline(
+        r#"
+        [{a: 1} {a: 2} {a: 3}] | select -i b
+            "#
+    ));
+
+    assert!(actual.err.is_empty());
+}

From b159bf2c28a2979d91e059938c2d739e740de040 Mon Sep 17 00:00:00 2001
From: nibon7 <nibon7@163.com>
Date: Wed, 14 Sep 2022 18:55:41 +0800
Subject: [PATCH 31/45] Make clickable links smarter (#6556)

* Disable clickable links when we can't get metadata of files

Fixes #6498

* Refactor path name rendering related code

* Make clickable links smarter

* Remove unneeded clone

* Return early if `use_ls_colors` is disabled
---
 crates/nu-command/src/viewers/table.rs | 112 +++++++++++--------------
 1 file changed, 51 insertions(+), 61 deletions(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 4656303565..a9575a4dd1 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -1,4 +1,4 @@
-use lscolors::Style;
+use lscolors::{LsColors, Style};
 use nu_color_config::{get_color_config, style_primitive};
 use nu_engine::{column::get_columns, env_to_string, CallExt};
 use nu_protocol::{
@@ -261,10 +261,6 @@ fn handle_row_stream(
             };
             let ls_colors = get_ls_colors(ls_colors_env_str);
 
-            // clickable links don't work in remote SSH sessions
-            let in_ssh_session = std::env::var("SSH_CLIENT").is_ok();
-            let show_clickable_links = config.show_clickable_links_in_ls && !in_ssh_session;
-
             ListStream::from_stream(
                 stream.map(move |mut x| match &mut x {
                     Value::Record { cols, vals, .. } => {
@@ -273,62 +269,10 @@ fn handle_row_stream(
                         while idx < cols.len() {
                             if cols[idx] == "name" {
                                 if let Some(Value::String { val: path, span }) = vals.get(idx) {
-                                    match std::fs::symlink_metadata(&path) {
-                                        Ok(metadata) => {
-                                            let style = ls_colors.style_for_path_with_metadata(
-                                                path.clone(),
-                                                Some(&metadata),
-                                            );
-                                            let ansi_style = style
-                                                .map(Style::to_crossterm_style)
-                                                // .map(ToNuAnsiStyle::to_nu_ansi_style)
-                                                .unwrap_or_default();
-                                            let use_ls_colors = config.use_ls_colors;
-
-                                            let full_path = PathBuf::from(path.clone())
-                                                .canonicalize()
-                                                .unwrap_or_else(|_| PathBuf::from(path));
-                                            let full_path_link = make_clickable_link(
-                                                full_path.display().to_string(),
-                                                Some(&path.clone()),
-                                                show_clickable_links,
-                                            );
-
-                                            if use_ls_colors {
-                                                vals[idx] = Value::String {
-                                                    val: ansi_style
-                                                        .apply(full_path_link)
-                                                        .to_string(),
-                                                    span: *span,
-                                                };
-                                            }
-                                        }
-                                        Err(_) => {
-                                            let style = ls_colors.style_for_path(path.clone());
-                                            let ansi_style = style
-                                                .map(Style::to_crossterm_style)
-                                                // .map(ToNuAnsiStyle::to_nu_ansi_style)
-                                                .unwrap_or_default();
-                                            let use_ls_colors = config.use_ls_colors;
-
-                                            let full_path = PathBuf::from(path.clone())
-                                                .canonicalize()
-                                                .unwrap_or_else(|_| PathBuf::from(path));
-                                            let full_path_link = make_clickable_link(
-                                                full_path.display().to_string(),
-                                                Some(&path.clone()),
-                                                show_clickable_links,
-                                            );
-
-                                            if use_ls_colors {
-                                                vals[idx] = Value::String {
-                                                    val: ansi_style
-                                                        .apply(full_path_link)
-                                                        .to_string(),
-                                                    span: *span,
-                                                };
-                                            }
-                                        }
+                                    if let Some(val) =
+                                        render_path_name(path, &config, &ls_colors, *span)
+                                    {
+                                        vals[idx] = val;
                                     }
                                 }
                             }
@@ -629,3 +573,49 @@ fn load_theme_from_config(config: &Config) -> TableTheme {
         _ => nu_table::TableTheme::rounded(),
     }
 }
+
+fn render_path_name(
+    path: &String,
+    config: &Config,
+    ls_colors: &LsColors,
+    span: Span,
+) -> Option<Value> {
+    if !config.use_ls_colors {
+        return None;
+    }
+
+    let stripped_path = match strip_ansi_escapes::strip(path) {
+        Ok(v) => String::from_utf8(v).unwrap_or_else(|_| path.to_owned()),
+        Err(_) => path.to_owned(),
+    };
+
+    let (style, has_metadata) = match std::fs::symlink_metadata(&stripped_path) {
+        Ok(metadata) => (
+            ls_colors.style_for_path_with_metadata(path, Some(&metadata)),
+            true,
+        ),
+        Err(_) => (ls_colors.style_for_path(path), false),
+    };
+
+    // clickable links don't work in remote SSH sessions
+    let in_ssh_session = std::env::var("SSH_CLIENT").is_ok();
+    let show_clickable_links = config.show_clickable_links_in_ls && !in_ssh_session && has_metadata;
+
+    let ansi_style = style
+        .map(Style::to_crossterm_style)
+        // .map(ToNuAnsiStyle::to_nu_ansi_style)
+        .unwrap_or_default();
+
+    let full_path = PathBuf::from(&stripped_path)
+        .canonicalize()
+        .unwrap_or_else(|_| PathBuf::from(&stripped_path));
+
+    let full_path_link = make_clickable_link(
+        full_path.display().to_string(),
+        Some(path),
+        show_clickable_links,
+    );
+
+    let val = ansi_style.apply(full_path_link).to_string();
+    Some(Value::String { val, span })
+}

From 2791251268b409224496963c9b3f1726aa0beed3 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 14 Sep 2022 08:25:55 -0500
Subject: [PATCH 32/45] update text in readme file (#6557)

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

diff --git a/README.release.txt b/README.release.txt
index 2329c5f30f..60951bb74e 100644
--- a/README.release.txt
+++ b/README.release.txt
@@ -1,3 +1,3 @@
 To use Nu plugins, use the register command to tell Nu where to find the plugin. For example:
 
-> register -e json ./nu_plugin_query
+> register ./nu_plugin_query

From 56bb9e92cb1b86a2bea8697687c5e991e90926ec Mon Sep 17 00:00:00 2001
From: nibon7 <nibon7@163.com>
Date: Thu, 15 Sep 2022 18:34:47 +0800
Subject: [PATCH 33/45] Use stripped path for lscolors to get style (#6561)

---
 crates/nu-command/src/viewers/table.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index a9575a4dd1..656e9121f3 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -591,10 +591,10 @@ fn render_path_name(
 
     let (style, has_metadata) = match std::fs::symlink_metadata(&stripped_path) {
         Ok(metadata) => (
-            ls_colors.style_for_path_with_metadata(path, Some(&metadata)),
+            ls_colors.style_for_path_with_metadata(&stripped_path, Some(&metadata)),
             true,
         ),
-        Err(_) => (ls_colors.style_for_path(path), false),
+        Err(_) => (ls_colors.style_for_path(&stripped_path), false),
     };
 
     // clickable links don't work in remote SSH sessions

From cc62e4db26e3eb1961e67fd6756cc312f3015a24 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 15 Sep 2022 05:47:40 -0500
Subject: [PATCH 34/45] update to the latest sysinfo crate (#6563)

---
 Cargo.lock                   | 4 ++--
 crates/nu-cli/Cargo.toml     | 2 +-
 crates/nu-command/Cargo.toml | 2 +-
 crates/nu-engine/Cargo.toml  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f021eac31b..60d9052305 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4965,9 +4965,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.25.2"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1594a36887d0f70096702bffadfb67dfbfe76ad4bf84605e86157dc9fce9961a"
+checksum = "4ae2421f3e16b3afd4aa692d23b83d0ba42ee9b0081d5deeb7d21428d7195fb1"
 dependencies = [
  "cfg-if 1.0.0",
  "core-foundation-sys",
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index e1261939fc..cb2f44ab16 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -33,7 +33,7 @@ log = "0.4"
 miette = { version = "5.1.0", features = ["fancy"] }
 percent-encoding = "2"
 strip-ansi-escapes = "0.1.1"
-sysinfo = "0.25.2"
+sysinfo = "0.26.2"
 thiserror = "1.0.31"
 
 [features]
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 6b1c1179ed..298ce69abf 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -78,7 +78,7 @@ sha2 = "0.10.0"
 # Disable default features b/c the default features build Git (very slow to compile)
 shadow-rs = { version = "0.16.1", default-features = false }
 strip-ansi-escapes = "0.1.1"
-sysinfo = "0.25.2"
+sysinfo = "0.26.2"
 terminal_size = "0.2.1"
 thiserror = "1.0.31"
 titlecase = "2.0.0"
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index e690c596e3..f4fe9d6dbc 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -14,7 +14,7 @@ nu-glob = { path = "../nu-glob", version = "0.68.2" }
 nu-utils = { path = "../nu-utils", version = "0.68.2"  }
 
 chrono = { version="0.4.21", features=["serde"] }
-sysinfo = "0.25.2"
+sysinfo = "0.26.2"
 strip-ansi-escapes = "0.1.1"
 
 [features]

From f6c791f19980ced012bbafa5c4fe8c406f5d7ca9 Mon Sep 17 00:00:00 2001
From: nibon7 <nibon7@163.com>
Date: Thu, 15 Sep 2022 19:12:20 +0800
Subject: [PATCH 35/45] Use style from lscolors to render the rest of the
 filename (#6564)

* Use style from lscolors to render the rest of the filename

Related: https://github.com/nushell/nushell/pull/6556#issuecomment-1246681644

* Make cargo-clippy happy
---
 crates/nu-command/src/filters/find.rs | 52 +++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/filters/find.rs b/crates/nu-command/src/filters/find.rs
index 3fe81b121c..5ad5e09cc2 100644
--- a/crates/nu-command/src/filters/find.rs
+++ b/crates/nu-command/src/filters/find.rs
@@ -1,7 +1,7 @@
 use crate::help::highlight_search_string;
 use fancy_regex::Regex;
-use lscolors::Style as LsColors_Style;
-use nu_ansi_term::{Color::Default, Style};
+use lscolors::{Color as LsColors_Color, Style as LsColors_Style};
+use nu_ansi_term::{Color, Color::Default, Style};
 use nu_color_config::get_color_config;
 use nu_engine::{env_to_string, eval_block, CallExt};
 use nu_protocol::{
@@ -384,10 +384,15 @@ fn find_with_rest_and_highlight(
 
                                             let ls_colored_val =
                                                 ansi_style.apply(&val_str).to_string();
+
+                                            let ansi_term_style = style
+                                                .map(to_nu_ansi_term_style)
+                                                .unwrap_or_else(|| string_style);
+
                                             let hi = match highlight_search_string(
                                                 &ls_colored_val,
                                                 &term_str,
-                                                &string_style,
+                                                &ansi_term_style,
                                             ) {
                                                 Ok(hi) => hi,
                                                 Err(_) => string_style
@@ -535,6 +540,47 @@ fn find_with_rest_and_highlight(
     }
 }
 
+fn to_nu_ansi_term_style(style: &LsColors_Style) -> Style {
+    fn to_nu_ansi_term_color(color: &LsColors_Color) -> Color {
+        match *color {
+            LsColors_Color::Fixed(n) => Color::Fixed(n),
+            LsColors_Color::RGB(r, g, b) => Color::Rgb(r, g, b),
+            LsColors_Color::Black => Color::Black,
+            LsColors_Color::Red => Color::Red,
+            LsColors_Color::Green => Color::Green,
+            LsColors_Color::Yellow => Color::Yellow,
+            LsColors_Color::Blue => Color::Blue,
+            LsColors_Color::Magenta => Color::Magenta,
+            LsColors_Color::Cyan => Color::Cyan,
+            LsColors_Color::White => Color::White,
+
+            // Below items are a rough translations to 256 colors as
+            // nu-ansi-term do not have bright varients
+            LsColors_Color::BrightBlack => Color::Fixed(8),
+            LsColors_Color::BrightRed => Color::Fixed(9),
+            LsColors_Color::BrightGreen => Color::Fixed(10),
+            LsColors_Color::BrightYellow => Color::Fixed(11),
+            LsColors_Color::BrightBlue => Color::Fixed(12),
+            LsColors_Color::BrightMagenta => Color::Fixed(13),
+            LsColors_Color::BrightCyan => Color::Fixed(14),
+            LsColors_Color::BrightWhite => Color::Fixed(15),
+        }
+    }
+
+    Style {
+        foreground: style.foreground.as_ref().map(to_nu_ansi_term_color),
+        background: style.background.as_ref().map(to_nu_ansi_term_color),
+        is_bold: style.font_style.bold,
+        is_dimmed: style.font_style.dimmed,
+        is_italic: style.font_style.italic,
+        is_underline: style.font_style.underline,
+        is_blink: style.font_style.slow_blink || style.font_style.rapid_blink,
+        is_reverse: style.font_style.reverse,
+        is_hidden: style.font_style.hidden,
+        is_strikethrough: style.font_style.strikethrough,
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

From 02e3f49bce4fa301ed889482fb184fd374f161c0 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 15 Sep 2022 09:22:00 -0500
Subject: [PATCH 36/45] provide a way to use sql to query dataframes (#6537)

---
 crates/nu-command/src/dataframe/eager/mod.rs  |   9 +-
 .../src/dataframe/eager/sql_context.rs        | 220 ++++++++++++++++++
 .../src/dataframe/eager/sql_expr.rs           | 191 +++++++++++++++
 .../src/dataframe/eager/with_sql.rs           | 102 ++++++++
 4 files changed, 521 insertions(+), 1 deletion(-)
 create mode 100644 crates/nu-command/src/dataframe/eager/sql_context.rs
 create mode 100644 crates/nu-command/src/dataframe/eager/sql_expr.rs
 create mode 100644 crates/nu-command/src/dataframe/eager/with_sql.rs

diff --git a/crates/nu-command/src/dataframe/eager/mod.rs b/crates/nu-command/src/dataframe/eager/mod.rs
index bbeb551036..80421f77f9 100644
--- a/crates/nu-command/src/dataframe/eager/mod.rs
+++ b/crates/nu-command/src/dataframe/eager/mod.rs
@@ -17,6 +17,8 @@ mod rename;
 mod sample;
 mod shape;
 mod slice;
+mod sql_context;
+mod sql_expr;
 mod take;
 mod to_arrow;
 mod to_csv;
@@ -24,6 +26,7 @@ mod to_df;
 mod to_nu;
 mod to_parquet;
 mod with_column;
+mod with_sql;
 
 use nu_protocol::engine::StateWorkingSet;
 
@@ -46,6 +49,8 @@ pub use rename::RenameDF;
 pub use sample::SampleDF;
 pub use shape::ShapeDF;
 pub use slice::SliceDF;
+pub use sql_context::SQLContext;
+pub use sql_expr::parse_sql_expr;
 pub use take::TakeDF;
 pub use to_arrow::ToArrow;
 pub use to_csv::ToCSV;
@@ -53,6 +58,7 @@ pub use to_df::ToDataFrame;
 pub use to_nu::ToNu;
 pub use to_parquet::ToParquet;
 pub use with_column::WithColumn;
+pub use with_sql::WithSql;
 
 pub fn add_eager_decls(working_set: &mut StateWorkingSet) {
     macro_rules! bind_command {
@@ -91,6 +97,7 @@ pub fn add_eager_decls(working_set: &mut StateWorkingSet) {
         ToDataFrame,
         ToNu,
         ToParquet,
-        WithColumn
+        WithColumn,
+        WithSql
     );
 }
diff --git a/crates/nu-command/src/dataframe/eager/sql_context.rs b/crates/nu-command/src/dataframe/eager/sql_context.rs
new file mode 100644
index 0000000000..f8c2acd153
--- /dev/null
+++ b/crates/nu-command/src/dataframe/eager/sql_context.rs
@@ -0,0 +1,220 @@
+use crate::dataframe::eager::sql_expr::parse_sql_expr;
+use polars::error::PolarsError;
+use polars::prelude::{col, DataFrame, DataType, IntoLazy, LazyFrame};
+use sqlparser::ast::{
+    Expr as SqlExpr, 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::default(),
+        }
+    }
+
+    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.get(0).ok_or_else(|| {
+            PolarsError::NotFound("No table found in select statement".to_string())
+        })?;
+        let mut alias_map = HashMap::new();
+        let tbl_name = match &tbl.relation {
+            TableFactor::Table { name, alias, .. } => {
+                let tbl_name = name
+                    .0
+                    .get(0)
+                    .ok_or_else(|| {
+                        PolarsError::NotFound("No table found in select statement".to_string())
+                    })?
+                    .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 = select_stmt
+            .group_by
+            .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 processed wildcard in groupby".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.groupby(group_by).agg(agg_projection);
+            let mut final_proj_pos = groupby_pos
+                .into_iter()
+                .chain(agg_proj_pos.into_iter())
+                .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_index(shm_p)
+                        .unwrap_or((&"".to_string(), &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
+                .get(0)
+                .ok_or_else(|| PolarsError::NotFound("No statement found".to_string()))?;
+            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 {:?} is not supported", ast).into(),
+                    ))
+                }
+            })
+        }
+    }
+}
diff --git a/crates/nu-command/src/dataframe/eager/sql_expr.rs b/crates/nu-command/src/dataframe/eager/sql_expr.rs
new file mode 100644
index 0000000000..d434acd284
--- /dev/null
+++ b/crates/nu-command/src/dataframe/eager/sql_expr.rs
@@ -0,0 +1,191 @@
+use polars::error::PolarsError;
+use polars::prelude::{col, lit, DataType, Expr, LiteralValue, Result, TimeUnit};
+
+use sqlparser::ast::{
+    BinaryOperator as SQLBinaryOperator, DataType as SQLDataType, Expr as SqlExpr,
+    Function as SQLFunction, Value as SqlValue, WindowSpec,
+};
+
+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::Utf8,
+        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::Milliseconds, None),
+        SQLDataType::Interval => DataType::Duration(TimeUnit::Milliseconds),
+        SQLDataType::Array(inner_type) => {
+            DataType::List(Box::new(map_sql_polars_datatype(inner_type)?))
+        }
+        _ => {
+            return Err(PolarsError::ComputeError(
+                format!(
+                    "SQL Datatype {:?} was not supported in polars-sql yet!",
+                    data_type
+                )
+                .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::Utf8) + right.cast(DataType::Utf8),
+        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 {:?} was not supported in polars-sql yet!", op).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 {:?} was not supported in polars-sql yet!",
+                    value
+                )
+                .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 } => 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: {:?} was not supported in polars-sql yet!",
+                    expr
+                )
+                .into(),
+            ))
+        }
+    })
+}
+
+fn apply_window_spec(expr: Expr, window_spec: &Option<WindowSpec>) -> Result<Expr> {
+    Ok(match &window_spec {
+        Some(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
+        }
+        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_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)?.sum()
+            }
+            ("count", [FunctionArgExpr::Expr(expr)], false) => {
+                apply_window_spec(parse_sql_expr(expr)?, &sql_function.over)?.count()
+            }
+            ("count", [FunctionArgExpr::Expr(expr)], true) => {
+                apply_window_spec(parse_sql_expr(expr)?, &sql_function.over)?.n_unique()
+            }
+            // Special case for wildcard args to count function.
+            ("count", [FunctionArgExpr::Wildcard], false) => lit(1i32).count(),
+            _ => {
+                return Err(PolarsError::ComputeError(
+                    format!(
+                        "Function {:?} with args {:?} was not supported in polars-sql yet!",
+                        function_name, args
+                    )
+                    .into(),
+                ))
+            }
+        },
+    )
+}
diff --git a/crates/nu-command/src/dataframe/eager/with_sql.rs b/crates/nu-command/src/dataframe/eager/with_sql.rs
new file mode 100644
index 0000000000..90abfeacaf
--- /dev/null
+++ b/crates/nu-command/src/dataframe/eager/with_sql.rs
@@ -0,0 +1,102 @@
+use super::super::values::NuDataFrame;
+use crate::dataframe::values::Column;
+use crate::dataframe::{eager::SQLContext, values::NuLazyFrame};
+use nu_engine::CallExt;
+use nu_protocol::{
+    ast::Call,
+    engine::{Command, EngineState, Stack},
+    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
+};
+
+// 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 WithSql;
+
+impl Command for WithSql {
+    fn name(&self) -> &str {
+        "with-sql"
+    }
+
+    fn usage(&self) -> &str {
+        "Query dataframe using SQL. Note: The dataframe is always named df in your query."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required("sql", SyntaxShape::String, "sql query")
+            .input_type(Type::Custom("dataframe".into()))
+            .output_type(Type::Custom("dataframe".into()))
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Query dataframe using SQL",
+            example: "[[a b]; [1 2] [3 4]] | into df | with-sql '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)],
+                )])
+                .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(
+            "Dataframe Error".into(),
+            e.to_string(),
+            Some(call.head),
+            None,
+            Vec::new(),
+        )
+    })?;
+    let lazy = NuLazyFrame::new(false, df_sql);
+
+    let eager = lazy.collect(call.head)?;
+    let value = Value::CustomValue {
+        val: Box::new(eager),
+        span: 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(WithSql {})])
+    }
+}

From 10b9c65cb750b4fcae811b2eaad9725f491b0b63 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:39:36 -0500
Subject: [PATCH 37/45] synchronize the db commands with file names (#6565)

---
 .../database/commands/{alias.rs => as_.rs}    |  0
 .../commands/{from.rs => from_table.rs}       |  0
 .../commands/{to_db.rs => into_db.rs}         |  0
 .../nu-command/src/database/commands/mod.rs   | 24 +++++++++----------
 .../database/commands/{open.rs => open_db.rs} |  0
 .../commands/{query.rs => query_db.rs}        |  0
 .../commands/{testing.rs => testing_db.rs}    |  0
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename crates/nu-command/src/database/commands/{alias.rs => as_.rs} (100%)
 rename crates/nu-command/src/database/commands/{from.rs => from_table.rs} (100%)
 rename crates/nu-command/src/database/commands/{to_db.rs => into_db.rs} (100%)
 rename crates/nu-command/src/database/commands/{open.rs => open_db.rs} (100%)
 rename crates/nu-command/src/database/commands/{query.rs => query_db.rs} (100%)
 rename crates/nu-command/src/database/commands/{testing.rs => testing_db.rs} (100%)

diff --git a/crates/nu-command/src/database/commands/alias.rs b/crates/nu-command/src/database/commands/as_.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/alias.rs
rename to crates/nu-command/src/database/commands/as_.rs
diff --git a/crates/nu-command/src/database/commands/from.rs b/crates/nu-command/src/database/commands/from_table.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/from.rs
rename to crates/nu-command/src/database/commands/from_table.rs
diff --git a/crates/nu-command/src/database/commands/to_db.rs b/crates/nu-command/src/database/commands/into_db.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/to_db.rs
rename to crates/nu-command/src/database/commands/into_db.rs
diff --git a/crates/nu-command/src/database/commands/mod.rs b/crates/nu-command/src/database/commands/mod.rs
index 3ee4af3c8d..39fd34ef0e 100644
--- a/crates/nu-command/src/database/commands/mod.rs
+++ b/crates/nu-command/src/database/commands/mod.rs
@@ -1,45 +1,45 @@
 // Conversions between value and sqlparser objects
 pub mod conversions;
 
-mod alias;
 mod and;
+mod as_;
 mod collect;
 mod describe;
-mod from;
+mod from_table;
 mod group_by;
+mod into_db;
 mod into_sqlite;
 mod join;
 mod limit;
-mod open;
+mod open_db;
 mod or;
 mod order_by;
-mod query;
+mod query_db;
 mod schema;
 mod select;
-mod to_db;
 mod where_;
 
 // Temporal module to create Query objects
-mod testing;
-use testing::TestingDb;
+mod testing_db;
+use testing_db::TestingDb;
 
-use alias::AliasDb;
 use and::AndDb;
+use as_::AliasDb;
 use collect::CollectDb;
 pub(crate) use describe::DescribeDb;
-pub(crate) use from::FromDb;
+pub(crate) use from_table::FromDb;
 use group_by::GroupByDb;
+pub(crate) use into_db::ToDataBase;
 use into_sqlite::IntoSqliteDb;
 use join::JoinDb;
 use limit::LimitDb;
 use nu_protocol::engine::StateWorkingSet;
-use open::OpenDb;
+use open_db::OpenDb;
 use or::OrDb;
 use order_by::OrderByDb;
-use query::QueryDb;
+use query_db::QueryDb;
 use schema::SchemaDb;
 pub(crate) use select::ProjectionDb;
-pub(crate) use to_db::ToDataBase;
 use where_::WhereDb;
 
 pub fn add_commands_decls(working_set: &mut StateWorkingSet) {
diff --git a/crates/nu-command/src/database/commands/open.rs b/crates/nu-command/src/database/commands/open_db.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/open.rs
rename to crates/nu-command/src/database/commands/open_db.rs
diff --git a/crates/nu-command/src/database/commands/query.rs b/crates/nu-command/src/database/commands/query_db.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/query.rs
rename to crates/nu-command/src/database/commands/query_db.rs
diff --git a/crates/nu-command/src/database/commands/testing.rs b/crates/nu-command/src/database/commands/testing_db.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/testing.rs
rename to crates/nu-command/src/database/commands/testing_db.rs

From f0ae6ffe12a2d17c3f7386b849571fcac9bf705c Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 15 Sep 2022 18:03:43 -0500
Subject: [PATCH 38/45] update sql-parser crate and all the files it touches
 (#6566)

* update sql-parser crate and all the files it touches

* undo adding extra as a default feature
---
 Cargo.lock                                    |  4 ++--
 Cargo.toml                                    |  2 +-
 crates/nu-command/Cargo.toml                  |  2 +-
 .../nu-command/src/database/commands/and.rs   |  2 +-
 .../nu-command/src/database/commands/as_.rs   |  2 +-
 .../src/database/commands/conversions.rs      |  2 +-
 .../src/database/commands/from_table.rs       | 11 +++++----
 .../src/database/commands/group_by.rs         |  2 +-
 .../nu-command/src/database/commands/join.rs  |  2 +-
 crates/nu-command/src/database/commands/or.rs |  2 +-
 .../src/database/commands/select.rs           |  8 ++++---
 .../src/database/commands/where_.rs           |  5 ++--
 .../src/database/expressions/function.rs      |  1 +
 .../src/database/values/dsl/expression.rs     | 23 +++++++++++++++++--
 .../src/dataframe/eager/sql_context.rs        |  2 +-
 15 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 60d9052305..ce5f592280 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4774,9 +4774,9 @@ dependencies = [
 
 [[package]]
 name = "sqlparser"
-version = "0.16.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9a527b68048eb95495a1508f6c8395c8defcff5ecdbe8ad4106d08a2ef2a3c"
+checksum = "0beb13adabbdda01b63d595f38c8bfd19a361e697fd94ce0098a634077bc5b25"
 dependencies = [
  "log",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 5e6384f52f..7927c162ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -79,9 +79,9 @@ winres = "0.1"
 
 [features]
 plugin = ["nu-plugin", "nu-cli/plugin", "nu-parser/plugin", "nu-command/plugin", "nu-protocol/plugin", "nu-engine/plugin"]
+extra = ["default", "dataframe", "database"]
 default = ["plugin", "which-support", "trash-support"]
 stable = ["default"]
-extra = ["default", "dataframe", "database"]
 wasi = []
 # Enable to statically link OpenSSL; otherwise the system version will be used. Not enabled by default because it takes a while to build
 static-link-openssl = ["dep:openssl"]
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 298ce69abf..29a63c44ef 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -90,7 +90,7 @@ which = { version = "4.3.0", optional = true }
 reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
 wax = { version =  "0.5.0", features = ["diagnostics"] }
 rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
-sqlparser = { version = "0.16.0", features = ["serde"], optional = true }
+sqlparser = { version = "0.23.0", features = ["serde"], optional = true }
 
 [target.'cfg(unix)'.dependencies]
 umask = "2.0.0"
diff --git a/crates/nu-command/src/database/commands/and.rs b/crates/nu-command/src/database/commands/and.rs
index fccc71018a..ba67171112 100644
--- a/crates/nu-command/src/database/commands/and.rs
+++ b/crates/nu-command/src/database/commands/and.rs
@@ -125,7 +125,7 @@ impl Command for AndDb {
 }
 
 fn modify_query(query: &mut Box<Query>, expression: Expr, span: Span) -> Result<(), ShellError> {
-    match query.body {
+    match *query.body {
         SetExpr::Select(ref mut select) => modify_select(select, expression, span)?,
         _ => {
             return Err(ShellError::GenericError(
diff --git a/crates/nu-command/src/database/commands/as_.rs b/crates/nu-command/src/database/commands/as_.rs
index d030dee647..1c4ca1717b 100644
--- a/crates/nu-command/src/database/commands/as_.rs
+++ b/crates/nu-command/src/database/commands/as_.rs
@@ -113,7 +113,7 @@ fn alias_db(
             Vec::new(),
         )),
         Some(statement) => match statement {
-            Statement::Query(query) => match &mut query.body {
+            Statement::Query(query) => match &mut *query.body {
                 SetExpr::Select(select) => {
                     select.as_mut().from.iter_mut().for_each(|table| {
                         let new_alias = Some(TableAlias {
diff --git a/crates/nu-command/src/database/commands/conversions.rs b/crates/nu-command/src/database/commands/conversions.rs
index 8225c95ed5..77b19e5389 100644
--- a/crates/nu-command/src/database/commands/conversions.rs
+++ b/crates/nu-command/src/database/commands/conversions.rs
@@ -17,7 +17,7 @@ pub fn value_into_table_factor(
             Ok(TableFactor::Table {
                 name: ObjectName(vec![ident]),
                 alias,
-                args: Vec::new(),
+                args: None,
                 with_hints: Vec::new(),
             })
         }
diff --git a/crates/nu-command/src/database/commands/from_table.rs b/crates/nu-command/src/database/commands/from_table.rs
index 712f777ad9..310a5344e0 100644
--- a/crates/nu-command/src/database/commands/from_table.rs
+++ b/crates/nu-command/src/database/commands/from_table.rs
@@ -96,12 +96,12 @@ fn create_statement(
 ) -> Result<Statement, ShellError> {
     let query = Query {
         with: None,
-        body: SetExpr::Select(Box::new(create_select(
+        body: Box::new(SetExpr::Select(Box::new(create_select(
             connection,
             engine_state,
             stack,
             call,
-        )?)),
+        )?))),
         order_by: Vec::new(),
         limit: None,
         offset: None,
@@ -121,18 +121,18 @@ fn modify_statement(
 ) -> Result<Statement, ShellError> {
     match statement {
         Statement::Query(ref mut query) => {
-            match query.body {
+            match *query.body {
                 SetExpr::Select(ref mut select) => {
                     let table = create_table(connection, engine_state, stack, call)?;
                     select.from.push(table);
                 }
                 _ => {
-                    query.as_mut().body = SetExpr::Select(Box::new(create_select(
+                    query.as_mut().body = Box::new(SetExpr::Select(Box::new(create_select(
                         connection,
                         engine_state,
                         stack,
                         call,
-                    )?));
+                    )?)));
                 }
             };
 
@@ -167,6 +167,7 @@ fn create_select(
         distribute_by: Vec::new(),
         sort_by: Vec::new(),
         having: None,
+        qualify: None,
     })
 }
 
diff --git a/crates/nu-command/src/database/commands/group_by.rs b/crates/nu-command/src/database/commands/group_by.rs
index cf0389f544..6ae43788a0 100644
--- a/crates/nu-command/src/database/commands/group_by.rs
+++ b/crates/nu-command/src/database/commands/group_by.rs
@@ -104,7 +104,7 @@ impl Command for GroupByDb {
         let mut db = SQLiteDatabase::try_from_pipeline(input, call.head)?;
         match db.statement.as_mut() {
             Some(statement) => match statement {
-                Statement::Query(ref mut query) => match &mut query.body {
+                Statement::Query(ref mut query) => match &mut *query.body {
                     SetExpr::Select(ref mut select) => select.group_by = expressions,
                     s => {
                         return Err(ShellError::GenericError(
diff --git a/crates/nu-command/src/database/commands/join.rs b/crates/nu-command/src/database/commands/join.rs
index 9498249df0..ed84c68796 100644
--- a/crates/nu-command/src/database/commands/join.rs
+++ b/crates/nu-command/src/database/commands/join.rs
@@ -146,7 +146,7 @@ fn modify_statement(
 ) -> Result<Statement, ShellError> {
     match statement {
         Statement::Query(ref mut query) => {
-            match &mut query.body {
+            match &mut *query.body {
                 SetExpr::Select(ref mut select) => {
                     modify_from(connection, select, engine_state, stack, call)?
                 }
diff --git a/crates/nu-command/src/database/commands/or.rs b/crates/nu-command/src/database/commands/or.rs
index 60b1e8fdde..0e77dda321 100644
--- a/crates/nu-command/src/database/commands/or.rs
+++ b/crates/nu-command/src/database/commands/or.rs
@@ -125,7 +125,7 @@ impl Command for OrDb {
 }
 
 fn modify_query(query: &mut Box<Query>, expression: Expr, span: Span) -> Result<(), ShellError> {
-    match query.body {
+    match *query.body {
         SetExpr::Select(ref mut select) => modify_select(select, expression, span)?,
         _ => {
             return Err(ShellError::GenericError(
diff --git a/crates/nu-command/src/database/commands/select.rs b/crates/nu-command/src/database/commands/select.rs
index e8ae79d39f..b7ad3bfd56 100644
--- a/crates/nu-command/src/database/commands/select.rs
+++ b/crates/nu-command/src/database/commands/select.rs
@@ -108,7 +108,7 @@ impl Command for ProjectionDb {
 fn create_statement(expressions: Vec<SelectItem>) -> Statement {
     let query = Query {
         with: None,
-        body: SetExpr::Select(Box::new(create_select(expressions))),
+        body: Box::new(SetExpr::Select(Box::new(create_select(expressions)))),
         order_by: Vec::new(),
         limit: None,
         offset: None,
@@ -126,10 +126,11 @@ fn modify_statement(
 ) -> Result<Statement, ShellError> {
     match statement {
         Statement::Query(ref mut query) => {
-            match query.body {
+            match *query.body {
                 SetExpr::Select(ref mut select) => select.as_mut().projection = expressions,
                 _ => {
-                    query.as_mut().body = SetExpr::Select(Box::new(create_select(expressions)));
+                    query.as_mut().body =
+                        Box::new(SetExpr::Select(Box::new(create_select(expressions))));
                 }
             };
 
@@ -159,6 +160,7 @@ fn create_select(projection: Vec<SelectItem>) -> Select {
         distribute_by: Vec::new(),
         sort_by: Vec::new(),
         having: None,
+        qualify: None,
     }
 }
 
diff --git a/crates/nu-command/src/database/commands/where_.rs b/crates/nu-command/src/database/commands/where_.rs
index a39b13d46f..733f8cf207 100644
--- a/crates/nu-command/src/database/commands/where_.rs
+++ b/crates/nu-command/src/database/commands/where_.rs
@@ -99,10 +99,10 @@ impl Command for WhereDb {
 }
 
 fn modify_query(query: &mut Box<Query>, expression: Expr) {
-    match query.body {
+    match *query.body {
         SetExpr::Select(ref mut select) => modify_select(select, expression),
         _ => {
-            query.as_mut().body = SetExpr::Select(Box::new(create_select(expression)));
+            query.as_mut().body = Box::new(SetExpr::Select(Box::new(create_select(expression))));
         }
     };
 }
@@ -125,6 +125,7 @@ fn create_select(expression: Expr) -> Select {
         distribute_by: Vec::new(),
         sort_by: Vec::new(),
         having: None,
+        qualify: None,
     }
 }
 
diff --git a/crates/nu-command/src/database/expressions/function.rs b/crates/nu-command/src/database/expressions/function.rs
index d01db7a5d0..74fc69fb40 100644
--- a/crates/nu-command/src/database/expressions/function.rs
+++ b/crates/nu-command/src/database/expressions/function.rs
@@ -132,6 +132,7 @@ impl Command for FunctionExpr {
             args,
             over: None,
             distinct: call.has_flag("distinct"),
+            special: false,
         })
         .into();
 
diff --git a/crates/nu-command/src/database/values/dsl/expression.rs b/crates/nu-command/src/database/values/dsl/expression.rs
index a1447109bf..2bda5a4b9f 100644
--- a/crates/nu-command/src/database/values/dsl/expression.rs
+++ b/crates/nu-command/src/database/values/dsl/expression.rs
@@ -249,7 +249,7 @@ impl ExtractedExpr {
 
 impl ExprDb {
     pub fn expr_to_value(expr: &Expr, span: Span) -> Value {
-        match expr {
+        match &*expr {
             Expr::Identifier(ident) => {
                 let cols = vec!["value".into(), "quoted_style".into()];
                 let val = Value::String {
@@ -339,7 +339,7 @@ impl ExprDb {
             Expr::TypedString { .. } => todo!(),
             Expr::MapAccess { .. } => todo!(),
             Expr::Case { .. } => todo!(),
-            Expr::Exists(_) => todo!(),
+            Expr::Exists { .. } => todo!(),
             Expr::Subquery(_) => todo!(),
             Expr::ListAgg(_) => todo!(),
             Expr::GroupingSets(_) => todo!(),
@@ -348,6 +348,25 @@ impl ExprDb {
             Expr::Tuple(_) => todo!(),
             Expr::ArrayIndex { .. } => todo!(),
             Expr::Array(_) => todo!(),
+            Expr::JsonAccess { .. } => todo!(),
+            Expr::CompositeAccess { .. } => todo!(),
+            Expr::IsFalse(_) => todo!(),
+            Expr::IsNotFalse(_) => todo!(),
+            Expr::IsTrue(_) => todo!(),
+            Expr::IsNotTrue(_) => todo!(),
+            Expr::IsUnknown(_) => todo!(),
+            Expr::IsNotUnknown(_) => todo!(),
+            Expr::Like { .. } => todo!(),
+            Expr::ILike { .. } => todo!(),
+            Expr::SimilarTo { .. } => todo!(),
+            Expr::AnyOp(_) => todo!(),
+            Expr::AllOp(_) => todo!(),
+            Expr::SafeCast { .. } => todo!(),
+            Expr::AtTimeZone { .. } => todo!(),
+            Expr::Position { .. } => todo!(),
+            Expr::Overlay { .. } => todo!(),
+            Expr::AggregateExpressionWithFilter { .. } => todo!(),
+            Expr::ArraySubquery(_) => todo!(),
         }
     }
 }
diff --git a/crates/nu-command/src/dataframe/eager/sql_context.rs b/crates/nu-command/src/dataframe/eager/sql_context.rs
index f8c2acd153..5232f8858f 100644
--- a/crates/nu-command/src/dataframe/eager/sql_context.rs
+++ b/crates/nu-command/src/dataframe/eager/sql_context.rs
@@ -184,7 +184,7 @@ impl SQLContext {
                 .ok_or_else(|| PolarsError::NotFound("No statement found".to_string()))?;
             Ok(match ast {
                 Statement::Query(query) => {
-                    let rs = match &query.body {
+                    let rs = match &*query.body {
                         SetExpr::Select(select_stmt) => self.execute_select(&*select_stmt)?,
                         _ => {
                             return Err(PolarsError::ComputeError(

From 35a521d76238cfce4e856b102461bf5213ab63ac Mon Sep 17 00:00:00 2001
From: Kangaxx-0 <85712372+Kangaxx-0@users.noreply.github.com>
Date: Fri, 16 Sep 2022 00:27:12 -0700
Subject: [PATCH 39/45] Fix 6529 - Trim overlay name (#6555)

* trim overlay name

* format

* Update tests/overlays/mod.rs

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>

* cleanup

* new tests

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 .../src/core_commands/overlay/use_.rs         |  4 +-
 tests/overlays/mod.rs                         | 62 +++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/core_commands/overlay/use_.rs b/crates/nu-command/src/core_commands/overlay/use_.rs
index 052cdb7a90..e21fb843e0 100644
--- a/crates/nu-command/src/core_commands/overlay/use_.rs
+++ b/crates/nu-command/src/core_commands/overlay/use_.rs
@@ -1,4 +1,5 @@
 use nu_engine::{eval_block, find_in_dirs_env, redirect_env, CallExt};
+use nu_parser::trim_quotes_str;
 use nu_protocol::ast::{Call, Expr};
 use nu_protocol::engine::{Command, EngineState, Stack};
 use nu_protocol::{
@@ -55,7 +56,8 @@ impl Command for OverlayUse {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let name_arg: Spanned<String> = call.req(engine_state, caller_stack, 0)?;
+        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 origin_module_id = if let Some(overlay_expr) = call.positional_nth(0) {
             if let Expr::Overlay(module_id) = overlay_expr.expr {
diff --git a/tests/overlays/mod.rs b/tests/overlays/mod.rs
index 57cca589dd..b7267e9854 100644
--- a/tests/overlays/mod.rs
+++ b/tests/overlays/mod.rs
@@ -993,3 +993,65 @@ fn overlay_preserve_hidden_alias() {
     assert_eq!(actual.out, "foo");
     assert_eq!(actual_repl.out, "foo");
 }
+
+#[test]
+fn overlay_trim_single_quote() {
+    let inp = &[
+        r#"module spam { export def foo [] { "foo" } }"#,
+        r#"overlay use 'spam'"#,
+        r#"overlay list | last "#,
+    ];
+
+    let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
+
+    assert_eq!(actual.out, "spam");
+}
+
+#[test]
+fn overlay_trim_single_quote_hide() {
+    let inp = &[
+        r#"module spam { export def foo [] { "foo" } }"#,
+        r#"overlay use 'spam'"#,
+        r#"overlay hide spam "#,
+        r#"foo"#,
+    ];
+    let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
+    let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
+
+    assert!(!actual.err.is_empty());
+    #[cfg(windows)]
+    assert!(actual_repl.out != "foo");
+    #[cfg(not(windows))]
+    assert!(!actual_repl.err.is_empty());
+}
+
+#[test]
+fn overlay_trim_double_quote() {
+    let inp = &[
+        r#"module spam { export def foo [] { "foo" } }"#,
+        r#"overlay use "spam" "#,
+        r#"overlay list | last "#,
+    ];
+
+    let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
+
+    assert_eq!(actual.out, "spam");
+}
+
+#[test]
+fn overlay_trim_double_quote_hide() {
+    let inp = &[
+        r#"module spam { export def foo [] { "foo" } }"#,
+        r#"overlay use "spam" "#,
+        r#"overlay hide spam "#,
+        r#"foo"#,
+    ];
+    let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
+    let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
+
+    assert!(!actual.err.is_empty());
+    #[cfg(windows)]
+    assert!(actual_repl.out != "foo");
+    #[cfg(not(windows))]
+    assert!(!actual_repl.err.is_empty());
+}

From 4fdfd3d15e6a717eb230d419b1a622e4643abd38 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 16 Sep 2022 08:34:58 -0500
Subject: [PATCH 40/45] rename with_sql to query dfr (#6568)

* rename with_sql to query dfr

* add search terms

* update example command
---
 crates/nu-command/src/dataframe/eager/mod.rs     |  8 ++++----
 .../eager/{with_sql.rs => query_dfr.rs}          | 16 ++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)
 rename crates/nu-command/src/dataframe/eager/{with_sql.rs => query_dfr.rs} (88%)

diff --git a/crates/nu-command/src/dataframe/eager/mod.rs b/crates/nu-command/src/dataframe/eager/mod.rs
index 80421f77f9..ea865ff3f6 100644
--- a/crates/nu-command/src/dataframe/eager/mod.rs
+++ b/crates/nu-command/src/dataframe/eager/mod.rs
@@ -13,6 +13,7 @@ mod last;
 mod list;
 mod melt;
 mod open;
+mod query_dfr;
 mod rename;
 mod sample;
 mod shape;
@@ -26,7 +27,6 @@ mod to_df;
 mod to_nu;
 mod to_parquet;
 mod with_column;
-mod with_sql;
 
 use nu_protocol::engine::StateWorkingSet;
 
@@ -45,6 +45,7 @@ pub use last::LastDF;
 pub use list::ListDF;
 pub use melt::MeltDF;
 pub use open::OpenDataFrame;
+pub use query_dfr::QueryDfr;
 pub use rename::RenameDF;
 pub use sample::SampleDF;
 pub use shape::ShapeDF;
@@ -58,7 +59,6 @@ pub use to_df::ToDataFrame;
 pub use to_nu::ToNu;
 pub use to_parquet::ToParquet;
 pub use with_column::WithColumn;
-pub use with_sql::WithSql;
 
 pub fn add_eager_decls(working_set: &mut StateWorkingSet) {
     macro_rules! bind_command {
@@ -87,6 +87,7 @@ pub fn add_eager_decls(working_set: &mut StateWorkingSet) {
         ListDF,
         MeltDF,
         OpenDataFrame,
+        QueryDfr,
         RenameDF,
         SampleDF,
         ShapeDF,
@@ -97,7 +98,6 @@ pub fn add_eager_decls(working_set: &mut StateWorkingSet) {
         ToDataFrame,
         ToNu,
         ToParquet,
-        WithColumn,
-        WithSql
+        WithColumn
     );
 }
diff --git a/crates/nu-command/src/dataframe/eager/with_sql.rs b/crates/nu-command/src/dataframe/eager/query_dfr.rs
similarity index 88%
rename from crates/nu-command/src/dataframe/eager/with_sql.rs
rename to crates/nu-command/src/dataframe/eager/query_dfr.rs
index 90abfeacaf..33f967f827 100644
--- a/crates/nu-command/src/dataframe/eager/with_sql.rs
+++ b/crates/nu-command/src/dataframe/eager/query_dfr.rs
@@ -14,15 +14,15 @@ use nu_protocol::{
 // https://github.com/pola-rs/polars/tree/master/polars-sql
 
 #[derive(Clone)]
-pub struct WithSql;
+pub struct QueryDfr;
 
-impl Command for WithSql {
+impl Command for QueryDfr {
     fn name(&self) -> &str {
-        "with-sql"
+        "query dfr"
     }
 
     fn usage(&self) -> &str {
-        "Query dataframe using SQL. Note: The dataframe is always named df in your query."
+        "Query dataframe using SQL. Note: The dataframe is always named 'df' in your query's from clause."
     }
 
     fn signature(&self) -> Signature {
@@ -33,10 +33,14 @@ impl Command for WithSql {
             .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]] | into df | with-sql 'select a from df'",
+            example: "[[a b]; [1 2] [3 4]] | into df | query dfr 'select a from df'",
             result: Some(
                 NuDataFrame::try_from_columns(vec![Column::new(
                     "a".to_string(),
@@ -97,6 +101,6 @@ mod test {
 
     #[test]
     fn test_examples() {
-        test_dataframe(vec![Box::new(WithSql {})])
+        test_dataframe(vec![Box::new(QueryDfr {})])
     }
 }

From e7bf89b3118d5f791528a35e1575967021524b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Sat, 17 Sep 2022 02:36:17 +0300
Subject: [PATCH 41/45] Add export-env eval to use command (#6572)

---
 crates/nu-command/src/core_commands/use_.rs |  53 +++++++--
 crates/nu-command/tests/commands/use_.rs    | 122 +++++++++++++++++++-
 2 files changed, 167 insertions(+), 8 deletions(-)

diff --git a/crates/nu-command/src/core_commands/use_.rs b/crates/nu-command/src/core_commands/use_.rs
index 32b017b348..2eb1aa85d6 100644
--- a/crates/nu-command/src/core_commands/use_.rs
+++ b/crates/nu-command/src/core_commands/use_.rs
@@ -1,4 +1,4 @@
-use nu_engine::eval_block;
+use nu_engine::{eval_block, find_in_dirs_env, redirect_env};
 use nu_protocol::ast::{Call, Expr, Expression, ImportPatternMember};
 use nu_protocol::engine::{Command, EngineState, Stack};
 use nu_protocol::{
@@ -35,9 +35,9 @@ impl Command for Use {
     fn run(
         &self,
         engine_state: &EngineState,
-        stack: &mut Stack,
+        caller_stack: &mut Stack,
         call: &Call,
-        _input: PipelineData,
+        input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let import_pattern = if let Some(Expression {
             expr: Expr::ImportPattern(pat),
@@ -107,7 +107,7 @@ impl Command for Use {
 
                 let val = eval_block(
                     engine_state,
-                    stack,
+                    caller_stack,
                     block,
                     PipelineData::new(call.head),
                     false,
@@ -115,11 +115,50 @@ impl Command for Use {
                 )?
                 .into_value(call.head);
 
-                stack.add_env_var(name, val);
+                caller_stack.add_env_var(name, val);
+            }
+
+            // Evaluate the export-env block if there is one
+            if let Some(block_id) = module.env_block {
+                let block = engine_state.get_block(block_id);
+
+                // See if the module is a file
+                let module_arg_str = String::from_utf8_lossy(
+                    engine_state.get_span_contents(&import_pattern.head.span),
+                );
+                let maybe_parent = if let Some(path) =
+                    find_in_dirs_env(&module_arg_str, engine_state, caller_stack)?
+                {
+                    path.parent().map(|p| p.to_path_buf()).or(None)
+                } else {
+                    None
+                };
+
+                let mut callee_stack = caller_stack.gather_captures(&block.captures);
+
+                // If so, set the currently evaluated directory (file-relative PWD)
+                if let Some(parent) = maybe_parent {
+                    let file_pwd = Value::String {
+                        val: parent.to_string_lossy().to_string(),
+                        span: call.head,
+                    };
+                    callee_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
+                }
+
+                // Run the block (discard the result)
+                let _ = eval_block(
+                    engine_state,
+                    &mut callee_stack,
+                    block,
+                    input,
+                    call.redirect_stdout,
+                    call.redirect_stderr,
+                )?;
+
+                // Merge the block's environment to the current stack
+                redirect_env(engine_state, caller_stack, &callee_stack);
             }
         } else {
-            // TODO: This is a workaround since call.positional[0].span points at 0 for some reason
-            // when this error is triggered
             return Err(ShellError::GenericError(
                 format!(
                     "Could not import from '{}'",
diff --git a/crates/nu-command/tests/commands/use_.rs b/crates/nu-command/tests/commands/use_.rs
index 11ec04bd31..0dd7b368a0 100644
--- a/crates/nu-command/tests/commands/use_.rs
+++ b/crates/nu-command/tests/commands/use_.rs
@@ -1,4 +1,5 @@
-use nu_test_support::fs::{AbsolutePath, Stub::FileWithContent};
+use nu_test_support::fs::AbsolutePath;
+use nu_test_support::fs::Stub::{FileWithContent, FileWithContentToBeTrimmed};
 use nu_test_support::nu;
 use nu_test_support::pipeline;
 use nu_test_support::playground::Playground;
@@ -63,3 +64,122 @@ fn use_keeps_doc_comments() {
         assert!(actual.out.contains("this is an x parameter"));
     })
 }
+
+#[test]
+fn use_eval_export_env() {
+    Playground::setup("use_eval_export_env", |dirs, sandbox| {
+        sandbox.with_files(vec![FileWithContentToBeTrimmed(
+            "spam.nu",
+            r#"
+                export-env { let-env FOO = 'foo' }
+            "#,
+        )]);
+
+        let inp = &[r#"use spam.nu"#, r#"$env.FOO"#];
+
+        let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
+
+        assert_eq!(actual.out, "foo");
+    })
+}
+
+#[test]
+fn use_eval_export_env_hide() {
+    Playground::setup("use_eval_export_env", |dirs, sandbox| {
+        sandbox.with_files(vec![FileWithContentToBeTrimmed(
+            "spam.nu",
+            r#"
+                export-env { hide-env FOO }
+            "#,
+        )]);
+
+        let inp = &[r#"let-env FOO = 'foo'"#, r#"use spam.nu"#, r#"$env.FOO"#];
+
+        let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
+
+        assert!(actual.err.contains("did you mean"));
+    })
+}
+
+#[test]
+fn use_do_cd() {
+    Playground::setup("use_do_cd", |dirs, sandbox| {
+        sandbox
+            .mkdir("test1/test2")
+            .with_files(vec![FileWithContentToBeTrimmed(
+                "test1/test2/spam.nu",
+                r#"
+                    export-env { cd test1/test2 }
+                "#,
+            )]);
+
+        let inp = &[r#"use test1/test2/spam.nu"#, r#"$env.PWD | path basename"#];
+
+        let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
+
+        assert_eq!(actual.out, "test2");
+    })
+}
+
+#[test]
+fn use_do_cd_file_relative() {
+    Playground::setup("use_do_cd_file_relative", |dirs, sandbox| {
+        sandbox
+            .mkdir("test1/test2")
+            .with_files(vec![FileWithContentToBeTrimmed(
+                "test1/test2/spam.nu",
+                r#"
+                    export-env { cd ($env.FILE_PWD | path join '..') }
+                "#,
+            )]);
+
+        let inp = &[r#"use test1/test2/spam.nu"#, r#"$env.PWD | path basename"#];
+
+        let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
+
+        assert_eq!(actual.out, "test1");
+    })
+}
+
+#[test]
+fn use_dont_cd_overlay() {
+    Playground::setup("use_dont_cd_overlay", |dirs, sandbox| {
+        sandbox
+            .mkdir("test1/test2")
+            .with_files(vec![FileWithContentToBeTrimmed(
+                "test1/test2/spam.nu",
+                r#"
+                    export-env {
+                        overlay new spam
+                        cd test1/test2
+                        overlay hide spam
+                    }
+                "#,
+            )]);
+
+        let inp = &[r#"use test1/test2/spam.nu"#, r#"$env.PWD | path basename"#];
+
+        let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
+
+        assert_eq!(actual.out, "use_dont_cd_overlay");
+    })
+}
+
+#[test]
+fn use_export_env_combined() {
+    Playground::setup("use_is_scoped", |dirs, sandbox| {
+        sandbox.with_files(vec![FileWithContentToBeTrimmed(
+            "spam.nu",
+            r#"
+                alias bar = foo
+                export-env { let-env FOO = bar }
+                def foo [] { 'foo' }
+            "#,
+        )]);
+
+        let inp = &[r#"use spam.nu"#, r#"$env.FOO"#];
+
+        let actual = nu!(cwd: dirs.test(), pipeline(&inp.join("; ")));
+        assert_eq!(actual.out, "foo");
+    })
+}

From 5491634dda932f765b376f7c56a7f9e8f93c0049 Mon Sep 17 00:00:00 2001
From: WindSoilder <WindSoilder@outlook.com>
Date: Sat, 17 Sep 2022 19:07:45 +0800
Subject: [PATCH 42/45] escape external args (#6560)

---
 crates/nu-command/tests/commands/run_external.rs | 14 ++++++++++++++
 crates/nu-parser/src/parser.rs                   |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index 3dac3c3c81..d92573426e 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -186,6 +186,20 @@ fn external_arg_with_variable_name() {
     })
 }
 
+#[test]
+fn external_command_escape_args() {
+    Playground::setup("external failed command with semicolon", |dirs, _| {
+        let actual = nu!(
+            cwd: dirs.test(), pipeline(
+            r#"
+                ^echo "\"abcd"
+            "#
+        ));
+
+        assert_eq!(actual.out, r#""abcd"#);
+    })
+}
+
 #[cfg(windows)]
 #[test]
 fn explicit_glob_windows() {
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 33e5f6e7a5..877c54ae2d 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -331,7 +331,13 @@ pub fn parse_external_call(
             args.push(arg);
         } else {
             // Eval stage trims the quotes, so we don't have to do the same thing when parsing.
-            let contents = String::from_utf8_lossy(contents).to_string();
+            let contents = if contents.starts_with(b"\"") {
+                let (contents, err) = unescape_string(contents, *span);
+                error = error.or(err);
+                String::from_utf8_lossy(&contents).to_string()
+            } else {
+                String::from_utf8_lossy(contents).to_string()
+            };
 
             args.push(Expression {
                 expr: Expr::String(contents),

From b086f34fa283dbe6d39e6005b35fa17888396f2b Mon Sep 17 00:00:00 2001
From: Dan Davison <dandavison7@gmail.com>
Date: Sat, 17 Sep 2022 08:02:17 -0400
Subject: [PATCH 43/45] Reinstate -a short form of save --append (#6575)

Present before engine-q merge (e.g.
265ee1281d810a569c7daddd02031f5c6991699e) but not included when
--append was re-introduced at
https://github.com/nushell/nushell/pull/4744.
---
 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 0587f799cf..8c66434326 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -36,7 +36,7 @@ impl Command for Save {
         Signature::build("save")
             .required("filename", SyntaxShape::Filepath, "the filename to use")
             .switch("raw", "save file as raw binary", Some('r'))
-            .switch("append", "append input to the end of the file", None)
+            .switch("append", "append input to the end of the file", Some('a'))
             .category(Category::FileSystem)
     }
 

From 15ebf45f46385b5883237a0917d0381961005901 Mon Sep 17 00:00:00 2001
From: nibon7 <nibon7@163.com>
Date: Sun, 18 Sep 2022 01:10:32 +0800
Subject: [PATCH 44/45] Apply clippy fix for rust 1.63.0 (#6576)

* Apply clippy fix to avoid extra allocation

error: `format!(..)` appended to existing `String`
  --> crates/nu-engine/src/documentation.rs:82:9
   |
82 |         long_desc.push_str(&format!("\n{G}Subcommands{RESET}:\n"));
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `-D clippy::format-push-string` implied by `-D warnings`
   = help: consider using `write!` to avoid the extra allocation
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string

error: `format!(..)` appended to existing `String`
  --> crates/nu-engine/src/documentation.rs:96:9
   |
96 |         long_desc.push_str(&format!("\n{G}Parameters{RESET}:\n"));
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = help: consider using `write!` to avoid the extra allocation
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string

error: `format!(..)` appended to existing `String`
   --> crates/nu-engine/src/documentation.rs:128:9
    |
128 |         long_desc.push_str(&format!("\n{}Examples{}:", G, RESET));
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: consider using `write!` to avoid the extra allocation
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string

error: `format!(..)` appended to existing `String`
   --> crates/nu-engine/src/documentation.rs:202:5
    |
202 |     long_desc.push_str(&format!("\n{}Flags{}:\n", G, RESET));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: consider using `write!` to avoid the extra allocation
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string

error: could not compile `nu-engine` due to 4 previous errors

* Apply clippy fix to avoid deref on an immutable reference

error: deref on an immutable reference
   --> crates/nu-command/src/dataframe/eager/sql_context.rs:188:77
    |
188 |                         SetExpr::Select(select_stmt) => self.execute_select(&*select_stmt)?,
    |                                                                             ^^^^^^^^^^^^^
    |
    = note: `-D clippy::borrow-deref-ref` implied by `-D warnings`
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref
help: if you would like to reborrow, try removing `&*`
    |
188 |                         SetExpr::Select(select_stmt) => self.execute_select(select_stmt)?,
    |                                                                             ~~~~~~~~~~~
help: if you would like to deref, try using `&**`
    |
188 |                         SetExpr::Select(select_stmt) => self.execute_select(&**select_stmt)?,
    |                                                                             ~~~~~~~~~~~~~~

error: deref on an immutable reference
   --> crates/nu-command/src/database/values/dsl/expression.rs:252:15
    |
252 |         match &*expr {
    |               ^^^^^^ help: if you would like to reborrow, try removing `&*`: `expr`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref

error: could not compile `nu-command` due to 2 previous errors
---
 crates/nu-command/src/database/values/dsl/expression.rs | 2 +-
 crates/nu-command/src/dataframe/eager/sql_context.rs    | 2 +-
 crates/nu-engine/src/documentation.rs                   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/nu-command/src/database/values/dsl/expression.rs b/crates/nu-command/src/database/values/dsl/expression.rs
index 2bda5a4b9f..9489f8c657 100644
--- a/crates/nu-command/src/database/values/dsl/expression.rs
+++ b/crates/nu-command/src/database/values/dsl/expression.rs
@@ -249,7 +249,7 @@ impl ExtractedExpr {
 
 impl ExprDb {
     pub fn expr_to_value(expr: &Expr, span: Span) -> Value {
-        match &*expr {
+        match expr {
             Expr::Identifier(ident) => {
                 let cols = vec!["value".into(), "quoted_style".into()];
                 let val = Value::String {
diff --git a/crates/nu-command/src/dataframe/eager/sql_context.rs b/crates/nu-command/src/dataframe/eager/sql_context.rs
index 5232f8858f..c8106dfa34 100644
--- a/crates/nu-command/src/dataframe/eager/sql_context.rs
+++ b/crates/nu-command/src/dataframe/eager/sql_context.rs
@@ -185,7 +185,7 @@ impl SQLContext {
             Ok(match ast {
                 Statement::Query(query) => {
                     let rs = match &*query.body {
-                        SetExpr::Select(select_stmt) => self.execute_select(&*select_stmt)?,
+                        SetExpr::Select(select_stmt) => self.execute_select(select_stmt)?,
                         _ => {
                             return Err(PolarsError::ComputeError(
                                 "INSERT, UPDATE is not supported for polars".into(),
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 8be8974e68..e2639c1fee 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -79,7 +79,7 @@ fn get_documentation(
     let _ = write!(long_desc, "{}", text);
 
     if !subcommands.is_empty() {
-        long_desc.push_str(&format!("\n{G}Subcommands{RESET}:\n"));
+        let _ = write!(long_desc, "\n{G}Subcommands{RESET}:\n");
         subcommands.sort();
         long_desc.push_str(&subcommands.join("\n"));
         long_desc.push('\n');
@@ -93,7 +93,7 @@ fn get_documentation(
         || !sig.optional_positional.is_empty()
         || sig.rest_positional.is_some()
     {
-        long_desc.push_str(&format!("\n{G}Parameters{RESET}:\n"));
+        let _ = write!(long_desc, "\n{G}Parameters{RESET}:\n");
         for positional in &sig.required_positional {
             let text = format!(
                 "  {C}{}{RESET} <{BB}{:?}{RESET}>: {}",
@@ -125,7 +125,7 @@ fn get_documentation(
     }
 
     if !examples.is_empty() {
-        long_desc.push_str(&format!("\n{}Examples{}:", G, RESET));
+        let _ = write!(long_desc, "\n{}Examples{}:", G, RESET);
     }
 
     for example in examples {
@@ -199,7 +199,7 @@ pub fn get_flags_section(signature: &Signature) -> String {
     const D: &str = "\x1b[39m"; // default
 
     let mut long_desc = String::new();
-    long_desc.push_str(&format!("\n{}Flags{}:\n", G, RESET));
+    let _ = write!(long_desc, "\n{}Flags{}:\n", G, RESET);
     for flag in &signature.named {
         let msg = if let Some(arg) = &flag.arg {
             if let Some(short) = flag.short {

From d704b05b7a2b6c2923e68eaf8fecd6a454af1950 Mon Sep 17 00:00:00 2001
From: Dan Davison <dandavison7@gmail.com>
Date: Sun, 18 Sep 2022 11:24:27 -0400
Subject: [PATCH 45/45] Improve uniq documentation (#6580)

---
 crates/nu-command/src/filters/uniq.rs | 28 +++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs
index 7c519032cc..f64e3b7f3b 100644
--- a/crates/nu-command/src/filters/uniq.rs
+++ b/crates/nu-command/src/filters/uniq.rs
@@ -14,23 +14,31 @@ impl Command for Uniq {
 
     fn signature(&self) -> Signature {
         Signature::build("uniq")
-            .switch("count", "Count the unique rows", Some('c'))
+            .switch(
+                "count",
+                "Return a table containing the distinct input values together with their counts",
+                Some('c'),
+            )
             .switch(
                 "repeated",
-                "Count the rows that has more than one value",
+                "Return the input values that occur more than once",
                 Some('d'),
             )
             .switch(
                 "ignore-case",
-                "Ignore differences in case when comparing",
+                "Ignore differences in case when comparing input values",
                 Some('i'),
             )
-            .switch("unique", "Only return unique values", Some('u'))
+            .switch(
+                "unique",
+                "Return the input values that occur once only",
+                Some('u'),
+            )
             .category(Category::Filters)
     }
 
     fn usage(&self) -> &str {
-        "Return the unique rows."
+        "Return the distinct values in the input."
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -50,7 +58,7 @@ impl Command for Uniq {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Remove duplicate rows of a list/table",
+                description: "Return the distinct values of a list/table (remove duplicates so that each value occurs once only)",
                 example: "[2 3 3 4] | uniq",
                 result: Some(Value::List {
                     vals: vec![Value::test_int(2), Value::test_int(3), Value::test_int(4)],
@@ -58,7 +66,7 @@ impl Command for Uniq {
                 }),
             },
             Example {
-                description: "Only print duplicate lines, one for each group",
+                description: "Return the input values that occur more than once",
                 example: "[1 2 2] | uniq -d",
                 result: Some(Value::List {
                     vals: vec![Value::test_int(2)],
@@ -66,7 +74,7 @@ impl Command for Uniq {
                 }),
             },
             Example {
-                description: "Only print unique lines lines",
+                description: "Return the input values that occur once only",
                 example: "[1 2 2] | uniq -u",
                 result: Some(Value::List {
                     vals: vec![Value::test_int(1)],
@@ -74,7 +82,7 @@ impl Command for Uniq {
                 }),
             },
             Example {
-                description: "Ignore differences in case when comparing",
+                description: "Ignore differences in case when comparing input values",
                 example: "['hello' 'goodbye' 'Hello'] | uniq -i",
                 result: Some(Value::List {
                     vals: vec![Value::test_string("hello"), Value::test_string("goodbye")],
@@ -82,7 +90,7 @@ impl Command for Uniq {
                 }),
             },
             Example {
-                description: "Remove duplicate rows and show counts of a list/table",
+                description: "Return a table containing the distinct input values together with their counts",
                 example: "[1 2 2] | uniq -c",
                 result: Some(Value::List {
                     vals: vec![