diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 2c0fcbd771..d21926517e 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -10,4 +10,4 @@ jobs:
         uses: actions/checkout@v4.1.7
 
       - name: Check spelling
-        uses: crate-ci/typos@v1.27.3
+        uses: crate-ci/typos@v1.28.1
diff --git a/Cargo.lock b/Cargo.lock
index 2754f5bd23..ecad53d2d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,19 +4,13 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -88,9 +82,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
 
 [[package]]
 name = "alphanumeric-sort"
@@ -134,9 +128,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -149,49 +143,58 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+
+[[package]]
+name = "arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+dependencies = [
+ "derive_arbitrary",
+]
 
 [[package]]
 name = "arboard"
-version = "3.4.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
+checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
 dependencies = [
  "clipboard-win",
  "log",
@@ -258,9 +261,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -269,9 +272,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -280,9 +283,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -312,9 +315,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "avro-schema"
@@ -332,17 +335,17 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -354,12 +357,6 @@ dependencies = [
  "backtrace",
 ]
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -368,16 +365,14 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "regex",
@@ -448,9 +443,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
+checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
 dependencies = [
  "borsh-derive",
  "cfg_aliases 0.2.1",
@@ -458,16 +453,15 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
+checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
- "syn_derive",
 ]
 
 [[package]]
@@ -499,9 +493,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -516,9 +510,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-unit"
-version = "5.1.4"
+version = "5.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e"
+checksum = "e1cd29c3c585209b0cbc7309bfe3ed7efd8c84c21b7af29c8bfae908f8777174"
 dependencies = [
  "rust_decimal",
  "serde",
@@ -555,18 +549,18 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 
 [[package]]
 name = "bytemuck"
-version = "1.17.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -593,16 +587,15 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
 
 [[package]]
 name = "calamine"
-version = "0.24.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3a315226fdc5b1c3e33521073e1712a05944bc0664d665ff1f6ff0396334da"
+checksum = "138646b9af2c5d7f1804ea4bf93afc597737d2bd4f7341d67c48b03316976eb1"
 dependencies = [
  "byteorder",
  "chrono",
  "codepage",
  "encoding_rs",
  "log",
- "once_cell",
  "quick-xml 0.31.0",
  "serde",
  "zip",
@@ -625,9 +618,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.14"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
 dependencies = [
  "jobserver",
  "libc",
@@ -678,7 +671,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "encoding_rs",
 ]
 
@@ -773,9 +766,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -783,9 +776,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstream",
  "anstyle",
@@ -796,9 +789,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -808,9 +801,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "clipboard-win"
@@ -832,9 +825,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colorz"
@@ -847,14 +840,14 @@ dependencies = [
 
 [[package]]
 name = "comfy-table"
-version = "7.1.1"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
+checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9"
 dependencies = [
- "crossterm 0.27.0",
+ "crossterm 0.28.1",
  "strum",
  "strum_macros",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -894,7 +887,7 @@ dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "unicode-width",
+ "unicode-width 0.1.11",
  "windows-sys 0.52.0",
 ]
 
@@ -920,18 +913,18 @@ dependencies = [
 
 [[package]]
 name = "const_format"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -956,9 +949,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
  "libc",
 ]
@@ -1113,9 +1106,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
 dependencies = [
  "csv-core",
  "itoa",
@@ -1144,9 +1137,9 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.46"
+version = "0.4.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
+checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
 dependencies = [
  "curl-sys",
  "libc",
@@ -1159,9 +1152,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.74+curl-8.9.0"
+version = "0.4.78+curl-8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf"
+checksum = "8eec768341c5c7789611ae51cf6c459099f22e64a5d5d0ce4892434e33821eaf"
 dependencies = [
  "cc",
  "libc",
@@ -1198,6 +1191,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.18"
@@ -1218,7 +1222,7 @@ dependencies = [
  "console",
  "fuzzy-matcher",
  "shell-words",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1264,6 +1268,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "dlib"
 version = "0.5.2"
@@ -1372,9 +1387,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
@@ -1452,9 +1467,9 @@ dependencies = [
 
 [[package]]
 name = "error-code"
-version = "3.2.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
 
 [[package]]
 name = "ethnum"
@@ -1493,9 +1508,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c"
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "fd-lock"
@@ -1510,11 +1525,11 @@ dependencies = [
 
 [[package]]
 name = "file-id"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9"
+checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1528,9 +1543,9 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1546,12 +1561,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.32"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1569,6 +1584,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1626,9 +1647,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1641,9 +1662,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1651,15 +1672,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1668,15 +1689,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1685,21 +1706,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1766,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git2"
@@ -1875,9 +1896,14 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
 
 [[package]]
 name = "hashlink"
@@ -1995,9 +2021,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -2014,7 +2040,7 @@ dependencies = [
  "chrono",
  "pest",
  "pest_derive",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2025,9 +2051,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2045,9 +2071,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-util",
@@ -2060,9 +2086,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2087,17 +2113,146 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b7cab7543a8b7729a19e2c04309f902861293dcdae6558dfbeb634454d279f6"
 dependencies = [
- "thiserror",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -2107,21 +2262,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
  "serde",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.8"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
 dependencies = [
  "console",
- "instant",
  "number_prefix",
  "portable-atomic",
- "unicode-width",
+ "unicode-width 0.2.0",
+ "web-time",
 ]
 
 [[package]]
@@ -2144,15 +2299,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "interprocess"
 version = "2.2.1"
@@ -2216,9 +2362,9 @@ checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89"
 
 [[package]]
 name = "is_executable"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
+checksum = "d4a1b5bad6f9072935961dfbf1cced2f3d129963d091b6f69f007fe04e758ae2"
 dependencies = [
  "winapi",
 ]
@@ -2285,9 +2431,9 @@ checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2329,17 +2475,11 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "lexical-core"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+checksum = "0431c65b318a590c1de6b8fd6e72798c92291d27762d94c9e6c37ed7a73d8458"
 dependencies = [
  "lexical-parse-float",
  "lexical-parse-integer",
@@ -2350,9 +2490,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-parse-float"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+checksum = "eb17a4bdb9b418051aa59d41d65b1c9be5affab314a872e5ad7f06231fb3b4e0"
 dependencies = [
  "lexical-parse-integer",
  "lexical-util",
@@ -2361,9 +2501,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-parse-integer"
-version = "0.8.6"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+checksum = "5df98f4a4ab53bf8b175b363a34c7af608fe31f93cc1fb1bf07130622ca4ef61"
 dependencies = [
  "lexical-util",
  "static_assertions",
@@ -2371,18 +2511,18 @@ dependencies = [
 
 [[package]]
 name = "lexical-util"
-version = "0.8.5"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+checksum = "85314db53332e5c192b6bca611fb10c114a80d1b831ddac0af1e9be1b9232ca0"
 dependencies = [
  "static_assertions",
 ]
 
 [[package]]
 name = "lexical-write-float"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+checksum = "6e7c3ad4e37db81c1cbe7cf34610340adc09c322871972f74877a712abc6c809"
 dependencies = [
  "lexical-util",
  "lexical-write-integer",
@@ -2391,9 +2531,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-write-integer"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+checksum = "eb89e9f6958b83258afa3deed90b5de9ef68eef090ad5086c791cd2345610162"
 dependencies = [
  "lexical-util",
  "static_assertions",
@@ -2451,9 +2591,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libmimalloc-sys"
@@ -2467,9 +2607,9 @@ dependencies = [
 
 [[package]]
 name = "libproc"
-version = "0.14.8"
+version = "0.14.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae9ea4b75e1a81675429dafe43441df1caea70081e82246a8cccf514884a88bb"
+checksum = "e78a09b56be5adbcad5aa1197371688dc6bb249a26da3bca2011ee2fb987ebfb"
 dependencies = [
  "bindgen",
  "errno",
@@ -2514,9 +2654,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.19"
+version = "1.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
 dependencies = [
  "cc",
  "libc",
@@ -2539,6 +2679,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -2549,6 +2695,12 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
 version = "0.4.22"
@@ -2557,11 +2709,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
 ]
 
 [[package]]
@@ -2575,9 +2727,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-server"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095"
+checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -2600,19 +2752,18 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.26.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
 dependencies = [
- "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.10.0"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -2700,29 +2851,29 @@ dependencies = [
 
 [[package]]
 name = "miette"
-version = "7.2.0"
+version = "7.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
+checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64"
 dependencies = [
  "backtrace",
  "backtrace-ext",
  "cfg-if",
  "miette-derive",
  "owo-colors",
- "supports-color 3.0.0",
+ "supports-color 3.0.1",
  "supports-hyperlinks",
  "supports-unicode",
  "terminal_size",
  "textwrap",
- "thiserror",
- "unicode-width",
+ "thiserror 1.0.69",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
 name = "miette-derive"
-version = "7.2.0"
+version = "7.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
+checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2760,15 +2911,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -3135,7 +3277,7 @@ name = "nu-command"
 version = "0.100.1"
 dependencies = [
  "alphanumeric-sort",
- "base64 0.22.1",
+ "base64",
  "bracoxide",
  "brotli",
  "byteorder",
@@ -3197,7 +3339,7 @@ dependencies = [
  "pretty_assertions",
  "print-positions",
  "procfs",
- "quick-xml 0.32.0",
+ "quick-xml 0.37.0",
  "quickcheck",
  "quickcheck_macros",
  "rand",
@@ -3216,19 +3358,19 @@ dependencies = [
  "sysinfo 0.32.0",
  "tabled",
  "tempfile",
- "terminal_size",
  "titlecase",
  "toml 0.8.19",
  "trash",
  "umask",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.2.0",
  "ureq",
  "url",
  "uu_cp",
  "uu_mkdir",
  "uu_mktemp",
  "uu_mv",
+ "uu_touch",
  "uu_uname",
  "uu_whoami",
  "uucore",
@@ -3236,7 +3378,7 @@ dependencies = [
  "v_htmlescape",
  "wax",
  "which",
- "windows",
+ "windows 0.56.0",
  "winreg",
 ]
 
@@ -3284,8 +3426,7 @@ dependencies = [
  "nu-utils",
  "ratatui",
  "strip-ansi-escapes",
- "terminal_size",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -3367,7 +3508,7 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "serde",
- "thiserror",
+ "thiserror 2.0.3",
  "typetag",
 ]
 
@@ -3382,7 +3523,7 @@ dependencies = [
  "rmp-serde",
  "serde",
  "serde_json",
- "windows",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3398,7 +3539,7 @@ dependencies = [
  "nu-utils",
  "serde",
  "typetag",
- "windows",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3473,7 +3614,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.3",
  "typetag",
  "windows-sys 0.48.0",
 ]
@@ -3503,7 +3644,7 @@ dependencies = [
  "ntapi",
  "procfs",
  "sysinfo 0.32.0",
- "windows",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3525,7 +3666,7 @@ name = "nu-term-grid"
 version = "0.100.1"
 dependencies = [
  "nu-utils",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -3886,9 +4027,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.3"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
@@ -3913,18 +4054,15 @@ checksum = "80adb31078122c880307e9cdfd4e3361e6545c319f9b9dcafcb03acd3b51a575"
 
 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "open"
-version = "5.3.0"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
+checksum = "3ecd52f0b8d15c40ce4820aa251ed5de032e5d91fab27f7db2f40d42a8bdf69c"
 dependencies = [
  "is-wsl",
  "libc",
@@ -3933,9 +4071,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -3965,18 +4103,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.3.1+3.3.1"
+version = "300.4.0+3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
+checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -4007,7 +4145,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75"
 dependencies = [
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -4022,9 +4160,9 @@ dependencies = [
 
 [[package]]
 name = "owo-colors"
-version = "4.0.0"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
+checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
 
 [[package]]
 name = "papergrid"
@@ -4036,7 +4174,7 @@ dependencies = [
  "ansitok",
  "bytecount",
  "fnv",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -4081,6 +4219,17 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "parse_datetime"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8720474e3dd4af20cea8716703498b9f3b690f318fa9d9d9e2e38eaf44b96d0"
+dependencies = [
+ "chrono",
+ "nom",
+ "regex",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -4089,9 +4238,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pathdiff"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
 
 [[package]]
 name = "percent-encoding"
@@ -4107,20 +4256,20 @@ checksum = "f658886ed52e196e850cfbbfddab9eaa7f6d90dd0929e264c31e5cec07e09e57"
 
 [[package]]
 name = "pest"
-version = "2.7.11"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
+checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.69",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.11"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
+checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4128,9 +4277,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.11"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
+checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
 dependencies = [
  "pest",
  "pest_meta",
@@ -4141,9 +4290,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.7.11"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
+checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
 dependencies = [
  "once_cell",
  "pest",
@@ -4233,9 +4382,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -4245,9 +4394,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "plain"
@@ -4266,9 +4415,9 @@ dependencies = [
 
 [[package]]
 name = "platform-info"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217"
+checksum = "91077ffd05d058d70d79eefcd7d7f6aac34980860a7519960f7913b6563a8c3a"
 dependencies = [
  "libc",
  "winapi",
@@ -4280,7 +4429,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "indexmap",
  "quick-xml 0.32.0",
  "serde",
@@ -4401,7 +4550,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "version_check",
  "xxhash-rust",
 ]
@@ -4416,7 +4565,7 @@ dependencies = [
  "polars-arrow-format",
  "regex",
  "simdutf8",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -4555,7 +4704,7 @@ checksum = "5ac14a136d87bea798f3db51d5987556deb2293da34bfc8b105ebffa05f6e810"
 dependencies = [
  "ahash 0.8.11",
  "argminmax",
- "base64 0.22.1",
+ "base64",
  "bytemuck",
  "chrono",
  "chrono-tz 0.8.6",
@@ -4591,7 +4740,7 @@ checksum = "491f5af321169259d5b1294c9fe8ed89faaeac34b4dec4abcedc0d1b3d11013a"
 dependencies = [
  "ahash 0.8.11",
  "async-stream",
- "base64 0.22.1",
+ "base64",
  "brotli",
  "bytemuck",
  "ethnum",
@@ -4775,9 +4924,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "powerfmt"
@@ -4829,9 +4978,9 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
  "yansi",
@@ -4848,11 +4997,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -4880,9 +5029,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -4915,9 +5064,9 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
 dependencies = [
  "cc",
 ]
@@ -4955,7 +5104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72c71c0c79b9701efe4e1e4b563b2016dd4ee789eb99badcb09d61ac4b92e4a2"
 dependencies = [
  "libc",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -4991,9 +5140,18 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.34.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbfb3ddf5364c9cfcd65549a1e7b801d0e8d1b14c1a1590a6408aa93cfbfa84"
 dependencies = [
  "memchr",
 ]
@@ -5098,14 +5256,14 @@ dependencies = [
  "strum",
  "unicode-segmentation",
  "unicode-truncate",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
 name = "raw-cpuid"
-version = "11.1.0"
+version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5158,9 +5316,9 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5173,14 +5331,13 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "reedline"
 version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9834765acaa2deedf29197f2da3d309801683beb20e25775bc0249f97a7b9a74"
+source = "git+https://github.com/nushell/reedline?branch=main#3c46dc2c0c69476a625611a556e67ddb8439629c"
 dependencies = [
  "arboard",
  "chrono",
@@ -5194,9 +5351,9 @@ dependencies = [
  "strip-ansi-escapes",
  "strum",
  "strum_macros",
- "thiserror",
+ "thiserror 1.0.69",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -5221,9 +5378,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5233,9 +5390,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5244,9 +5401,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "relative-path"
@@ -5265,16 +5422,16 @@ dependencies = [
 
 [[package]]
 name = "rfc2047-decoder"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e90a668c463c412c3118ae1883e18b53d812c349f5af7a06de3ba4bb0c17cc73"
+checksum = "bc36545d1021456a751b573517cb52e8c339b2f662e6b2778ef629282678de29"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "charset",
  "chumsky",
  "memchr",
  "quoted_printable",
- "thiserror",
+ "thiserror 2.0.3",
 ]
 
 [[package]]
@@ -5489,9 +5646,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -5510,20 +5667,20 @@ dependencies = [
 
 [[package]]
 name = "scc"
-version = "2.1.16"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb7ac86243095b70a7920639507b71d51a63390d1ba26c4f60a552fbb914a37"
+checksum = "66b202022bb57c049555430e11fc22fea12909276a80a4c3d368da36ac1d88ed"
 dependencies = [
  "sdd",
 ]
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5575,9 +5732,9 @@ dependencies = [
 
 [[package]]
 name = "sdd"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0495e4577c672de8254beb68d01a9b62d0e8a13c099edecdbedccce3223cd29f"
+checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95"
 
 [[package]]
 name = "seahash"
@@ -5600,9 +5757,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5635,18 +5792,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.208"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.208"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5655,9 +5812,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "indexmap",
  "itoa",
@@ -5679,9 +5836,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -5758,9 +5915,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca0e9bdc073d7173ba993fb7886477af5df75588b57afcb4b96f21911ab0bfa"
+checksum = "58cfcd0643497a9f780502063aecbcc4a3212cbe4948fd25ee8fd179c2cf9a18"
 dependencies = [
  "const_format",
  "is_debug",
@@ -5811,10 +5968,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "simd-json"
-version = "0.13.10"
+name = "simd-adler32"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simd-json"
+version = "0.13.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0228a564470f81724e30996bbc2b171713b37b15254a6440c7e2d5449b95691"
 dependencies = [
  "ahash 0.8.11",
  "getrandom",
@@ -5830,9 +5993,9 @@ dependencies = [
 
 [[package]]
 name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "similar"
@@ -5872,12 +6035,6 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
-[[package]]
-name = "smawk"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
-
 [[package]]
 name = "snap"
 version = "1.1.1"
@@ -5921,15 +6078,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stacker"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f"
+checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
 dependencies = [
  "cc",
  "cfg-if",
  "libc",
  "psm",
- "windows-sys 0.36.1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5940,9 +6097,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "str_indices"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c"
+checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6"
 
 [[package]]
 name = "streaming-decompression"
@@ -6040,9 +6197,9 @@ dependencies = [
 
 [[package]]
 name = "supports-color"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f"
+checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77"
 dependencies = [
  "is_ci",
 ]
@@ -6103,12 +6260,11 @@ dependencies = [
 ]
 
 [[package]]
-name = "syn_derive"
-version = "0.1.8"
+name = "synstructure"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
- "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
@@ -6116,9 +6272,9 @@ dependencies = [
 
 [[package]]
 name = "sys-locale"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
 dependencies = [
  "libc",
 ]
@@ -6133,7 +6289,7 @@ dependencies = [
  "libc",
  "memchr",
  "ntapi",
- "windows",
+ "windows 0.57.0",
 ]
 
 [[package]]
@@ -6147,7 +6303,7 @@ dependencies = [
  "memchr",
  "ntapi",
  "rayon",
- "windows",
+ "windows 0.57.0",
 ]
 
 [[package]]
@@ -6179,7 +6335,7 @@ dependencies = [
  "rand",
  "scroll",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -6229,12 +6385,12 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
 dependencies = [
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6249,25 +6405,44 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
- "smawk",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl 2.0.3",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6326,6 +6501,16 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.8.0"
@@ -6354,9 +6539,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
@@ -6370,9 +6555,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6403,7 +6588,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -6430,26 +6615,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow 0.6.20",
 ]
 
 [[package]]
@@ -6485,17 +6659,16 @@ dependencies = [
  "once_cell",
  "scopeguard",
  "urlencoding",
- "windows",
+ "windows 0.56.0",
 ]
 
 [[package]]
 name = "tree_magic_mini"
-version = "3.1.5"
+version = "3.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2"
+checksum = "aac5e8971f245c3389a5a76e648bfc80803ae066a1243a75db0064d7c1129d63"
 dependencies = [
  "fnv",
- "home",
  "memchr",
  "nom",
  "once_cell",
@@ -6552,9 +6725,9 @@ dependencies = [
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "umask"
@@ -6562,7 +6735,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec9a46c2549e35c054e0ffe281a3a6ec0007793db4df106604d37ed3f4d73d1c"
 dependencies = [
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -6571,12 +6744,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
@@ -6589,15 +6756,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-reverse"
 version = "1.0.9"
@@ -6621,7 +6779,7 @@ checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
 dependencies = [
  "itertools 0.13.0",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -6631,10 +6789,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
-name = "unicode-xid"
-version = "0.2.5"
+name = "unicode-width"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "unsafe-libyaml"
@@ -6648,7 +6812,7 @@ version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "encoding_rs",
  "flate2",
  "log",
@@ -6661,9 +6825,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -6683,12 +6847,24 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
 [[package]]
 name = "utf8-width"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -6697,9 +6873,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uu_cp"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb99d355ccb02e8c514e4a1d93e4aa4eedea9837de24635dfd24c165971444e"
+checksum = "e0eff79f5eacf6bb88c9afc19f3cec2ab14ad31317be1369100658b46d41e410"
 dependencies = [
  "clap",
  "filetime",
@@ -6713,9 +6889,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mkdir"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219588fbc146f18188781208ac4034616c51cf151677b4e1f9caf63ca8a7f2cf"
+checksum = "feba7cf875eecbb746b1c5a5a8a031ab3a00e5f44f5441643a06b78577780d3a"
 dependencies = [
  "clap",
  "uucore",
@@ -6723,9 +6899,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mktemp"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e79ad2c5911908fce23a6069c52ca82e1997e2ed4bf6abf2d867c79c3dc73f"
+checksum = "1a9cfd389f60e667c5ee6659beaad50bada7e710d76082c7d77ab91e04307c8f"
 dependencies = [
  "clap",
  "rand",
@@ -6735,9 +6911,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mv"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd57c8d02f8a99ed56ed9f6fddab403ee0e2bf9e8f3a5ca8f0f9e4d6e3e392a0"
+checksum = "bf932231fccdf108f75443bab0ce17acfe49b5825d731b8a358251833be7da20"
 dependencies = [
  "clap",
  "fs_extra",
@@ -6746,10 +6922,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "uu_uname"
-version = "0.0.27"
+name = "uu_touch"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1ca90f9b292bccaad0de70e6feccac5182c6713a5e1ca72d97bf3555b608b4"
+checksum = "55476bec11d5b70c578233a2e94f685058e0d65fc5d66c7ed465877c15124c7c"
+dependencies = [
+ "chrono",
+ "clap",
+ "filetime",
+ "parse_datetime",
+ "uucore",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "uu_uname"
+version = "0.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "182b4071a2e6f7288cbbc1b1ff05c74e9dc7527b4735583d9e3cd92802b06910"
 dependencies = [
  "clap",
  "platform-info",
@@ -6758,27 +6948,27 @@ dependencies = [
 
 [[package]]
 name = "uu_whoami"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7c52e42e0425710461700adc1063f468f2ba8a8ff83ee69ba661095ab7b77a"
+checksum = "5d15200414428c65f95d0b1d1226fc84f74ae80376bfe59959d93ddf57f944f5"
 dependencies = [
  "clap",
  "libc",
  "uucore",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "uucore"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b54aad02cf7e96f5fafabb6b836efa73eef934783b17530095a29ffd4fdc154"
+checksum = "04ea43050c46912575654c5181f4135529e8d4003fca80803af10cdef3ca6412"
 dependencies = [
  "clap",
  "dunce",
  "glob",
  "libc",
- "nix 0.28.0",
+ "nix 0.29.0",
  "number_prefix",
  "once_cell",
  "os_display",
@@ -6786,7 +6976,7 @@ dependencies = [
  "walkdir",
  "wild",
  "winapi-util",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
  "xattr",
 ]
 
@@ -6905,9 +7095,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6916,9 +7106,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -6931,9 +7121,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6941,9 +7131,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6954,9 +7144,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wax"
@@ -6969,15 +7159,15 @@ dependencies = [
  "nom",
  "pori",
  "regex",
- "thiserror",
+ "thiserror 1.0.69",
  "walkdir",
 ]
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
+checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -6989,9 +7179,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.5"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
+checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
 dependencies = [
  "bitflags 2.6.0",
  "rustix",
@@ -7026,26 +7216,36 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.4"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
+checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.34.0",
+ "quick-xml 0.36.2",
  "quote",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.4"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
+checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
 dependencies = [
  "dlib",
  "log",
  "pkg-config",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpage"
 version = "2.0.1"
@@ -7128,6 +7328,16 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core 0.57.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -7143,8 +7353,20 @@ version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.56.0",
+ "windows-interface 0.56.0",
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement 0.57.0",
+ "windows-interface 0.57.0",
  "windows-result",
  "windows-targets 0.52.6",
 ]
@@ -7160,6 +7382,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.56.0"
@@ -7171,6 +7404,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -7180,19 +7424,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -7263,12 +7494,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -7281,12 +7506,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -7305,12 +7524,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -7323,12 +7536,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -7353,12 +7560,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -7382,9 +7583,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
@@ -7427,7 +7628,7 @@ dependencies = [
  "nix 0.28.0",
  "os_pipe",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
  "tree_magic_mini",
  "wayland-backend",
  "wayland-client",
@@ -7435,6 +7636,18 @@ dependencies = [
  "wayland-protocols-wlr",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -7491,9 +7704,33 @@ checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
 
 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
 
 [[package]]
 name = "zerocopy"
@@ -7517,15 +7754,77 @@ dependencies = [
 ]
 
 [[package]]
-name = "zip"
-version = "0.6.6"
+name = "zerofrom"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
 dependencies = [
- "byteorder",
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zip"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+dependencies = [
+ "arbitrary",
  "crc32fast",
  "crossbeam-utils",
+ "displaydoc",
  "flate2",
+ "indexmap",
+ "memchr",
+ "thiserror 1.0.69",
+ "zopfli",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index a976aeec17..67c9e18c41 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,7 +71,7 @@ brotli = "6.0"
 byteorder = "1.5"
 bytes = "1"
 bytesize = "1.3"
-calamine = "0.24.0"
+calamine = "0.26.1"
 chardetng = "0.1.17"
 chrono = { default-features = false, version = "0.4.34" }
 chrono-humanize = "0.2.3"
@@ -106,7 +106,7 @@ lsp-server = "0.7.5"
 lsp-types = { version = "0.95.0", features = ["proposed"] }
 mach2 = "0.4"
 md5 = { version = "0.10", package = "md-5" }
-miette = "7.2"
+miette = "7.3"
 mime = "0.3.17"
 mime_guess = "2.0"
 mockito = { version = "1.6", default-features = false }
@@ -129,7 +129,7 @@ proc-macro-error = { version = "1.0", default-features = false }
 proc-macro2 = "1.0"
 procfs = "0.16.0"
 pwd = "1.3"
-quick-xml = "0.32.0"
+quick-xml = "0.37.0"
 quickcheck = "1.0"
 quickcheck_macros = "1.0"
 quote = "1.0"
@@ -156,22 +156,23 @@ syn = "2.0"
 sysinfo = "0.32"
 tabled = { version = "0.16.0", default-features = false }
 tempfile = "3.14"
-terminal_size = "0.3"
+terminal_size = "0.4"
 titlecase = "2.0"
 toml = "0.8"
 trash = "5.2"
 umask = "2.1"
 unicode-segmentation = "1.12"
-unicode-width = "0.1"
+unicode-width = "0.2"
 ureq = { version = "2.10", default-features = false }
 url = "2.2"
-uu_cp = "0.0.27"
-uu_mkdir = "0.0.27"
-uu_mktemp = "0.0.27"
-uu_mv = "0.0.27"
-uu_whoami = "0.0.27"
-uu_uname = "0.0.27"
-uucore = "0.0.27"
+uu_cp = "0.0.28"
+uu_mkdir = "0.0.28"
+uu_mktemp = "0.0.28"
+uu_mv = "0.0.28"
+uu_touch = "0.0.28"
+uu_whoami = "0.0.28"
+uu_uname = "0.0.28"
+uucore = "0.0.28"
 uuid = "1.11.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
@@ -313,7 +314,7 @@ bench = false
 # To use a development version of a dependency please use a global override here
 # changing versions in each sub-crate of the workspace is tedious
 [patch.crates-io]
-# reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
+reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
 # nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"}
 
 # Run all benchmarks with `cargo bench`
diff --git a/README.md b/README.md
index 66988a104d..698a06e4f3 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ For details about which platforms the Nushell team actively supports, see [our p
 
 ## Configuration
 
-The default configurations can be found at [sample_config](crates/nu-utils/src/sample_config)
+The default configurations can be found at [sample_config](crates/nu-utils/src/default_files)
 which are the configuration files one gets when they startup Nushell for the first time.
 
 It sets all of the default configuration to run Nushell.  From here one can
diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index 0086270ac5..b12df4735a 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -1,5 +1,7 @@
+use std::collections::HashMap;
+
 use crate::{
-    completions::{Completer, CompletionOptions, MatchAlgorithm},
+    completions::{Completer, CompletionOptions},
     SuggestionKind,
 };
 use nu_parser::FlatShape;
@@ -9,7 +11,7 @@ use nu_protocol::{
 };
 use reedline::Suggestion;
 
-use super::{completion_common::sort_suggestions, SemanticSuggestion};
+use super::{completion_options::NuMatcher, SemanticSuggestion};
 
 pub struct CommandCompletion {
     flattened: Vec<(Span, FlatShape)>,
@@ -33,10 +35,11 @@ impl CommandCompletion {
     fn external_command_completion(
         &self,
         working_set: &StateWorkingSet,
-        prefix: &str,
-        match_algorithm: MatchAlgorithm,
-    ) -> Vec<String> {
-        let mut executables = vec![];
+        sugg_span: reedline::Span,
+        matched_internal: impl Fn(&str) -> bool,
+        matcher: &mut NuMatcher<String>,
+    ) -> HashMap<String, SemanticSuggestion> {
+        let mut suggs = HashMap::new();
 
         // os agnostic way to get the PATH env var
         let paths = working_set.permanent_state.get_path_env_var();
@@ -54,24 +57,38 @@ impl CommandCompletion {
                                 .completions
                                 .external
                                 .max_results
-                                > executables.len() as i64
-                                && !executables.contains(
-                                    &item
-                                        .path()
-                                        .file_name()
-                                        .map(|x| x.to_string_lossy().to_string())
-                                        .unwrap_or_default(),
-                                )
-                                && matches!(
-                                    item.path().file_name().map(|x| match_algorithm
-                                        .matches_str(&x.to_string_lossy(), prefix)),
-                                    Some(true)
-                                )
-                                && is_executable::is_executable(item.path())
+                                <= suggs.len() as i64
                             {
-                                if let Ok(name) = item.file_name().into_string() {
-                                    executables.push(name);
-                                }
+                                break;
+                            }
+                            let Ok(name) = item.file_name().into_string() else {
+                                continue;
+                            };
+                            let value = if matched_internal(&name) {
+                                format!("^{}", name)
+                            } else {
+                                name.clone()
+                            };
+                            if suggs.contains_key(&value) {
+                                continue;
+                            }
+                            if matcher.matches(&name) && is_executable::is_executable(item.path()) {
+                                // If there's an internal command with the same name, adds ^cmd to the
+                                // matcher so that both the internal and external command are included
+                                matcher.add(&name, value.clone());
+                                suggs.insert(
+                                    value.clone(),
+                                    SemanticSuggestion {
+                                        suggestion: Suggestion {
+                                            value,
+                                            span: sugg_span,
+                                            append_whitespace: true,
+                                            ..Default::default()
+                                        },
+                                        // TODO: is there a way to create a test?
+                                        kind: None,
+                                    },
+                                );
                             }
                         }
                     }
@@ -79,7 +96,7 @@ impl CommandCompletion {
             }
         }
 
-        executables
+        suggs
     }
 
     fn complete_commands(
@@ -88,68 +105,59 @@ impl CommandCompletion {
         span: Span,
         offset: usize,
         find_externals: bool,
-        match_algorithm: MatchAlgorithm,
+        options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
         let partial = working_set.get_span_contents(span);
+        let mut matcher = NuMatcher::new(String::from_utf8_lossy(partial), options.clone());
 
-        let filter_predicate = |command: &[u8]| match_algorithm.matches_u8(command, partial);
+        let sugg_span = reedline::Span::new(span.start - offset, span.end - offset);
 
-        let mut results = working_set
-            .find_commands_by_predicate(filter_predicate, true)
-            .into_iter()
-            .map(move |x| SemanticSuggestion {
-                suggestion: Suggestion {
-                    value: String::from_utf8_lossy(&x.0).to_string(),
-                    description: x.1,
-                    span: reedline::Span::new(span.start - offset, span.end - offset),
-                    append_whitespace: true,
-                    ..Suggestion::default()
-                },
-                kind: Some(SuggestionKind::Command(x.2)),
-            })
-            .collect::<Vec<_>>();
-
-        let partial = working_set.get_span_contents(span);
-        let partial = String::from_utf8_lossy(partial).to_string();
-
-        if find_externals {
-            let results_external = self
-                .external_command_completion(working_set, &partial, match_algorithm)
-                .into_iter()
-                .map(move |x| SemanticSuggestion {
+        let mut internal_suggs = HashMap::new();
+        let filtered_commands = working_set.find_commands_by_predicate(
+            |name| {
+                let name = String::from_utf8_lossy(name);
+                matcher.add(&name, name.to_string())
+            },
+            true,
+        );
+        for (name, description, typ) in filtered_commands {
+            let name = String::from_utf8_lossy(&name);
+            internal_suggs.insert(
+                name.to_string(),
+                SemanticSuggestion {
                     suggestion: Suggestion {
-                        value: x,
-                        span: reedline::Span::new(span.start - offset, span.end - offset),
+                        value: name.to_string(),
+                        description,
+                        span: sugg_span,
                         append_whitespace: true,
                         ..Suggestion::default()
                     },
-                    // TODO: is there a way to create a test?
-                    kind: None,
-                });
-
-            let results_strings: Vec<String> =
-                results.iter().map(|x| x.suggestion.value.clone()).collect();
-
-            for external in results_external {
-                if results_strings.contains(&external.suggestion.value) {
-                    results.push(SemanticSuggestion {
-                        suggestion: Suggestion {
-                            value: format!("^{}", external.suggestion.value),
-                            span: external.suggestion.span,
-                            append_whitespace: true,
-                            ..Suggestion::default()
-                        },
-                        kind: external.kind,
-                    })
-                } else {
-                    results.push(external)
-                }
-            }
-
-            results
-        } else {
-            results
+                    kind: Some(SuggestionKind::Command(typ)),
+                },
+            );
         }
+
+        let mut external_suggs = if find_externals {
+            self.external_command_completion(
+                working_set,
+                sugg_span,
+                |name| internal_suggs.contains_key(name),
+                &mut matcher,
+            )
+        } else {
+            HashMap::new()
+        };
+
+        let mut res = Vec::new();
+        for cmd_name in matcher.results() {
+            if let Some(sugg) = internal_suggs
+                .remove(&cmd_name)
+                .or_else(|| external_suggs.remove(&cmd_name))
+            {
+                res.push(sugg);
+            }
+        }
+        res
     }
 }
 
@@ -158,7 +166,7 @@ impl Completer for CommandCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        prefix: &[u8],
+        _prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,
@@ -188,18 +196,18 @@ impl Completer for CommandCompletion {
                 Span::new(last.0.start, pos),
                 offset,
                 false,
-                options.match_algorithm,
+                options,
             )
         } else {
             vec![]
         };
 
         if !subcommands.is_empty() {
-            return sort_suggestions(&String::from_utf8_lossy(prefix), subcommands, options);
+            return subcommands;
         }
 
         let config = working_set.get_config();
-        let commands = if matches!(self.flat_shape, nu_parser::FlatShape::External)
+        if matches!(self.flat_shape, nu_parser::FlatShape::External)
             || matches!(self.flat_shape, nu_parser::FlatShape::InternalCall(_))
             || ((span.end - span.start) == 0)
             || is_passthrough_command(working_set.delta.get_file_contents())
@@ -214,13 +222,11 @@ impl Completer for CommandCompletion {
                 span,
                 offset,
                 config.completions.external.enable,
-                options.match_algorithm,
+                options,
             )
         } else {
             vec![]
-        };
-
-        sort_suggestions(&String::from_utf8_lossy(prefix), commands, options)
+        }
     }
 }
 
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index fc7a5fcd2c..4b5ef857e1 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -1,22 +1,20 @@
-use super::MatchAlgorithm;
-use crate::{
-    completions::{matches, CompletionOptions},
-    SemanticSuggestion,
-};
-use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
+use super::{completion_options::NuMatcher, MatchAlgorithm};
+use crate::completions::CompletionOptions;
 use nu_ansi_term::Style;
 use nu_engine::env_to_string;
 use nu_path::dots::expand_ndots;
 use nu_path::{expand_to_real_path, home_dir};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
-    CompletionSort, Span,
+    Span,
 };
 use nu_utils::get_ls_colors;
+use nu_utils::IgnoreCaseExt;
 use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
 
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {
+    cwd: PathBuf,
     parts: Vec<String>,
     isdir: bool,
 }
@@ -30,76 +28,84 @@ pub struct PathBuiltFromString {
 /// want_directory: Whether we want only directories as completion matches.
 /// Some commands like `cd` can only be run on directories whereas others
 /// like `ls` can be run on regular files as well.
-pub fn complete_rec(
+fn complete_rec(
     partial: &[&str],
-    built: &PathBuiltFromString,
-    cwd: &Path,
+    built_paths: &[PathBuiltFromString],
     options: &CompletionOptions,
     want_directory: bool,
     isdir: bool,
 ) -> Vec<PathBuiltFromString> {
-    let mut completions = vec![];
-
     if let Some((&base, rest)) = partial.split_first() {
         if base.chars().all(|c| c == '.') && (isdir || !rest.is_empty()) {
-            let mut built = built.clone();
-            built.parts.push(base.to_string());
-            built.isdir = true;
-            return complete_rec(rest, &built, cwd, options, want_directory, isdir);
-        }
-    }
-
-    let mut built_path = cwd.to_path_buf();
-    for part in &built.parts {
-        built_path.push(part);
-    }
-
-    let Ok(result) = built_path.read_dir() else {
-        return completions;
-    };
-
-    let mut entries = Vec::new();
-    for entry in result.filter_map(|e| e.ok()) {
-        let entry_name = entry.file_name().to_string_lossy().into_owned();
-        let entry_isdir = entry.path().is_dir();
-        let mut built = built.clone();
-        built.parts.push(entry_name.clone());
-        built.isdir = entry_isdir;
-
-        if !want_directory || entry_isdir {
-            entries.push((entry_name, built));
+            let built_paths: Vec<_> = built_paths
+                .iter()
+                .map(|built| {
+                    let mut built = built.clone();
+                    built.parts.push(base.to_string());
+                    built.isdir = true;
+                    built
+                })
+                .collect();
+            return complete_rec(rest, &built_paths, options, want_directory, isdir);
         }
     }
 
     let prefix = partial.first().unwrap_or(&"");
-    let sorted_entries = sort_completions(prefix, entries, options, |(entry, _)| entry);
+    let mut matcher = NuMatcher::new(prefix, options.clone());
 
-    for (entry_name, built) in sorted_entries {
+    for built in built_paths {
+        let mut path = built.cwd.clone();
+        for part in &built.parts {
+            path.push(part);
+        }
+
+        let Ok(result) = path.read_dir() else {
+            continue;
+        };
+
+        for entry in result.filter_map(|e| e.ok()) {
+            let entry_name = entry.file_name().to_string_lossy().into_owned();
+            let entry_isdir = entry.path().is_dir();
+            let mut built = built.clone();
+            built.parts.push(entry_name.clone());
+            built.isdir = entry_isdir;
+
+            if !want_directory || entry_isdir {
+                matcher.add(entry_name.clone(), (entry_name, built));
+            }
+        }
+    }
+
+    let mut completions = vec![];
+    for (entry_name, built) in matcher.results() {
         match partial.split_first() {
             Some((base, rest)) => {
-                if matches(base, &entry_name, options) {
-                    // We use `isdir` to confirm that the current component has
-                    // at least one next component or a slash.
-                    // Serves as confirmation to ignore longer completions for
-                    // components in between.
-                    if !rest.is_empty() || isdir {
-                        completions.extend(complete_rec(
-                            rest,
-                            &built,
-                            cwd,
-                            options,
-                            want_directory,
-                            isdir,
-                        ));
-                    } else {
-                        completions.push(built);
-                    }
+                // We use `isdir` to confirm that the current component has
+                // at least one next component or a slash.
+                // Serves as confirmation to ignore longer completions for
+                // components in between.
+                if !rest.is_empty() || isdir {
+                    completions.extend(complete_rec(
+                        rest,
+                        &[built],
+                        options,
+                        want_directory,
+                        isdir,
+                    ));
+                } else {
+                    completions.push(built);
                 }
-                if entry_name.eq(base)
-                    && matches!(options.match_algorithm, MatchAlgorithm::Prefix)
-                    && isdir
-                {
-                    break;
+
+                // For https://github.com/nushell/nushell/issues/13204
+                if isdir && options.match_algorithm == MatchAlgorithm::Prefix {
+                    let exact_match = if options.case_sensitive {
+                        entry_name.eq(base)
+                    } else {
+                        entry_name.to_folded_case().eq(&base.to_folded_case())
+                    };
+                    if exact_match {
+                        break;
+                    }
                 }
             }
             None => {
@@ -147,15 +153,25 @@ fn surround_remove(partial: &str) -> String {
     partial.to_string()
 }
 
+pub struct FileSuggestion {
+    pub span: nu_protocol::Span,
+    pub path: String,
+    pub style: Option<Style>,
+    pub cwd: PathBuf,
+}
+
+/// # Parameters
+/// * `cwds` - A list of directories in which to search. The only reason this isn't a single string
+///   is because dotnu_completions searches in multiple directories at once
 pub fn complete_item(
     want_directory: bool,
     span: nu_protocol::Span,
     partial: &str,
-    cwd: &str,
+    cwds: &[impl AsRef<str>],
     options: &CompletionOptions,
     engine_state: &EngineState,
     stack: &Stack,
-) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
+) -> Vec<FileSuggestion> {
     let cleaned_partial = surround_remove(partial);
     let isdir = cleaned_partial.ends_with(is_separator);
     let expanded_partial = expand_ndots(Path::new(&cleaned_partial));
@@ -175,7 +191,10 @@ pub fn complete_item(
         partial.push_str(&format!("{path_separator}."));
     }
 
-    let cwd_pathbuf = Path::new(cwd).to_path_buf();
+    let cwd_pathbufs: Vec<_> = cwds
+        .iter()
+        .map(|cwd| Path::new(cwd.as_ref()).to_path_buf())
+        .collect();
     let ls_colors = (engine_state.config.completions.use_ls_colors
         && engine_state.config.use_ansi_coloring)
         .then(|| {
@@ -186,7 +205,7 @@ pub fn complete_item(
             get_ls_colors(ls_colors_env_str)
         });
 
-    let mut cwd = cwd_pathbuf.clone();
+    let mut cwds = cwd_pathbufs.clone();
     let mut prefix_len = 0;
     let mut original_cwd = OriginalCwd::None;
 
@@ -194,19 +213,21 @@ pub fn complete_item(
     match components.peek().cloned() {
         Some(c @ Component::Prefix(..)) => {
             // windows only by definition
-            cwd = [c, Component::RootDir].iter().collect();
+            cwds = vec![[c, Component::RootDir].iter().collect()];
             prefix_len = c.as_os_str().len();
             original_cwd = OriginalCwd::Prefix(c.as_os_str().to_string_lossy().into_owned());
         }
         Some(c @ Component::RootDir) => {
             // This is kind of a hack. When joining an empty string with the rest,
             // we add the slash automagically
-            cwd = PathBuf::from(c.as_os_str());
+            cwds = vec![PathBuf::from(c.as_os_str())];
             prefix_len = 1;
             original_cwd = OriginalCwd::Prefix(String::new());
         }
         Some(Component::Normal(home)) if home.to_string_lossy() == "~" => {
-            cwd = home_dir().map(Into::into).unwrap_or(cwd_pathbuf);
+            cwds = home_dir()
+                .map(|dir| vec![dir.into()])
+                .unwrap_or(cwd_pathbufs);
             prefix_len = 1;
             original_cwd = OriginalCwd::Home;
         }
@@ -223,8 +244,14 @@ pub fn complete_item(
 
     complete_rec(
         partial.as_slice(),
-        &PathBuiltFromString::default(),
-        &cwd,
+        &cwds
+            .into_iter()
+            .map(|cwd| PathBuiltFromString {
+                cwd,
+                parts: Vec::new(),
+                isdir: false,
+            })
+            .collect::<Vec<_>>(),
         options,
         want_directory,
         isdir,
@@ -234,6 +261,7 @@ pub fn complete_item(
         if should_collapse_dots {
             p = collapse_ndots(p);
         }
+        let cwd = p.cwd.clone();
         let path = original_cwd.apply(p, path_separator);
         let style = ls_colors.as_ref().map(|lsc| {
             lsc.style_for_path_with_metadata(
@@ -245,7 +273,12 @@ pub fn complete_item(
             .map(lscolors::Style::to_nu_ansi_term_style)
             .unwrap_or_default()
         });
-        (span, escape_path(path, want_directory), style)
+        FileSuggestion {
+            span,
+            path: escape_path(path, want_directory),
+            style,
+            cwd,
+        }
     })
     .collect()
 }
@@ -310,45 +343,6 @@ pub fn adjust_if_intermediate(
     }
 }
 
-/// Convenience function to sort suggestions using [`sort_completions`]
-pub fn sort_suggestions(
-    prefix: &str,
-    items: Vec<SemanticSuggestion>,
-    options: &CompletionOptions,
-) -> Vec<SemanticSuggestion> {
-    sort_completions(prefix, items, options, |it| &it.suggestion.value)
-}
-
-/// # Arguments
-/// * `prefix` - What the user's typed, for sorting by fuzzy matcher score
-pub fn sort_completions<T>(
-    prefix: &str,
-    mut items: Vec<T>,
-    options: &CompletionOptions,
-    get_value: fn(&T) -> &str,
-) -> Vec<T> {
-    // Sort items
-    if options.sort == CompletionSort::Smart && options.match_algorithm == MatchAlgorithm::Fuzzy {
-        let mut matcher = SkimMatcherV2::default();
-        if options.case_sensitive {
-            matcher = matcher.respect_case();
-        } else {
-            matcher = matcher.ignore_case();
-        };
-        items.sort_unstable_by(|a, b| {
-            let a_str = get_value(a);
-            let b_str = get_value(b);
-            let a_score = matcher.fuzzy_match(a_str, prefix).unwrap_or_default();
-            let b_score = matcher.fuzzy_match(b_str, prefix).unwrap_or_default();
-            b_score.cmp(&a_score).then(a_str.cmp(b_str))
-        });
-    } else {
-        items.sort_unstable_by(|a, b| get_value(a).cmp(get_value(b)));
-    }
-
-    items
-}
-
 /// Collapse multiple ".." components into n-dots.
 ///
 /// It performs the reverse operation of `expand_ndots`, collapsing sequences of ".." into n-dots,
@@ -359,6 +353,7 @@ fn collapse_ndots(path: PathBuiltFromString) -> PathBuiltFromString {
     let mut result = PathBuiltFromString {
         parts: Vec::with_capacity(path.parts.len()),
         isdir: path.isdir,
+        cwd: path.cwd,
     };
 
     let mut dot_count = 0;
diff --git a/crates/nu-cli/src/completions/completion_options.rs b/crates/nu-cli/src/completions/completion_options.rs
index 880aa54fb1..9165bd32f9 100644
--- a/crates/nu-cli/src/completions/completion_options.rs
+++ b/crates/nu-cli/src/completions/completion_options.rs
@@ -1,7 +1,10 @@
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use nu_parser::trim_quotes_str;
 use nu_protocol::{CompletionAlgorithm, CompletionSort};
-use std::fmt::Display;
+use nu_utils::IgnoreCaseExt;
+use std::{borrow::Cow, fmt::Display};
+
+use super::SemanticSuggestion;
 
 /// Describes how suggestions should be matched.
 #[derive(Copy, Clone, Debug, PartialEq)]
@@ -19,33 +22,154 @@ pub enum MatchAlgorithm {
     Fuzzy,
 }
 
-impl MatchAlgorithm {
-    /// Returns whether the `needle` search text matches the given `haystack`.
-    pub fn matches_str(&self, haystack: &str, needle: &str) -> bool {
-        let haystack = trim_quotes_str(haystack);
-        let needle = trim_quotes_str(needle);
-        match *self {
-            MatchAlgorithm::Prefix => haystack.starts_with(needle),
+pub struct NuMatcher<T> {
+    options: CompletionOptions,
+    needle: String,
+    state: State<T>,
+}
+
+enum State<T> {
+    Prefix {
+        /// Holds (haystack, item)
+        items: Vec<(String, T)>,
+    },
+    Fuzzy {
+        matcher: Box<SkimMatcherV2>,
+        /// Holds (haystack, item, score)
+        items: Vec<(String, T, i64)>,
+    },
+}
+
+/// Filters and sorts suggestions
+impl<T> NuMatcher<T> {
+    /// # Arguments
+    ///
+    /// * `needle` - The text to search for
+    pub fn new(needle: impl AsRef<str>, options: CompletionOptions) -> NuMatcher<T> {
+        let orig_needle = trim_quotes_str(needle.as_ref());
+        let lowercase_needle = if options.case_sensitive {
+            orig_needle.to_owned()
+        } else {
+            orig_needle.to_folded_case()
+        };
+        match options.match_algorithm {
+            MatchAlgorithm::Prefix => NuMatcher {
+                options,
+                needle: lowercase_needle,
+                state: State::Prefix { items: Vec::new() },
+            },
             MatchAlgorithm::Fuzzy => {
-                let matcher = SkimMatcherV2::default();
-                matcher.fuzzy_match(haystack, needle).is_some()
+                let mut matcher = SkimMatcherV2::default();
+                if options.case_sensitive {
+                    matcher = matcher.respect_case();
+                } else {
+                    matcher = matcher.ignore_case();
+                };
+                NuMatcher {
+                    options,
+                    needle: orig_needle.to_owned(),
+                    state: State::Fuzzy {
+                        matcher: Box::new(matcher),
+                        items: Vec::new(),
+                    },
+                }
             }
         }
     }
 
-    /// Returns whether the `needle` search text matches the given `haystack`.
-    pub fn matches_u8(&self, haystack: &[u8], needle: &[u8]) -> bool {
-        match *self {
-            MatchAlgorithm::Prefix => haystack.starts_with(needle),
-            MatchAlgorithm::Fuzzy => {
-                let haystack_str = String::from_utf8_lossy(haystack);
-                let needle_str = String::from_utf8_lossy(needle);
-
-                let matcher = SkimMatcherV2::default();
-                matcher.fuzzy_match(&haystack_str, &needle_str).is_some()
+    /// Returns whether or not the haystack matches the needle. If it does, `item` is added
+    /// to the list of matches (if given).
+    ///
+    /// Helper to avoid code duplication between [NuMatcher::add] and [NuMatcher::matches].
+    fn matches_aux(&mut self, haystack: &str, item: Option<T>) -> bool {
+        let haystack = trim_quotes_str(haystack);
+        match &mut self.state {
+            State::Prefix { items } => {
+                let haystack_folded = if self.options.case_sensitive {
+                    Cow::Borrowed(haystack)
+                } else {
+                    Cow::Owned(haystack.to_folded_case())
+                };
+                let matches = if self.options.positional {
+                    haystack_folded.starts_with(self.needle.as_str())
+                } else {
+                    haystack_folded.contains(self.needle.as_str())
+                };
+                if matches {
+                    if let Some(item) = item {
+                        items.push((haystack.to_string(), item));
+                    }
+                }
+                matches
+            }
+            State::Fuzzy { items, matcher } => {
+                let Some(score) = matcher.fuzzy_match(haystack, &self.needle) else {
+                    return false;
+                };
+                if let Some(item) = item {
+                    items.push((haystack.to_string(), item, score));
+                }
+                true
             }
         }
     }
+
+    /// Add the given item if the given haystack matches the needle.
+    ///
+    /// Returns whether the item was added.
+    pub fn add(&mut self, haystack: impl AsRef<str>, item: T) -> bool {
+        self.matches_aux(haystack.as_ref(), Some(item))
+    }
+
+    /// Returns whether the haystack matches the needle.
+    pub fn matches(&mut self, haystack: &str) -> bool {
+        self.matches_aux(haystack, None)
+    }
+
+    /// Get all the items that matched (sorted)
+    pub fn results(self) -> Vec<T> {
+        match self.state {
+            State::Prefix { mut items, .. } => {
+                items.sort_by(|(haystack1, _), (haystack2, _)| {
+                    let cmp_sensitive = haystack1.cmp(haystack2);
+                    if self.options.case_sensitive {
+                        cmp_sensitive
+                    } else {
+                        haystack1
+                            .to_folded_case()
+                            .cmp(&haystack2.to_folded_case())
+                            .then(cmp_sensitive)
+                    }
+                });
+                items.into_iter().map(|(_, item)| item).collect::<Vec<_>>()
+            }
+            State::Fuzzy { mut items, .. } => {
+                match self.options.sort {
+                    CompletionSort::Alphabetical => {
+                        items.sort_by(|(haystack1, _, _), (haystack2, _, _)| {
+                            haystack1.cmp(haystack2)
+                        });
+                    }
+                    CompletionSort::Smart => {
+                        items.sort_by(|(haystack1, _, score1), (haystack2, _, score2)| {
+                            score2.cmp(score1).then(haystack1.cmp(haystack2))
+                        });
+                    }
+                }
+                items
+                    .into_iter()
+                    .map(|(_, item, _)| item)
+                    .collect::<Vec<_>>()
+            }
+        }
+    }
+}
+
+impl NuMatcher<SemanticSuggestion> {
+    pub fn add_semantic_suggestion(&mut self, sugg: SemanticSuggestion) -> bool {
+        let value = sugg.suggestion.value.to_string();
+        self.add(value, sugg)
+    }
 }
 
 impl From<CompletionAlgorithm> for MatchAlgorithm {
@@ -105,35 +229,49 @@ impl Default for CompletionOptions {
 
 #[cfg(test)]
 mod test {
-    use super::MatchAlgorithm;
+    use rstest::rstest;
 
-    #[test]
-    fn match_algorithm_prefix() {
-        let algorithm = MatchAlgorithm::Prefix;
+    use super::{CompletionOptions, MatchAlgorithm, NuMatcher};
 
-        assert!(algorithm.matches_str("example text", ""));
-        assert!(algorithm.matches_str("example text", "examp"));
-        assert!(!algorithm.matches_str("example text", "text"));
-
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[]));
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[1, 2]));
-        assert!(!algorithm.matches_u8(&[1, 2, 3], &[2, 3]));
+    #[rstest]
+    #[case(MatchAlgorithm::Prefix, "example text", "", true)]
+    #[case(MatchAlgorithm::Prefix, "example text", "examp", true)]
+    #[case(MatchAlgorithm::Prefix, "example text", "text", false)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "", true)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "examp", true)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "ext", true)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "mplxt", true)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "mpp", false)]
+    fn match_algorithm_simple(
+        #[case] match_algorithm: MatchAlgorithm,
+        #[case] haystack: &str,
+        #[case] needle: &str,
+        #[case] should_match: bool,
+    ) {
+        let options = CompletionOptions {
+            match_algorithm,
+            ..Default::default()
+        };
+        let mut matcher = NuMatcher::new(needle, options);
+        matcher.add(haystack, haystack);
+        if should_match {
+            assert_eq!(vec![haystack], matcher.results());
+        } else {
+            assert_ne!(vec![haystack], matcher.results());
+        }
     }
 
     #[test]
-    fn match_algorithm_fuzzy() {
-        let algorithm = MatchAlgorithm::Fuzzy;
-
-        assert!(algorithm.matches_str("example text", ""));
-        assert!(algorithm.matches_str("example text", "examp"));
-        assert!(algorithm.matches_str("example text", "ext"));
-        assert!(algorithm.matches_str("example text", "mplxt"));
-        assert!(!algorithm.matches_str("example text", "mpp"));
-
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[]));
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[1, 2]));
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[2, 3]));
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[1, 3]));
-        assert!(!algorithm.matches_u8(&[1, 2, 3], &[2, 2]));
+    fn match_algorithm_fuzzy_sort_score() {
+        let options = CompletionOptions {
+            match_algorithm: MatchAlgorithm::Fuzzy,
+            ..Default::default()
+        };
+        let mut matcher = NuMatcher::new("fob", options);
+        for item in ["foo/bar", "fob", "foo bar"] {
+            matcher.add(item, item);
+        }
+        // Sort by score, then in alphabetical order
+        assert_eq!(vec!["fob", "foo bar", "foo/bar"], matcher.results());
     }
 }
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index b6098bc85d..63e65053b4 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -9,10 +9,9 @@ use nu_protocol::{
     engine::{Stack, StateWorkingSet},
     CompletionSort, DeclId, PipelineData, Span, Type, Value,
 };
-use nu_utils::IgnoreCaseExt;
 use std::collections::HashMap;
 
-use super::completion_common::sort_suggestions;
+use super::completion_options::NuMatcher;
 
 pub struct CustomCompletion {
     stack: Stack,
@@ -123,41 +122,11 @@ impl Completer for CustomCompletion {
             })
             .unwrap_or_default();
 
-        let options = custom_completion_options
-            .as_ref()
-            .unwrap_or(completion_options);
-        let suggestions = filter(prefix, suggestions, options);
-        sort_suggestions(&String::from_utf8_lossy(prefix), suggestions, options)
+        let options = custom_completion_options.unwrap_or(completion_options.clone());
+        let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), options);
+        for sugg in suggestions {
+            matcher.add_semantic_suggestion(sugg);
+        }
+        matcher.results()
     }
 }
-
-fn filter(
-    prefix: &[u8],
-    items: Vec<SemanticSuggestion>,
-    options: &CompletionOptions,
-) -> Vec<SemanticSuggestion> {
-    items
-        .into_iter()
-        .filter(|it| match options.match_algorithm {
-            MatchAlgorithm::Prefix => match (options.case_sensitive, options.positional) {
-                (true, true) => it.suggestion.value.as_bytes().starts_with(prefix),
-                (true, false) => it
-                    .suggestion
-                    .value
-                    .contains(std::str::from_utf8(prefix).unwrap_or("")),
-                (false, positional) => {
-                    let value = it.suggestion.value.to_folded_case();
-                    let prefix = std::str::from_utf8(prefix).unwrap_or("").to_folded_case();
-                    if positional {
-                        value.starts_with(&prefix)
-                    } else {
-                        value.contains(&prefix)
-                    }
-                }
-            },
-            MatchAlgorithm::Fuzzy => options
-                .match_algorithm
-                .matches_u8(it.suggestion.value.as_bytes(), prefix),
-        })
-        .collect()
-}
diff --git a/crates/nu-cli/src/completions/directory_completions.rs b/crates/nu-cli/src/completions/directory_completions.rs
index ea8eb89871..b23b45945f 100644
--- a/crates/nu-cli/src/completions/directory_completions.rs
+++ b/crates/nu-cli/src/completions/directory_completions.rs
@@ -2,7 +2,6 @@ use crate::completions::{
     completion_common::{adjust_if_intermediate, complete_item, AdjustView},
     Completer, CompletionOptions,
 };
-use nu_ansi_term::Style;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     Span,
@@ -10,7 +9,7 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::path::Path;
 
-use super::SemanticSuggestion;
+use super::{completion_common::FileSuggestion, SemanticSuggestion};
 
 #[derive(Clone, Default)]
 pub struct DirectoryCompletion {}
@@ -47,11 +46,11 @@ impl Completer for DirectoryCompletion {
         .into_iter()
         .map(move |x| SemanticSuggestion {
             suggestion: Suggestion {
-                value: x.1,
-                style: x.2,
+                value: x.path,
+                style: x.style,
                 span: reedline::Span {
-                    start: x.0.start - offset,
-                    end: x.0.end - offset,
+                    start: x.span.start - offset,
+                    end: x.span.end - offset,
                 },
                 ..Suggestion::default()
             },
@@ -92,6 +91,6 @@ pub fn directory_completion(
     options: &CompletionOptions,
     engine_state: &EngineState,
     stack: &Stack,
-) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
-    complete_item(true, span, partial, cwd, options, engine_state, stack)
+) -> Vec<FileSuggestion> {
+    complete_item(true, span, partial, &[cwd], options, engine_state, stack)
 }
diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index 482c5c1d18..b8134404d3 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -6,7 +6,7 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::path::{is_separator, Path, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR};
 
-use super::{completion_common::sort_suggestions, SemanticSuggestion};
+use super::SemanticSuggestion;
 
 #[derive(Clone, Default)]
 pub struct DotNuCompletion {}
@@ -87,49 +87,44 @@ impl Completer for DotNuCompletion {
 
         // Fetch the files filtering the ones that ends with .nu
         // and transform them into suggestions
-        let output: Vec<SemanticSuggestion> = search_dirs
-            .into_iter()
-            .flat_map(|search_dir| {
-                let completions = file_path_completion(
-                    span,
-                    &partial,
-                    &search_dir,
-                    options,
-                    working_set.permanent_state,
-                    stack,
-                );
-                completions
-                    .into_iter()
-                    .filter(move |it| {
-                        // Different base dir, so we list the .nu files or folders
-                        if !is_current_folder {
-                            it.1.ends_with(".nu") || it.1.ends_with(SEP)
-                        } else {
-                            // Lib dirs, so we filter only the .nu files or directory modules
-                            if it.1.ends_with(SEP) {
-                                Path::new(&search_dir).join(&it.1).join("mod.nu").exists()
-                            } else {
-                                it.1.ends_with(".nu")
-                            }
-                        }
-                    })
-                    .map(move |x| SemanticSuggestion {
-                        suggestion: Suggestion {
-                            value: x.1,
-                            style: x.2,
-                            span: reedline::Span {
-                                start: x.0.start - offset,
-                                end: x.0.end - offset,
-                            },
-                            append_whitespace: true,
-                            ..Suggestion::default()
-                        },
-                        // TODO????
-                        kind: None,
-                    })
-            })
-            .collect();
 
-        sort_suggestions(&prefix_str, output, options)
+        let completions = file_path_completion(
+            span,
+            &partial,
+            &search_dirs.iter().map(|d| d.as_str()).collect::<Vec<_>>(),
+            options,
+            working_set.permanent_state,
+            stack,
+        );
+        completions
+            .into_iter()
+            .filter(move |it| {
+                // Different base dir, so we list the .nu files or folders
+                if !is_current_folder {
+                    it.path.ends_with(".nu") || it.path.ends_with(SEP)
+                } else {
+                    // Lib dirs, so we filter only the .nu files or directory modules
+                    if it.path.ends_with(SEP) {
+                        Path::new(&it.cwd).join(&it.path).join("mod.nu").exists()
+                    } else {
+                        it.path.ends_with(".nu")
+                    }
+                }
+            })
+            .map(move |x| SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: x.path,
+                    style: x.style,
+                    span: reedline::Span {
+                        start: x.span.start - offset,
+                        end: x.span.end - offset,
+                    },
+                    append_whitespace: true,
+                    ..Suggestion::default()
+                },
+                // TODO????
+                kind: None,
+            })
+            .collect::<Vec<_>>()
     }
 }
diff --git a/crates/nu-cli/src/completions/file_completions.rs b/crates/nu-cli/src/completions/file_completions.rs
index 42e1d397ea..5b4c546878 100644
--- a/crates/nu-cli/src/completions/file_completions.rs
+++ b/crates/nu-cli/src/completions/file_completions.rs
@@ -2,16 +2,14 @@ use crate::completions::{
     completion_common::{adjust_if_intermediate, complete_item, AdjustView},
     Completer, CompletionOptions,
 };
-use nu_ansi_term::Style;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     Span,
 };
-use nu_utils::IgnoreCaseExt;
 use reedline::Suggestion;
 use std::path::Path;
 
-use super::SemanticSuggestion;
+use super::{completion_common::FileSuggestion, SemanticSuggestion};
 
 #[derive(Clone, Default)]
 pub struct FileCompletion {}
@@ -44,7 +42,7 @@ impl Completer for FileCompletion {
             readjusted,
             span,
             &prefix,
-            &working_set.permanent_state.current_work_dir(),
+            &[&working_set.permanent_state.current_work_dir()],
             options,
             working_set.permanent_state,
             stack,
@@ -52,11 +50,11 @@ impl Completer for FileCompletion {
         .into_iter()
         .map(move |x| SemanticSuggestion {
             suggestion: Suggestion {
-                value: x.1,
-                style: x.2,
+                value: x.path,
+                style: x.style,
                 span: reedline::Span {
-                    start: x.0.start - offset,
-                    end: x.0.end - offset,
+                    start: x.span.start - offset,
+                    end: x.span.end - offset,
                 },
                 ..Suggestion::default()
             },
@@ -95,21 +93,10 @@ impl Completer for FileCompletion {
 pub fn file_path_completion(
     span: nu_protocol::Span,
     partial: &str,
-    cwd: &str,
+    cwds: &[impl AsRef<str>],
     options: &CompletionOptions,
     engine_state: &EngineState,
     stack: &Stack,
-) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
-    complete_item(false, span, partial, cwd, options, engine_state, stack)
-}
-
-pub fn matches(partial: &str, from: &str, options: &CompletionOptions) -> bool {
-    // Check for case sensitive
-    if !options.case_sensitive {
-        return options
-            .match_algorithm
-            .matches_str(&from.to_folded_case(), &partial.to_folded_case());
-    }
-
-    options.match_algorithm.matches_str(from, partial)
+) -> Vec<FileSuggestion> {
+    complete_item(false, span, partial, cwds, options, engine_state, stack)
 }
diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs
index 57cd691082..1df95f04ba 100644
--- a/crates/nu-cli/src/completions/flag_completions.rs
+++ b/crates/nu-cli/src/completions/flag_completions.rs
@@ -1,4 +1,4 @@
-use crate::completions::{completion_common::sort_suggestions, Completer, CompletionOptions};
+use crate::completions::{completion_options::NuMatcher, Completer, CompletionOptions};
 use nu_protocol::{
     ast::{Expr, Expression},
     engine::{Stack, StateWorkingSet},
@@ -35,7 +35,7 @@ impl Completer for FlagCompletion {
             let decl = working_set.get_decl(call.decl_id);
             let sig = decl.signature();
 
-            let mut output = vec![];
+            let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), options.clone());
 
             for named in &sig.named {
                 let flag_desc = &named.desc;
@@ -44,34 +44,7 @@ impl Completer for FlagCompletion {
                     short.encode_utf8(&mut named);
                     named.insert(0, b'-');
 
-                    if options.match_algorithm.matches_u8(&named, prefix) {
-                        output.push(SemanticSuggestion {
-                            suggestion: Suggestion {
-                                value: String::from_utf8_lossy(&named).to_string(),
-                                description: Some(flag_desc.to_string()),
-                                span: reedline::Span {
-                                    start: span.start - offset,
-                                    end: span.end - offset,
-                                },
-                                append_whitespace: true,
-                                ..Suggestion::default()
-                            },
-                            // TODO????
-                            kind: None,
-                        });
-                    }
-                }
-
-                if named.long.is_empty() {
-                    continue;
-                }
-
-                let mut named = named.long.as_bytes().to_vec();
-                named.insert(0, b'-');
-                named.insert(0, b'-');
-
-                if options.match_algorithm.matches_u8(&named, prefix) {
-                    output.push(SemanticSuggestion {
+                    matcher.add_semantic_suggestion(SemanticSuggestion {
                         suggestion: Suggestion {
                             value: String::from_utf8_lossy(&named).to_string(),
                             description: Some(flag_desc.to_string()),
@@ -86,9 +59,32 @@ impl Completer for FlagCompletion {
                         kind: None,
                     });
                 }
+
+                if named.long.is_empty() {
+                    continue;
+                }
+
+                let mut named = named.long.as_bytes().to_vec();
+                named.insert(0, b'-');
+                named.insert(0, b'-');
+
+                matcher.add_semantic_suggestion(SemanticSuggestion {
+                    suggestion: Suggestion {
+                        value: String::from_utf8_lossy(&named).to_string(),
+                        description: Some(flag_desc.to_string()),
+                        span: reedline::Span {
+                            start: span.start - offset,
+                            end: span.end - offset,
+                        },
+                        append_whitespace: true,
+                        ..Suggestion::default()
+                    },
+                    // TODO????
+                    kind: None,
+                });
             }
 
-            return sort_suggestions(&String::from_utf8_lossy(prefix), output, options);
+            return matcher.results();
         }
 
         vec![]
diff --git a/crates/nu-cli/src/completions/mod.rs b/crates/nu-cli/src/completions/mod.rs
index 3acb8e9bf3..7c9f9ff483 100644
--- a/crates/nu-cli/src/completions/mod.rs
+++ b/crates/nu-cli/src/completions/mod.rs
@@ -18,7 +18,7 @@ pub use completion_options::{CompletionOptions, MatchAlgorithm};
 pub use custom_completions::CustomCompletion;
 pub use directory_completions::DirectoryCompletion;
 pub use dotnu_completions::DotNuCompletion;
-pub use file_completions::{file_path_completion, matches, FileCompletion};
+pub use file_completions::{file_path_completion, FileCompletion};
 pub use flag_completions::FlagCompletion;
 pub use operator_completions::OperatorCompletion;
 pub use variable_completions::VariableCompletion;
diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index 460e7f590b..aebb176b76 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -1,5 +1,5 @@
 use crate::completions::{
-    Completer, CompletionOptions, MatchAlgorithm, SemanticSuggestion, SuggestionKind,
+    completion_options::NuMatcher, Completer, CompletionOptions, SemanticSuggestion, SuggestionKind,
 };
 use nu_protocol::{
     ast::{Expr, Expression},
@@ -28,7 +28,7 @@ impl Completer for OperatorCompletion {
         span: Span,
         offset: usize,
         _pos: usize,
-        _options: &CompletionOptions,
+        options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
         //Check if int, float, or string
         let partial = std::str::from_utf8(working_set.get_span_contents(span)).unwrap_or("");
@@ -60,10 +60,6 @@ impl Completer for OperatorCompletion {
                 ("bit-shr", "Bitwise shift right"),
                 ("in", "Is a member of (doesn't use regex)"),
                 ("not-in", "Is not a member of (doesn't use regex)"),
-                (
-                    "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
-                ),
             ],
             Expr::String(_) => vec![
                 ("=~", "Contains regex match"),
@@ -72,7 +68,7 @@ impl Completer for OperatorCompletion {
                 ("not-like", "Does not contain regex match"),
                 (
                     "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
+                    "Concatenates two lists, two strings, or two binary values",
                 ),
                 ("in", "Is a member of (doesn't use regex)"),
                 ("not-in", "Is not a member of (doesn't use regex)"),
@@ -95,10 +91,6 @@ impl Completer for OperatorCompletion {
                 ("**", "Power of"),
                 ("in", "Is a member of (doesn't use regex)"),
                 ("not-in", "Is not a member of (doesn't use regex)"),
-                (
-                    "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
-                ),
             ],
             Expr::Bool(_) => vec![
                 (
@@ -113,15 +105,11 @@ impl Completer for OperatorCompletion {
                 ("not", "Negates a value or expression"),
                 ("in", "Is a member of (doesn't use regex)"),
                 ("not-in", "Is not a member of (doesn't use regex)"),
-                (
-                    "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
-                ),
             ],
             Expr::FullCellPath(path) => match path.head.expr {
                 Expr::List(_) => vec![(
                     "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
+                    "Concatenates two lists, two strings, or two binary values",
                 )],
                 Expr::Var(id) => get_variable_completions(id, working_set),
                 _ => vec![],
@@ -129,17 +117,12 @@ impl Completer for OperatorCompletion {
             _ => vec![],
         };
 
-        let match_algorithm = MatchAlgorithm::Prefix;
-        let input_fuzzy_search =
-            |(operator, _): &(&str, &str)| match_algorithm.matches_str(operator, partial);
-
-        possible_operations
-            .into_iter()
-            .filter(input_fuzzy_search)
-            .map(move |x| SemanticSuggestion {
+        let mut matcher = NuMatcher::new(partial, options.clone());
+        for (symbol, desc) in possible_operations.into_iter() {
+            matcher.add_semantic_suggestion(SemanticSuggestion {
                 suggestion: Suggestion {
-                    value: x.0.to_string(),
-                    description: Some(x.1.to_string()),
+                    value: symbol.to_string(),
+                    description: Some(desc.to_string()),
                     span: reedline::Span::new(span.start - offset, span.end - offset),
                     append_whitespace: true,
                     ..Suggestion::default()
@@ -147,8 +130,9 @@ impl Completer for OperatorCompletion {
                 kind: Some(SuggestionKind::Command(
                     nu_protocol::engine::CommandType::Builtin,
                 )),
-            })
-            .collect()
+            });
+        }
+        matcher.results()
     }
 }
 
@@ -165,7 +149,7 @@ pub fn get_variable_completions<'a>(
         Type::List(_) | Type::String | Type::Binary => vec![
             (
                 "++=",
-                "Appends a list, a value, a string, or a binary value to a variable.",
+                "Concatenates two lists, two strings, or two binary values",
             ),
             ("=", "Assigns a value to a variable."),
         ],
diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index 29b5393257..69e0985e80 100644
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -1,6 +1,4 @@
-use crate::completions::{
-    Completer, CompletionOptions, MatchAlgorithm, SemanticSuggestion, SuggestionKind,
-};
+use crate::completions::{Completer, CompletionOptions, SemanticSuggestion, SuggestionKind};
 use nu_engine::{column::get_columns, eval_variable};
 use nu_protocol::{
     engine::{Stack, StateWorkingSet},
@@ -9,7 +7,7 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::str;
 
-use super::completion_common::sort_suggestions;
+use super::completion_options::NuMatcher;
 
 #[derive(Clone)]
 pub struct VariableCompletion {
@@ -33,7 +31,6 @@ impl Completer for VariableCompletion {
         _pos: usize,
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
-        let mut output = vec![];
         let builtins = ["$nu", "$in", "$env"];
         let var_str = std::str::from_utf8(&self.var_context.0).unwrap_or("");
         let var_id = working_set.find_variable(&self.var_context.0);
@@ -43,6 +40,7 @@ impl Completer for VariableCompletion {
         };
         let sublevels_count = self.var_context.1.len();
         let prefix_str = String::from_utf8_lossy(prefix);
+        let mut matcher = NuMatcher::new(prefix_str, options.clone());
 
         // Completions for the given variable
         if !var_str.is_empty() {
@@ -63,37 +61,25 @@ impl Completer for VariableCompletion {
 
                     if let Some(val) = env_vars.get(&target_var_str) {
                         for suggestion in nested_suggestions(val, &nested_levels, current_span) {
-                            if options.match_algorithm.matches_u8_insensitive(
-                                options.case_sensitive,
-                                suggestion.suggestion.value.as_bytes(),
-                                prefix,
-                            ) {
-                                output.push(suggestion);
-                            }
+                            matcher.add_semantic_suggestion(suggestion);
                         }
 
-                        return sort_suggestions(&prefix_str, output, options);
+                        return matcher.results();
                     }
                 } else {
                     // No nesting provided, return all env vars
                     for env_var in env_vars {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            env_var.0.as_bytes(),
-                            prefix,
-                        ) {
-                            output.push(SemanticSuggestion {
-                                suggestion: Suggestion {
-                                    value: env_var.0,
-                                    span: current_span,
-                                    ..Suggestion::default()
-                                },
-                                kind: Some(SuggestionKind::Type(env_var.1.get_type())),
-                            });
-                        }
+                        matcher.add_semantic_suggestion(SemanticSuggestion {
+                            suggestion: Suggestion {
+                                value: env_var.0,
+                                span: current_span,
+                                ..Suggestion::default()
+                            },
+                            kind: Some(SuggestionKind::Type(env_var.1.get_type())),
+                        });
                     }
 
-                    return sort_suggestions(&prefix_str, output, options);
+                    return matcher.results();
                 }
             }
 
@@ -108,16 +94,10 @@ impl Completer for VariableCompletion {
                 ) {
                     for suggestion in nested_suggestions(&nuval, &self.var_context.1, current_span)
                     {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            suggestion.suggestion.value.as_bytes(),
-                            prefix,
-                        ) {
-                            output.push(suggestion);
-                        }
+                        matcher.add_semantic_suggestion(suggestion);
                     }
 
-                    return sort_suggestions(&prefix_str, output, options);
+                    return matcher.results();
                 }
             }
 
@@ -130,37 +110,25 @@ impl Completer for VariableCompletion {
                 if let Ok(value) = var {
                     for suggestion in nested_suggestions(&value, &self.var_context.1, current_span)
                     {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            suggestion.suggestion.value.as_bytes(),
-                            prefix,
-                        ) {
-                            output.push(suggestion);
-                        }
+                        matcher.add_semantic_suggestion(suggestion);
                     }
 
-                    return sort_suggestions(&prefix_str, output, options);
+                    return matcher.results();
                 }
             }
         }
 
         // Variable completion (e.g: $en<tab> to complete $env)
         for builtin in builtins {
-            if options.match_algorithm.matches_u8_insensitive(
-                options.case_sensitive,
-                builtin.as_bytes(),
-                prefix,
-            ) {
-                output.push(SemanticSuggestion {
-                    suggestion: Suggestion {
-                        value: builtin.to_string(),
-                        span: current_span,
-                        ..Suggestion::default()
-                    },
-                    // TODO is there a way to get the VarId to get the type???
-                    kind: None,
-                });
-            }
+            matcher.add_semantic_suggestion(SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: builtin.to_string(),
+                    span: current_span,
+                    ..Suggestion::default()
+                },
+                // TODO is there a way to get the VarId to get the type???
+                kind: None,
+            });
         }
 
         // TODO: The following can be refactored (see find_commands_by_predicate() used in
@@ -170,40 +138,7 @@ impl Completer for VariableCompletion {
         for scope_frame in working_set.delta.scope.iter().rev() {
             for overlay_frame in scope_frame.active_overlays(&mut removed_overlays).rev() {
                 for v in &overlay_frame.vars {
-                    if options.match_algorithm.matches_u8_insensitive(
-                        options.case_sensitive,
-                        v.0,
-                        prefix,
-                    ) {
-                        output.push(SemanticSuggestion {
-                            suggestion: Suggestion {
-                                value: String::from_utf8_lossy(v.0).to_string(),
-                                span: current_span,
-                                ..Suggestion::default()
-                            },
-                            kind: Some(SuggestionKind::Type(
-                                working_set.get_variable(*v.1).ty.clone(),
-                            )),
-                        });
-                    }
-                }
-            }
-        }
-
-        // Permanent state vars
-        // for scope in &self.engine_state.scope {
-        for overlay_frame in working_set
-            .permanent_state
-            .active_overlays(&removed_overlays)
-            .rev()
-        {
-            for v in &overlay_frame.vars {
-                if options.match_algorithm.matches_u8_insensitive(
-                    options.case_sensitive,
-                    v.0,
-                    prefix,
-                ) {
-                    output.push(SemanticSuggestion {
+                    matcher.add_semantic_suggestion(SemanticSuggestion {
                         suggestion: Suggestion {
                             value: String::from_utf8_lossy(v.0).to_string(),
                             span: current_span,
@@ -217,11 +152,28 @@ impl Completer for VariableCompletion {
             }
         }
 
-        output = sort_suggestions(&prefix_str, output, options);
+        // Permanent state vars
+        // for scope in &self.engine_state.scope {
+        for overlay_frame in working_set
+            .permanent_state
+            .active_overlays(&removed_overlays)
+            .rev()
+        {
+            for v in &overlay_frame.vars {
+                matcher.add_semantic_suggestion(SemanticSuggestion {
+                    suggestion: Suggestion {
+                        value: String::from_utf8_lossy(v.0).to_string(),
+                        span: current_span,
+                        ..Suggestion::default()
+                    },
+                    kind: Some(SuggestionKind::Type(
+                        working_set.get_variable(*v.1).ty.clone(),
+                    )),
+                });
+            }
+        }
 
-        output.dedup(); // TODO: Removes only consecutive duplicates, is it intended?
-
-        output
+        matcher.results()
     }
 }
 
@@ -302,13 +254,3 @@ fn recursive_value(val: &Value, sublevels: &[Vec<u8>]) -> Result<Value, Span> {
         Ok(val.clone())
     }
 }
-
-impl MatchAlgorithm {
-    pub fn matches_u8_insensitive(&self, sensitive: bool, haystack: &[u8], needle: &[u8]) -> bool {
-        if sensitive {
-            self.matches_u8(haystack, needle)
-        } else {
-            self.matches_u8(&haystack.to_ascii_lowercase(), &needle.to_ascii_lowercase())
-        }
-    }
-}
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index f0bebfc884..5fba00f5c9 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -9,6 +9,8 @@ use nu_protocol::{
 };
 use std::sync::Arc;
 
+use crate::util::print_pipeline;
+
 #[derive(Default)]
 pub struct EvaluateCommandsOpts {
     pub table_mode: Option<Value>,
@@ -72,7 +74,7 @@ pub fn evaluate_commands(
 
         if let Some(err) = working_set.compile_errors.first() {
             report_compile_error(&working_set, err);
-            // Not a fatal error, for now
+            std::process::exit(1);
         }
 
         (output, working_set.render())
@@ -93,7 +95,7 @@ pub fn evaluate_commands(
             t_mode.coerce_str()?.parse().unwrap_or_default();
     }
 
-    pipeline.print(engine_state, stack, no_newline, false)?;
+    print_pipeline(engine_state, stack, pipeline, no_newline)?;
 
     info!("evaluate {}:{}:{}", file!(), line!(), column!());
 
diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index df75f7e4f8..826b6c8eb5 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -1,4 +1,4 @@
-use crate::util::eval_source;
+use crate::util::{eval_source, print_pipeline};
 use log::{info, trace};
 use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
@@ -89,7 +89,7 @@ pub fn evaluate_file(
 
     if let Some(err) = working_set.compile_errors.first() {
         report_compile_error(&working_set, err);
-        // Not a fatal error, for now
+        std::process::exit(1);
     }
 
     // Look for blocks whose name starts with "main" and replace it with the filename.
@@ -119,7 +119,7 @@ pub fn evaluate_file(
             };
 
         // Print the pipeline output of the last command of the file.
-        pipeline.print(engine_state, stack, true, false)?;
+        print_pipeline(engine_state, stack, pipeline, true)?;
 
         // Invoke the main command with arguments.
         // Arguments with whitespaces are quoted, thus can be safely concatenated by whitespace.
diff --git a/crates/nu-cli/src/print.rs b/crates/nu-cli/src/print.rs
index ffb0366242..40660ecf13 100644
--- a/crates/nu-cli/src/print.rs
+++ b/crates/nu-cli/src/print.rs
@@ -65,8 +65,12 @@ Since this command has no output, there is no point in piping it with other comm
                     arg.into_pipeline_data()
                         .print_raw(engine_state, no_newline, to_stderr)?;
                 } else {
-                    arg.into_pipeline_data()
-                        .print(engine_state, stack, no_newline, to_stderr)?;
+                    arg.into_pipeline_data().print_table(
+                        engine_state,
+                        stack,
+                        no_newline,
+                        to_stderr,
+                    )?;
                 }
             }
         } else if !input.is_nothing() {
@@ -78,7 +82,7 @@ Since this command has no output, there is no point in piping it with other comm
             if raw {
                 input.print_raw(engine_state, no_newline, to_stderr)?;
             } else {
-                input.print(engine_state, stack, no_newline, to_stderr)?;
+                input.print_table(engine_state, stack, no_newline, to_stderr)?;
             }
         }
 
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 67bc1ad8ef..7b9d783534 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -201,6 +201,35 @@ fn gather_env_vars(
     }
 }
 
+/// Print a pipeline with formatting applied based on display_output hook.
+///
+/// This function should be preferred when printing values resulting from a completed evaluation.
+/// For values printed as part of a command's execution, such as values printed by the `print` command,
+/// the `PipelineData::print_table` function should be preferred instead as it is not config-dependent.
+///
+/// `no_newline` controls if we need to attach newline character to output.
+pub fn print_pipeline(
+    engine_state: &mut EngineState,
+    stack: &mut Stack,
+    pipeline: PipelineData,
+    no_newline: bool,
+) -> Result<(), ShellError> {
+    if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
+        let pipeline = eval_hook(
+            engine_state,
+            stack,
+            Some(pipeline),
+            vec![],
+            &hook,
+            "display_output",
+        )?;
+        pipeline.print_raw(engine_state, no_newline, false)
+    } else {
+        // if display_output isn't set, we should still prefer to print with some formatting
+        pipeline.print_table(engine_state, stack, no_newline, false)
+    }
+}
+
 pub fn eval_source(
     engine_state: &mut EngineState,
     stack: &mut Stack,
@@ -267,7 +296,7 @@ fn evaluate_source(
 
         if let Some(err) = working_set.compile_errors.first() {
             report_compile_error(&working_set, err);
-            // Not a fatal error, for now
+            return Ok(true);
         }
 
         (output, working_set.render())
@@ -281,36 +310,12 @@ fn evaluate_source(
         eval_block::<WithoutDebug>(engine_state, stack, &block, input)
     }?;
 
-    if let PipelineData::ByteStream(..) = pipeline {
-        // run the display hook on bytestreams too
-        run_display_hook(engine_state, stack, pipeline, false)
-    } else {
-        run_display_hook(engine_state, stack, pipeline, true)
-    }?;
+    let no_newline = matches!(&pipeline, &PipelineData::ByteStream(..));
+    print_pipeline(engine_state, stack, pipeline, no_newline)?;
 
     Ok(false)
 }
 
-fn run_display_hook(
-    engine_state: &mut EngineState,
-    stack: &mut Stack,
-    pipeline: PipelineData,
-    no_newline: bool,
-) -> Result<(), ShellError> {
-    if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
-        let pipeline = eval_hook(
-            engine_state,
-            stack,
-            Some(pipeline),
-            vec![],
-            &hook,
-            "display_output",
-        )?;
-        pipeline.print(engine_state, stack, no_newline, false)
-    } else {
-        pipeline.print(engine_state, stack, no_newline, false)
-    }
-}
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 8e89239663..4bcf8b55c0 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -890,8 +890,8 @@ fn subcommand_completions(mut subcommand_completer: NuCompleter) {
     match_suggestions(
         &vec![
             "foo bar".to_string(),
-            "foo aabcrr".to_string(),
             "foo abaz".to_string(),
+            "foo aabcrr".to_string(),
         ],
         &suggestions,
     );
@@ -955,8 +955,8 @@ fn flag_completions() {
         "--mime-type".into(),
         "--short-names".into(),
         "--threads".into(),
-        "-D".into(),
         "-a".into(),
+        "-D".into(),
         "-d".into(),
         "-f".into(),
         "-h".into(),
@@ -1287,7 +1287,7 @@ fn variables_completions() {
     assert_eq!(3, suggestions.len());
 
     #[cfg(windows)]
-    let expected: Vec<String> = vec!["PWD".into(), "Path".into(), "TEST".into()];
+    let expected: Vec<String> = vec!["Path".into(), "PWD".into(), "TEST".into()];
     #[cfg(not(windows))]
     let expected: Vec<String> = vec!["PATH".into(), "PWD".into(), "TEST".into()];
 
@@ -1576,6 +1576,23 @@ fn sort_fuzzy_completions_in_alphabetical_order(mut fuzzy_alpha_sort_completer:
     );
 }
 
+#[test]
+fn exact_match() {
+    let (dir, _, engine, stack) = new_partial_engine();
+
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    let target_dir = format!("open {}", folder(dir.join("pArTiAL")));
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Since it's an exact match, only 'partial' should be suggested, not
+    // 'partial-a' and stuff. Implemented in #13302
+    match_suggestions(
+        &vec![file(dir.join("partial").join("hello.txt"))],
+        &suggestions,
+    );
+}
+
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7648() {
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index c5609e4ff8..6e8cb824ba 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -21,10 +21,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
 nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.35", default-features = false }
+shadow-rs = { version = "0.36", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.35", default-features = false }
+shadow-rs = { version = "0.36", default-features = false }
 
 [features]
 mimalloc = []
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 5f1b42cb66..81ea22ad39 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -69,6 +69,33 @@ impl Command for Do {
         let block: Closure = call.req(engine_state, caller_stack, 0)?;
         let rest: Vec<Value> = call.rest(engine_state, caller_stack, 1)?;
         let ignore_all_errors = call.has_flag(engine_state, caller_stack, "ignore-errors")?;
+
+        if call.has_flag(engine_state, caller_stack, "ignore-shell-errors")? {
+            nu_protocol::report_shell_warning(
+                engine_state,
+                &ShellError::GenericError {
+                    error: "Deprecated option".into(),
+                    msg: "`--ignore-shell-errors` is deprecated and will be removed in 0.102.0."
+                        .into(),
+                    span: Some(call.head),
+                    help: Some("Please use the `--ignore-errors(-i)`".into()),
+                    inner: vec![],
+                },
+            );
+        }
+        if call.has_flag(engine_state, caller_stack, "ignore-program-errors")? {
+            nu_protocol::report_shell_warning(
+                engine_state,
+                &ShellError::GenericError {
+                    error: "Deprecated option".into(),
+                    msg: "`--ignore-program-errors` is deprecated and will be removed in 0.102.0."
+                        .into(),
+                    span: Some(call.head),
+                    help: Some("Please use the `--ignore-errors(-i)`".into()),
+                    inner: vec![],
+                },
+            );
+        }
         let ignore_shell_errors = ignore_all_errors
             || call.has_flag(engine_state, caller_stack, "ignore-shell-errors")?;
         let ignore_program_errors = ignore_all_errors
@@ -208,16 +235,6 @@ impl Command for Do {
                 example: r#"do --ignore-errors { thisisnotarealcommand }"#,
                 result: None,
             },
-            Example {
-                description: "Run the closure and ignore shell errors",
-                example: r#"do --ignore-shell-errors { thisisnotarealcommand }"#,
-                result: None,
-            },
-            Example {
-                description: "Run the closure and ignore external program errors",
-                example: r#"do --ignore-program-errors { nu --commands 'exit 1' }; echo "I'll still run""#,
-                result: None,
-            },
             Example {
                 description: "Abort the pipeline if a program returns a non-zero exit code",
                 example: r#"do --capture-errors { nu --commands 'exit 1' } | myscarycommand"#,
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index e9c3b9a784..53e39353c0 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -86,7 +86,6 @@ serde_yaml = { workspace = true }
 sha2 = { workspace = true }
 sysinfo = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
-terminal_size = { workspace = true }
 titlecase = { workspace = true }
 toml = { workspace = true, features = ["preserve_order"] }
 unicode-segmentation = { workspace = true }
@@ -96,6 +95,7 @@ uu_cp = { workspace = true }
 uu_mkdir = { workspace = true }
 uu_mktemp = { workspace = true }
 uu_mv = { workspace = true }
+uu_touch = { workspace = true }
 uu_uname = { workspace = true }
 uu_whoami = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
diff --git a/crates/nu-command/src/database/commands/into_sqlite.rs b/crates/nu-command/src/database/commands/into_sqlite.rs
index fcfa228f3b..3236f90999 100644
--- a/crates/nu-command/src/database/commands/into_sqlite.rs
+++ b/crates/nu-command/src/database/commands/into_sqlite.rs
@@ -359,7 +359,6 @@ fn nu_value_to_sqlite_type(val: &Value) -> Result<&'static str, ShellError> {
         | Type::Custom(_)
         | Type::Error
         | Type::List(_)
-        | Type::ListStream
         | Type::Range
         | Type::Record(_)
         | Type::Signature
diff --git a/crates/nu-command/src/debug/ast.rs b/crates/nu-command/src/debug/ast.rs
index c6e405d533..45e7738c32 100644
--- a/crates/nu-command/src/debug/ast.rs
+++ b/crates/nu-command/src/debug/ast.rs
@@ -1,6 +1,7 @@
 use nu_engine::command_prelude::*;
-use nu_parser::parse;
-use nu_protocol::engine::StateWorkingSet;
+use nu_parser::{flatten_block, parse};
+use nu_protocol::{engine::StateWorkingSet, record};
+use serde_json::{json, Value as JsonValue};
 
 #[derive(Clone)]
 pub struct Ast;
@@ -16,109 +17,23 @@ impl Command for Ast {
 
     fn signature(&self) -> Signature {
         Signature::build("ast")
-            .input_output_types(vec![(Type::String, Type::record())])
+            .input_output_types(vec![
+                (Type::Nothing, Type::table()),
+                (Type::Nothing, Type::record()),
+                (Type::Nothing, Type::String),
+            ])
             .required(
                 "pipeline",
                 SyntaxShape::String,
                 "The pipeline to print the ast for.",
             )
-            .switch("json", "serialize to json", Some('j'))
-            .switch("minify", "minify the nuon or json output", Some('m'))
+            .switch("json", "Serialize to json", Some('j'))
+            .switch("minify", "Minify the nuon or json output", Some('m'))
+            .switch("flatten", "An easier to read version of the ast", Some('f'))
             .allow_variants_without_examples(true)
             .category(Category::Debug)
     }
 
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let pipeline: Spanned<String> = call.req(engine_state, stack, 0)?;
-        let to_json = call.has_flag(engine_state, stack, "json")?;
-        let minify = call.has_flag(engine_state, stack, "minify")?;
-        let mut working_set = StateWorkingSet::new(engine_state);
-        let block_output = parse(&mut working_set, None, pipeline.item.as_bytes(), false);
-        let error_output = working_set.parse_errors.first();
-        let block_span = match &block_output.span {
-            Some(span) => span,
-            None => &pipeline.span,
-        };
-        if to_json {
-            // Get the block as json
-            let serde_block_str = if minify {
-                serde_json::to_string(&*block_output)
-            } else {
-                serde_json::to_string_pretty(&*block_output)
-            };
-            let block_json = match serde_block_str {
-                Ok(json) => json,
-                Err(e) => Err(ShellError::CantConvert {
-                    to_type: "string".to_string(),
-                    from_type: "block".to_string(),
-                    span: *block_span,
-                    help: Some(format!(
-                        "Error: {e}\nCan't convert {block_output:?} to string"
-                    )),
-                })?,
-            };
-            // Get the error as json
-            let serde_error_str = if minify {
-                serde_json::to_string(&error_output)
-            } else {
-                serde_json::to_string_pretty(&error_output)
-            };
-
-            let error_json = match serde_error_str {
-                Ok(json) => json,
-                Err(e) => Err(ShellError::CantConvert {
-                    to_type: "string".to_string(),
-                    from_type: "error".to_string(),
-                    span: *block_span,
-                    help: Some(format!(
-                        "Error: {e}\nCan't convert {error_output:?} to string"
-                    )),
-                })?,
-            };
-
-            // Create a new output record, merging the block and error
-            let output_record = Value::record(
-                record! {
-                    "block" => Value::string(block_json, *block_span),
-                    "error" => Value::string(error_json, Span::test_data()),
-                },
-                pipeline.span,
-            );
-            Ok(output_record.into_pipeline_data())
-        } else {
-            let block_value = Value::string(
-                if minify {
-                    format!("{block_output:?}")
-                } else {
-                    format!("{block_output:#?}")
-                },
-                pipeline.span,
-            );
-            let error_value = Value::string(
-                if minify {
-                    format!("{error_output:?}")
-                } else {
-                    format!("{error_output:#?}")
-                },
-                pipeline.span,
-            );
-            let output_record = Value::record(
-                record! {
-                    "block" => block_value,
-                    "error" => error_value
-                },
-                pipeline.span,
-            );
-            Ok(output_record.into_pipeline_data())
-        }
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -147,8 +62,247 @@ impl Command for Ast {
                 example: "ast 'for x in 1..10 { echo $x ' --json --minify",
                 result: None,
             },
+            Example {
+                description: "Print the ast of a string flattened",
+                example: r#"ast "'hello'" --flatten"#,
+                result: Some(Value::test_list(vec![Value::test_record(record! {
+                    "content" => Value::test_string("'hello'"),
+                    "shape" => Value::test_string("shape_string"),
+                    "span" => Value::test_record(record! {
+                        "start" => Value::test_int(0),
+                        "end" => Value::test_int(7),}),
+                })])),
+            },
+            Example {
+                description: "Print the ast of a string flattened, as json, minified",
+                example: r#"ast "'hello'" --flatten --json --minify"#,
+                result: Some(Value::test_string(
+                    r#"[{"content":"'hello'","shape":"shape_string","span":{"start":0,"end":7}}]"#,
+                )),
+            },
+            Example {
+                description: "Print the ast of a pipeline flattened",
+                example: r#"ast 'ls | sort-by type name -i' --flatten"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {
+                        "content" => Value::test_string("ls"),
+                        "shape" => Value::test_string("shape_external"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(0),
+                            "end" => Value::test_int(2),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("|"),
+                        "shape" => Value::test_string("shape_pipe"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(3),
+                            "end" => Value::test_int(4),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("sort-by"),
+                        "shape" => Value::test_string("shape_internalcall"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(5),
+                            "end" => Value::test_int(12),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("type"),
+                        "shape" => Value::test_string("shape_string"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(13),
+                            "end" => Value::test_int(17),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("name"),
+                        "shape" => Value::test_string("shape_string"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(18),
+                            "end" => Value::test_int(22),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("-i"),
+                        "shape" => Value::test_string("shape_flag"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(23),
+                            "end" => Value::test_int(25),}),
+                    }),
+                ])),
+            },
         ]
     }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let pipeline: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let to_json = call.has_flag(engine_state, stack, "json")?;
+        let minify = call.has_flag(engine_state, stack, "minify")?;
+        let flatten = call.has_flag(engine_state, stack, "flatten")?;
+
+        let mut working_set = StateWorkingSet::new(engine_state);
+        let offset = working_set.next_span_start();
+        let parsed_block = parse(&mut working_set, None, pipeline.item.as_bytes(), false);
+
+        if flatten {
+            let flat = flatten_block(&working_set, &parsed_block);
+            if to_json {
+                let mut json_val: JsonValue = json!([]);
+                for (span, shape) in flat {
+                    let content =
+                        String::from_utf8_lossy(working_set.get_span_contents(span)).to_string();
+
+                    let json = json!(
+                        {
+                            "content": content,
+                            "shape": shape.to_string(),
+                            "span": {
+                                "start": span.start.checked_sub(offset),
+                                "end": span.end.checked_sub(offset),
+                            },
+                        }
+                    );
+                    json_merge(&mut json_val, &json);
+                }
+                let json_string = if minify {
+                    if let Ok(json_str) = serde_json::to_string(&json_val) {
+                        json_str
+                    } else {
+                        "{}".to_string()
+                    }
+                } else if let Ok(json_str) = serde_json::to_string_pretty(&json_val) {
+                    json_str
+                } else {
+                    "{}".to_string()
+                };
+
+                Ok(Value::string(json_string, pipeline.span).into_pipeline_data())
+            } else {
+                // let mut rec: Record = Record::new();
+                let mut rec = vec![];
+                for (span, shape) in flat {
+                    let content =
+                        String::from_utf8_lossy(working_set.get_span_contents(span)).to_string();
+                    let each_rec = record! {
+                        "content" => Value::test_string(content),
+                        "shape" => Value::test_string(shape.to_string()),
+                        "span" => Value::test_record(record!{
+                            "start" => Value::test_int(match span.start.checked_sub(offset) {
+                                Some(start) => start as i64,
+                                None => 0
+                            }),
+                            "end" => Value::test_int(match span.end.checked_sub(offset) {
+                                Some(end) => end as i64,
+                                None => 0
+                            }),
+                        }),
+                    };
+                    rec.push(Value::test_record(each_rec));
+                }
+                Ok(Value::list(rec, pipeline.span).into_pipeline_data())
+            }
+        } else {
+            let error_output = working_set.parse_errors.first();
+            let block_span = match &parsed_block.span {
+                Some(span) => span,
+                None => &pipeline.span,
+            };
+            if to_json {
+                // Get the block as json
+                let serde_block_str = if minify {
+                    serde_json::to_string(&*parsed_block)
+                } else {
+                    serde_json::to_string_pretty(&*parsed_block)
+                };
+                let block_json = match serde_block_str {
+                    Ok(json) => json,
+                    Err(e) => Err(ShellError::CantConvert {
+                        to_type: "string".to_string(),
+                        from_type: "block".to_string(),
+                        span: *block_span,
+                        help: Some(format!(
+                            "Error: {e}\nCan't convert {parsed_block:?} to string"
+                        )),
+                    })?,
+                };
+                // Get the error as json
+                let serde_error_str = if minify {
+                    serde_json::to_string(&error_output)
+                } else {
+                    serde_json::to_string_pretty(&error_output)
+                };
+
+                let error_json = match serde_error_str {
+                    Ok(json) => json,
+                    Err(e) => Err(ShellError::CantConvert {
+                        to_type: "string".to_string(),
+                        from_type: "error".to_string(),
+                        span: *block_span,
+                        help: Some(format!(
+                            "Error: {e}\nCan't convert {error_output:?} to string"
+                        )),
+                    })?,
+                };
+
+                // Create a new output record, merging the block and error
+                let output_record = Value::record(
+                    record! {
+                        "block" => Value::string(block_json, *block_span),
+                        "error" => Value::string(error_json, Span::test_data()),
+                    },
+                    pipeline.span,
+                );
+                Ok(output_record.into_pipeline_data())
+            } else {
+                let block_value = Value::string(
+                    if minify {
+                        format!("{parsed_block:?}")
+                    } else {
+                        format!("{parsed_block:#?}")
+                    },
+                    pipeline.span,
+                );
+                let error_value = Value::string(
+                    if minify {
+                        format!("{error_output:?}")
+                    } else {
+                        format!("{error_output:#?}")
+                    },
+                    pipeline.span,
+                );
+                let output_record = Value::record(
+                    record! {
+                        "block" => block_value,
+                        "error" => error_value
+                    },
+                    pipeline.span,
+                );
+                Ok(output_record.into_pipeline_data())
+            }
+        }
+    }
+}
+
+fn json_merge(a: &mut JsonValue, b: &JsonValue) {
+    match (a, b) {
+        (JsonValue::Object(ref mut a), JsonValue::Object(b)) => {
+            for (k, v) in b {
+                json_merge(a.entry(k).or_insert(JsonValue::Null), v);
+            }
+        }
+        (JsonValue::Array(ref mut a), JsonValue::Array(b)) => {
+            a.extend(b.clone());
+        }
+        (JsonValue::Array(ref mut a), JsonValue::Object(b)) => {
+            a.extend([JsonValue::Object(b.clone())]);
+        }
+        (a, b) => {
+            *a = b.clone();
+        }
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/nu-command/src/debug/inspect.rs b/crates/nu-command/src/debug/inspect.rs
index 97217780bf..4a9f7bc4a5 100644
--- a/crates/nu-command/src/debug/inspect.rs
+++ b/crates/nu-command/src/debug/inspect.rs
@@ -1,6 +1,6 @@
 use super::inspect_table;
+use crossterm::terminal::size;
 use nu_engine::command_prelude::*;
-use terminal_size::{terminal_size, Height, Width};
 
 #[derive(Clone)]
 pub struct Inspect;
@@ -38,12 +38,9 @@ impl Command for Inspect {
         let original_input = input_val.clone();
         let description = input_val.get_type().to_string();
 
-        let (cols, _rows) = match terminal_size() {
-            Some((w, h)) => (Width(w.0), Height(h.0)),
-            None => (Width(0), Height(0)),
-        };
+        let (cols, _rows) = size().unwrap_or((0, 0));
 
-        let table = inspect_table::build_table(input_val, description, cols.0 as usize);
+        let table = inspect_table::build_table(input_val, description, cols as usize);
 
         // Note that this is printed to stderr. The reason for this is so it doesn't disrupt the regular nushell
         // tabular output. If we printed to stdout, nushell would get confused with two outputs.
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index ac6fb46631..9903eed774 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -230,6 +230,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Rm,
             Save,
             Touch,
+            UTouch,
             Glob,
             Watch,
         };
@@ -247,7 +248,9 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             IsTerminal,
             Kill,
             Sleep,
+            Term,
             TermSize,
+            TermQuery,
             Whoami,
         };
 
diff --git a/crates/nu-command/src/env/config/config_env.rs b/crates/nu-command/src/env/config/config_env.rs
index cb4a217d9b..5331d2d3be 100644
--- a/crates/nu-command/src/env/config/config_env.rs
+++ b/crates/nu-command/src/env/config/config_env.rs
@@ -15,7 +15,16 @@ impl Command for ConfigEnv {
         Signature::build(self.name())
             .category(Category::Env)
             .input_output_types(vec![(Type::Nothing, Type::Any)])
-            .switch("default", "Print default `env.nu` file instead.", Some('d'))
+            .switch(
+                "default",
+                "Print the internal default `env.nu` file instead.",
+                Some('d'),
+            )
+            .switch(
+                "sample",
+                "Print a commented, sample `env.nu` file instead.",
+                Some('s'),
+            )
         // TODO: Signature narrower than what run actually supports theoretically
     }
 
@@ -26,18 +35,18 @@ impl Command for ConfigEnv {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "allow user to open and update nu env",
+                description: "open user's env.nu in the default editor",
                 example: "config env",
                 result: None,
             },
             Example {
-                description: "allow user to print default `env.nu` file",
-                example: "config env --default,",
+                description: "pretty-print a commented, sample `env.nu` that explains common settings",
+                example: "config env --sample | nu-highlight,",
                 result: None,
             },
             Example {
-                description: "allow saving the default `env.nu` locally",
-                example: "config env --default | save -f ~/.config/nushell/default_env.nu",
+                description: "pretty-print the internal `env.nu` file which is loaded before the user's environment",
+                example: "config env --default | nu-highlight,",
                 result: None,
             },
         ]
@@ -50,12 +59,28 @@ impl Command for ConfigEnv {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let default_flag = call.has_flag(engine_state, stack, "default")?;
+        let sample_flag = call.has_flag(engine_state, stack, "sample")?;
+        if default_flag && sample_flag {
+            return Err(ShellError::IncompatibleParameters {
+                left_message: "can't use `--default` at the same time".into(),
+                left_span: call.get_flag_span(stack, "default").expect("has flag"),
+                right_message: "because of `--sample`".into(),
+                right_span: call.get_flag_span(stack, "sample").expect("has flag"),
+            });
+        }
         // `--default` flag handling
         if call.has_flag(engine_state, stack, "default")? {
             let head = call.head;
             return Ok(Value::string(nu_utils::get_default_env(), head).into_pipeline_data());
         }
 
+        // `--sample` flag handling
+        if sample_flag {
+            let head = call.head;
+            return Ok(Value::string(nu_utils::get_sample_env(), head).into_pipeline_data());
+        }
+
         // Find the editor executable.
         let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
         let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index 9969968ed2..176643a76f 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -17,9 +17,14 @@ impl Command for ConfigNu {
             .input_output_types(vec![(Type::Nothing, Type::Any)])
             .switch(
                 "default",
-                "Print default `config.nu` file instead.",
+                "Print the internal default `config.nu` file instead.",
                 Some('d'),
             )
+            .switch(
+                "sample",
+                "Print a commented, sample `config.nu` file instead.",
+                Some('s'),
+            )
         // TODO: Signature narrower than what run actually supports theoretically
     }
 
@@ -30,18 +35,19 @@ impl Command for ConfigNu {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "allow user to open and update nu config",
+                description: "open user's config.nu in the default editor",
                 example: "config nu",
                 result: None,
             },
             Example {
-                description: "allow user to print default `config.nu` file",
-                example: "config nu --default,",
+                description: "pretty-print a commented, sample `config.nu` that explains common settings",
+                example: "config nu --sample | nu-highlight",
                 result: None,
             },
             Example {
-                description: "allow saving the default `config.nu` locally",
-                example: "config nu --default | save -f ~/.config/nushell/default_config.nu",
+                description:
+                    "pretty-print the internal `config.nu` file which is loaded before user's config",
+                example: "config nu --default | nu-highlight",
                 result: None,
             },
         ]
@@ -54,12 +60,29 @@ impl Command for ConfigNu {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let default_flag = call.has_flag(engine_state, stack, "default")?;
+        let sample_flag = call.has_flag(engine_state, stack, "sample")?;
+        if default_flag && sample_flag {
+            return Err(ShellError::IncompatibleParameters {
+                left_message: "can't use `--default` at the same time".into(),
+                left_span: call.get_flag_span(stack, "default").expect("has flag"),
+                right_message: "because of `--sample`".into(),
+                right_span: call.get_flag_span(stack, "sample").expect("has flag"),
+            });
+        }
+
         // `--default` flag handling
-        if call.has_flag(engine_state, stack, "default")? {
+        if default_flag {
             let head = call.head;
             return Ok(Value::string(nu_utils::get_default_config(), head).into_pipeline_data());
         }
 
+        // `--sample` flag handling
+        if sample_flag {
+            let head = call.head;
+            return Ok(Value::string(nu_utils::get_sample_config(), head).into_pipeline_data());
+        }
+
         // Find the editor executable.
         let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
         let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
diff --git a/crates/nu-command/src/filesystem/mod.rs b/crates/nu-command/src/filesystem/mod.rs
index acfa54fee3..089e899dda 100644
--- a/crates/nu-command/src/filesystem/mod.rs
+++ b/crates/nu-command/src/filesystem/mod.rs
@@ -12,6 +12,7 @@ mod ucp;
 mod umkdir;
 mod umv;
 mod util;
+mod utouch;
 mod watch;
 
 pub use self::open::Open;
@@ -27,4 +28,5 @@ pub use touch::Touch;
 pub use ucp::UCp;
 pub use umkdir::UMkdir;
 pub use umv::UMv;
+pub use utouch::UTouch;
 pub use watch::Watch;
diff --git a/crates/nu-command/src/filesystem/umv.rs b/crates/nu-command/src/filesystem/umv.rs
index 0f49a7d97d..929fc7bcbb 100644
--- a/crates/nu-command/src/filesystem/umv.rs
+++ b/crates/nu-command/src/filesystem/umv.rs
@@ -188,6 +188,7 @@ impl Command for UMv {
             target_dir: None,
             no_target_dir: false,
             strip_slashes: false,
+            debug: false,
         };
         if let Err(error) = uu_mv::mv(&files, &options) {
             return Err(ShellError::GenericError {
diff --git a/crates/nu-command/src/filesystem/utouch.rs b/crates/nu-command/src/filesystem/utouch.rs
new file mode 100644
index 0000000000..f32364b28a
--- /dev/null
+++ b/crates/nu-command/src/filesystem/utouch.rs
@@ -0,0 +1,268 @@
+use std::io::ErrorKind;
+use std::path::PathBuf;
+
+use chrono::{DateTime, FixedOffset};
+use filetime::FileTime;
+
+use nu_engine::CallExt;
+use nu_path::expand_path_with;
+use nu_protocol::engine::{Call, Command, EngineState, Stack};
+use nu_protocol::{
+    Category, Example, NuGlob, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type,
+};
+use uu_touch::error::TouchError;
+use uu_touch::{ChangeTimes, InputFile, Options, Source};
+
+use super::util::get_rest_for_glob_pattern;
+
+#[derive(Clone)]
+pub struct UTouch;
+
+impl Command for UTouch {
+    fn name(&self) -> &str {
+        "utouch"
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["create", "file"]
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("utouch")
+            .input_output_types(vec![ (Type::Nothing, Type::Nothing) ])
+            .rest(
+                "files",
+                SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::Filepath]),
+                "The file(s) to create. '-' is used to represent stdout."
+            )
+            .named(
+                "reference",
+                SyntaxShape::Filepath,
+                "Use the access and modification times of the reference file/directory instead of the current time",
+                Some('r'),
+            )
+            .named(
+                "timestamp",
+                SyntaxShape::DateTime,
+                "Use the given timestamp instead of the current time",
+                Some('t')
+            )
+            .named(
+                "date",
+                SyntaxShape::String,
+                "Use the given time instead of the current time. This can be a full timestamp or it can be relative to either the current time or reference file time (if given). For more information, see https://www.gnu.org/software/coreutils/manual/html_node/touch-invocation.html",
+                Some('d')
+            )
+            .switch(
+                "modified",
+                "Change only the modification time (if used with -a, access time is changed too)",
+                Some('m'),
+            )
+            .switch(
+                "access",
+                "Change only the access time (if used with -m, modification time is changed too)",
+                Some('a'),
+            )
+            .switch(
+                "no-create",
+                "Don't create the file if it doesn't exist",
+                Some('c'),
+            )
+            .switch(
+                "no-deref",
+                "Affect each symbolic link instead of any referenced file (only for systems that can change the timestamps of a symlink). Ignored if touching stdout",
+                Some('s'),
+            )
+            .category(Category::FileSystem)
+    }
+
+    fn description(&self) -> &str {
+        "Creates one or more files."
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let change_mtime: bool = call.has_flag(engine_state, stack, "modified")?;
+        let change_atime: bool = call.has_flag(engine_state, stack, "access")?;
+        let no_create: bool = call.has_flag(engine_state, stack, "no-create")?;
+        let no_deref: bool = call.has_flag(engine_state, stack, "no-dereference")?;
+        let file_globs: Vec<Spanned<NuGlob>> =
+            get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let cwd = engine_state.cwd(Some(stack))?;
+
+        if file_globs.is_empty() {
+            return Err(ShellError::MissingParameter {
+                param_name: "requires file paths".to_string(),
+                span: call.head,
+            });
+        }
+
+        let (reference_file, reference_span) = if let Some(reference) =
+            call.get_flag::<Spanned<PathBuf>>(engine_state, stack, "reference")?
+        {
+            (Some(reference.item), Some(reference.span))
+        } else {
+            (None, None)
+        };
+        let (date_str, date_span) =
+            if let Some(date) = call.get_flag::<Spanned<String>>(engine_state, stack, "date")? {
+                (Some(date.item), Some(date.span))
+            } else {
+                (None, None)
+            };
+        let timestamp: Option<Spanned<DateTime<FixedOffset>>> =
+            call.get_flag(engine_state, stack, "timestamp")?;
+
+        let source = if let Some(timestamp) = timestamp {
+            if let Some(reference_span) = reference_span {
+                return Err(ShellError::IncompatibleParameters {
+                    left_message: "timestamp given".to_string(),
+                    left_span: timestamp.span,
+                    right_message: "reference given".to_string(),
+                    right_span: reference_span,
+                });
+            }
+            if let Some(date_span) = date_span {
+                return Err(ShellError::IncompatibleParameters {
+                    left_message: "timestamp given".to_string(),
+                    left_span: timestamp.span,
+                    right_message: "date given".to_string(),
+                    right_span: date_span,
+                });
+            }
+            Source::Timestamp(FileTime::from_unix_time(
+                timestamp.item.timestamp(),
+                timestamp.item.timestamp_subsec_nanos(),
+            ))
+        } else if let Some(reference_file) = reference_file {
+            let reference_file = expand_path_with(reference_file, &cwd, true);
+            Source::Reference(reference_file)
+        } else {
+            Source::Now
+        };
+
+        let change_times = if change_atime && !change_mtime {
+            ChangeTimes::AtimeOnly
+        } else if change_mtime && !change_atime {
+            ChangeTimes::MtimeOnly
+        } else {
+            ChangeTimes::Both
+        };
+
+        let mut input_files = Vec::new();
+        for file_glob in &file_globs {
+            if file_glob.item.as_ref() == "-" {
+                input_files.push(InputFile::Stdout);
+            } else {
+                let path =
+                    expand_path_with(file_glob.item.as_ref(), &cwd, file_glob.item.is_expand());
+                input_files.push(InputFile::Path(path));
+            }
+        }
+
+        if let Err(err) = uu_touch::touch(
+            &input_files,
+            &Options {
+                no_create,
+                no_deref,
+                source,
+                date: date_str,
+                change_times,
+                strict: true,
+            },
+        ) {
+            let nu_err = match err {
+                TouchError::TouchFileError { path, index, error } => ShellError::GenericError {
+                    error: format!("Could not touch {}", path.display()),
+                    msg: error.to_string(),
+                    span: Some(file_globs[index].span),
+                    help: None,
+                    inner: Vec::new(),
+                },
+                TouchError::InvalidDateFormat(date) => ShellError::IncorrectValue {
+                    msg: format!("Invalid date: {}", date),
+                    val_span: date_span.expect("utouch should've been given a date"),
+                    call_span: call.head,
+                },
+                TouchError::ReferenceFileInaccessible(reference_path, io_err) => {
+                    let span =
+                        reference_span.expect("utouch should've been given a reference file");
+                    if io_err.kind() == ErrorKind::NotFound {
+                        ShellError::FileNotFound {
+                            span,
+                            file: reference_path.display().to_string(),
+                        }
+                    } else {
+                        ShellError::GenericError {
+                            error: io_err.to_string(),
+                            msg: format!("Failed to read metadata of {}", reference_path.display()),
+                            span: Some(span),
+                            help: None,
+                            inner: Vec::new(),
+                        }
+                    }
+                }
+                _ => ShellError::GenericError {
+                    error: err.to_string(),
+                    msg: err.to_string(),
+                    span: Some(call.head),
+                    help: None,
+                    inner: Vec::new(),
+                },
+            };
+            return Err(nu_err);
+        }
+
+        Ok(PipelineData::empty())
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Creates \"fixture.json\"",
+                example: "utouch fixture.json",
+                result: None,
+            },
+            Example {
+                description: "Creates files a, b and c",
+                example: "utouch a b c",
+                result: None,
+            },
+            Example {
+                description: r#"Changes the last modified time of "fixture.json" to today's date"#,
+                example: "utouch -m fixture.json",
+                result: None,
+            },
+            Example {
+                description: "Changes the last accessed and modified times of files a, b and c to the current time but yesterday",
+                example: r#"utouch -d "yesterday" a b c"#,
+                result: None,
+            },
+            Example {
+                description: r#"Changes the last modified time of files d and e to "fixture.json"'s last modified time"#,
+                example: r#"utouch -m -r fixture.json d e"#,
+                result: None,
+            },
+            Example {
+                description: r#"Changes the last accessed time of "fixture.json" to a datetime"#,
+                example: r#"utouch -a -t 2019-08-24T12:30:30 fixture.json"#,
+                result: None,
+            },
+            Example {
+                description: r#"Change the last accessed and modified times of stdout"#,
+                example: r#"utouch -"#,
+                result: None,
+            },
+            Example {
+                description: r#"Changes the last accessed and modified times of file a to 1 month before "fixture.json"'s last modified time"#,
+                example: r#"utouch -r fixture.json -d "-1 month" a"#,
+                result: None,
+            },
+        ]
+    }
+}
diff --git a/crates/nu-command/src/filesystem/watch.rs b/crates/nu-command/src/filesystem/watch.rs
index 6f022acca8..dd21304173 100644
--- a/crates/nu-command/src/filesystem/watch.rs
+++ b/crates/nu-command/src/filesystem/watch.rs
@@ -194,7 +194,7 @@ impl Command for Watch {
 
                 match result {
                     Ok(val) => {
-                        val.print(engine_state, stack, false, false)?;
+                        val.print_table(engine_state, stack, false, false)?;
                     }
                     Err(err) => {
                         let working_set = StateWorkingSet::new(engine_state);
diff --git a/crates/nu-command/src/filters/insert.rs b/crates/nu-command/src/filters/insert.rs
index e6f9a7d8d7..0d3a234f58 100644
--- a/crates/nu-command/src/filters/insert.rs
+++ b/crates/nu-command/src/filters/insert.rs
@@ -129,6 +129,8 @@ fn insert(
     let replacement: Value = call.req(engine_state, stack, 1)?;
 
     match input {
+        // Propagate errors in the pipeline
+        PipelineData::Value(Value::Error { error, .. }, ..) => Err(*error),
         PipelineData::Value(mut value, metadata) => {
             if let Value::Closure { val, .. } = replacement {
                 match (cell_path.members.first(), &mut value) {
diff --git a/crates/nu-command/src/filters/merge.rs b/crates/nu-command/src/filters/merge.rs
index e1d3095b20..588138fb42 100644
--- a/crates/nu-command/src/filters/merge.rs
+++ b/crates/nu-command/src/filters/merge.rs
@@ -120,6 +120,8 @@ repeating this process with row 1, and so on."#
                 PipelineData::Value(Value::Record { val: inp, .. }, ..),
                 Value::Record { val: to_merge, .. },
             ) => Ok(Value::record(do_merge(inp, &to_merge), head).into_pipeline_data()),
+            // Propagate errors in the pipeline
+            (PipelineData::Value(Value::Error { error, .. }, ..), _) => Err(*error.clone()),
             (PipelineData::Value(val, ..), ..) => {
                 // Only point the "value originates here" arrow at the merge value
                 // if it was generated from a block. Otherwise, point at the pipeline value. -Leon 2022-10-27
diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
index 217918cf91..b42f0c820c 100644
--- a/crates/nu-command/src/filters/split_by.rs
+++ b/crates/nu-command/src/filters/split_by.rs
@@ -1,5 +1,6 @@
 use indexmap::IndexMap;
 use nu_engine::command_prelude::*;
+use nu_protocol::report_shell_warning;
 
 #[derive(Clone)]
 pub struct SplitBy;
@@ -27,6 +28,15 @@ impl Command for SplitBy {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        report_shell_warning(
+            engine_state,
+            &ShellError::Deprecated {
+                deprecated: "The `split_by` command",
+                suggestion: "Please use the `group-by` command instead.",
+                span: call.head,
+                help: None,
+            },
+        );
         split_by(engine_state, stack, call, input)
     }
 
diff --git a/crates/nu-command/src/formats/from/csv.rs b/crates/nu-command/src/formats/from/csv.rs
index 472ccf4d71..bde84c2c73 100644
--- a/crates/nu-command/src/formats/from/csv.rs
+++ b/crates/nu-command/src/formats/from/csv.rs
@@ -11,7 +11,10 @@ impl Command for FromCsv {
 
     fn signature(&self) -> Signature {
         Signature::build("from csv")
-            .input_output_types(vec![(Type::String, Type::table())])
+            .input_output_types(vec![
+                (Type::String, Type::table()),
+                (Type::String, Type::list(Type::Any)),
+            ])
             .named(
                 "separator",
                 SyntaxShape::String,
@@ -82,6 +85,26 @@ impl Command for FromCsv {
                     })],
                 ))
             },
+            Example {
+                description: "Convert comma-separated data to a table, allowing variable number of columns per row",
+                example: "\"ColA,ColB\n1,2\n3,4,5\n6\" | from csv --flexible",
+                result: Some(Value::test_list (
+                    vec![
+                        Value::test_record(record! {
+                            "ColA" => Value::test_int(1),
+                            "ColB" => Value::test_int(2),
+                        }),
+                        Value::test_record(record! {
+                            "ColA" => Value::test_int(3),
+                            "ColB" => Value::test_int(4),
+                            "column2" => Value::test_int(5),
+                        }),
+                        Value::test_record(record! {
+                            "ColA" => Value::test_int(6),
+                        }),
+                    ],
+                ))
+            },
             Example {
                 description: "Convert comma-separated data to a table, ignoring headers",
                 example: "open data.txt | from csv --noheaders",
diff --git a/crates/nu-command/src/formats/from/delimited.rs b/crates/nu-command/src/formats/from/delimited.rs
index 0fea7e082b..5dfdd4ad82 100644
--- a/crates/nu-command/src/formats/from/delimited.rs
+++ b/crates/nu-command/src/formats/from/delimited.rs
@@ -39,12 +39,7 @@ fn from_delimited_stream(
         .from_reader(input_reader);
 
     let headers = if noheaders {
-        (0..reader
-            .headers()
-            .map_err(|err| from_csv_error(err, span))?
-            .len())
-            .map(|i| format!("column{i}"))
-            .collect::<Vec<String>>()
+        vec![]
     } else {
         reader
             .headers()
@@ -54,32 +49,28 @@ fn from_delimited_stream(
             .collect()
     };
 
+    let n = headers.len();
+    let columns = headers
+        .into_iter()
+        .chain((n..).map(|i| format!("column{i}")));
     let iter = reader.into_records().map(move |row| {
         let row = match row {
             Ok(row) => row,
             Err(err) => return Value::error(from_csv_error(err, span), span),
         };
-        let columns = headers.iter().cloned();
-        let values = row
-            .into_iter()
-            .map(|s| {
-                if no_infer {
-                    Value::string(s, span)
-                } else if let Ok(i) = s.parse() {
-                    Value::int(i, span)
-                } else if let Ok(f) = s.parse() {
-                    Value::float(f, span)
-                } else {
-                    Value::string(s, span)
-                }
-            })
-            .chain(std::iter::repeat(Value::nothing(span)));
+        let columns = columns.clone();
+        let values = row.into_iter().map(|s| {
+            if no_infer {
+                Value::string(s, span)
+            } else if let Ok(i) = s.parse() {
+                Value::int(i, span)
+            } else if let Ok(f) = s.parse() {
+                Value::float(f, span)
+            } else {
+                Value::string(s, span)
+            }
+        });
 
-        // If there are more values than the number of headers,
-        // then the remaining values are ignored.
-        //
-        // Otherwise, if there are less values than headers,
-        // then `Value::nothing(span)` is used to fill the remaining columns.
         Value::record(columns.zip(values).collect(), span)
     });
 
diff --git a/crates/nu-command/src/formats/from/tsv.rs b/crates/nu-command/src/formats/from/tsv.rs
index cd3c9f97bd..09bee4803f 100644
--- a/crates/nu-command/src/formats/from/tsv.rs
+++ b/crates/nu-command/src/formats/from/tsv.rs
@@ -11,7 +11,10 @@ impl Command for FromTsv {
 
     fn signature(&self) -> Signature {
         Signature::build("from tsv")
-            .input_output_types(vec![(Type::String, Type::table())])
+            .input_output_types(vec![
+                (Type::String, Type::table()),
+                (Type::String, Type::list(Type::Any)),
+            ])
             .named(
                 "comment",
                 SyntaxShape::String,
@@ -76,6 +79,21 @@ impl Command for FromTsv {
                     })],
                 ))
             },
+            Example {
+                description: "Convert comma-separated data to a table, allowing variable number of columns per row and ignoring headers",
+                example: "\"value 1\nvalue 2\tdescription 2\" | from tsv --flexible --noheaders",
+                result: Some(Value::test_list (
+                    vec![
+                        Value::test_record(record! {
+                            "column0" => Value::test_string("value 1"),
+                        }),
+                        Value::test_record(record! {
+                            "column0" => Value::test_string("value 2"),
+                            "column1" => Value::test_string("description 2"),
+                        }),
+                    ],
+                ))
+            },
             Example {
                 description: "Create a tsv file with header columns and open it",
                 example: r#"$'c1(char tab)c2(char tab)c3(char nl)1(char tab)2(char tab)3' | save tsv-data | open tsv-data | from tsv"#,
diff --git a/crates/nu-command/src/formats/to/xml.rs b/crates/nu-command/src/formats/to/xml.rs
index 77708aa375..4476f654c2 100644
--- a/crates/nu-command/src/formats/to/xml.rs
+++ b/crates/nu-command/src/formats/to/xml.rs
@@ -4,7 +4,7 @@ use nu_engine::command_prelude::*;
 
 use quick_xml::{
     escape,
-    events::{BytesEnd, BytesStart, BytesText, Event},
+    events::{BytesEnd, BytesPI, BytesStart, BytesText, Event},
 };
 use std::{borrow::Cow, io::Cursor};
 
@@ -406,7 +406,7 @@ impl Job {
         let content_text = format!("{} {}", tag, content);
         // PI content must NOT be escaped
         // https://www.w3.org/TR/xml/#sec-pi
-        let pi_content = BytesText::from_escaped(content_text.as_str());
+        let pi_content = BytesPI::new(content_text.as_str());
 
         self.writer
             .write_event(Event::PI(pi_content))
diff --git a/crates/nu-command/src/help/help_operators.rs b/crates/nu-command/src/help/help_operators.rs
index 28be6a68ed..28bb223e61 100644
--- a/crates/nu-command/src/help/help_operators.rs
+++ b/crates/nu-command/src/help/help_operators.rs
@@ -31,7 +31,7 @@ impl Command for HelpOperators {
         let mut operators = [
             Operator::Assignment(Assignment::Assign),
             Operator::Assignment(Assignment::PlusAssign),
-            Operator::Assignment(Assignment::AppendAssign),
+            Operator::Assignment(Assignment::ConcatAssign),
             Operator::Assignment(Assignment::MinusAssign),
             Operator::Assignment(Assignment::MultiplyAssign),
             Operator::Assignment(Assignment::DivideAssign),
@@ -48,7 +48,7 @@ impl Command for HelpOperators {
             Operator::Comparison(Comparison::StartsWith),
             Operator::Comparison(Comparison::EndsWith),
             Operator::Math(Math::Plus),
-            Operator::Math(Math::Append),
+            Operator::Math(Math::Concat),
             Operator::Math(Math::Minus),
             Operator::Math(Math::Multiply),
             Operator::Math(Math::Divide),
@@ -144,8 +144,8 @@ fn description(operator: &Operator) -> &'static str {
         Operator::Comparison(Comparison::StartsWith) => "Checks if a string starts with another.",
         Operator::Comparison(Comparison::EndsWith) => "Checks if a string ends with another.",
         Operator::Math(Math::Plus) => "Adds two values.",
-        Operator::Math(Math::Append) => {
-            "Appends two lists, a list and a value, two strings, or two binary values."
+        Operator::Math(Math::Concat) => {
+            "Concatenates two lists, two strings, or two binary values."
         }
         Operator::Math(Math::Minus) => "Subtracts two values.",
         Operator::Math(Math::Multiply) => "Multiplies two values.",
@@ -163,8 +163,8 @@ fn description(operator: &Operator) -> &'static str {
         Operator::Bits(Bits::ShiftRight) => "Bitwise shifts a value right by another.",
         Operator::Assignment(Assignment::Assign) => "Assigns a value to a variable.",
         Operator::Assignment(Assignment::PlusAssign) => "Adds a value to a variable.",
-        Operator::Assignment(Assignment::AppendAssign) => {
-            "Appends a list, a value, a string, or a binary value to a variable."
+        Operator::Assignment(Assignment::ConcatAssign) => {
+            "Concatenates two lists, two strings, or two binary values."
         }
         Operator::Assignment(Assignment::MinusAssign) => "Subtracts a value from a variable.",
         Operator::Assignment(Assignment::MultiplyAssign) => "Multiplies a variable by a value.",
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 62dd693627..504cc7b632 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -376,7 +376,7 @@ fn send_multipart_request(
                         format!("Content-Length: {}", val.len()),
                     ];
                     builder
-                        .add(&mut Cursor::new(val), &headers.join("\n"))
+                        .add(&mut Cursor::new(val), &headers.join("\r\n"))
                         .map_err(err)?;
                 } else {
                     let headers = format!(r#"Content-Disposition: form-data; name="{}""#, col);
diff --git a/crates/nu-command/src/platform/input/input_.rs b/crates/nu-command/src/platform/input/input_.rs
index cf46b400c0..f792db992e 100644
--- a/crates/nu-command/src/platform/input/input_.rs
+++ b/crates/nu-command/src/platform/input/input_.rs
@@ -43,6 +43,12 @@ impl Command for Input {
                 "number of characters to read; suppresses output",
                 Some('n'),
             )
+            .named(
+                "default",
+                SyntaxShape::String,
+                "default value if no input is provided",
+                Some('d'),
+            )
             .switch("suppress-output", "don't print keystroke values", Some('s'))
             .category(Category::Platform)
     }
@@ -72,8 +78,12 @@ impl Command for Input {
             });
         }
 
+        let default_val: Option<String> = call.get_flag(engine_state, stack, "default")?;
         if let Some(prompt) = &prompt {
-            print!("{prompt}");
+            match &default_val {
+                None => print!("{prompt}"),
+                Some(val) => print!("{prompt} (default: {val})"),
+            }
             let _ = std::io::stdout().flush();
         }
 
@@ -149,7 +159,10 @@ impl Command for Input {
         if !suppress_output {
             std::io::stdout().write_all(b"\n")?;
         }
-        Ok(Value::string(buf, call.head).into_pipeline_data())
+        match default_val {
+            Some(val) if buf.is_empty() => Ok(Value::string(val, call.head).into_pipeline_data()),
+            _ => Ok(Value::string(buf, call.head).into_pipeline_data()),
+        }
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -164,6 +177,11 @@ impl Command for Input {
                 example: "let user_input = (input --numchar 2)",
                 result: None,
             },
+            Example {
+                description: "Get input from the user with default value, and assign to a variable",
+                example: "let user_input = (input --default 10)",
+                result: None,
+            },
         ]
     }
 }
diff --git a/crates/nu-command/src/platform/mod.rs b/crates/nu-command/src/platform/mod.rs
index 16a245f87b..25df4e0c59 100644
--- a/crates/nu-command/src/platform/mod.rs
+++ b/crates/nu-command/src/platform/mod.rs
@@ -5,7 +5,7 @@ mod input;
 mod is_terminal;
 mod kill;
 mod sleep;
-mod term_size;
+mod term;
 #[cfg(unix)]
 mod ulimit;
 mod whoami;
@@ -19,7 +19,7 @@ pub use input::InputListen;
 pub use is_terminal::IsTerminal;
 pub use kill::Kill;
 pub use sleep::Sleep;
-pub use term_size::TermSize;
+pub use term::{Term, TermQuery, TermSize};
 #[cfg(unix)]
 pub use ulimit::ULimit;
 pub use whoami::Whoami;
diff --git a/crates/nu-command/src/platform/term/mod.rs b/crates/nu-command/src/platform/term/mod.rs
new file mode 100644
index 0000000000..cd37a0583b
--- /dev/null
+++ b/crates/nu-command/src/platform/term/mod.rs
@@ -0,0 +1,7 @@
+mod term_;
+mod term_query;
+mod term_size;
+
+pub use term_::Term;
+pub use term_query::TermQuery;
+pub use term_size::TermSize;
diff --git a/crates/nu-command/src/platform/term/term_.rs b/crates/nu-command/src/platform/term/term_.rs
new file mode 100644
index 0000000000..b28f226263
--- /dev/null
+++ b/crates/nu-command/src/platform/term/term_.rs
@@ -0,0 +1,34 @@
+use nu_engine::{command_prelude::*, get_full_help};
+
+#[derive(Clone)]
+pub struct Term;
+
+impl Command for Term {
+    fn name(&self) -> &str {
+        "term"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("term")
+            .category(Category::Platform)
+            .input_output_types(vec![(Type::Nothing, Type::String)])
+    }
+
+    fn description(&self) -> &str {
+        "Commands for querying information about the terminal."
+    }
+
+    fn extra_description(&self) -> &str {
+        "You must use one of the following subcommands. Using this command as-is will only produce this help message."
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
+    }
+}
diff --git a/crates/nu-command/src/platform/term/term_query.rs b/crates/nu-command/src/platform/term/term_query.rs
new file mode 100644
index 0000000000..a4966edde0
--- /dev/null
+++ b/crates/nu-command/src/platform/term/term_query.rs
@@ -0,0 +1,137 @@
+use std::{
+    io::{Read, Write},
+    time::Duration,
+};
+
+use nu_engine::command_prelude::*;
+
+const CTRL_C: u8 = 3;
+
+#[derive(Clone)]
+pub struct TermQuery;
+
+impl Command for TermQuery {
+    fn name(&self) -> &str {
+        "term query"
+    }
+
+    fn description(&self) -> &str {
+        "Query the terminal for information."
+    }
+
+    fn extra_description(&self) -> &str {
+        "Print the given query, and read the immediate result from stdin.
+
+The standard input will be read right after `query` is printed, and consumed until the `terminator`
+sequence is encountered. The `terminator` is not removed from the output.
+
+If `terminator` is not supplied, input will be read until Ctrl-C is pressed."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("term query")
+            .category(Category::Platform)
+            .input_output_types(vec![(Type::Nothing, Type::Binary)])
+            .allow_variants_without_examples(true)
+            .required(
+                "query",
+                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::String]),
+                "The query that will be printed to stdout.",
+            )
+            .named(
+                "terminator",
+                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::String]),
+                "Terminator sequence for the expected reply.",
+                Some('t'),
+            )
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Get cursor position.",
+                example: r#"term query (ansi cursor_position) --terminator 'R'"#,
+                result: None,
+            },
+            Example {
+                description: "Get terminal background color.",
+                example: r#"term query $'(ansi osc)10;?(ansi st)' --terminator (ansi st)"#,
+                result: None,
+            },
+            Example {
+                description: "Read clipboard content on terminals supporting OSC-52.",
+                example: r#"term query $'(ansi osc)52;c;?(ansi st)' --terminator (ansi st)"#,
+                result: None,
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let query: Vec<u8> = call.req(engine_state, stack, 0)?;
+        let terminator: Option<Vec<u8>> = call.get_flag(engine_state, stack, "terminator")?;
+
+        crossterm::terminal::enable_raw_mode()?;
+
+        // clear terminal events
+        while crossterm::event::poll(Duration::from_secs(0))? {
+            // If there's an event, read it to remove it from the queue
+            let _ = crossterm::event::read()?;
+        }
+
+        let mut b = [0u8; 1];
+        let mut buf = vec![];
+        let mut stdin = std::io::stdin().lock();
+
+        {
+            let mut stdout = std::io::stdout().lock();
+            stdout.write_all(&query)?;
+            stdout.flush()?;
+        }
+
+        let out = if let Some(terminator) = terminator {
+            loop {
+                if let Err(err) = stdin.read_exact(&mut b) {
+                    break Err(ShellError::from(err));
+                }
+
+                if b[0] == CTRL_C {
+                    break Err(ShellError::Interrupted { span: call.head });
+                }
+
+                buf.push(b[0]);
+
+                if buf.ends_with(&terminator) {
+                    break Ok(Value::Binary {
+                        val: buf,
+                        internal_span: call.head,
+                    }
+                    .into_pipeline_data());
+                }
+            }
+        } else {
+            loop {
+                if let Err(err) = stdin.read_exact(&mut b) {
+                    break Err(ShellError::from(err));
+                }
+
+                if b[0] == CTRL_C {
+                    break Ok(Value::Binary {
+                        val: buf,
+                        internal_span: call.head,
+                    }
+                    .into_pipeline_data());
+                }
+
+                buf.push(b[0]);
+            }
+        };
+        crossterm::terminal::disable_raw_mode()?;
+        out
+    }
+}
diff --git a/crates/nu-command/src/platform/term_size.rs b/crates/nu-command/src/platform/term/term_size.rs
similarity index 82%
rename from crates/nu-command/src/platform/term_size.rs
rename to crates/nu-command/src/platform/term/term_size.rs
index a4261dee81..b41d9da6c1 100644
--- a/crates/nu-command/src/platform/term_size.rs
+++ b/crates/nu-command/src/platform/term/term_size.rs
@@ -1,5 +1,5 @@
+use crossterm::terminal::size;
 use nu_engine::command_prelude::*;
-use terminal_size::{terminal_size, Height, Width};
 
 #[derive(Clone)]
 pub struct TermSize;
@@ -51,15 +51,12 @@ impl Command for TermSize {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
 
-        let (cols, rows) = match terminal_size() {
-            Some((w, h)) => (Width(w.0), Height(h.0)),
-            None => (Width(0), Height(0)),
-        };
+        let (cols, rows) = size().unwrap_or((0, 0));
 
         Ok(Value::record(
             record! {
-                "columns" => Value::int(cols.0 as i64, head),
-                "rows" => Value::int(rows.0 as i64, head),
+                "columns" => Value::int(cols as i64, head),
+                "rows" => Value::int(rows as i64, head),
             },
             head,
         )
diff --git a/crates/nu-command/src/random/dice.rs b/crates/nu-command/src/random/dice.rs
index b11eb59e3e..32768a9937 100644
--- a/crates/nu-command/src/random/dice.rs
+++ b/crates/nu-command/src/random/dice.rs
@@ -12,7 +12,7 @@ impl Command for SubCommand {
 
     fn signature(&self) -> Signature {
         Signature::build("random dice")
-            .input_output_types(vec![(Type::Nothing, Type::ListStream)])
+            .input_output_types(vec![(Type::Nothing, Type::list(Type::Int))])
             .allow_variants_without_examples(true)
             .named(
                 "dice",
diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs
index de91768e76..d24fac6668 100644
--- a/crates/nu-command/src/strings/str_/contains.rs
+++ b/crates/nu-command/src/strings/str_/contains.rs
@@ -77,20 +77,6 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        if call.has_flag_const(working_set, "not")? {
-            nu_protocol::report_shell_error(
-                working_set.permanent(),
-                &ShellError::GenericError {
-                    error: "Deprecated option".into(),
-                    msg: "`str contains --not {string}` is deprecated and will be removed in 0.95."
-                        .into(),
-                    span: Some(call.head),
-                    help: Some("Please use the `not` operator instead.".into()),
-                    inner: vec![],
-                },
-            );
-        }
-
         let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
diff --git a/crates/nu-command/src/strings/str_/stats.rs b/crates/nu-command/src/strings/str_/stats.rs
index 586a48ffde..8722a030d4 100644
--- a/crates/nu-command/src/strings/str_/stats.rs
+++ b/crates/nu-command/src/strings/str_/stats.rs
@@ -307,7 +307,7 @@ fn test_one_newline() {
     correct_counts.insert(Counter::GraphemeClusters, 1);
     correct_counts.insert(Counter::Bytes, 1);
     correct_counts.insert(Counter::CodePoints, 1);
-    correct_counts.insert(Counter::UnicodeWidth, 0);
+    correct_counts.insert(Counter::UnicodeWidth, 1);
 
     assert_eq!(correct_counts, counts);
 }
@@ -347,7 +347,7 @@ fn test_count_counts_lines() {
 
     // one more than grapheme clusters because of \r\n
     correct_counts.insert(Counter::CodePoints, 24);
-    correct_counts.insert(Counter::UnicodeWidth, 17);
+    correct_counts.insert(Counter::UnicodeWidth, 23);
 
     assert_eq!(correct_counts, counts);
 }
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index 59982dfaa7..945440cca4 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -15,7 +15,6 @@ impl Command for NuCheck {
         Signature::build("nu-check")
             .input_output_types(vec![
                 (Type::String, Type::Bool),
-                (Type::ListStream, Type::Bool),
                 (Type::List(Box::new(Type::Any)), Type::Bool),
             ])
             // type is string to avoid automatically canonicalizing the path
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 604278c676..ffb34bf077 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -5,6 +5,8 @@ use nu_protocol::{did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDe
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
 use pathdiff::diff_paths;
+#[cfg(windows)]
+use std::os::windows::process::CommandExt;
 use std::{
     borrow::Cow,
     ffi::{OsStr, OsString},
@@ -91,6 +93,22 @@ impl Command for External {
             false
         };
 
+        // let's make sure it's a .ps1 script, but only on Windows
+        let potential_powershell_script = if cfg!(windows) {
+            if let Some(executable) = which(&expanded_name, "", cwd.as_ref()) {
+                let ext = executable
+                    .extension()
+                    .unwrap_or_default()
+                    .to_string_lossy()
+                    .to_uppercase();
+                ext == "PS1"
+            } else {
+                false
+            }
+        } else {
+            false
+        };
+
         // Find the absolute path to the executable. On Windows, set the
         // executable to "cmd.exe" if it's a CMD internal command. If the
         // command is not found, display a helpful error message.
@@ -98,11 +116,16 @@ impl Command for External {
             && (is_cmd_internal_command(&name_str) || potential_nuscript_in_windows)
         {
             PathBuf::from("cmd.exe")
+        } else if cfg!(windows) && potential_powershell_script {
+            // If we're on Windows and we're trying to run a PowerShell script, we'll use
+            // `powershell.exe` to run it. We shouldn't have to check for powershell.exe because
+            // it's automatically installed on all modern windows systems.
+            PathBuf::from("powershell.exe")
         } else {
             // Determine the PATH to be used and then use `which` to find it - though this has no
             // effect if it's an absolute path already
             let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-            let Some(executable) = which(expanded_name, &paths, cwd.as_ref()) else {
+            let Some(executable) = which(&expanded_name, &paths, cwd.as_ref()) else {
                 return Err(command_not_found(&name_str, call.head, engine_state, stack));
             };
             executable
@@ -123,15 +146,29 @@ impl Command for External {
         let args = eval_arguments_from_call(engine_state, stack, call)?;
         #[cfg(windows)]
         if is_cmd_internal_command(&name_str) || potential_nuscript_in_windows {
-            use std::os::windows::process::CommandExt;
-
             // The /D flag disables execution of AutoRun commands from registry.
             // The /C flag followed by a command name instructs CMD to execute
             // that command and quit.
-            command.args(["/D", "/C", &name_str]);
+            command.args(["/D", "/C", &expanded_name.to_string_lossy()]);
             for arg in &args {
                 command.raw_arg(escape_cmd_argument(arg)?);
             }
+        } else if potential_powershell_script {
+            use nu_path::canonicalize_with;
+
+            // canonicalize the path to the script so that tests pass
+            let canon_path = if let Ok(cwd) = engine_state.cwd_as_string(None) {
+                canonicalize_with(&expanded_name, cwd)?
+            } else {
+                // If we can't get the current working directory, just provide the expanded name
+                expanded_name
+            };
+            // The -Command flag followed by a script name instructs PowerShell to
+            // execute that script and quit.
+            command.args(["-Command", &canon_path.to_string_lossy()]);
+            for arg in &args {
+                command.raw_arg(arg.item.clone());
+            }
         } else {
             command.args(args.into_iter().map(|s| s.item));
         }
diff --git a/crates/nu-command/src/system/sys/net.rs b/crates/nu-command/src/system/sys/net.rs
index ee82f73c61..8e2ac19bf5 100644
--- a/crates/nu-command/src/system/sys/net.rs
+++ b/crates/nu-command/src/system/sys/net.rs
@@ -44,8 +44,29 @@ fn net(span: Span) -> Value {
     let networks = Networks::new_with_refreshed_list()
         .iter()
         .map(|(iface, data)| {
+            let ip_addresses = data
+                .ip_networks()
+                .iter()
+                .map(|ip| {
+                    let protocol = match ip.addr {
+                        std::net::IpAddr::V4(_) => "ipv4",
+                        std::net::IpAddr::V6(_) => "ipv6",
+                    };
+                    Value::record(
+                        record! {
+                            "address" => Value::string(ip.addr.to_string(), span),
+                            "protocol" => Value::string(protocol, span),
+                            "loop" => Value::bool(ip.addr.is_loopback(), span),
+                            "multicast" => Value::bool(ip.addr.is_multicast(), span),
+                        },
+                        span,
+                    )
+                })
+                .collect();
             let record = record! {
                 "name" => Value::string(trim_cstyle_null(iface), span),
+                "mac" => Value::string(data.mac_address().to_string(), span),
+                "ip" => Value::list(ip_addresses, span),
                 "sent" => Value::filesize(data.total_transmitted() as i64, span),
                 "recv" => Value::filesize(data.total_received() as i64, span),
             };
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index 2774903d0f..730c5ec0df 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -1,12 +1,12 @@
 // use super::icons::{icon_for_file, iconify_style_ansi_to_nu};
 use super::icons::icon_for_file;
+use crossterm::terminal::size;
 use lscolors::Style;
 use nu_engine::{command_prelude::*, env_to_string};
 use nu_protocol::Config;
 use nu_term_grid::grid::{Alignment, Cell, Direction, Filling, Grid, GridOptions};
 use nu_utils::get_ls_colors;
 use std::path::Path;
-use terminal_size::{Height, Width};
 
 #[derive(Clone)]
 pub struct Griddle;
@@ -192,7 +192,7 @@ fn create_grid_output(
 
     let cols = if let Some(col) = width_param {
         col as u16
-    } else if let Some((Width(w), Height(_h))) = terminal_size::terminal_size() {
+    } else if let Ok((w, _h)) = size() {
         w
     } else {
         80u16
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index a9e7361a9e..43c9ed0b8d 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -2,6 +2,7 @@
 //        overall reduce the redundant calls to StyleComputer etc.
 //        the goal is to configure it once...
 
+use crossterm::terminal::size;
 use lscolors::{LsColors, Style};
 use nu_color_config::{color_from_hex, StyleComputer, TextStyle};
 use nu_engine::{command_prelude::*, env_to_string};
@@ -22,7 +23,6 @@ use std::{
     str::FromStr,
     time::Instant,
 };
-use terminal_size::{Height, Width};
 use url::Url;
 
 const STREAM_PAGE_SIZE: usize = 1000;
@@ -30,7 +30,7 @@ const STREAM_PAGE_SIZE: usize = 1000;
 fn get_width_param(width_param: Option<i64>) -> usize {
     if let Some(col) = width_param {
         col as usize
-    } else if let Some((Width(w), Height(_))) = terminal_size::terminal_size() {
+    } else if let Ok((w, _h)) = size() {
         w as usize
     } else {
         80
@@ -1088,7 +1088,7 @@ fn create_empty_placeholder(
     let data = vec![vec![cell]];
     let mut table = NuTable::from(data);
     table.set_data_style(TextStyle::default().dimmed());
-    let out = TableOutput::new(table, false, false, false);
+    let out = TableOutput::new(table, false, false, 1);
 
     let style_computer = &StyleComputer::from_config(engine_state, stack);
     let config = create_nu_table_config(&config, style_computer, &out, false, TableMode::default());
diff --git a/crates/nu-command/tests/commands/assignment/append_assign.rs b/crates/nu-command/tests/commands/assignment/append_assign.rs
deleted file mode 100644
index 97abc8eb6f..0000000000
--- a/crates/nu-command/tests/commands/assignment/append_assign.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use nu_test_support::nu;
-
-#[test]
-fn append_assign_int() {
-    let actual = nu!(r#"
-            mut a = [1 2];
-            $a ++= [3 4];
-            $a == [1 2 3 4]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_string() {
-    let actual = nu!(r#"
-            mut a = [a b];
-            $a ++= [c d];
-            $a == [a b c d]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_any() {
-    let actual = nu!(r#"
-            mut a = [1 2 a];
-            $a ++= [b 3];
-            $a == [1 2 a b 3]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_both_empty() {
-    let actual = nu!(r#"
-            mut a = [];
-            $a ++= [];
-            $a == []
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_type_mismatch() {
-    let actual = nu!(r#"
-            mut a = [1 2];
-            $a ++= [a];
-            $a == [1 2 "a"]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_single_element() {
-    let actual = nu!(r#"
-            mut a = ["list" "and"];
-            $a ++= "a single element";
-	    $a == ["list" "and" "a single element"]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_to_single_element() {
-    let actual = nu!(r#"
-            mut a = "string";
-            $a ++= ["and" "the" "list"];
-	    $a == ["string" "and" "the" "list"]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_single_to_single() {
-    let actual = nu!(r#"
-            mut a = 1;
-            $a ++= "and a single element";
-        "#);
-
-    assert!(actual.err.contains("nu::parser::unsupported_operation"));
-}
diff --git a/crates/nu-command/tests/commands/assignment/concat.rs b/crates/nu-command/tests/commands/assignment/concat.rs
new file mode 100644
index 0000000000..603a486f14
--- /dev/null
+++ b/crates/nu-command/tests/commands/assignment/concat.rs
@@ -0,0 +1,76 @@
+use nu_test_support::nu;
+
+#[test]
+fn concat_assign_list_int() {
+    let actual = nu!(r#"
+        mut a = [1 2];
+        $a ++= [3 4];
+        $a == [1 2 3 4]
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_list_string() {
+    let actual = nu!(r#"
+        mut a = [a b];
+        $a ++= [c d];
+        $a == [a b c d]
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_any() {
+    let actual = nu!(r#"
+        mut a = [1 2 a];
+        $a ++= [b 3];
+        $a == [1 2 a b 3]
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_both_empty() {
+    let actual = nu!(r#"
+        mut a = [];
+        $a ++= [];
+        $a == []
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_string() {
+    let actual = nu!(r#"
+        mut a = 'hello';
+        $a ++= ' world';
+        $a == 'hello world'
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_type_mismatch() {
+    let actual = nu!(r#"
+        mut a = [];
+        $a ++= 'str'
+    "#);
+
+    assert!(actual.err.contains("nu::parser::unsupported_operation"));
+}
+
+#[test]
+fn concat_assign_runtime_type_mismatch() {
+    let actual = nu!(r#"
+        mut a = [];
+        $a ++= if true { 'str' }
+    "#);
+
+    assert!(actual.err.contains("nu::shell::type_mismatch"));
+}
diff --git a/crates/nu-command/tests/commands/assignment/mod.rs b/crates/nu-command/tests/commands/assignment/mod.rs
index 8235f532f5..0859deee1a 100644
--- a/crates/nu-command/tests/commands/assignment/mod.rs
+++ b/crates/nu-command/tests/commands/assignment/mod.rs
@@ -1 +1 @@
-mod append_assign;
+mod concat;
diff --git a/crates/nu-command/tests/commands/def.rs b/crates/nu-command/tests/commands/def.rs
index c66869b479..0705c0085f 100644
--- a/crates/nu-command/tests/commands/def.rs
+++ b/crates/nu-command/tests/commands/def.rs
@@ -2,6 +2,13 @@ use nu_test_support::nu;
 use nu_test_support::playground::Playground;
 use std::fs;
 
+#[test]
+fn def_with_trailing_comma() {
+    let actual = nu!("def test-command [ foo: int, ] { $foo }; test-command 1");
+
+    assert!(actual.out == "1");
+}
+
 #[test]
 fn def_with_comment() {
     Playground::setup("def_with_comment", |dirs, _| {
@@ -72,6 +79,13 @@ fn def_errors_with_comma_before_equals() {
     assert!(actual.err.contains("expected parameter"));
 }
 
+#[test]
+fn def_errors_with_colon_before_equals() {
+    let actual = nu!("def test-command [ foo: = 1 ] {}");
+
+    assert!(actual.err.contains("expected type"));
+}
+
 #[test]
 fn def_errors_with_comma_before_colon() {
     let actual = nu!("def test-command [ foo, : int ] {}");
@@ -85,7 +99,6 @@ fn def_errors_with_multiple_colons() {
     assert!(actual.err.contains("expected type"));
 }
 
-#[ignore = "This error condition is not implemented yet"]
 #[test]
 fn def_errors_with_multiple_types() {
     let actual = nu!("def test-command [ foo:int:string ] {}");
@@ -93,6 +106,20 @@ fn def_errors_with_multiple_types() {
     assert!(actual.err.contains("expected parameter"));
 }
 
+#[test]
+fn def_errors_with_trailing_colon() {
+    let actual = nu!("def test-command [ foo: int: ] {}");
+
+    assert!(actual.err.contains("expected parameter"));
+}
+
+#[test]
+fn def_errors_with_trailing_default_value() {
+    let actual = nu!("def test-command [ foo: int = ] {}");
+
+    assert!(actual.err.contains("expected default value"));
+}
+
 #[test]
 fn def_errors_with_multiple_commas() {
     let actual = nu!("def test-command [ foo,,bar ] {}");
diff --git a/crates/nu-command/tests/commands/do_.rs b/crates/nu-command/tests/commands/do_.rs
index bbce5648db..1a2258cf9c 100644
--- a/crates/nu-command/tests/commands/do_.rs
+++ b/crates/nu-command/tests/commands/do_.rs
@@ -44,7 +44,7 @@ fn do_with_semicolon_break_on_failed_external() {
 fn ignore_shell_errors_works_for_external_with_semicolon() {
     let actual = nu!(r#"do -s { open asdfasdf.txt }; "text""#);
 
-    assert_eq!(actual.err, "");
+    assert!(actual.err.contains("Deprecated option"));
     assert_eq!(actual.out, "text");
 }
 
@@ -52,7 +52,7 @@ fn ignore_shell_errors_works_for_external_with_semicolon() {
 fn ignore_program_errors_works_for_external_with_semicolon() {
     let actual = nu!(r#"do -p { nu -n -c 'exit 1' }; "text""#);
 
-    assert_eq!(actual.err, "");
+    assert!(actual.err.contains("Deprecated option"));
     assert_eq!(actual.out, "text");
 }
 
@@ -80,6 +80,7 @@ fn run_closure_with_it_using() {
 #[test]
 fn waits_for_external() {
     let actual = nu!(r#"do -p { nu -c 'sleep 1sec; print before; exit 1'}; print after"#);
-    assert!(actual.err.is_empty());
+
+    assert!(actual.err.contains("Deprecated option"));
     assert_eq!(actual.out, "beforeafter");
 }
diff --git a/crates/nu-command/tests/commands/math/mod.rs b/crates/nu-command/tests/commands/math/mod.rs
index cde6a2da35..5d04f450a4 100644
--- a/crates/nu-command/tests/commands/math/mod.rs
+++ b/crates/nu-command/tests/commands/math/mod.rs
@@ -483,7 +483,7 @@ fn compound_where_paren() {
 // TODO: these ++ tests are not really testing *math* functionality, maybe find another place for them
 
 #[test]
-fn adding_lists() {
+fn concat_lists() {
     let actual = nu!(pipeline(
         r#"
             [1 3] ++ [5 6] | to nuon
@@ -494,29 +494,7 @@ fn adding_lists() {
 }
 
 #[test]
-fn adding_list_and_value() {
-    let actual = nu!(pipeline(
-        r#"
-            [1 3] ++ 5 | to nuon
-        "#
-    ));
-
-    assert_eq!(actual.out, "[1, 3, 5]");
-}
-
-#[test]
-fn adding_value_and_list() {
-    let actual = nu!(pipeline(
-        r#"
-            1 ++ [3 5] | to nuon
-        "#
-    ));
-
-    assert_eq!(actual.out, "[1, 3, 5]");
-}
-
-#[test]
-fn adding_tables() {
+fn concat_tables() {
     let actual = nu!(pipeline(
         r#"
             [[a b]; [1 2]] ++ [[c d]; [10 11]] | to nuon
@@ -526,7 +504,7 @@ fn adding_tables() {
 }
 
 #[test]
-fn append_strings() {
+fn concat_strings() {
     let actual = nu!(pipeline(
         r#"
             "foo" ++ "bar"
@@ -536,7 +514,7 @@ fn append_strings() {
 }
 
 #[test]
-fn append_binary_values() {
+fn concat_binary_values() {
     let actual = nu!(pipeline(
         r#"
             0x[01 02] ++ 0x[03 04] | to nuon
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 63911ebfbc..678b8d8896 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -127,6 +127,7 @@ mod update;
 mod upsert;
 mod url;
 mod use_;
+mod utouch;
 mod where_;
 mod which;
 mod while_;
diff --git a/crates/nu-command/tests/commands/move_/umv.rs b/crates/nu-command/tests/commands/move_/umv.rs
index b193d5b7cb..98e2a753bf 100644
--- a/crates/nu-command/tests/commands/move_/umv.rs
+++ b/crates/nu-command/tests/commands/move_/umv.rs
@@ -513,13 +513,18 @@ fn test_mv_no_clobber() {
         sandbox.with_files(&[EmptyFile(file_a)]);
         sandbox.with_files(&[EmptyFile(file_b)]);
 
-        let actual = nu!(
+        let _ = nu!(
             cwd: dirs.test(),
             "mv -n {} {}",
             file_a,
             file_b,
         );
-        assert!(actual.err.contains("not replacing"));
+
+        let file_count = nu!(
+            cwd: dirs.test(),
+            "ls test_mv* | length | to nuon"
+        );
+        assert_eq!(file_count.out, "2");
     })
 }
 
diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index 17667c9bb3..8a797300f1 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -355,9 +355,9 @@ fn external_command_receives_raw_binary_data() {
 
 #[cfg(windows)]
 #[test]
-fn can_run_batch_files() {
+fn can_run_cmd_files() {
     use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("run a Windows batch file", |dirs, sandbox| {
+    Playground::setup("run a Windows cmd file", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
             "foo.cmd",
             r#"
@@ -371,12 +371,30 @@ fn can_run_batch_files() {
     });
 }
 
+#[cfg(windows)]
+#[test]
+fn can_run_batch_files() {
+    use nu_test_support::fs::Stub::FileWithContent;
+    Playground::setup("run a Windows batch file", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent(
+            "foo.bat",
+            r#"
+                @echo off
+                echo Hello World
+            "#,
+        )]);
+
+        let actual = nu!(cwd: dirs.test(), pipeline("foo.bat"));
+        assert!(actual.out.contains("Hello World"));
+    });
+}
+
 #[cfg(windows)]
 #[test]
 fn can_run_batch_files_without_cmd_extension() {
     use nu_test_support::fs::Stub::FileWithContent;
     Playground::setup(
-        "run a Windows batch file without specifying the extension",
+        "run a Windows cmd file without specifying the extension",
         |dirs, sandbox| {
             sandbox.with_files(&[FileWithContent(
                 "foo.cmd",
@@ -440,3 +458,20 @@ fn redirect_combine() {
         assert_eq!(actual.out, "FooBar");
     });
 }
+
+#[cfg(windows)]
+#[test]
+fn can_run_ps1_files() {
+    use nu_test_support::fs::Stub::FileWithContent;
+    Playground::setup("run_a_windows_ps_file", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent(
+            "foo.ps1",
+            r#"
+                Write-Host Hello World
+            "#,
+        )]);
+
+        let actual = nu!(cwd: dirs.test(), pipeline("foo.ps1"));
+        assert!(actual.out.contains("Hello World"));
+    });
+}
diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index 96ae395e47..b9b80b9e87 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -2941,3 +2941,123 @@ fn table_footer_inheritance() {
     assert_eq!(actual.out.match_indices("x2").count(), 1);
     assert_eq!(actual.out.match_indices("x3").count(), 1);
 }
+
+#[test]
+fn table_footer_inheritance_kv_rows() {
+    let actual = nu!(
+        concat!(
+            "$env.config.table.footer_inheritance = true;",
+            "$env.config.footer_mode = 7;",
+            "[[a b]; ['kv' {0: 0, 1: 1, 2: 2, 3: 3, 4: 4} ], ['data' 0], ['data' 0] ] | table --expand --width=80",
+        )
+    );
+
+    assert_eq!(
+        actual.out,
+        "╭───┬──────┬───────────╮\
+         │ # │  a   │     b     │\
+         ├───┼──────┼───────────┤\
+         │ 0 │ kv   │ ╭───┬───╮ │\
+         │   │      │ │ 0 │ 0 │ │\
+         │   │      │ │ 1 │ 1 │ │\
+         │   │      │ │ 2 │ 2 │ │\
+         │   │      │ │ 3 │ 3 │ │\
+         │   │      │ │ 4 │ 4 │ │\
+         │   │      │ ╰───┴───╯ │\
+         │ 1 │ data │         0 │\
+         │ 2 │ data │         0 │\
+         ╰───┴──────┴───────────╯"
+    );
+
+    let actual = nu!(
+        concat!(
+            "$env.config.table.footer_inheritance = true;",
+            "$env.config.footer_mode = 7;",
+            "[[a b]; ['kv' {0: 0, 1: 1, 2: 2, 3: 3, 4: 4, 5: 5} ], ['data' 0], ['data' 0] ] | table --expand --width=80",
+        )
+    );
+
+    assert_eq!(
+        actual.out,
+        "╭───┬──────┬───────────╮\
+         │ # │  a   │     b     │\
+         ├───┼──────┼───────────┤\
+         │ 0 │ kv   │ ╭───┬───╮ │\
+         │   │      │ │ 0 │ 0 │ │\
+         │   │      │ │ 1 │ 1 │ │\
+         │   │      │ │ 2 │ 2 │ │\
+         │   │      │ │ 3 │ 3 │ │\
+         │   │      │ │ 4 │ 4 │ │\
+         │   │      │ │ 5 │ 5 │ │\
+         │   │      │ ╰───┴───╯ │\
+         │ 1 │ data │         0 │\
+         │ 2 │ data │         0 │\
+         ├───┼──────┼───────────┤\
+         │ # │  a   │     b     │\
+         ╰───┴──────┴───────────╯"
+    );
+}
+
+#[test]
+fn table_footer_inheritance_list_rows() {
+    let actual = nu!(
+        concat!(
+            "$env.config.table.footer_inheritance = true;",
+            "$env.config.footer_mode = 7;",
+            "[[a b]; ['kv' {0: [[field]; [0] [1] [2] [3] [4]]} ], ['data' 0], ['data' 0] ] | table --expand --width=80",
+        )
+    );
+
+    assert_eq!(
+        actual.out,
+        "╭───┬──────┬───────────────────────╮\
+         │ # │  a   │           b           │\
+         ├───┼──────┼───────────────────────┤\
+         │ 0 │ kv   │ ╭───┬───────────────╮ │\
+         │   │      │ │   │ ╭───┬───────╮ │ │\
+         │   │      │ │ 0 │ │ # │ field │ │ │\
+         │   │      │ │   │ ├───┼───────┤ │ │\
+         │   │      │ │   │ │ 0 │     0 │ │ │\
+         │   │      │ │   │ │ 1 │     1 │ │ │\
+         │   │      │ │   │ │ 2 │     2 │ │ │\
+         │   │      │ │   │ │ 3 │     3 │ │ │\
+         │   │      │ │   │ │ 4 │     4 │ │ │\
+         │   │      │ │   │ ╰───┴───────╯ │ │\
+         │   │      │ ╰───┴───────────────╯ │\
+         │ 1 │ data │                     0 │\
+         │ 2 │ data │                     0 │\
+         ╰───┴──────┴───────────────────────╯"
+    );
+
+    let actual = nu!(
+        concat!(
+            "$env.config.table.footer_inheritance = true;",
+            "$env.config.footer_mode = 7;",
+            "[[a b]; ['kv' {0: [[field]; [0] [1] [2] [3] [4] [5]]} ], ['data' 0], ['data' 0] ] | table --expand --width=80",
+        )
+    );
+
+    assert_eq!(
+        actual.out,
+        "╭───┬──────┬───────────────────────╮\
+         │ # │  a   │           b           │\
+         ├───┼──────┼───────────────────────┤\
+         │ 0 │ kv   │ ╭───┬───────────────╮ │\
+         │   │      │ │   │ ╭───┬───────╮ │ │\
+         │   │      │ │ 0 │ │ # │ field │ │ │\
+         │   │      │ │   │ ├───┼───────┤ │ │\
+         │   │      │ │   │ │ 0 │     0 │ │ │\
+         │   │      │ │   │ │ 1 │     1 │ │ │\
+         │   │      │ │   │ │ 2 │     2 │ │ │\
+         │   │      │ │   │ │ 3 │     3 │ │ │\
+         │   │      │ │   │ │ 4 │     4 │ │ │\
+         │   │      │ │   │ │ 5 │     5 │ │ │\
+         │   │      │ │   │ ╰───┴───────╯ │ │\
+         │   │      │ ╰───┴───────────────╯ │\
+         │ 1 │ data │                     0 │\
+         │ 2 │ data │                     0 │\
+         ├───┼──────┼───────────────────────┤\
+         │ # │  a   │           b           │\
+         ╰───┴──────┴───────────────────────╯"
+    );
+}
diff --git a/crates/nu-command/tests/commands/ucp.rs b/crates/nu-command/tests/commands/ucp.rs
index eb2363e68c..e3fa2ca931 100644
--- a/crates/nu-command/tests/commands/ucp.rs
+++ b/crates/nu-command/tests/commands/ucp.rs
@@ -841,14 +841,13 @@ fn test_cp_arg_no_clobber() {
         let target = dirs.fixtures.join("cp").join(TEST_HOW_ARE_YOU_SOURCE);
         let target_hash = get_file_hash(target.display());
 
-        let actual = nu!(
-        cwd: dirs.root(),
-        "cp {} {} --no-clobber",
-        src.display(),
-        target.display()
+        let _ = nu!(
+            cwd: dirs.root(),
+            "cp {} {} --no-clobber",
+            src.display(),
+            target.display()
         );
         let after_cp_hash = get_file_hash(target.display());
-        assert!(actual.err.contains("not replacing"));
         // Check content was not clobbered
         assert_eq!(after_cp_hash, target_hash);
     });
diff --git a/crates/nu-command/tests/commands/url/join.rs b/crates/nu-command/tests/commands/url/join.rs
index 92257a41ff..086d230cc4 100644
--- a/crates/nu-command/tests/commands/url/join.rs
+++ b/crates/nu-command/tests/commands/url/join.rs
@@ -27,7 +27,7 @@ fn url_join_with_only_user() {
                     "password": "",
                     "host": "localhost",
                     "port": "",
-                } | url join 
+                } | url join
             "#
     ));
 
@@ -44,7 +44,7 @@ fn url_join_with_only_pwd() {
                     "password": "pwd",
                     "host": "localhost",
                     "port": "",
-                } | url join 
+                } | url join
             "#
     ));
 
@@ -61,7 +61,7 @@ fn url_join_with_user_and_pwd() {
                     "password": "pwd",
                     "host": "localhost",
                     "port": "",
-                } | url join 
+                } | url join
             "#
     ));
 
@@ -79,7 +79,7 @@ fn url_join_with_query() {
                     "host": "localhost",
                     "query": "par_1=aaa&par_2=bbb"
                     "port": "",
-                } | url join 
+                } | url join
             "#
     ));
 
@@ -411,12 +411,9 @@ fn url_join_with_params_invalid_table() {
                 "host": "localhost",
                 "params": (
                     [
-                        ["key", "value"];
-                        ["par_1", "aaa"],
-                        ["par_2", "bbb"],
-                        ["par_1", "ccc"],
-                        ["par_2", "ddd"],
-                    ] ++ ["not a record"]
+                        { key: foo, value: bar }
+                        "not a record"
+                    ]
                 ),
                 "port": "1234",
             } | url join
diff --git a/crates/nu-command/tests/commands/utouch.rs b/crates/nu-command/tests/commands/utouch.rs
new file mode 100644
index 0000000000..062ec7ddfc
--- /dev/null
+++ b/crates/nu-command/tests/commands/utouch.rs
@@ -0,0 +1,740 @@
+use chrono::{DateTime, Days, Local, TimeDelta, Utc};
+use filetime::FileTime;
+use nu_test_support::fs::{files_exist_at, Stub};
+use nu_test_support::nu;
+use nu_test_support::playground::{Dirs, Playground};
+use std::path::Path;
+
+// Use 1 instead of 0 because 0 has a special meaning in Windows
+const TIME_ONE: FileTime = FileTime::from_unix_time(1, 0);
+
+fn file_times(file: impl AsRef<Path>) -> (FileTime, FileTime) {
+    (
+        file.as_ref().metadata().unwrap().accessed().unwrap().into(),
+        file.as_ref().metadata().unwrap().modified().unwrap().into(),
+    )
+}
+
+fn symlink_times(path: &nu_path::AbsolutePath) -> (filetime::FileTime, filetime::FileTime) {
+    let metadata = path.symlink_metadata().unwrap();
+
+    (
+        filetime::FileTime::from_system_time(metadata.accessed().unwrap()),
+        filetime::FileTime::from_system_time(metadata.modified().unwrap()),
+    )
+}
+
+// From https://github.com/nushell/nushell/pull/14214
+fn setup_symlink_fs(dirs: &Dirs, sandbox: &mut Playground<'_>) {
+    sandbox.mkdir("d");
+    sandbox.with_files(&[Stub::EmptyFile("f"), Stub::EmptyFile("d/f")]);
+    sandbox.symlink("f", "fs");
+    sandbox.symlink("d", "ds");
+    sandbox.symlink("d/f", "fds");
+
+    // sandbox.symlink does not handle symlinks to missing files well. It panics
+    // But they are useful, and they should be tested.
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(dirs.test().join("m"), dirs.test().join("fms")).unwrap();
+    }
+
+    #[cfg(windows)]
+    {
+        std::os::windows::fs::symlink_file(dirs.test().join("m"), dirs.test().join("fms")).unwrap();
+    }
+
+    // Change the file times to a known "old" value for comparison
+    filetime::set_symlink_file_times(dirs.test().join("f"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("d"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("d/f"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("ds"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fs"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fds"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fms"), TIME_ONE, TIME_ONE).unwrap();
+}
+
+#[test]
+fn creates_a_file_when_it_doesnt_exist() {
+    Playground::setup("create_test_1", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch i_will_be_created.txt"
+        );
+
+        let path = dirs.test().join("i_will_be_created.txt");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn creates_two_files() {
+    Playground::setup("create_test_2", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch a b"
+        );
+
+        let path = dirs.test().join("a");
+        assert!(path.exists());
+
+        let path2 = dirs.test().join("b");
+        assert!(path2.exists());
+    })
+}
+
+#[test]
+fn change_modified_time_of_file_to_today() {
+    Playground::setup("change_time_test_9", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+        let path = dirs.test().join("file.txt");
+
+        // Set file.txt's times to the past before the test to make sure `utouch` actually changes the mtime to today
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -m file.txt"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+
+        // Check that atime remains unchanged
+        assert_eq!(
+            TIME_ONE,
+            FileTime::from_system_time(metadata.accessed().unwrap())
+        );
+    })
+}
+
+#[test]
+fn change_access_time_of_file_to_today() {
+    Playground::setup("change_time_test_18", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+        let path = dirs.test().join("file.txt");
+
+        // Set file.txt's times to the past before the test to make sure `utouch` actually changes the atime to today
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -a file.txt"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, atime_day);
+
+        // Check that mtime remains unchanged
+        assert_eq!(
+            TIME_ONE,
+            FileTime::from_system_time(metadata.modified().unwrap())
+        );
+    })
+}
+
+#[test]
+fn change_modified_and_access_time_of_file_to_today() {
+    Playground::setup("change_time_test_27", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+        let path = dirs.test().join("file.txt");
+
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -a -m file.txt"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+        assert_eq!(today, atime_day);
+    })
+}
+
+#[test]
+fn not_create_file_if_it_not_exists() {
+    Playground::setup("change_time_test_28", |dirs, _sandbox| {
+        let outcome = nu!(
+            cwd: dirs.test(),
+            "utouch -c file.txt"
+        );
+
+        let path = dirs.test().join("file.txt");
+
+        assert!(!path.exists());
+
+        // If --no-create is improperly handled `utouch` may error when trying to change the times of a nonexistent file
+        assert!(outcome.status.success())
+    })
+}
+
+#[test]
+fn change_file_times_if_exists_with_no_create() {
+    Playground::setup(
+        "change_file_times_if_exists_with_no_create",
+        |dirs, sandbox| {
+            sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+            let path = dirs.test().join("file.txt");
+
+            filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+            nu!(
+                cwd: dirs.test(),
+                "utouch -c file.txt"
+            );
+
+            let metadata = path.metadata().unwrap();
+
+            // Check only the date since the time may not match exactly
+            let today = Local::now().date_naive();
+            let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+            let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+            assert_eq!(today, mtime_day);
+            assert_eq!(today, atime_day);
+        },
+    )
+}
+
+#[test]
+fn creates_file_three_dots() {
+    Playground::setup("create_test_1", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch file..."
+        );
+
+        let path = dirs.test().join("file...");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn creates_file_four_dots() {
+    Playground::setup("create_test_1", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch file...."
+        );
+
+        let path = dirs.test().join("file....");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn creates_file_four_dots_quotation_marks() {
+    Playground::setup("create_test_1", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch 'file....'"
+        );
+
+        let path = dirs.test().join("file....");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn change_file_times_to_reference_file() {
+    Playground::setup("change_dir_times_to_reference_dir", |dirs, sandbox| {
+        sandbox.with_files(&[
+            Stub::EmptyFile("reference_file"),
+            Stub::EmptyFile("target_file"),
+        ]);
+
+        let reference = dirs.test().join("reference_file");
+        let target = dirs.test().join("target_file");
+
+        // Change the times for reference
+        filetime::set_file_times(&reference, FileTime::from_unix_time(1337, 0), TIME_ONE).unwrap();
+
+        // target should have today's date since it was just created, but reference should be different
+        assert_ne!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -r reference_file target_file"
+        );
+
+        assert_eq!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_eq!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+    })
+}
+
+#[test]
+fn change_file_mtime_to_reference() {
+    Playground::setup("change_file_mtime_to_reference", |dirs, sandbox| {
+        sandbox.with_files(&[
+            Stub::EmptyFile("reference_file"),
+            Stub::EmptyFile("target_file"),
+        ]);
+
+        let reference = dirs.test().join("reference_file");
+        let target = dirs.test().join("target_file");
+
+        // Change the times for reference
+        filetime::set_file_times(&reference, TIME_ONE, FileTime::from_unix_time(1337, 0)).unwrap();
+
+        // target should have today's date since it was just created, but reference should be different
+        assert_ne!(file_times(&reference), file_times(&target));
+
+        // Save target's current atime to make sure it is preserved
+        let target_original_atime = target.metadata().unwrap().accessed().unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -mr reference_file target_file"
+        );
+
+        assert_eq!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_eq!(
+            target_original_atime,
+            target.metadata().unwrap().accessed().unwrap()
+        );
+    })
+}
+
+// TODO when https://github.com/uutils/coreutils/issues/6629 is fixed,
+// unignore this test
+#[test]
+#[ignore]
+fn change_file_times_to_reference_file_with_date() {
+    Playground::setup(
+        "change_file_times_to_reference_file_with_date",
+        |dirs, sandbox| {
+            sandbox.with_files(&[
+                Stub::EmptyFile("reference_file"),
+                Stub::EmptyFile("target_file"),
+            ]);
+
+            let reference = dirs.test().join("reference_file");
+            let target = dirs.test().join("target_file");
+
+            let now = Utc::now();
+
+            let ref_atime = now;
+            let ref_mtime = now.checked_sub_days(Days::new(5)).unwrap();
+
+            // Change the times for reference
+            filetime::set_file_times(
+                reference,
+                FileTime::from_unix_time(ref_atime.timestamp(), ref_atime.timestamp_subsec_nanos()),
+                FileTime::from_unix_time(ref_mtime.timestamp(), ref_mtime.timestamp_subsec_nanos()),
+            )
+            .unwrap();
+
+            nu!(
+                cwd: dirs.test(),
+                r#"utouch -r reference_file -d "yesterday" target_file"#
+            );
+
+            let (got_atime, got_mtime) = file_times(target);
+            let got = (
+                DateTime::from_timestamp(got_atime.seconds(), got_atime.nanoseconds()).unwrap(),
+                DateTime::from_timestamp(got_mtime.seconds(), got_mtime.nanoseconds()).unwrap(),
+            );
+            assert_eq!(
+                (
+                    now.checked_sub_days(Days::new(1)).unwrap(),
+                    now.checked_sub_days(Days::new(6)).unwrap()
+                ),
+                got
+            );
+        },
+    )
+}
+
+#[test]
+fn change_file_times_to_timestamp() {
+    Playground::setup("change_file_times_to_timestamp", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("target_file")]);
+
+        let target = dirs.test().join("target_file");
+        let timestamp = DateTime::from_timestamp(TIME_ONE.unix_seconds(), TIME_ONE.nanoseconds())
+            .unwrap()
+            .to_rfc3339();
+
+        nu!(cwd: dirs.test(), format!("utouch --timestamp {} target_file", timestamp));
+
+        assert_eq!((TIME_ONE, TIME_ONE), file_times(target));
+    })
+}
+
+#[test]
+fn change_modified_time_of_dir_to_today() {
+    Playground::setup("change_dir_mtime", |dirs, sandbox| {
+        sandbox.mkdir("test_dir");
+        let path = dirs.test().join("test_dir");
+
+        filetime::set_file_mtime(&path, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -m test_dir"
+        );
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day =
+            DateTime::<Local>::from(path.metadata().unwrap().modified().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+    })
+}
+
+#[test]
+fn change_access_time_of_dir_to_today() {
+    Playground::setup("change_dir_atime", |dirs, sandbox| {
+        sandbox.mkdir("test_dir");
+        let path = dirs.test().join("test_dir");
+
+        filetime::set_file_atime(&path, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -a test_dir"
+        );
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let atime_day =
+            DateTime::<Local>::from(path.metadata().unwrap().accessed().unwrap()).date_naive();
+
+        assert_eq!(today, atime_day);
+    })
+}
+
+#[test]
+fn change_modified_and_access_time_of_dir_to_today() {
+    Playground::setup("change_dir_times", |dirs, sandbox| {
+        sandbox.mkdir("test_dir");
+        let path = dirs.test().join("test_dir");
+
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -a -m test_dir"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+        assert_eq!(today, atime_day);
+    })
+}
+
+// TODO when https://github.com/uutils/coreutils/issues/6629 is fixed,
+// unignore this test
+#[test]
+#[ignore]
+fn change_file_times_to_date() {
+    Playground::setup("change_file_times_to_date", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("target_file")]);
+
+        let expected = Utc::now().checked_sub_signed(TimeDelta::hours(2)).unwrap();
+        nu!(cwd: dirs.test(), "utouch -d '-2 hours' target_file");
+
+        let (got_atime, got_mtime) = file_times(dirs.test().join("target_file"));
+        let got_atime =
+            DateTime::from_timestamp(got_atime.seconds(), got_atime.nanoseconds()).unwrap();
+        let got_mtime =
+            DateTime::from_timestamp(got_mtime.seconds(), got_mtime.nanoseconds()).unwrap();
+        let threshold = TimeDelta::minutes(1);
+        assert!(
+            got_atime.signed_duration_since(expected).lt(&threshold)
+                && got_mtime.signed_duration_since(expected).lt(&threshold),
+            "Expected: {}. Got: atime={}, mtime={}",
+            expected,
+            got_atime,
+            got_mtime
+        );
+        assert!(got_mtime.signed_duration_since(expected).lt(&threshold));
+    })
+}
+
+#[test]
+fn change_dir_three_dots_times() {
+    Playground::setup("change_dir_three_dots_times", |dirs, sandbox| {
+        sandbox.mkdir("test_dir...");
+        let path = dirs.test().join("test_dir...");
+
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch test_dir..."
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+        assert_eq!(today, atime_day);
+    })
+}
+
+#[test]
+fn change_dir_times_to_reference_dir() {
+    Playground::setup("change_dir_times_to_reference_dir", |dirs, sandbox| {
+        sandbox.mkdir("reference_dir");
+        sandbox.mkdir("target_dir");
+
+        let reference = dirs.test().join("reference_dir");
+        let target = dirs.test().join("target_dir");
+
+        // Change the times for reference
+        filetime::set_file_times(&reference, FileTime::from_unix_time(1337, 0), TIME_ONE).unwrap();
+
+        // target should have today's date since it was just created, but reference should be different
+        assert_ne!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -r reference_dir target_dir"
+        );
+
+        assert_eq!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_eq!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+    })
+}
+
+#[test]
+fn change_dir_atime_to_reference() {
+    Playground::setup("change_dir_atime_to_reference", |dirs, sandbox| {
+        sandbox.mkdir("reference_dir");
+        sandbox.mkdir("target_dir");
+
+        let reference = dirs.test().join("reference_dir");
+        let target = dirs.test().join("target_dir");
+
+        // Change the times for reference
+        filetime::set_file_times(&reference, FileTime::from_unix_time(1337, 0), TIME_ONE).unwrap();
+
+        // target should have today's date since it was just created, but reference should be different
+        assert_ne!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+
+        // Save target's current mtime to make sure it is preserved
+        let target_original_mtime = target.metadata().unwrap().modified().unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -ar reference_dir target_dir"
+        );
+
+        assert_eq!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+        assert_eq!(
+            target_original_mtime,
+            target.metadata().unwrap().modified().unwrap()
+        );
+    })
+}
+
+#[test]
+fn create_a_file_with_tilde() {
+    Playground::setup("utouch with tilde", |dirs, _| {
+        let actual = nu!(cwd: dirs.test(), "utouch '~tilde'");
+        assert!(actual.err.is_empty());
+        assert!(files_exist_at(&[Path::new("~tilde")], dirs.test()));
+
+        // pass variable
+        let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; utouch $f");
+        assert!(actual.err.is_empty());
+        assert!(files_exist_at(&[Path::new("~tilde2")], dirs.test()));
+    })
+}
+
+#[test]
+fn respects_cwd() {
+    Playground::setup("utouch_respects_cwd", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "mkdir 'dir'; cd 'dir'; utouch 'i_will_be_created.txt'"
+        );
+
+        let path = dirs.test().join("dir/i_will_be_created.txt");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn reference_respects_cwd() {
+    Playground::setup("utouch_reference_respects_cwd", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "mkdir 'dir'; cd 'dir'; utouch 'ref.txt'; utouch --reference 'ref.txt' 'foo.txt'"
+        );
+
+        let path = dirs.test().join("dir/foo.txt");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn recognizes_stdout() {
+    Playground::setup("utouch_recognizes_stdout", |dirs, _sandbox| {
+        nu!(cwd: dirs.test(), "utouch -");
+        assert!(!dirs.test().join("-").exists());
+    })
+}
+
+#[test]
+fn follow_symlinks() {
+    Playground::setup("touch_follows_symlinks", |dirs, sandbox| {
+        setup_symlink_fs(&dirs, sandbox);
+
+        let missing = dirs.test().join("m");
+        assert!(!missing.exists());
+
+        nu!(
+            cwd: dirs.test(),
+            "
+                touch fds
+                touch ds
+                touch fs
+                touch fms
+            "
+        );
+
+        // We created the missing symlink target
+        assert!(missing.exists());
+
+        // The timestamps for files and directories were changed from TIME_ONE
+        let file_times = symlink_times(&dirs.test().join("f"));
+        let dir_times = symlink_times(&dirs.test().join("d"));
+        let dir_file_times = symlink_times(&dirs.test().join("d/f"));
+
+        assert_ne!(file_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_file_times, (TIME_ONE, TIME_ONE));
+
+        // For symlinks, they remain (mostly) the same
+        // We can't test accessed times, since to reach the target file, the symlink must be accessed!
+        let file_symlink_times = symlink_times(&dirs.test().join("fs"));
+        let dir_symlink_times = symlink_times(&dirs.test().join("ds"));
+        let dir_file_symlink_times = symlink_times(&dirs.test().join("fds"));
+        let file_missing_symlink_times = symlink_times(&dirs.test().join("fms"));
+
+        assert_eq!(file_symlink_times.1, TIME_ONE);
+        assert_eq!(dir_symlink_times.1, TIME_ONE);
+        assert_eq!(dir_file_symlink_times.1, TIME_ONE);
+        assert_eq!(file_missing_symlink_times.1, TIME_ONE);
+    })
+}
+
+#[test]
+fn no_follow_symlinks() {
+    Playground::setup("touch_touches_symlinks", |dirs, sandbox| {
+        setup_symlink_fs(&dirs, sandbox);
+
+        let missing = dirs.test().join("m");
+        assert!(!missing.exists());
+
+        nu!(
+            cwd: dirs.test(),
+            "
+                touch fds -s
+                touch ds -s
+                touch fs -s
+                touch fms -s
+            "
+        );
+
+        // We did not create the missing symlink target
+        assert!(!missing.exists());
+
+        // The timestamps for files and directories remain the same
+        let file_times = symlink_times(&dirs.test().join("f"));
+        let dir_times = symlink_times(&dirs.test().join("d"));
+        let dir_file_times = symlink_times(&dirs.test().join("d/f"));
+
+        assert_eq!(file_times, (TIME_ONE, TIME_ONE));
+        assert_eq!(dir_times, (TIME_ONE, TIME_ONE));
+        assert_eq!(dir_file_times, (TIME_ONE, TIME_ONE));
+
+        // For symlinks, everything changed. (except their targets, and paths, and personality)
+        let file_symlink_times = symlink_times(&dirs.test().join("fs"));
+        let dir_symlink_times = symlink_times(&dirs.test().join("ds"));
+        let dir_file_symlink_times = symlink_times(&dirs.test().join("fds"));
+        let file_missing_symlink_times = symlink_times(&dirs.test().join("fms"));
+
+        assert_ne!(file_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_file_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(file_missing_symlink_times, (TIME_ONE, TIME_ONE));
+    })
+}
diff --git a/crates/nu-command/tests/format_conversions/csv.rs b/crates/nu-command/tests/format_conversions/csv.rs
index f10a84b672..4f50ab1492 100644
--- a/crates/nu-command/tests/format_conversions/csv.rs
+++ b/crates/nu-command/tests/format_conversions/csv.rs
@@ -469,7 +469,7 @@ fn from_csv_test_flexible_extra_vals() {
           echo "a,b\n1,2,3" | from csv --flexible | first | values | to nuon
         "#
     ));
-    assert_eq!(actual.out, "[1, 2]");
+    assert_eq!(actual.out, "[1, 2, 3]");
 }
 
 #[test]
@@ -479,5 +479,5 @@ fn from_csv_test_flexible_missing_vals() {
           echo "a,b\n1" | from csv --flexible | first | values | to nuon
         "#
     ));
-    assert_eq!(actual.out, "[1, null]");
+    assert_eq!(actual.out, "[1]");
 }
diff --git a/crates/nu-command/tests/format_conversions/ods.rs b/crates/nu-command/tests/format_conversions/ods.rs
index 34e3e5208c..8a69493cc4 100644
--- a/crates/nu-command/tests/format_conversions/ods.rs
+++ b/crates/nu-command/tests/format_conversions/ods.rs
@@ -29,3 +29,20 @@ fn from_ods_file_to_table_select_sheet() {
 
     assert_eq!(actual.out, "SalesOrders");
 }
+
+#[test]
+fn from_ods_file_to_table_select_sheet_with_annotations() {
+    let actual = nu!(
+        cwd: "tests/fixtures/formats", pipeline(
+        r#"
+            open sample_data_with_annotation.ods --raw
+            | from ods --sheets ["SalesOrders"]
+            | get SalesOrders
+            | get column4
+            | get 0
+        "#
+    ));
+
+    // The Units column in the sheet SalesOrders has an annotation and should be ignored.
+    assert_eq!(actual.out, "Units");
+}
diff --git a/crates/nu-engine/src/compile/operator.rs b/crates/nu-engine/src/compile/operator.rs
index bad206358d..0f7059e027 100644
--- a/crates/nu-engine/src/compile/operator.rs
+++ b/crates/nu-engine/src/compile/operator.rs
@@ -155,7 +155,7 @@ pub(crate) fn decompose_assignment(assignment: Assignment) -> Option<Operator> {
     match assignment {
         Assignment::Assign => None,
         Assignment::PlusAssign => Some(Operator::Math(Math::Plus)),
-        Assignment::AppendAssign => Some(Operator::Math(Math::Append)),
+        Assignment::ConcatAssign => Some(Operator::Math(Math::Concat)),
         Assignment::MinusAssign => Some(Operator::Math(Math::Minus)),
         Assignment::MultiplyAssign => Some(Operator::Math(Math::Multiply)),
         Assignment::DivideAssign => Some(Operator::Math(Math::Divide)),
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index fc4a88f83e..0e3917290f 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -547,9 +547,9 @@ impl Eval for EvalRuntime {
                 let lhs = eval_expression::<D>(engine_state, stack, lhs)?;
                 lhs.div(op_span, &rhs, op_span)?
             }
-            Assignment::AppendAssign => {
+            Assignment::ConcatAssign => {
                 let lhs = eval_expression::<D>(engine_state, stack, lhs)?;
-                lhs.append(op_span, &rhs, op_span)?
+                lhs.concat(op_span, &rhs, op_span)?
             }
         };
 
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 8d809f182e..1aec6b30ea 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -956,7 +956,7 @@ fn binary_op(
         },
         Operator::Math(mat) => match mat {
             Math::Plus => lhs_val.add(op_span, &rhs_val, span)?,
-            Math::Append => lhs_val.append(op_span, &rhs_val, span)?,
+            Math::Concat => lhs_val.concat(op_span, &rhs_val, span)?,
             Math::Minus => lhs_val.sub(op_span, &rhs_val, span)?,
             Math::Multiply => lhs_val.mul(op_span, &rhs_val, span)?,
             Math::Divide => lhs_val.div(op_span, &rhs_val, span)?,
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 6ea09e3f13..e201262750 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -27,7 +27,6 @@ nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
-terminal_size = { workspace = true }
 strip-ansi-escapes = { workspace = true }
 crossterm = { workspace = true }
 ratatui = { workspace = true }
diff --git a/crates/nu-explore/src/lib.rs b/crates/nu-explore/src/lib.rs
index d645572c89..a6d4161631 100644
--- a/crates/nu-explore/src/lib.rs
+++ b/crates/nu-explore/src/lib.rs
@@ -9,6 +9,7 @@ mod views;
 
 use anyhow::Result;
 use commands::{ExpandCmd, HelpCmd, NuCmd, QuitCmd, TableCmd, TryCmd};
+use crossterm::terminal::size;
 pub use default_context::add_explore_context;
 pub use explore::Explore;
 use explore::ExploreConfig;
@@ -19,7 +20,6 @@ use nu_protocol::{
 };
 use pager::{Page, Pager, PagerConfig};
 use registry::CommandRegistry;
-use terminal_size::{Height, Width};
 use views::{BinaryView, Orientation, Preview, RecordView};
 
 mod util {
@@ -80,7 +80,7 @@ fn create_record_view(
     }
 
     if config.tail {
-        if let Some((Width(w), Height(h))) = terminal_size::terminal_size() {
+        if let Ok((w, h)) = size() {
             view.tail(w, h);
         }
     }
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index e4d3765e17..d9f534cc60 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -772,6 +772,51 @@ fn calculate_end_span(
     }
 }
 
+fn parse_oneof(
+    working_set: &mut StateWorkingSet,
+    spans: &[Span],
+    spans_idx: &mut usize,
+    possible_shapes: &Vec<SyntaxShape>,
+    multispan: bool,
+) -> Expression {
+    for shape in possible_shapes {
+        let starting_error_count = working_set.parse_errors.len();
+        let value = match multispan {
+            true => parse_multispan_value(working_set, spans, spans_idx, shape),
+            false => parse_value(working_set, spans[*spans_idx], shape),
+        };
+
+        if starting_error_count == working_set.parse_errors.len() {
+            return value;
+        }
+
+        // while trying the possible shapes, ignore Expected type errors
+        // unless they're inside a block, closure, or expression
+        let propagate_error = match working_set.parse_errors.last() {
+            Some(ParseError::Expected(_, error_span))
+            | Some(ParseError::ExpectedWithStringMsg(_, error_span)) => {
+                matches!(
+                    shape,
+                    SyntaxShape::Block | SyntaxShape::Closure(_) | SyntaxShape::Expression
+                ) && *error_span != spans[*spans_idx]
+            }
+            _ => true,
+        };
+        if !propagate_error {
+            working_set.parse_errors.truncate(starting_error_count);
+        }
+    }
+
+    if working_set.parse_errors.is_empty() {
+        working_set.error(ParseError::ExpectedWithStringMsg(
+            format!("one of a list of accepted shapes: {possible_shapes:?}"),
+            spans[*spans_idx],
+        ));
+    }
+
+    Expression::garbage(working_set, spans[*spans_idx])
+}
+
 pub fn parse_multispan_value(
     working_set: &mut StateWorkingSet,
     spans: &[Span],
@@ -800,54 +845,10 @@ pub fn parse_multispan_value(
 
             arg
         }
-        SyntaxShape::OneOf(shapes) => {
-            // handle for `if` command.
-            //let block_then_exp = shapes.as_slice() == [SyntaxShape::Block, SyntaxShape::Expression];
-            for shape in shapes.iter() {
-                let starting_error_count = working_set.parse_errors.len();
-                let s = parse_multispan_value(working_set, spans, spans_idx, shape);
-
-                if starting_error_count == working_set.parse_errors.len() {
-                    return s;
-                } else if let Some(
-                    ParseError::Expected(..) | ParseError::ExpectedWithStringMsg(..),
-                ) = working_set.parse_errors.last()
-                {
-                    working_set.parse_errors.truncate(starting_error_count);
-                    continue;
-                }
-                // `if` is parsing block first and then expression.
-                // when we're writing something like `else if $a`, parsing as a
-                // block will result to error(because it's not a block)
-                //
-                // If parse as a expression also failed, user is more likely concerned
-                // about expression failure rather than "expect block failure"".
-
-                // FIXME FIXME FIXME
-                // if block_then_exp {
-                //     match &err {
-                //         Some(ParseError::Expected(expected, _)) => {
-                //             if expected.starts_with("block") {
-                //                 err = e
-                //             }
-                //         }
-                //         _ => err = err.or(e),
-                //     }
-                // } else {
-                //     err = err.or(e)
-                // }
-            }
-            let span = spans[*spans_idx];
-
-            if working_set.parse_errors.is_empty() {
-                working_set.error(ParseError::ExpectedWithStringMsg(
-                    format!("one of a list of accepted shapes: {shapes:?}"),
-                    span,
-                ));
-            }
-
-            Expression::garbage(working_set, span)
+        SyntaxShape::OneOf(possible_shapes) => {
+            parse_oneof(working_set, spans, spans_idx, possible_shapes, true)
         }
+
         SyntaxShape::Expression => {
             trace!("parsing: expression");
 
@@ -3392,6 +3393,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
         Arg,
         AfterCommaArg,
         Type,
+        AfterType,
         DefaultValue,
     }
 
@@ -3425,7 +3427,9 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
     let mut args: Vec<Arg> = vec![];
     let mut parse_mode = ParseMode::Arg;
 
-    for token in &output {
+    for (index, token) in output.iter().enumerate() {
+        let last_token = index == output.len() - 1;
+
         match token {
             Token {
                 contents: crate::TokenContents::Item | crate::TokenContents::AssignmentOperator,
@@ -3437,10 +3441,12 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                 // The : symbol separates types
                 if contents == b":" {
                     match parse_mode {
+                        ParseMode::Arg if last_token => working_set
+                            .error(ParseError::Expected("type", Span::new(span.end, span.end))),
                         ParseMode::Arg => {
                             parse_mode = ParseMode::Type;
                         }
-                        ParseMode::AfterCommaArg => {
+                        ParseMode::AfterCommaArg | ParseMode::AfterType => {
                             working_set.error(ParseError::Expected("parameter or flag", span));
                         }
                         ParseMode::Type | ParseMode::DefaultValue => {
@@ -3452,9 +3458,15 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                 // The = symbol separates a variable from its default value
                 else if contents == b"=" {
                     match parse_mode {
-                        ParseMode::Type | ParseMode::Arg => {
+                        ParseMode::Arg | ParseMode::AfterType if last_token => working_set.error(
+                            ParseError::Expected("default value", Span::new(span.end, span.end)),
+                        ),
+                        ParseMode::Arg | ParseMode::AfterType => {
                             parse_mode = ParseMode::DefaultValue;
                         }
+                        ParseMode::Type => {
+                            working_set.error(ParseError::Expected("type", span));
+                        }
                         ParseMode::AfterCommaArg => {
                             working_set.error(ParseError::Expected("parameter or flag", span));
                         }
@@ -3467,7 +3479,9 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                 // The , symbol separates params only
                 else if contents == b"," {
                     match parse_mode {
-                        ParseMode::Arg => parse_mode = ParseMode::AfterCommaArg,
+                        ParseMode::Arg | ParseMode::AfterType => {
+                            parse_mode = ParseMode::AfterCommaArg
+                        }
                         ParseMode::AfterCommaArg => {
                             working_set.error(ParseError::Expected("parameter or flag", span));
                         }
@@ -3480,7 +3494,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                     }
                 } else {
                     match parse_mode {
-                        ParseMode::Arg | ParseMode::AfterCommaArg => {
+                        ParseMode::Arg | ParseMode::AfterCommaArg | ParseMode::AfterType => {
                             // Long flag with optional short form following with no whitespace, e.g. --output, --age(-a)
                             if contents.starts_with(b"--") && contents.len() > 2 {
                                 // Split the long flag from the short flag with the ( character as delimiter.
@@ -3790,7 +3804,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                     }
                                 }
                             }
-                            parse_mode = ParseMode::Arg;
+                            parse_mode = ParseMode::AfterType;
                         }
                         ParseMode::DefaultValue => {
                             if let Some(last) = args.last_mut() {
@@ -4813,29 +4827,7 @@ pub fn parse_value(
 
         SyntaxShape::ExternalArgument => parse_regular_external_arg(working_set, span),
         SyntaxShape::OneOf(possible_shapes) => {
-            for s in possible_shapes {
-                let starting_error_count = working_set.parse_errors.len();
-                let value = parse_value(working_set, span, s);
-
-                if starting_error_count == working_set.parse_errors.len() {
-                    return value;
-                } else if let Some(
-                    ParseError::Expected(..) | ParseError::ExpectedWithStringMsg(..),
-                ) = working_set.parse_errors.last()
-                {
-                    working_set.parse_errors.truncate(starting_error_count);
-                    continue;
-                }
-            }
-
-            if working_set.parse_errors.is_empty() {
-                working_set.error(ParseError::ExpectedWithStringMsg(
-                    format!("one of a list of accepted shapes: {possible_shapes:?}"),
-                    span,
-                ));
-            }
-
-            Expression::garbage(working_set, span)
+            parse_oneof(working_set, &[span], &mut 0, possible_shapes, false)
         }
 
         SyntaxShape::Any => {
@@ -4895,7 +4887,7 @@ pub fn parse_assignment_operator(working_set: &mut StateWorkingSet, span: Span)
     let operator = match contents {
         b"=" => Operator::Assignment(Assignment::Assign),
         b"+=" => Operator::Assignment(Assignment::PlusAssign),
-        b"++=" => Operator::Assignment(Assignment::AppendAssign),
+        b"++=" => Operator::Assignment(Assignment::ConcatAssign),
         b"-=" => Operator::Assignment(Assignment::MinusAssign),
         b"*=" => Operator::Assignment(Assignment::MultiplyAssign),
         b"/=" => Operator::Assignment(Assignment::DivideAssign),
@@ -5021,7 +5013,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b"=~" | b"like" => Operator::Comparison(Comparison::RegexMatch),
         b"!~" | b"not-like" => Operator::Comparison(Comparison::NotRegexMatch),
         b"+" => Operator::Math(Math::Plus),
-        b"++" => Operator::Math(Math::Append),
+        b"++" => Operator::Math(Math::Concat),
         b"-" => Operator::Math(Math::Minus),
         b"*" => Operator::Math(Math::Multiply),
         b"/" => Operator::Math(Math::Divide),
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index a7de3800e2..fd57acd5ca 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -29,8 +29,6 @@ pub fn type_compatible(lhs: &Type, rhs: &Type) -> bool {
 
     match (lhs, rhs) {
         (Type::List(c), Type::List(d)) => type_compatible(c, d),
-        (Type::ListStream, Type::List(_)) => true,
-        (Type::List(_), Type::ListStream) => true,
         (Type::List(c), Type::Table(table_fields)) => {
             if matches!(**c, Type::Any) {
                 return true;
@@ -132,7 +130,7 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Math(Math::Append) => check_append(working_set, lhs, rhs, op),
+            Operator::Math(Math::Concat) => check_concat(working_set, lhs, rhs, op),
             Operator::Math(Math::Minus) => match (&lhs.ty, &rhs.ty) {
                 (Type::Int, Type::Int) => (Type::Int, None),
                 (Type::Float, Type::Int) => (Type::Float, None),
@@ -935,8 +933,8 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Assignment(Assignment::AppendAssign) => {
-                check_append(working_set, lhs, rhs, op)
+            Operator::Assignment(Assignment::ConcatAssign) => {
+                check_concat(working_set, lhs, rhs, op)
             }
             Operator::Assignment(_) => match (&lhs.ty, &rhs.ty) {
                 (x, y) if x == y => (Type::Nothing, None),
@@ -1085,7 +1083,7 @@ pub fn check_block_input_output(working_set: &StateWorkingSet, block: &Block) ->
     output_errors
 }
 
-fn check_append(
+fn check_concat(
     working_set: &mut StateWorkingSet,
     lhs: &Expression,
     rhs: &Expression,
@@ -1099,23 +1097,17 @@ fn check_append(
                 (Type::List(Box::new(Type::Any)), None)
             }
         }
-        (Type::List(a), b) | (b, Type::List(a)) => {
-            if a == &Box::new(b.clone()) {
-                (Type::List(a.clone()), None)
-            } else {
-                (Type::List(Box::new(Type::Any)), None)
-            }
-        }
         (Type::Table(a), Type::Table(_)) => (Type::Table(a.clone()), None),
         (Type::String, Type::String) => (Type::String, None),
         (Type::Binary, Type::Binary) => (Type::Binary, None),
         (Type::Any, _) | (_, Type::Any) => (Type::Any, None),
-        (Type::Table(_) | Type::String | Type::Binary, _) => {
+        (Type::Table(_) | Type::List(_) | Type::String | Type::Binary, _)
+        | (_, Type::Table(_) | Type::List(_) | Type::String | Type::Binary) => {
             *op = Expression::garbage(working_set, op.span);
             (
                 Type::Any,
                 Some(ParseError::UnsupportedOperationRHS(
-                    "append".into(),
+                    "concatenation".into(),
                     op.span,
                     lhs.span,
                     lhs.ty.clone(),
@@ -1129,7 +1121,7 @@ fn check_append(
             (
                 Type::Any,
                 Some(ParseError::UnsupportedOperationLHS(
-                    "append".into(),
+                    "concatenation".into(),
                     op.span,
                     lhs.span,
                     lhs.ty.clone(),
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index 5058a45695..4761da6824 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -1485,7 +1485,7 @@ fn prepare_plugin_call_custom_value_op() {
                     span,
                 },
                 CustomValueOp::Operation(
-                    Operator::Math(Math::Append).into_spanned(span),
+                    Operator::Math(Math::Concat).into_spanned(span),
                     cv_ok_val.clone(),
                 ),
             ),
@@ -1498,7 +1498,7 @@ fn prepare_plugin_call_custom_value_op() {
                     span,
                 },
                 CustomValueOp::Operation(
-                    Operator::Math(Math::Append).into_spanned(span),
+                    Operator::Math(Math::Concat).into_spanned(span),
                     cv_bad_val.clone(),
                 ),
             ),
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index a2c328375e..2c43a86c5e 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -21,7 +21,7 @@ nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1", default-feat
 nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 log = { workspace = true }
-thiserror = "1.0"
+thiserror = "2.0"
 
 [dev-dependencies]
 serde = { workspace = true }
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 60d6c10acc..dfbcb7b307 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -36,7 +36,7 @@ num-format = { workspace = true }
 rmp-serde = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-thiserror = "1.0"
+thiserror = "2.0"
 typetag = "0.2"
 os_pipe = { workspace = true, features = ["io_safety"] }
 log = { workspace = true }
diff --git a/crates/nu-protocol/src/ast/operator.rs b/crates/nu-protocol/src/ast/operator.rs
index 8c2e59d93a..bde866498c 100644
--- a/crates/nu-protocol/src/ast/operator.rs
+++ b/crates/nu-protocol/src/ast/operator.rs
@@ -24,7 +24,7 @@ pub enum Comparison {
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Math {
     Plus,
-    Append,
+    Concat,
     Minus,
     Multiply,
     Divide,
@@ -53,7 +53,7 @@ pub enum Bits {
 pub enum Assignment {
     Assign,
     PlusAssign,
-    AppendAssign,
+    ConcatAssign,
     MinusAssign,
     MultiplyAssign,
     DivideAssign,
@@ -90,7 +90,7 @@ impl Operator {
             | Self::Comparison(Comparison::NotEqual)
             | Self::Comparison(Comparison::In)
             | Self::Comparison(Comparison::NotIn)
-            | Self::Math(Math::Append) => 80,
+            | Self::Math(Math::Concat) => 80,
             Self::Bits(Bits::BitAnd) => 75,
             Self::Bits(Bits::BitXor) => 70,
             Self::Bits(Bits::BitOr) => 60,
@@ -107,7 +107,7 @@ impl Display for Operator {
         match self {
             Operator::Assignment(Assignment::Assign) => write!(f, "="),
             Operator::Assignment(Assignment::PlusAssign) => write!(f, "+="),
-            Operator::Assignment(Assignment::AppendAssign) => write!(f, "++="),
+            Operator::Assignment(Assignment::ConcatAssign) => write!(f, "++="),
             Operator::Assignment(Assignment::MinusAssign) => write!(f, "-="),
             Operator::Assignment(Assignment::MultiplyAssign) => write!(f, "*="),
             Operator::Assignment(Assignment::DivideAssign) => write!(f, "/="),
@@ -124,7 +124,7 @@ impl Display for Operator {
             Operator::Comparison(Comparison::In) => write!(f, "in"),
             Operator::Comparison(Comparison::NotIn) => write!(f, "not-in"),
             Operator::Math(Math::Plus) => write!(f, "+"),
-            Operator::Math(Math::Append) => write!(f, "++"),
+            Operator::Math(Math::Concat) => write!(f, "++"),
             Operator::Math(Math::Minus) => write!(f, "-"),
             Operator::Math(Math::Multiply) => write!(f, "*"),
             Operator::Math(Math::Divide) => write!(f, "/"),
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 9704509de1..626033f915 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -698,7 +698,7 @@ impl EngineState {
 
     pub fn find_commands_by_predicate(
         &self,
-        predicate: impl Fn(&[u8]) -> bool,
+        mut predicate: impl FnMut(&[u8]) -> bool,
         ignore_deprecated: bool,
     ) -> Vec<(Vec<u8>, Option<String>, CommandType)> {
         let mut output = vec![];
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 8c500ddd65..0d59068dbf 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -724,7 +724,7 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn find_commands_by_predicate(
         &self,
-        predicate: impl Fn(&[u8]) -> bool,
+        mut predicate: impl FnMut(&[u8]) -> bool,
         ignore_deprecated: bool,
     ) -> Vec<(Vec<u8>, Option<String>, CommandType)> {
         let mut output = vec![];
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 96678daef5..b4b6c29cee 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1330,14 +1330,15 @@ This is an internal Nushell error, please file an issue https://github.com/nushe
         span: Span,
     },
 
-    #[error("Deprecated: {old_command}")]
-    #[diagnostic(help("for more info see {url}"))]
+    #[error("{deprecated} is deprecated and will be removed in a future release")]
+    #[diagnostic()]
     Deprecated {
-        old_command: String,
-        new_suggestion: String,
-        #[label("`{old_command}` is deprecated and will be removed in a future release. Please {new_suggestion} instead.")]
+        deprecated: &'static str,
+        suggestion: &'static str,
+        #[label("{deprecated} is deprecated. {suggestion}")]
         span: Span,
-        url: String,
+        #[help]
+        help: Option<&'static str>,
     },
 
     /// Invalid glob pattern
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 12070f9ca3..0a65c50817 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -238,7 +238,7 @@ pub trait Eval {
                             Math::Minus => lhs.sub(op_span, &rhs, expr_span),
                             Math::Multiply => lhs.mul(op_span, &rhs, expr_span),
                             Math::Divide => lhs.div(op_span, &rhs, expr_span),
-                            Math::Append => lhs.append(op_span, &rhs, expr_span),
+                            Math::Concat => lhs.concat(op_span, &rhs, expr_span),
                             Math::Modulo => lhs.modulo(op_span, &rhs, expr_span),
                             Math::FloorDivision => lhs.floor_div(op_span, &rhs, expr_span),
                             Math::Pow => lhs.pow(op_span, &rhs, expr_span),
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 827f6e31a7..af56533e91 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -109,7 +109,7 @@ impl PipelineData {
     /// than would be returned by [`Value::get_type()`] on the result of
     /// [`.into_value()`](Self::into_value).
     ///
-    /// Specifically, a `ListStream` results in [`list stream`](Type::ListStream) rather than
+    /// Specifically, a `ListStream` results in `list<any>` rather than
     /// the fully complete [`list`](Type::List) type (which would require knowing the contents),
     /// and a `ByteStream` with [unknown](crate::ByteStreamType::Unknown) type results in
     /// [`any`](Type::Any) rather than [`string`](Type::String) or [`binary`](Type::Binary).
@@ -117,7 +117,7 @@ impl PipelineData {
         match self {
             PipelineData::Empty => Type::Nothing,
             PipelineData::Value(value, _) => value.get_type(),
-            PipelineData::ListStream(_, _) => Type::ListStream,
+            PipelineData::ListStream(_, _) => Type::list(Type::Any),
             PipelineData::ByteStream(stream, _) => stream.type_().into(),
         }
     }
@@ -203,7 +203,7 @@ impl PipelineData {
     ) -> Result<Self, ShellError> {
         match stack.pipe_stdout().unwrap_or(&OutDest::Inherit) {
             OutDest::Print => {
-                self.print(engine_state, stack, false, false)?;
+                self.print_table(engine_state, stack, false, false)?;
                 Ok(Self::Empty)
             }
             OutDest::Pipe | OutDest::PipeSeparate => Ok(self),
@@ -534,11 +534,14 @@ impl PipelineData {
         }
     }
 
-    /// Consume and print self data immediately.
+    /// Consume and print self data immediately, formatted using table command.
+    ///
+    /// This does not respect the display_output hook. If a value is being printed out by a command,
+    /// this function should be used. Otherwise, `nu_cli::util::print_pipeline` should be preferred.
     ///
     /// `no_newline` controls if we need to attach newline character to output.
     /// `to_stderr` controls if data is output to stderr, when the value is false, the data is output to stdout.
-    pub fn print(
+    pub fn print_table(
         self,
         engine_state: &EngineState,
         stack: &mut Stack,
diff --git a/crates/nu-protocol/src/ty.rs b/crates/nu-protocol/src/ty.rs
index 55da6422b9..d1b6f7140a 100644
--- a/crates/nu-protocol/src/ty.rs
+++ b/crates/nu-protocol/src/ty.rs
@@ -23,7 +23,6 @@ pub enum Type {
     Float,
     Int,
     List(Box<Type>),
-    ListStream,
     #[default]
     Nothing,
     Number,
@@ -121,7 +120,6 @@ impl Type {
             Type::Nothing => SyntaxShape::Nothing,
             Type::Record(entries) => SyntaxShape::Record(mk_shape(entries)),
             Type::Table(columns) => SyntaxShape::Table(mk_shape(columns)),
-            Type::ListStream => SyntaxShape::List(Box::new(SyntaxShape::Any)),
             Type::Any => SyntaxShape::Any,
             Type::Error => SyntaxShape::Any,
             Type::Binary => SyntaxShape::Binary,
@@ -151,7 +149,6 @@ impl Type {
             Type::Nothing => String::from("nothing"),
             Type::Number => String::from("number"),
             Type::String => String::from("string"),
-            Type::ListStream => String::from("list-stream"),
             Type::Any => String::from("any"),
             Type::Error => String::from("error"),
             Type::Binary => String::from("binary"),
@@ -209,7 +206,6 @@ impl Display for Type {
             Type::Nothing => write!(f, "nothing"),
             Type::Number => write!(f, "number"),
             Type::String => write!(f, "string"),
-            Type::ListStream => write!(f, "list-stream"),
             Type::Any => write!(f, "any"),
             Type::Error => write!(f, "error"),
             Type::Binary => write!(f, "binary"),
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 1a1e8fada2..28b468a151 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -2503,34 +2503,20 @@ impl Value {
         }
     }
 
-    pub fn append(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+    pub fn concat(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         match (self, rhs) {
             (Value::List { vals: lhs, .. }, Value::List { vals: rhs, .. }) => {
-                let mut lhs = lhs.clone();
-                let mut rhs = rhs.clone();
-                lhs.append(&mut rhs);
-                Ok(Value::list(lhs, span))
-            }
-            (Value::List { vals: lhs, .. }, val) => {
-                let mut lhs = lhs.clone();
-                lhs.push(val.clone());
-                Ok(Value::list(lhs, span))
-            }
-            (val, Value::List { vals: rhs, .. }) => {
-                let mut rhs = rhs.clone();
-                rhs.insert(0, val.clone());
-                Ok(Value::list(rhs, span))
+                Ok(Value::list([lhs.as_slice(), rhs.as_slice()].concat(), span))
             }
             (Value::String { val: lhs, .. }, Value::String { val: rhs, .. }) => {
-                Ok(Value::string(lhs.to_string() + rhs, span))
-            }
-            (Value::Binary { val: lhs, .. }, Value::Binary { val: rhs, .. }) => {
-                let mut val = lhs.clone();
-                val.extend(rhs);
-                Ok(Value::binary(val, span))
+                Ok(Value::string([lhs.as_str(), rhs.as_str()].join(""), span))
             }
+            (Value::Binary { val: lhs, .. }, Value::Binary { val: rhs, .. }) => Ok(Value::binary(
+                [lhs.as_slice(), rhs.as_slice()].concat(),
+                span,
+            )),
             (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(self.span(), Operator::Math(Math::Append), op, rhs)
+                lhs.operation(self.span(), Operator::Math(Math::Concat), op, rhs)
             }
             _ => Err(ShellError::OperatorMismatch {
                 op_span: op,
diff --git a/crates/nu-protocol/tests/into_config.rs b/crates/nu-protocol/tests/into_config.rs
index 63d7eb8b22..3ff8d44672 100644
--- a/crates/nu-protocol/tests/into_config.rs
+++ b/crates/nu-protocol/tests/into_config.rs
@@ -35,7 +35,7 @@ fn config_affected_when_mutated() {
 
 #[test]
 fn config_affected_when_deep_mutated() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[
         r#"source default_config.nu"#,
         r#"$env.config.filesize.metric = true"#,
         r#"20mib | into string"#]));
@@ -45,7 +45,7 @@ fn config_affected_when_deep_mutated() {
 
 #[test]
 fn config_add_unsupported_key() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[
         r#"source default_config.nu"#,
         r#"$env.config.foo = 2"#,
         r#";"#]));
@@ -57,7 +57,7 @@ fn config_add_unsupported_key() {
 
 #[test]
 fn config_add_unsupported_type() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#"source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#"source default_config.nu"#,
         r#"$env.config.ls = '' "#,
         r#";"#]));
 
@@ -66,7 +66,7 @@ fn config_add_unsupported_type() {
 
 #[test]
 fn config_add_unsupported_value() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#"source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#"source default_config.nu"#,
         r#"$env.config.history.file_format = ''"#,
         r#";"#]));
 
@@ -77,7 +77,7 @@ fn config_add_unsupported_value() {
 #[test]
 #[ignore = "Figure out how to make test_bins::nu_repl() continue execution after shell errors"]
 fn config_unsupported_key_reverted() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#"source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#"source default_config.nu"#,
         r#"$env.config.foo = 1"#,
         r#"'foo' in $env.config"#]));
 
@@ -87,7 +87,7 @@ fn config_unsupported_key_reverted() {
 #[test]
 #[ignore = "Figure out how to make test_bins::nu_repl() continue execution after shell errors"]
 fn config_unsupported_type_reverted() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#" source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#" source default_config.nu"#,
         r#"$env.config.ls = ''"#,
         r#"$env.config.ls | describe"#]));
 
@@ -97,7 +97,7 @@ fn config_unsupported_type_reverted() {
 #[test]
 #[ignore = "Figure out how to make test_bins::nu_repl() continue execution after errors"]
 fn config_unsupported_value_reverted() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#" source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#" source default_config.nu"#,
         r#"$env.config.history.file_format = 'plaintext'"#,
         r#"$env.config.history.file_format = ''"#,
         r#"$env.config.history.file_format | to json"#]));
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index f47dda3121..eb57903685 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -69,7 +69,7 @@ fn fancy_default_errors() {
 
     assert_eq!(
         actual.err,
-        "Error:   \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline1\u{1b}[0m:1:13]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n\n"
+        "Error: \n  \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline1:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n"
     );
 }
 
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index ebc6ee0053..b03b710cfc 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -54,6 +54,7 @@ pub fn load_standard_library(
         ("mod.nu", "std/math", include_str!("../std/math/mod.nu")),
         ("mod.nu", "std/util", include_str!("../std/util/mod.nu")),
         ("mod.nu", "std/xml", include_str!("../std/xml/mod.nu")),
+        ("mod.nu", "std/config", include_str!("../std/config/mod.nu")),
     ];
 
     for (filename, std_subdir_name, content) in std_submodules.drain(..) {
diff --git a/crates/nu-std/std/config/mod.nu b/crates/nu-std/std/config/mod.nu
new file mode 100644
index 0000000000..b73964e8d3
--- /dev/null
+++ b/crates/nu-std/std/config/mod.nu
@@ -0,0 +1,139 @@
+# Returns a dark-mode theme that can be assigned to $env.config.color_config
+export def dark-theme [] {
+    {
+        # color for nushell primitives
+        separator: white
+        leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
+        header: green_bold
+        empty: blue
+        # Closures can be used to choose colors for specific values.
+        # The value (in this case, a bool) is piped into the closure.
+        # eg) {|| if $in { 'light_cyan' } else { 'light_gray' } }
+        bool: light_cyan
+        int: white
+        filesize: cyan
+        duration: white
+        date: purple
+        range: white
+        float: white
+        string: white
+        nothing: white
+        binary: white
+        cell-path: white
+        row_index: green_bold
+        record: white
+        list: white
+        block: white
+        hints: dark_gray
+        search_result: { bg: red fg: white }
+        shape_and: purple_bold
+        shape_binary: purple_bold
+        shape_block: blue_bold
+        shape_bool: light_cyan
+        shape_closure: green_bold
+        shape_custom: green
+        shape_datetime: cyan_bold
+        shape_directory: cyan
+        shape_external: cyan
+        shape_externalarg: green_bold
+        shape_external_resolved: light_yellow_bold
+        shape_filepath: cyan
+        shape_flag: blue_bold
+        shape_float: purple_bold
+        # shapes are used to change the cli syntax highlighting
+        shape_garbage: { fg: white bg: red attr: b }
+        shape_glob_interpolation: cyan_bold
+        shape_globpattern: cyan_bold
+        shape_int: purple_bold
+        shape_internalcall: cyan_bold
+        shape_keyword: cyan_bold
+        shape_list: cyan_bold
+        shape_literal: blue
+        shape_match_pattern: green
+        shape_matching_brackets: { attr: u }
+        shape_nothing: light_cyan
+        shape_operator: yellow
+        shape_or: purple_bold
+        shape_pipe: purple_bold
+        shape_range: yellow_bold
+        shape_record: cyan_bold
+        shape_redirection: purple_bold
+        shape_signature: green_bold
+        shape_string: green
+        shape_string_interpolation: cyan_bold
+        shape_table: blue_bold
+        shape_variable: purple
+        shape_vardecl: purple
+        shape_raw_string: light_purple
+    }
+}
+
+# Returns a light-mode theme that can be assigned to $env.config.color_config
+export def light-theme [] {
+    {
+        # color for nushell primitives
+        separator: dark_gray
+        leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
+        header: green_bold
+        empty: blue
+        # Closures can be used to choose colors for specific values.
+        # The value (in this case, a bool) is piped into the closure.
+        # eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } }
+        bool: dark_cyan
+        int: dark_gray
+        filesize: cyan_bold
+        duration: dark_gray
+        date: purple
+        range: dark_gray
+        float: dark_gray
+        string: dark_gray
+        nothing: dark_gray
+        binary: dark_gray
+        cell-path: dark_gray
+        row_index: green_bold
+        record: dark_gray
+        list: dark_gray
+        block: dark_gray
+        hints: dark_gray
+        search_result: { fg: white bg: red }
+        shape_and: purple_bold
+        shape_binary: purple_bold
+        shape_block: blue_bold
+        shape_bool: light_cyan
+        shape_closure: green_bold
+        shape_custom: green
+        shape_datetime: cyan_bold
+        shape_directory: cyan
+        shape_external: cyan
+        shape_externalarg: green_bold
+        shape_external_resolved: light_purple_bold
+        shape_filepath: cyan
+        shape_flag: blue_bold
+        shape_float: purple_bold
+        # shapes are used to change the cli syntax highlighting
+        shape_garbage: { fg: white bg: red attr: b }
+        shape_glob_interpolation: cyan_bold
+        shape_globpattern: cyan_bold
+        shape_int: purple_bold
+        shape_internalcall: cyan_bold
+        shape_keyword: cyan_bold
+        shape_list: cyan_bold
+        shape_literal: blue
+        shape_match_pattern: green
+        shape_matching_brackets: { attr: u }
+        shape_nothing: light_cyan
+        shape_operator: yellow
+        shape_or: purple_bold
+        shape_pipe: purple_bold
+        shape_range: yellow_bold
+        shape_record: cyan_bold
+        shape_redirection: purple_bold
+        shape_signature: green_bold
+        shape_string: green
+        shape_string_interpolation: cyan_bold
+        shape_table: blue_bold
+        shape_variable: purple
+        shape_vardecl: purple
+        shape_raw_string: light_purple
+    }
+}
\ No newline at end of file
diff --git a/crates/nu-std/std/dirs/mod.nu b/crates/nu-std/std/dirs/mod.nu
index a26128a5d7..ab3403f36c 100644
--- a/crates/nu-std/std/dirs/mod.nu
+++ b/crates/nu-std/std/dirs/mod.nu
@@ -43,7 +43,7 @@ export def --env add [
 }
 
 # Make the next directory on the list the active directory.
-# If the currenta ctive directory is the last in the list, 
+# If the current active directory is the last in the list,
 # then cycle to the top of the list.
 export def --env next [
     N:int = 1   # number of positions to move.
@@ -52,7 +52,7 @@ export def --env next [
 }
 
 # Make the previous directory on the list the active directory.
-# If the current active directory is the first in the list, 
+# If the current active directory is the first in the list,
 # then cycle to the end of the list.
 export def --env prev [
     N:int = 1   # number of positions to move.
diff --git a/crates/nu-std/std/formats/mod.nu b/crates/nu-std/std/formats/mod.nu
index 2f20e81451..addfa4c1c9 100644
--- a/crates/nu-std/std/formats/mod.nu
+++ b/crates/nu-std/std/formats/mod.nu
@@ -28,3 +28,13 @@ export def "to ndjson" []: any -> string {
 export def "to jsonl" []: any -> string {
     each { to json --raw } | to text
 }
+
+# Convert from NDNUON (newline-delimited NUON), to structured data
+export def "from ndnuon" []: [string -> any] {
+    lines | each { from nuon }
+}
+
+# Convert structured data to NDNUON, i.e. newline-delimited NUON
+export def "to ndnuon" []: [any -> string] {
+    each { to nuon --raw } | to text
+}
diff --git a/crates/nu-std/std/help/mod.nu b/crates/nu-std/std/help/mod.nu
index 089bbff7f8..85edd3790d 100644
--- a/crates/nu-std/std/help/mod.nu
+++ b/crates/nu-std/std/help/mod.nu
@@ -37,7 +37,7 @@ def get-all-operators [] { return [
 
     [Assignment, =, Assign, "Assigns a value to a variable.", 10]
     [Assignment, +=, PlusAssign, "Adds a value to a variable.", 10]
-    [Assignment, ++=, AppendAssign, "Appends a list or a value to a variable.", 10]
+    [Assignment, ++=, ConcatAssign, "Concatenate two lists, two strings, or two binary values.", 10]
     [Assignment, -=, MinusAssign, "Subtracts a value from a variable.", 10]
     [Assignment, *=, MultiplyAssign, "Multiplies a variable by a value.", 10]
     [Assignment, /=, DivideAssign, "Divides a variable by a value.", 10]
@@ -55,7 +55,7 @@ def get-all-operators [] { return [
     [Comparison, ends-with, EndsWith, "Checks if a string ends with another.", 80]
     [Comparison, not, UnaryNot, "Negates a value or expression.", 0]
     [Math, +, Plus, "Adds two values.", 90]
-    [Math, ++, Append, "Appends two lists or a list and a value.", 80]
+    [Math, ++, Concat, "Concatenate two lists, two strings, or two binary values.", 80]
     [Math, -, Minus, "Subtracts two values.", 90]
     [Math, *, Multiply, "Multiplies two values.", 95]
     [Math, /, Divide, "Divides two values.", 95]
@@ -684,8 +684,7 @@ def build-command-page [command: record] {
     ] | flatten | str join "\n"
 }
 
-# Show help on commands.
-export def commands [
+def scope-commands [
     ...command: string@"nu-complete list-commands"  # the name of command to get help on
     --find (-f): string  # string to find in command names and description
 ] {
@@ -699,20 +698,35 @@ export def commands [
         let found_command = ($commands | where name == $target_command)
 
         if ($found_command | is-empty) {
-            try {
-                print $"(ansi default_italic)Help pages from external command ($target_command | pretty-cmd):(ansi reset)"
-                ^($env.NU_HELPER? | default "man") $target_command
-            } catch {
-                command-not-found-error (metadata $command | get span)
-            }
+            command-not-found-error (metadata $command | get span)
+        } else {
+            build-command-page ($found_command | get 0)
         }
-
-        build-command-page ($found_command | get 0)
     } else {
         $commands | select name category description signatures search_terms
     }
 }
 
+def external-commands [
+    ...command: string@"nu-complete list-commands",
+] {
+    let target_command = $command | str join " "
+    print $"(ansi default_italic)Help pages from external command ($target_command | pretty-cmd):(ansi reset)"
+    ^($env.NU_HELPER? | default "man") $target_command
+}
+
+# Show help on commands.
+export def commands [
+    ...command: string@"nu-complete list-commands"  # the name of command to get help on
+    --find (-f): string  # string to find in command names and description
+] {
+    try {
+        scope-commands ...$command --find=$find
+    } catch {
+        external-commands ...$command
+    }
+}
+
 def pretty-cmd [] {
     let cmd = $in
     $"(ansi default_dimmed)(ansi default_italic)($cmd)(ansi reset)"
@@ -763,7 +777,7 @@ You can also learn more at (ansi default_italic)(ansi light_cyan_underline)https
 
     let target_item = ($item | str join " ")
 
-    let commands = (try { commands $target_item --find $find })
+    let commands = (try { scope-commands $target_item --find $find })
     if not ($commands | is-empty) { return $commands }
 
     let aliases = (try { aliases $target_item --find $find })
@@ -776,13 +790,7 @@ You can also learn more at (ansi default_italic)(ansi light_cyan_underline)https
         print -e $"No help results found mentioning: ($find)"
         return []
     }
-
-    let span = (metadata $item | get span)
-    error make {
-        msg: ("std::help::item_not_found" | error-fmt)
-        label: {
-            text: "item not found"
-            span: $span
-        }
-    }
+    # use external tool (e.g: `man`) to search help for $target_item
+    # the stdout and stderr of external tool will follow `main` call.
+    external-commands $target_item
 }
diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 4d1e74e72d..89454ee1f3 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -14,6 +14,7 @@ export module std/iter
 export module std/log
 export module std/math
 export module std/xml
+export module std/config
 
 # Load main dirs command and all subcommands
 export use std/dirs main
diff --git a/crates/nu-std/tests/test_formats.nu b/crates/nu-std/tests/test_formats.nu
index f54598bf08..ec1f6adb47 100644
--- a/crates/nu-std/tests/test_formats.nu
+++ b/crates/nu-std/tests/test_formats.nu
@@ -2,15 +2,26 @@
 use std/assert
 use std/formats *
 
-def test_data_multiline [] {
-  let lines = [
-    "{\"a\":1}",
-    "{\"a\":2}",
-    "{\"a\":3}",
-    "{\"a\":4}",
-    "{\"a\":5}",
-    "{\"a\":6}",
-  ]
+def test_data_multiline [--nuon] {
+  let lines = if $nuon {
+    [
+      "{a: 1}",
+      "{a: 2}",
+      "{a: 3}",
+      "{a: 4}",
+      "{a: 5}",
+      "{a: 6}",
+    ]
+  } else {
+    [
+      "{\"a\":1}",
+      "{\"a\":2}",
+      "{\"a\":3}",
+      "{\"a\":4}",
+      "{\"a\":5}",
+      "{\"a\":6}",
+    ]
+  }
 
   if $nu.os-info.name == "windows" {
     $lines | str join "\r\n"
@@ -84,3 +95,36 @@ def to_jsonl_single_object [] {
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to JSONL"
 }
+
+#[test]
+def from_ndnuon_multiple_objects [] {
+  let result = test_data_multiline | from ndnuon
+  let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
+  assert equal $result $expect "could not convert from NDNUON"
+}
+
+#[test]
+def from_ndnuon_single_object [] {
+  let result = '{a: 1}' | from ndnuon
+  let expect = [{a:1}]
+  assert equal $result $expect "could not convert from NDNUON"
+}
+
+#[test]
+def from_ndnuon_invalid_object [] {
+  assert error { '{"a":1' | formats from ndnuon }
+}
+
+#[test]
+def to_ndnuon_multiple_objects [] {
+  let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to ndnuon | str trim
+  let expect = test_data_multiline --nuon
+  assert equal $result $expect "could not convert to NDNUON"
+}
+
+#[test]
+def to_ndnuon_single_object [] {
+  let result = [{a:1}] | to ndnuon | str trim
+  let expect = "{a: 1}"
+  assert equal $result $expect "could not convert to NDNUON"
+}
diff --git a/crates/nu-std/tests/test_std_formats.nu b/crates/nu-std/tests/test_std_formats.nu
index f23590c5a0..ed6b079d7e 100644
--- a/crates/nu-std/tests/test_std_formats.nu
+++ b/crates/nu-std/tests/test_std_formats.nu
@@ -1,16 +1,27 @@
 # Test std/formats when importing `use std *`
 use std *
 
-def test_data_multiline [] {
+def test_data_multiline [--nuon] {
   use std *
-  let lines = [
-    "{\"a\":1}",
-    "{\"a\":2}",
-    "{\"a\":3}",
-    "{\"a\":4}",
-    "{\"a\":5}",
-    "{\"a\":6}",
-  ]
+  let lines = if $nuon {
+    [
+      "{a: 1}",
+      "{a: 2}",
+      "{a: 3}",
+      "{a: 4}",
+      "{a: 5}",
+      "{a: 6}",
+    ]
+  } else {
+    [
+      "{\"a\":1}",
+      "{\"a\":2}",
+      "{\"a\":3}",
+      "{\"a\":4}",
+      "{\"a\":5}",
+      "{\"a\":6}",
+    ]
+  }
 
   if $nu.os-info.name == "windows" {
     $lines | str join "\r\n"
@@ -84,3 +95,36 @@ def to_jsonl_single_object [] {
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to JSONL"
 }
+
+#[test]
+def from_ndnuon_multiple_objects [] {
+  let result = test_data_multiline | formats from ndnuon
+  let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
+  assert equal $result $expect "could not convert from NDNUON"
+}
+
+#[test]
+def from_ndnuon_single_object [] {
+  let result = '{a: 1}' | formats from ndnuon
+  let expect = [{a:1}]
+  assert equal $result $expect "could not convert from NDNUON"
+}
+
+#[test]
+def from_ndnuon_invalid_object [] {
+  assert error { '{"a":1' | formats from ndnuon }
+}
+
+#[test]
+def to_ndnuon_multiple_objects [] {
+  let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | formats to ndnuon | str trim
+  let expect = test_data_multiline --nuon
+  assert equal $result $expect "could not convert to NDNUON"
+}
+
+#[test]
+def to_ndnuon_single_object [] {
+  let result = [{a:1}] | formats to ndnuon | str trim
+  let expect = "{a: 1}"
+  assert equal $result $expect "could not convert to NDNUON"
+}
diff --git a/crates/nu-table/src/common.rs b/crates/nu-table/src/common.rs
index d18e053a1c..13c8f84fbc 100644
--- a/crates/nu-table/src/common.rs
+++ b/crates/nu-table/src/common.rs
@@ -18,8 +18,12 @@ pub fn create_nu_table_config(
     expand: bool,
     mode: TableMode,
 ) -> NuTableConfig {
-    let with_footer = (config.table.footer_inheritance && out.with_footer)
-        || with_footer(config, out.with_header, out.table.count_rows());
+    let mut count_rows = out.table.count_rows();
+    if config.table.footer_inheritance {
+        count_rows = out.count_rows;
+    }
+
+    let with_footer = with_footer(config, out.with_header, count_rows);
 
     NuTableConfig {
         theme: load_theme(mode),
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index 971e5b1f91..bf75e14380 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -615,12 +615,15 @@ fn load_theme(
     if let Some(style) = sep_color {
         let color = convert_style(style);
         let color = ANSIBuf::from(color);
+        // todo: use .modify(Segment::all(), color) --> it has this optimization
         table.get_config_mut().set_border_color_default(color);
     }
 
     if !with_header {
+        // todo: remove and use theme.remove_horizontal_lines();
         table.with(RemoveHorizontalLine);
     } else if with_footer {
+        // todo: remove and set it on theme rather then here...
         table.with(CopyFirstHorizontalLineAtLast);
     }
 }
@@ -1257,6 +1260,7 @@ fn remove_row(recs: &mut NuRecords, row: usize) -> Vec<String> {
     columns
 }
 
+// todo; use Format?
 struct StripColorFromRow(usize);
 
 impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for StripColorFromRow {
diff --git a/crates/nu-table/src/types/expanded.rs b/crates/nu-table/src/types/expanded.rs
index a0b6cd0ff2..d87af74522 100644
--- a/crates/nu-table/src/types/expanded.rs
+++ b/crates/nu-table/src/types/expanded.rs
@@ -5,7 +5,7 @@ use crate::{
         NuText, StringResult, TableResult, INDEX_COLUMN_NAME,
     },
     string_width,
-    types::{has_footer, has_index},
+    types::has_index,
     NuTable, NuTableCell, TableOpts, TableOutput,
 };
 use nu_color_config::{Alignment, StyleComputer, TextStyle};
@@ -63,22 +63,22 @@ struct Cfg<'a> {
 struct CellOutput {
     text: String,
     style: TextStyle,
-    is_big: bool,
+    size: usize,
     is_expanded: bool,
 }
 
 impl CellOutput {
-    fn new(text: String, style: TextStyle, is_big: bool, is_expanded: bool) -> Self {
+    fn new(text: String, style: TextStyle, size: usize, is_expanded: bool) -> Self {
         Self {
             text,
             style,
-            is_big,
+            size,
             is_expanded,
         }
     }
 
-    fn clean(text: String, is_big: bool, is_expanded: bool) -> Self {
-        Self::new(text, Default::default(), is_big, is_expanded)
+    fn clean(text: String, size: usize, is_expanded: bool) -> Self {
+        Self::new(text, Default::default(), size, is_expanded)
     }
 
     fn text(text: String) -> Self {
@@ -86,7 +86,7 @@ impl CellOutput {
     }
 
     fn styled(text: NuText) -> Self {
-        Self::new(text.0, text.1, false, false)
+        Self::new(text.0, text.1, 1, false)
     }
 }
 
@@ -117,7 +117,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
     let with_index = has_index(&cfg.opts, &headers);
     let row_offset = cfg.opts.index_offset;
-    let mut is_footer_used = false;
+    let mut rows_count = 0usize;
 
     // The header with the INDEX is removed from the table headers since
     // it is added to the natural table index
@@ -199,9 +199,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
             data[row].push(value);
             data_styles.insert((row, with_index as usize), cell.style);
 
-            if cell.is_big {
-                is_footer_used = cell.is_big;
-            }
+            rows_count = rows_count.saturating_add(cell.size);
         }
 
         let mut table = NuTable::from(data);
@@ -209,12 +207,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
         table.set_index_style(get_index_style(cfg.opts.style_computer));
         set_data_styles(&mut table, data_styles);
 
-        return Ok(Some(TableOutput::new(
-            table,
-            false,
-            with_index,
-            is_footer_used,
-        )));
+        return Ok(Some(TableOutput::new(table, false, with_index, rows_count)));
     }
 
     if !headers.is_empty() {
@@ -269,6 +262,8 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
             }
         }
 
+        let mut column_rows = 0usize;
+
         for (row, item) in input.iter().enumerate() {
             cfg.opts.signals.check(cfg.opts.span)?;
 
@@ -294,9 +289,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
             data[row + 1].push(value);
             data_styles.insert((row + 1, col + with_index as usize), cell.style);
 
-            if cell.is_big {
-                is_footer_used = cell.is_big;
-            }
+            column_rows = column_rows.saturating_add(cell.size);
         }
 
         let head_cell = NuTableCell::new(header);
@@ -316,6 +309,8 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
         available_width -= pad_space + column_width;
         rendered_column += 1;
+
+        rows_count = std::cmp::max(rows_count, column_rows);
     }
 
     if truncate && rendered_column == 0 {
@@ -374,9 +369,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
     table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
     set_data_styles(&mut table, data_styles);
 
-    let has_footer = is_footer_used || has_footer(&cfg.opts, table.count_rows() as u64);
-
-    Ok(Some(TableOutput::new(table, true, with_index, has_footer)))
+    Ok(Some(TableOutput::new(table, true, with_index, rows_count)))
 }
 
 fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
@@ -395,7 +388,7 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
 
     let value_width = cfg.opts.width - key_width - count_borders - padding - padding;
 
-    let mut with_footer = false;
+    let mut count_rows = 0usize;
 
     let mut data = Vec::with_capacity(record.len());
     for (key, value) in record {
@@ -420,19 +413,17 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
 
         data.push(row);
 
-        if cell.is_big {
-            with_footer = cell.is_big;
-        }
+        count_rows = count_rows.saturating_add(cell.size);
     }
 
     let mut table = NuTable::from(data);
     table.set_index_style(get_key_style(&cfg));
     table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
 
-    let out = TableOutput::new(table, false, true, with_footer);
+    let out = TableOutput::new(table, false, true, count_rows);
 
     maybe_expand_table(out, cfg.opts.width, &cfg.opts)
-        .map(|value| value.map(|value| CellOutput::clean(value, with_footer, false)))
+        .map(|value| value.map(|value| CellOutput::clean(value, count_rows, false)))
 }
 
 // the flag is used as an optimization to not do `value.lines().count()` search.
@@ -441,7 +432,7 @@ fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellR
     if is_limited {
         return Ok(Some(CellOutput::clean(
             value_to_string_clean(value, cfg),
-            false,
+            1,
             false,
         )));
     }
@@ -457,7 +448,7 @@ fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellR
                     let cfg = create_table_cfg(cfg, &out);
                     let value = out.table.draw(cfg, value_width);
                     match value {
-                        Some(value) => Ok(Some(CellOutput::clean(value, out.with_footer, true))),
+                        Some(value) => Ok(Some(CellOutput::clean(value, out.count_rows, true))),
                         None => Ok(None),
                     }
                 }
@@ -484,7 +475,7 @@ fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellR
             let inner_cfg = update_config(dive_options(cfg, span), value_width);
             let result = expanded_table_kv(record, inner_cfg)?;
             match result {
-                Some(result) => Ok(Some(CellOutput::clean(result.text, result.is_big, true))),
+                Some(result) => Ok(Some(CellOutput::clean(result.text, result.size, true))),
                 None => Ok(Some(CellOutput::text(value_to_wrapped_string(
                     value,
                     cfg,
@@ -575,7 +566,7 @@ fn expanded_table_entry2(item: &Value, cfg: Cfg<'_>) -> CellOutput {
             let table_config = create_table_cfg(&cfg, &out);
             let table = out.table.draw(table_config, usize::MAX);
             match table {
-                Some(table) => CellOutput::clean(table, out.with_footer, false),
+                Some(table) => CellOutput::clean(table, out.count_rows, false),
                 None => CellOutput::styled(nu_value_to_string(
                     item,
                     cfg.opts.config,
diff --git a/crates/nu-table/src/types/general.rs b/crates/nu-table/src/types/general.rs
index ba0a1ceefa..e748b6eff2 100644
--- a/crates/nu-table/src/types/general.rs
+++ b/crates/nu-table/src/types/general.rs
@@ -56,8 +56,9 @@ fn kv_table(record: &Record, opts: TableOpts<'_>) -> StringResult {
 
     let mut table = NuTable::from(data);
     table.set_index_style(TextStyle::default_field());
+    let count_rows = table.count_rows();
 
-    let mut out = TableOutput::new(table, false, true, false);
+    let mut out = TableOutput::new(table, false, true, count_rows);
 
     let left = opts.config.table.padding.left;
     let right = opts.config.table.padding.right;
@@ -82,7 +83,10 @@ fn table(input: &[Value], opts: &TableOpts<'_>) -> TableResult {
     let with_header = !headers.is_empty();
     if !with_header {
         let table = to_table_with_no_header(input, with_index, row_offset, opts)?;
-        let table = table.map(|table| TableOutput::new(table, false, with_index, false));
+        let table = table.map(|table| {
+            let count_rows = table.count_rows();
+            TableOutput::new(table, false, with_index, count_rows)
+        });
         return Ok(table);
     }
 
@@ -98,7 +102,10 @@ fn table(input: &[Value], opts: &TableOpts<'_>) -> TableResult {
         .collect();
 
     let table = to_table_with_header(input, &headers, with_index, row_offset, opts)?;
-    let table = table.map(|table| TableOutput::new(table, true, with_index, false));
+    let table = table.map(|table| {
+        let count_rows = table.count_rows();
+        TableOutput::new(table, true, with_index, count_rows)
+    });
 
     Ok(table)
 }
diff --git a/crates/nu-table/src/types/mod.rs b/crates/nu-table/src/types/mod.rs
index adbe56bf27..829c87ed9e 100644
--- a/crates/nu-table/src/types/mod.rs
+++ b/crates/nu-table/src/types/mod.rs
@@ -1,8 +1,7 @@
-use terminal_size::{terminal_size, Height, Width};
+use nu_color_config::StyleComputer;
+use nu_protocol::{Config, Signals, Span, TableIndexMode, TableMode};
 
 use crate::{common::INDEX_COLUMN_NAME, NuTable};
-use nu_color_config::StyleComputer;
-use nu_protocol::{Config, FooterMode, Signals, Span, TableIndexMode, TableMode};
 
 mod collapse;
 mod expanded;
@@ -16,16 +15,16 @@ pub struct TableOutput {
     pub table: NuTable,
     pub with_header: bool,
     pub with_index: bool,
-    pub with_footer: bool,
+    pub count_rows: usize,
 }
 
 impl TableOutput {
-    pub fn new(table: NuTable, with_header: bool, with_index: bool, with_footer: bool) -> Self {
+    pub fn new(table: NuTable, with_header: bool, with_index: bool, count_rows: usize) -> Self {
         Self {
             table,
             with_header,
             with_index,
-            with_footer,
+            count_rows,
         }
     }
 }
@@ -79,23 +78,3 @@ fn has_index(opts: &TableOpts<'_>, headers: &[String]) -> bool {
 
     with_index && !opts.index_remove
 }
-
-fn has_footer(opts: &TableOpts<'_>, count_records: u64) -> bool {
-    match opts.config.footer_mode {
-        // Only show the footer if there are more than RowCount rows
-        FooterMode::RowCount(limit) => count_records > limit,
-        // Always show the footer
-        FooterMode::Always => true,
-        // Never show the footer
-        FooterMode::Never => false,
-        // Calculate the screen height and row count, if screen height is larger than row count, don't show footer
-        FooterMode::Auto => {
-            let (_width, height) = match terminal_size() {
-                Some((w, h)) => (Width(w.0).0 as u64, Height(h.0).0 as u64),
-                None => (Width(0).0 as u64, Height(0).0 as u64),
-            };
-
-            height <= count_records
-        }
-    }
-}
diff --git a/crates/nu-utils/src/default_files/README.md b/crates/nu-utils/src/default_files/README.md
new file mode 100644
index 0000000000..68a36b865d
--- /dev/null
+++ b/crates/nu-utils/src/default_files/README.md
@@ -0,0 +1,76 @@
+# Nushell configuration files
+
+## `default_env.nu`:
+
+* The internal default environment variables (other than `$env.config`) that will be set during Nushell startup.
+* Is loaded *before* the user's `env.nu`.
+* Will be loaded during any startup where the user's `env.nu` is also loaded. For example:
+  * During normal startup with `nu`
+  * During a startup where the user specifies an alternative `env.nu` via `nu --env-config <path>`
+  * During a `nu -c <commandstring>` or `nu <script>` startup so that `ENV_CONVERSIONS` is properly handled for Windows.
+* Is *not* loaded when running with an explicit `no --no-config-file (-n)`.
+* Is not commented - Comments are in `sample_env.nu`.
+* Should be optimized for fastest load times.
+* Can be introspected via `config env --default | nu-highlight`
+
+## `default_config.nu`:
+
+Counterpart to `default_env.nu`.
+
+* Contains any `$env.config` values that are not set via Rust defaults.
+* Is loaded *after* the user's `env.nu`.
+* Is loaded *before* the user's `config.nu`.
+* Will be loaded during any startup where the user's `config.nu` is also loaded. For example:
+  * During normal startup with `nu`
+  * During a startup where the user specifies an alternative `config.nu` via `nu --config <path>`
+* Likewise, is never loaded during a startup where the user's `config.nu` would not be loaded. For example:
+  * `nu -n/--no-config`
+  * `nu -c "ls"`
+  * `nu <script.nu>`
+* Is not commented - Comments are in `sample_config.nu`.
+* Should be optimized for fastest load times. Whenever possible, values should be set via nu-protocol::config
+  * Exception: `color_config` values are currently set in this file so that user's can introspect the values
+  * TODO: Implement defaults for `color_config` in nu-protocol::config and remove from `default_config.nu`
+* Can be introspected via `config nu --default | nu-highlight`
+* An ideal `default_config.nu` (when all values are set via `nu-protocol::config`) will simply be:
+  ```
+  $env.config = {}
+  ```
+
+## `sample_env.nu`
+
+* A commented file documenting the most common environment variables that a user might configure in `env.nu`
+* For convenient in-shell access - Can be pretty-printed via `config env --sample | nu-highlight`
+* Since this file is for documentation only, include actual Nushell code without comments so that it can be pretty-printed
+* No optimization necessary - Not intended for use other than documentation.
+* Consider replacing `config env --sample` with `help env.nu` at some point.
+* Uses a mix of default values (explained) as well as other examples that users might want in their own `env.nu`
+
+## `sample_config.nu`
+
+Counterpart to `sample_env.nu`.
+
+* A commented file documenting the most common environment variables that a user might configure in `config.nu`
+* For convenient in-shell access - Can be pretty-printed via `config nu --sample | nu-highlight`
+* Since this file is for documentation only, include actual Nushell code without comments so that it can be pretty-printed
+* No optimization necessary - Not intended for use other than documentation.
+* Consider replacing `config nu --sample` with `help config.nu` at some point.
+* Uses a mix of default values (explained) as well as other examples that users might want in their own `config.nu`
+
+## `scaffold_env.nu`
+
+* This file is used *one-time* (typically) at **first** startup
+* If the `$nu.default-config-path` directory does not exist, the directory is created and then both `scaffold_env.nu` and `scaffold_config.nu` are written to it
+* Contains only commented lines explaining the purpose of the file to the user, along with information on the `config env` command.
+
+## `scaffold_config.nu`
+
+Counterpart to `scaffold_env.nu`.
+
+* This file is used *one-time* (typically) at **first** startup
+* If the `$nu.default-config-path` directory does not exist, the directory is created and then both `scaffold_env.nu` and `scaffold_config.nu` are written to it
+* Contains only commented lines explaining the purpose of the file to the user, along with information on the `config nu` command.
+
+## `sample_login.nu`
+
+This file is not used by any Nushell code. Of course, if the user has a `login.nu`, then it will be evaluated during startup of a login shell.
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
new file mode 100644
index 0000000000..d95f4b3f97
--- /dev/null
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -0,0 +1,63 @@
+# Nushell Config File
+#
+# version = "0.100.1"
+$env.config.color_config = {
+    separator: white
+    leading_trailing_space_bg: { attr: n }
+    header: green_bold
+    empty: blue
+    bool: light_cyan
+    int: white
+    filesize: cyan
+    duration: white
+    date: purple
+    range: white
+    float: white
+    string: white
+    nothing: white
+    binary: white
+    cell-path: white
+    row_index: green_bold
+    record: white
+    list: white
+    block: white
+    hints: dark_gray
+    search_result: { bg: red fg: white }
+    shape_and: purple_bold
+    shape_binary: purple_bold
+    shape_block: blue_bold
+    shape_bool: light_cyan
+    shape_closure: green_bold
+    shape_custom: green
+    shape_datetime: cyan_bold
+    shape_directory: cyan
+    shape_external: cyan
+    shape_externalarg: green_bold
+    shape_external_resolved: light_yellow_bold
+    shape_filepath: cyan
+    shape_flag: blue_bold
+    shape_float: purple_bold
+    shape_glob_interpolation: cyan_bold
+    shape_globpattern: cyan_bold
+    shape_int: purple_bold
+    shape_internalcall: cyan_bold
+    shape_keyword: cyan_bold
+    shape_list: cyan_bold
+    shape_literal: blue
+    shape_match_pattern: green
+    shape_matching_brackets: { attr: u }
+    shape_nothing: light_cyan
+    shape_operator: yellow
+    shape_or: purple_bold
+    shape_pipe: purple_bold
+    shape_range: yellow_bold
+    shape_record: cyan_bold
+    shape_redirection: purple_bold
+    shape_signature: green_bold
+    shape_string: green
+    shape_string_interpolation: cyan_bold
+    shape_table: blue_bold
+    shape_variable: purple
+    shape_vardecl: purple
+    shape_raw_string: light_purple
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
new file mode 100644
index 0000000000..cb85e519ba
--- /dev/null
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -0,0 +1,57 @@
+# Default Nushell Environment Config File
+# These "sensible defaults" are set before the user's `env.nu` is loaded
+#
+# version = "0.100.1"
+
+$env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {|| 
+    let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
+        null => $env.PWD
+        '' => '~'
+        $relative_pwd => ([~ $relative_pwd] | path join)
+    }
+
+    let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
+    let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
+    let path_segment = $"($path_color)($dir)(ansi reset)"
+
+    $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
+}
+
+$env.PROMPT_INDICATOR = $env.PROMPT_INDICATOR? | default "> "
+$env.PROMPT_INDICATOR_VI_NORMAL = $env.PROMPT_INDICATOR_VI_NORMAL? | default "> "
+$env.PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR_VI_INSERT? | default ": "
+$env.PROMPT_MULTILINE_INDICATOR = $env.PROMPT_MULTILINE_INDICATOR? | default "::: "
+
+$env.PROMPT_COMMAND_RIGHT = $env.PROMPT_COMMAND_RIGHT? | default {|| 
+    # create a right prompt in magenta with green separators and am/pm underlined
+    let time_segment = ([
+        (ansi reset)
+        (ansi magenta)
+        (date now | format date '%x %X') # try to respect user's locale
+    ] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
+        str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
+
+    let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
+        (ansi rb)
+        ($env.LAST_EXIT_CODE)
+    ] | str join)
+    } else { "" }
+
+    ([$last_exit_code, (char space), $time_segment] | str join)
+}
+
+$env.ENV_CONVERSIONS = {
+    "PATH": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+
+$env.NU_LIB_DIRS = $env.NU_LIB_DIRS? | default [
+    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+    ($nu.data-dir | path join 'completions') # default home for nushell completions
+]
+
+$env.NU_PLUGIN_DIRS = $env.NU_PLUGIN_DIRS | default [
+    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
+]
diff --git a/crates/nu-utils/src/default_files/sample_config.nu b/crates/nu-utils/src/default_files/sample_config.nu
new file mode 100644
index 0000000000..5a8181506c
--- /dev/null
+++ b/crates/nu-utils/src/default_files/sample_config.nu
@@ -0,0 +1,792 @@
+# Nushell Config File
+#
+# version = "0.99.2"
+#
+# A `config.nu` file is used to override default Nushell settings,
+# define (or import) custom commands, or run any other startup tasks.
+# See https://www.nushell.sh/book/configuration.html
+#
+# Nushell sets "sensible defaults" for most configuration settings, so
+# the user's `config.nu` only needs to override these defaults if
+# desired.
+#
+# This file serves as simple "in-shell" documentation for these
+# settings, or you can view a more complete discussion online at:
+# https://nushell.sh/book/configuration
+#
+# You can pretty-print and page this file using:
+# config nu --sample | nu-highlight | less -R
+
+# $env.config
+# -----------
+# The $env.config environment variable is a record containing most Nushell
+# configuration settings. Keep in mind that, as a record, setting it to a
+# new record will remove any keys which aren't in the new record. Nushell
+# will then automatically merge in the internal defaults for missing keys.
+#
+# The same holds true for keys in the $env.config which are also records
+# or lists.
+#
+# For this reason, settings are typically changed by updating the value of
+# a particular key. Merging a new config record is also possible. See the
+# Configuration chapter of the book for more information.
+
+# ------------------------
+# History-related settings
+# ------------------------
+# $env.config.history.*
+
+# file_format (string):  Either "sqlite" or "plaintext". While text-backed history
+# is currently the default for historical reasons, "sqlite" is stable and
+# provides more advanced history features.
+$env.config.history.file_format = "sqlite"
+
+# max_size (int): The maximum number of entries allowed in the history.
+# After exceeding this value, the oldest history items will be removed
+# as new commands are added.
+$env.config.history.max_size = 5_000_000
+
+# sync_on_enter (bool): Whether the plaintext history file is updated
+# each time a command is entered. If set to `false`, the plaintext history
+# is only updated/written when the shell exits. This setting has no effect
+# for SQLite-backed history.
+$env.config.history.sync_on_enter = true
+
+# isolation (bool):
+# `true`: New history from other currently-open Nushell sessions is not
+# seen when scrolling through the history using PrevHistory (typically
+# the Up key) or NextHistory (Down key)
+# `false`: All commands entered in other Nushell sessions will be mixed with
+# those from the current shell.
+# Note: Older history items (from before the current shell was started) are
+# always shown.
+# This setting only applies to SQLite-backed history
+$env.config.history.isolation = true
+
+# ----------------------
+# Miscellaneous Settings
+# ----------------------
+
+# show_banner (bool): Enable or disable the welcome banner at startup
+$env.config.show_banner = true
+
+# rm.always_trash (bool):
+# true: rm behaves as if the --trash/-t option is specified
+# false: rm behaves as if the --permanent/-p option is specified (default)
+# Explicitly calling `rm` with `--trash` or `--permanent` always override this setting
+# Note that this feature is dependent on the host OS trashcan support.
+$env.config.rm.always_trash = false
+
+# recursion_limit (int): how many times a command can call itself recursively
+# before an error will be generated.
+$env.config.recursion_limit = 50
+
+# ---------------------------
+# Commandline Editor Settings
+# ---------------------------
+
+# edit_mode (string) "vi" or "emacs" sets the editing behavior of Reedline
+edit_mode: "emacs"
+
+# Command that will be used to edit the current line buffer with Ctrl+O.
+# If unset, uses $env.VISUAL and then $env.EDITOR
+#
+# Tip: Set to "editor" to use the default editor on Unix platforms using
+#      the Alternatives system or equivalent
+buffer_editor: "editor"
+
+# cursor_shape_* (string)
+# -----------------------
+# The following variables accept a string from the following selections:
+# "block", "underscore", "line", "blink_block", "blink_underscore", "blink_line", or "inherit"
+# "inherit" skips setting cursor shape and uses the current terminal setting.
+$env.config.cursor_shape.emacs = "inherit"         # Cursor shape in emacs mode
+$env.config.cursor_shape.vi_insert = "block"       # Cursor shape in vi-insert mode
+$env.config.cursor_shape.vi_normal = "underscore"  # Cursor shape in normal vi mode
+
+# --------------------
+# Completions Behavior
+# --------------------
+# $env.config.completions.*
+# Apply to the Nushell completion system
+
+# algorithm (string): Either "prefix" or "fuzzy"
+$env.config.completions.algorithm = "prefix"
+
+# sort (string): One of "smart" or "alphabetical"
+# In "smart" mode sort order is based on the "algorithm" setting.
+# When using the "prefix" algorithm, results are alphabetically sorted.
+# When using the "fuzzy" algorithm, results are sorted based on their fuzzy score.
+$env.config.completions.sort = "smart"
+
+# case_sensitive (bool): true/false to enable/disable case-sensitive completions
+$env.config.completions.case_sensitive = false 
+
+# quick (bool):
+# true: auto-select the completion when only one remains
+# false: prevents auto-select of the final result
+$env.config.completions.quick = true
+
+# partial (bool):
+# true: Partially complete up to the best possible match
+# false: Do not partially complete
+# Partial Example: If a directory contains only files named "forage", "food", and "forest",
+#                  then typing "ls " and pressing <Tab> will partially complete the first two
+#                  letters, "f" and "o". If the directory also includes a file named "faster", 
+#                  then only "f" would be partially completed.
+$env.config.completions.partial = true
+
+# use_ls_colors (bool): When true, apply LS_COLORS to file/path/directory matches
+$env.config.completions.use_ls_colors = true
+
+# --------------------
+# External Completions
+# --------------------
+# completions.external.*: Settings related to completing external commands
+# and additional completers
+
+# external.exnable (bool)
+# true: search for external commands on the Path
+# false: disabling might be desired for performance if your path includes
+#        directories on a slower filesystem
+$env.config.completions.external.enable = true
+
+# max_results (int): Limit the number of external commands retrieved from
+# path to this value. Has no effect if `...external.enable` (above) is set to `false`
+$env.config.completions.external.max_results = 50
+
+# completer (closure with a |spans| parameter): A command to call for *argument* completions
+# to commands (internal or external). 
+#
+# The |spans| parameter is a list of strings representing the tokens (spans)
+# on the current commandline. It is always a list of at least two strings - The 
+# command being completed plus the first argument of that command ("" if no argument has
+# been partially typed yet), and additional strings for additional arguments beyond
+# the first.
+#
+# This setting is usually set to a closure which will call a third-party completion system, such
+# as Carapace. 
+#
+# Note: The following is an over-simplified completer command that will call Carapace if it
+# is installed. Please use the official Carapace completer, which can be generated automatically
+# by Carapace itself. See the Carapace documentation for the proper syntax.
+$env.config.completions.external.completer = {|spans|
+  carapace $spans.0 nushell ...$spans | from json
+}
+
+# --------------------
+# Terminal Integration
+# --------------------
+# Nushell can output a number of escape codes to enable advanced features in Terminal Emulators
+# that support them. Settings in this section enable or disable these features in Nushell.
+# Features aren't supported by your Terminal can be disabled. Features can also be disabled,
+#  of course, if there is a conflict between the Nushell and Terminal's implementation.
+
+# use_kitty_protocol (bool):
+# A keyboard enhancement protocol supported by the Kitty Terminal. Additional keybindings are
+# available when using this protocol in a supported terminal. For example, without this protocol,
+# Ctrl+I is interpreted as the Tab Key. With this protocol, Ctrl+I and Tab can be mapped separately.
+$env.config.use_kitty_protocol = false
+
+# osc2 (bool):
+# When true, the current directory and running command are shown in the terminal tab/window title.
+# Also abbreviates the directory name by prepending ~ to the home directory and its subdirectories.
+$env.config.shell_integration.osc2 = true
+
+# osc7 (bool):
+# Nushell will report the current directory to the terminal using OSC 7. This is useful when
+# spawning new tabs in the same directory.
+$env.config.shell_integration.osc7 = true
+
+# osc9_9 (bool):
+# Enables/Disables OSC 9;9 support, originally a ConEmu terminal feature. This is an
+# alternative to OSC 7 which also communicates the current path to the terminal.
+$env.config.shell_integration.osc9_9 = false
+
+# osc8 (bool):
+# When true, the `ls` command will generate clickable links that can be launched in another
+# application by the terminal.
+# Note: This setting replaces the now deprecated `ls.show_clickable_links`
+$env.config.shell.integration.osc8: true
+
+# Deprecated
+# $env.config.ls.clickable_links = true
+
+# osc133 (bool):
+# true/false to enable/disable OSC 133 support, a set of several escape sequences which
+# report the (1) starting location of the prompt, (2) ending location of the prompt,
+# (3) starting location of the command output, and (4) the exit code of the command.
+
+# originating with Final Term. These sequences report information regarding the prompt
+# location as well as command status to the terminal. This enables advanced features in
+# some terminals, including the ability to provide separate background colors for the
+# command vs. the output, collapsible output, or keybindings to scroll between prompts.
+$env.config.shell_integration.osc133 = true
+
+# osc633 (bool):
+# true/false to enable/disable OSC 633, an extension to OSC 133 for Visual Studio Code
+$env.config.shell_integration.osc633 = true
+
+# reset_application_mode (bool):
+# true/false to enable/disable sending ESC[?1l to the terminal
+# This sequence is commonly used to keep cursor key modes in sync between the local 
+# terminal and a remove SSH host.
+$env.config.shell_integration.reset_application_mode = true
+
+# bracketed_paste (bool):
+# true/false to enable/disable the bracketed-paste feature, which allows multiple-lines
+# to be pasted into Nushell at once without immediate execution. When disabled, 
+# each pasted line is executed as it is received.
+# Note that bracketed paste is not currently supported on the Windows version of
+# Nushell.
+$env.config.bracketed_paste = true
+
+# use_ansi_coloring (bool):
+# true/false to enable/disable the use of ANSI colors in Nushell internal commands.
+# When disabled, output from Nushell built-in commands will display only in the default
+# foreground color.
+# Note: Does not apply to the `ansi` command.
+$env.config.use_ansi_coloring = true
+
+# ----------------------
+# Error Display Settings
+# ----------------------
+
+# error_style (string): One of "fancy" or "plain"
+# Plain: Display plain-text errors for screen-readers
+# Fancy: Display errors using line-drawing characters to point to the span in which the
+#        problem occurred.
+$env.config.error_style = "fancy"
+
+# display_errors.exit_code (bool):
+# true: Display a Nushell error when an external command returns a non-zero exit code
+# false: Display only the error information printed by the external command itself
+# Note: Core dump errors are always printed; SIGPIPE never triggers an error
+$env.config.display_errors.exit_code = false
+
+# display_errors.termination_signal (bool):
+# true/false to enable/disable displaying a Nushell error when a child process is
+# terminated via any signal 
+$env.config.display_errors.termination_signal = true
+
+# -------------
+# Table Display
+# -------------
+# footer_mode (string or int):
+# Specifies when to display table footers with column names. Allowed values:
+# "always"
+# "never"
+# "auto": When the length of the table would scroll the header past the first line of the terminal
+# (int): When the number of table rows meets or exceeds this value
+# Note: Does not take into account rows with multiple lines themselves
+$env.config.footer_mode = 25
+
+# table.*
+# table_mode (string): 
+# One of: "default", "basic", "compact", "compact_double", "heavy", "light", "none", "reinforced",
+# "rounded", "thin", "with_love", "psql", "markdown", "dots", "restructured", "ascii_rounded",
+# or "basic_compact"
+# Can be overridden by passing a table to `| table --theme/-t`
+$env.config.table.mode = "default"
+
+# index_mode (string) - One of:
+# "never": never show the index column in a table or list
+# "always": always show the index column in tables and lists
+# "auto": show the column only when there is an explicit "index" column in the table
+# Can be overridden by passing a table to `| table --index/-i`
+$env.config.table.index_mode = "always"
+
+# show_empty (bool):
+# true: show "empty list" or "empty table" when no values exist
+# false: display no output when no values exist
+$env.config.table.show_empty = true
+
+# padding.left/right (int): The number of spaces to pad around values in each column
+$env.config.table.padding.left = 1
+$env.config.table.padding.right = 1
+
+# trim.*: The rules that will be used to display content in a table row when it would cause the
+#         table to exceed the terminal width.
+# methodology (string): One of "wrapping" or "truncating"
+# truncating_suffix (string): The text to show at the end of the row to indicate that it has
+#                             been truncated. Only valid when `methodology = "truncating"`.
+# wrapping_try_keep_words (bool): true to keep words together based on whitespace
+#                                 false to allow wrapping in the middle of a word.
+#                                 Only valid when `methodology = wrapping`.
+$env.config.table.trim = {
+  methodology: "wrapping"
+  wrapping_try_keep_words: true
+}
+# or
+$env.config.table.trim = {
+  methodology: "truncating"
+  truncating_suffix: "..."
+}
+
+# header_on_separator (bool):
+# true: Displays the column headers as part of the top (or bottom) border of the table
+# false: Displays the column header in its own row with a separator below.
+$env.config.table.header_on_separator = false
+
+# abbreviated_row_count (int or nothing):
+# If set to an int, all tables will be abbreviated to only show the first <n> and last <n> rows
+# If set to `null`, all table rows will be displayed
+# Can be overridden by passing a table to `| table --abbreviated/-a`
+$env.config.table.abbreviated_row_count
+
+# footer_inheritance (bool): Footer behavior in nested tables
+# true: If a nested table is long enough on its own to display a footer (per `footer_mode` above),
+#       then also display the footer for the parent table
+# false: Always apply `footer_mode` rules to the parent table
+$env.config.table.footer_inheritance = false
+
+# ----------------
+# Datetime Display
+# ----------------
+# datetime_format.* (string or nothing):
+# Format strings that will be used for datetime values. 
+# When set to `null`, the default behavior is to "humanize" the value (e.g., "now" or "a day ago")
+
+# datetime_format.table (string or nothing):
+# The format string (or `null`) that will be used to display a datetime value when it appears in a
+# structured value such as a table, list, or record.
+$env.config.datetime_format.table = null
+
+# datetime_format.normal (string or nothing):
+# The format string (or `null`) that will be used to display a datetime value when it appears as
+# a raw value.
+$env.config.datetime_format.normal = "%m/%d/%y %I:%M:%S%p"
+
+# ----------------
+# Filesize Display
+# ----------------
+# filesize.metric (bool): When displaying filesize values ...
+# true: Use the ISO-standard KB, MB, GB
+# false: Use the Windows-standard KiB, MiB, GiB
+$env.config.filesize.metric = false
+
+# filesize.format (string): One of either:
+# - The filesize units such as "KB", "KiB", etc. In this case, filesize values always display using
+# this unit.
+# - Or "auto": Filesizes are displayed using the closest unit. For example, 1_000_000_000b will display
+#   as 953.7 MiB (when `metric = false`) or 1.0GB (when `metric = true`)
+$env.config.filesize.format = "auto"
+
+# ---------------------
+# Miscellaneous Display
+# ---------------------
+
+# render_right_prompt_on_last_line(bool):
+# true: When using a multi-line left-prompt, the right-prompt will be displayed on the last line
+# false: The right-prompt is displayed on the first line of the left-prompt
+$env.config.render_right_prompt_on_last_line = false
+
+# float_precision (int):
+# Float values will be rounded to this precision when displaying in structured values such as lists,
+# tables, or records.
+$env.config.float_precision = 2
+
+# ls.use_ls_colors (bool):
+# true: The `ls` command will apply the $env.LS_COLORS standard to filenames
+# false: Filenames in the `ls` table will use the color_config for strings
+$env.config.ls = true
+
+# Hooks
+# -----
+# $env.config.hooks is a record containing the five different types of Nushell hooks.
+# See the Hooks documentation at https://www.nushell.sh/book/hooks for details
+#
+# Most hooks can accept a string, a closure, or a list containing strings and/or closures.
+# The display_output record can only accept a string or a closure, but never a list
+#
+# WARNING: A malformed display_output hook can suppress all Nushell output to the terminal.
+#          It can be reset by assigning an empty string as below:
+
+$env.config.hooks.pre_prompt = []          # Before each prompt is displayed
+$env.config.hooks.pre_execution = []       # After <enter> is pressed; before the commandline
+                                           # is executed
+$env.config.hooks.env_change = []          # When a specified environment variable changes
+$env.config.hooks.display_output = ""      # Before Nushell output is displayed in the terminal
+$env.config.hooks.command_not_found = []   # When a command is not found
+
+# -----------
+# Keybindings
+# -----------
+# keybindings (list): A list of user-defined keybindings
+# Nushell/Reedline keybindings can be added or overridden using this setting.
+# See https://www.nushell.sh/book/line_editor.html#keybindings for details.
+#
+# Example - Add a new Alt+. keybinding to insert the last token used on the previous commandline
+$env.config.keybindings ++= [
+  {
+    name: insert_last_token
+    modifier: alt
+    keycode: char_.
+    mode: [emacs vi_normal vi_insert]
+    event: [
+      { edit: InsertString, value: "!$" }
+      { send: Enter }
+    ]
+  }
+]
+
+# Example: Override the F1 keybinding with a user-defined help menu (see "Menus" below):
+$env.config.keybindings ++= [
+  {
+    name: help_menu
+    modifier: none
+    keycode: f1
+    mode: [emacs, vi_insert, vi_normal]
+    event: { send: menu name: help_menu }
+  }
+]
+
+# -----
+# Menus
+# -----
+# menus (list):
+#
+# Nushell/Reedline menus can be created and modified using this setting.
+# See https://www.nushell.sh/book/line_editor.html#menus for details.
+#
+# Note that menus are usually activated via keybindings, which are defined in
+# $env.config.keybindings (above).
+#
+# Simple example - Add a new Help menu to the list (note that a similar menu is already
+# defined internally):
+$env.config.menus ++= [
+    {
+        name: help_menu
+        only_buffer_difference: true
+        marker: "? "
+        type: {
+            layout: description
+            columns: 4
+            col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
+            col_padding: 2
+            selection_rows: 4
+            description_rows: 10
+        }
+        style: {
+            text: green
+            selected_text: green_reverse
+            description_text: yellow
+        }
+    }
+]
+
+
+# ---------------
+# Plugin behavior
+# ---------------
+# Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration.
+plugins: {}
+$env.config.plugins
+$env.config.plugin_gc
+$env.config.plugin_gc.default
+$env.config.plugin_gc.default.enabled
+$env.config.plugin_gc.default.stop_after
+$env.config.plugin_gc.plugins
+    plugin_gc: {
+        # Configuration for plugin garbage collection
+        default: {
+            enabled: true # true to enable stopping of inactive plugins
+            stop_after: 10sec # how long to wait after a plugin is inactive to stop it
+        }
+        plugins: {
+            # alternate configuration for specific plugins, by name, for example:
+            #
+            # gstat: {
+            #     enabled: false
+            # }
+        }
+    }
+
+
+# -------------------------------------
+# Themes/Colors and Syntax Highlighting
+# -------------------------------------
+# For more information on defining custom themes, see
+# https://www.nushell.sh/book/coloring_and_theming.html
+
+# Use and/or contribute to the theme collection at
+# https://github.com/nushell/nu_scripts/tree/main/themes
+
+# Values:
+
+# highlight_resolved_externals (bool):
+# true: Applies the `color_config.shape_external_resolved` color (below) to external commands
+#       which are found (resolved) on the path
+# false: Applies the `color_config.shape_external` color to *all* externals simply based on whether
+#        or not they would be *parsed* as an external command based on their position.
+# Defaults to false for systems with a slower search path
+$env.config.highlight_resolved_externals = true
+
+# color_config (record): A record of shapes, types, UI elements, etc. that can be styled (e.g.,
+# colorized) in Nushell, either on the commandline itself (shapes) or in output.
+#
+# Note that this is usually set through a theme provided by a record in a custom command. For
+# instance, the standard library contains two "starter" theme commands: "dark-theme" and
+# "light-theme". For example:
+use std/config dark-theme
+$env.config.color_config = (dark-theme)
+
+# Or, individual color settings can be configured or overridden.
+# 
+# Values can be one of:
+# - A color name such as "red" (see `ansi -l` for a list)
+# - A color RGB value in the form of "#C4C9C6"
+# - A record including:
+#   * `fg` (color) 
+#   * `bg` (color)
+#   * `attr`: a string with one or more of:
+#     - 'n': normal
+#     - 'b': bold
+#     - 'u': underline
+#     - 'r': reverse
+#     - 'i': italics
+#     - 'd': dimmed
+
+# foreground, background, and cursor colors are not handled by Nushell, but can be used by 
+# custom-commands such as `theme` from the nu_scripts repository. That `theme` command can be
+# used to set the terminal foreground, background, and cursor colors.
+$env.config.color_config.foreground
+$env.config.color_config.background
+$env.config.color_config.cursor
+
+# -------------------------------------------------------------------------------------------------
+# shape_: Applies syntax highlighting based on the "shape" (inferred or declared type) of an
+# element on the commandline. Nushell's parser can identify shapes based on many criteria, often
+# as the commandline is being typed. 
+
+# shape_string: Can appear as a single-or-quoted value, a bareword string, the key of a record,
+# an argument which has been declared as a string, and other parsed strings.
+$env.config.color_config.shape_string
+
+# shape_string_interpolation: A single-or-double-quoted string interpolation. This style
+# applies to the dollar sign and quotes of the string. The elements inside the string are
+# styled according to their own shape.
+$env.config.color_config.shape_string_interpolation
+
+# shape_raw_string: a raw string literal. E.g., r#'This is a raw string'#. This style applies
+# to the entire raw string.
+$env.config.color_config.shape_raw_string
+
+# shape_record: A record-literal. This style applies to the brackets around the record. The keys
+# and values will be styled according to their individual shapes.
+$env.config.color_config.shape_record
+
+# shape_list: A list-literal. This style applies to the brackets and list separator only. The
+# items in a list are styled according to their individual shapes.
+$env.config.color_config.shape_list
+
+# shape_table: A table-literl. Color applies to the brackets, semicolon, and list separators. The
+# items in the table are style according to their individual shapes.
+$env.config.color_config.shape_table
+
+# shape_bool: A boolean-literal `true` or `false` value
+$env.config.color_config.shape_bool
+
+# shape_int: Integer literals
+$env.config.color_config.shape_int
+
+# shape_float: Float literals. E.g., 5.4
+# Also integer literals in a float-argument position
+$env.config.color_config.shape_float
+
+# shape_range: Range literals
+$env.config.color_config.shape_range
+
+# shape_binary: Binary literals
+$env.config.color_config.shape_binary
+
+# shape_datetime: Datetime literals
+$env.config.color_config.shape_datetime
+
+# shape_custom: A custom value, usually from a plugin
+$env.config.color_config.shape_custom
+
+# shape_nothing: A literal `null`
+$env.config.color_config.shape_nothing
+
+# shape_literal: Not currently used
+$env.config.color_config.shape_literal
+
+# shape_operator: An operator such as +, -, ++, in, not-in, etc.
+$env.config.color_config.shape_operator
+
+# shape_filepath: An argument that appears in the position of a `path` shape for a command
+$env.config.color_config.shape_filepath
+
+# shape_directory: A more specific 'path' shape that only accepts a directory.
+$env.config.color_config.shape_directory
+
+# shape_globpattern: An argument in the position of a glob parameter. E.g., the asterisk (or any other string) in `ls *`.
+$env.config.color_config.shape_globpattern
+
+# shape_glob_interpolation: Deprecated
+$env.config.color_config.shape_glob_interpolation
+
+# shape_garbage: When an argument is of the wrong type or cannot otherwise be parsed.
+# E.g., `ls {a: 5}` - A record argument to `ls` is 'garbage'. Also applied in real-time when
+# an expression is not (yet) properly closed.
+$env.config.color_config.shape_garbage
+
+# shape_or and shape_and: The and and or operators.
+# Note: Not currently implemented.
+$env.config.color_config.shape_or
+$env.config.color_config.shape_and
+
+# shape_variable: The *use* of a variable. E.g., `$env` or `$a`.
+$env.config.color_config.shape_variable
+
+# shape_vardecl: The *declaration* of a variable. E.g. the "a" in `let a = 5`.
+$env.config.color_config.shape_vardecl
+
+# shape_matching_brackets: When the cursor is positioned on an opening or closing bracket (e.g,
+# braces, curly braces, or parenthesis), and there is a matching opening/closing bracket, both will
+# temporarily have this style applied.
+$env.config.color_config.shape_matching_brackets
+
+# shape_pipe: The pipe `|` when used to separate expressions in a pipeline
+$env.config.color_config.shape_pipe
+
+# shape_internalcall: A known Nushell built-in or custom command in the "command position" (usually
+# the first bare word of an expression).
+$env.config.color_config.shape_internalcall
+
+# shape_external: A token in the "command position" (see above) that is not a known Nushell
+# built-in or custom command. This is assumed to be an external command.
+$env.config.color_config.shape_external
+
+# shape_external_resolved: Requires "highlight_resolved_externals" (above) to be enabled.
+# When a token matches the "external" requirement (above) and is also a *confirmed* external
+# command, this style will be applied.
+$env.config.color_config.shape_external_resolved
+
+# shape_externalarg: Arguments to an external command (whether resolved or not)
+$env.config.color_config.shape_externalarg
+
+# shape_match_pattern: The matching pattern for each arm in a match expression. Does not
+# include the guard expression (if present).
+$env.config.color_config.shape_match_pattern
+
+# shape_block: The curly-braces around a block. Expressions within the block will have their
+# their own shapes' styles applied.
+$env.config.color_config.shape_block
+
+# shape_signature: The parameter definitions and input/output types for a command signature.
+$env.config.color_config.shape_signature
+
+# shape_keyword: Not current used
+$env.config.color_config.shape_keyword
+
+# shape_closure: Styles the brackets and arguments of a closure.
+$env.config.color_config.shape_closure
+
+# shape_direction: The redirection symbols such as `o>`, `error>`, `e>|`, etc.
+$env.config.color_config.shape_redirection
+
+# shape_flag: Flags and switches to internal and custom-commands. Only the `--flag` (`-f`) portion
+# is styled. The argument to a flag will be styled using its own shape.
+$env.config.color_config.shape_flag
+
+# -------------------------------------------------------------------------------------------------
+# color.config.<type>
+# *Values* of a particular *type* can be styled differently than the *shape*.
+# Note that the style is applied only when this type is displayed in *structured* data (list,
+# record, or table). It is not currently applied to basic raw values.
+#
+# Note that some types are rarely or never seen in a context in which styling would be applied.
+# For example, a cell-path *value* is unlikely to (but can) appear in a list, record, or table.
+#
+# Tip: In addition to the styles above (fg, bg, attr), types typically accept a closure which can
+# dynamically change the style based on the *value*. For instance, the themes in the nu_scripts
+# repository will style filesizes difference in an `ls` (or other table) differently depending on
+# their magnitude.
+
+# Simple examples:
+
+# bool: A boolean value
+$env.config.color_config.bool = {||
+  if $in {
+    {
+      bg: 'light_green'
+      fg: 'white'
+      attr: 'b'
+    }
+  } else {
+    {
+      bg: 'yellow'
+      fg: 'black'
+      attr: 'b'
+    }
+  }
+}
+
+# int: An integer value
+$env.config.color_config.int = {||
+  if $in == 42 { 'green' } else { 'red' }
+}
+
+# Additional type values (without examples):
+$env.config.color_config.string      # String
+$env.config.color_config.float       # Float value
+$env.config.color_config.glob        # Glob value (must be declared)
+$env.config.color_config.binary      # Binary value
+$env.config.color_config.custom      # Custom value (often from a plugin)
+$env.config.color_config.nothing     # Not used, since a null is not displayed
+$env.config.color_config.date        # datetime value
+$env.config.color_config.filesize    # filesize value
+$env.config.color_config.list        # Not currently used. Lists are displayed using their 
+                                     # members' styles
+$env.config.color_config.record      # Not currently used. Records are displayed using their
+                                     # member's styles
+$env.config.color_config.duration    # Duration type
+$env.config.color_config.range       # Range value
+$env.config.color_config.cell-path   # Cell-path value
+$env.config.color_config.closure     # Not currently used
+$env.config.color_config.block       # Not currently used
+
+# Additional UI elements
+# hints: The (usually dimmed) style in which completion hints are displayed
+$env.config.color_config.hints
+
+# search_result: The style applied to `find` search results
+$env.config.color_config.search_result
+
+# header: The column names in a table header
+$env.config.color_config.header
+
+# separator: Used for table/list/record borders
+$env.config.color_config.separator
+
+# row_index: The `#` or `index` column of a table or list
+$env.config.color_config.row_index
+
+# empty: This style is applied to empty/missing values in a table. However, since the ❎
+# emoji is used for this purpose, there is limited styling that can be applied.
+$env.config.color_config.empty
+
+# leading_trailing_space_bg: When a string value inside structured data has leading or trailing
+# whitespace, that whitespace will be displayed using this style.
+# Use { attr: n } to disable.
+$env.config.color_config.leading_trailing_space_bg = { bg: 'red' }
+
+# ------------------------
+# `explore` command colors
+# ------------------------
+# Configure the UI colors of the `explore` command
+# Allowed values are the same as for the `color_config` options above.
+# Example:
+$env.config.explore = {
+    status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" },
+    command_bar_text: { fg: "#C4C9C6" },
+    highlight: { fg: "black", bg: "yellow" },
+    status: {
+        error: { fg: "white", bg: "red" },
+        warn: {}
+        info: {}
+    },
+    selected_cell: { bg: light_blue },
+}
diff --git a/crates/nu-utils/src/default_files/sample_env.nu b/crates/nu-utils/src/default_files/sample_env.nu
new file mode 100644
index 0000000000..23dc925ccd
--- /dev/null
+++ b/crates/nu-utils/src/default_files/sample_env.nu
@@ -0,0 +1,140 @@
+# Sample Nushell Environment Config File
+#
+# Environment variables are usually configured in `env.nu`. Nushell
+# sets sensible defaults for many environment variables, so the user's
+# `env.nu` only needs to override these defaults if desired.
+#
+# This file serves as simple "in-shell" documentation for these
+# settings, or you can view a more complete discussion online at:
+# https://nushell.sh/book/configuration
+#
+# You can pretty-print and page this file using:
+# config env --sample | nu-highlight | less -R
+
+# PROMPT_*
+# --------
+# Prompt configuration
+# PROMPT_ variables accept either a string or a closure that returns a string
+
+# PROMPT_COMMAND
+# --------------
+# Defines the primary prompt. Note that the PROMPT_INDICATOR (below) is appended to this value.
+# Simple example - Static string:
+$env.PROMPT_COMMAND = "Nushell"
+# Simple example - Dynamic closure displaying the path:
+$env.PROMPT_COMMAND = {|| pwd}
+
+# PROMPT_COMMAND_RIGHT
+# --------------------
+# Defines a prompt which will appear right-aligned in the terminal
+$env.PROMPT_COMMAND_RIGHT = {|| date now | format date "%d-%a %r" }
+
+# PROMPT_INDICATOR*
+# -----------------
+# The prompt indicators are environmental variables that represent
+# the state of the prompt. The specified character(s) will appear
+# immediately following the PROMPT_COMMAND
+
+# When in Emacs mode (default):
+$env.PROMPT_INDICATOR = "> "
+
+# When in normal vi mode:
+$env.PROMPT_INDICATOR_VI_NORMAL = "> "
+# When in vi insert-mode:
+$env.PROMPT_INDICATOR_VI_INSERT = ": "
+
+# When a commandline extends across multiple lines:
+$env.PROMPT_MULTILINE_INDICATOR = "::: "
+
+# TRANSIENT_PROMPT_* 
+# ------------------
+# Allows a different prompt to be shown after a command has been executed.  This
+# can be useful if you have a 2-line prompt. Instead of each previously-entered
+# command taking up at least 2 lines, the transient prompt can condense it to a
+# shorter version. The following example shows a rocket emoji before each
+# previously-entered command:
+$env.TRANSIENT_PROMPT_COMMAND = "🚀 "
+$env.TRANSIENT_PROMPT_INDICATOR = ""
+$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = ""
+$env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = ""
+# Tip: Removing the transient multiline indicator and right-prompt can simplify
+#      copying from the terminal
+$env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = ""
+$env.TRANSIENT_PROMPT_COMMAND_RIGHT = ""
+
+# ENV_CONVERSIONS
+# ---------------
+# Certain variables, such as those containing multiple paths, are often stored as a
+# colon-separated string in other shells. Nushell can convert these automatically to a
+# more convenient Nushell list.  The ENV_CONVERSIONS variable specifies how environment
+# variables are:
+# - converted from a string to a value on Nushell startup (from_string)
+# - converted from a value back to a string when running external commands (to_string)
+#
+# Note: The OS Path variable is automatically converted before env.nu loads, so it can
+# be treated a list in this file.
+# 
+# Note: Environment variables are not case-sensitive, so the following will work
+# for both Windows and Unix-like platforms.
+# 
+# By default, the internal conversion looks something like the following, so there
+# is no need to add this in your actual env.nu:
+$env.ENV_CONVERSIONS = {
+    "Path": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+
+# Here's an example converts the XDG_DATA_DIRS variable to and from a list:
+$env.ENV_CONVERSIONS = $env.ENV_CONVERSIONS | merge {
+    "XDG_DATA_DIRS": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+#
+# Other common directory-lists for conversion: TERMINFO_DIRS.
+# Note that other variable conversions take place after `config.nu` is loaded.
+
+# NU_LIB_DIRS
+# -----------
+# Directories in this environment variable are searched by the
+# `use` and `source` commands.
+#
+# By default, the `scripts` subdirectory of the default configuration
+# directory is included:
+$env.NU_LIB_DIRS = [
+    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+    ($nu.data-dir | path join 'completions') # default home for nushell completions
+]
+# You can replace (override) or append to this list:
+$env.NU_LIB_DIRS ++= ($nu.default-config-dir | path join 'modules')
+
+# NU_PLUGIN_DIRS
+# --------------
+# Directories to search for plugin binaries when calling register.
+
+# By default, the `plugins` subdirectory of the default configuration
+# directory is included:
+$env.NU_PLUGIN_DIRS = [
+    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
+]
+
+# Appending to the OS path is a common configuration task.
+# Because of the previous ENV_CONVERSIONS (performed internally
+# before your env.nu loads), the path variable is a list that can 
+# be appended to using, for example:
+$env.path ++= "~/.local/bin"
+
+# Or prepend using
+$env.path = "~/.local/bin" ++ $env.path
+
+# The `path add` function from the Standard Library also provides
+# a convenience method for prepending to the path:
+use std/util "path add"
+path add "~/.local/bin"
+path add ($env.CARGO_HOME | path join "bin")
+
+# You can remove duplicate directories from the path using:
+$env.PATH = ($env.PATH | uniq)
diff --git a/crates/nu-utils/src/sample_config/sample_login.nu b/crates/nu-utils/src/default_files/sample_login.nu
similarity index 100%
rename from crates/nu-utils/src/sample_config/sample_login.nu
rename to crates/nu-utils/src/default_files/sample_login.nu
diff --git a/crates/nu-utils/src/default_files/scaffold_config.nu b/crates/nu-utils/src/default_files/scaffold_config.nu
new file mode 100644
index 0000000000..7bf7ecc632
--- /dev/null
+++ b/crates/nu-utils/src/default_files/scaffold_config.nu
@@ -0,0 +1,19 @@
+# config.nu
+#
+# This file is used to override default Nushell settings, define
+# (or import) custom commands, or run any other startup tasks.
+# See https://www.nushell.sh/book/configuration.html
+#
+# This file is loaded after env.nu and before login.nu
+# 
+# You can open this file in your default editor using:
+# config nu
+#
+# To pretty-print a sample config.nu with documentation, run:
+# config nu --sample | nu-highlight | less -R
+#
+# To pretty-print the default configuration values, run:
+# config nu --default | nu-highlight | less -R
+#
+# You can remove these comments if you want or leave
+# them for future reference.
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
new file mode 100644
index 0000000000..a3ce3cab07
--- /dev/null
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -0,0 +1,18 @@
+# env.nu
+#
+# This file is typically used to add or override environment variables.
+# See https://www.nushell.sh/book/configuration.html
+#
+# This file is loaded before config.nu and login.nu
+#
+# You can open this file in your default editor using:
+# config env
+#
+# To pretty-print a sample env.nu with documentation, run:
+# config env --sample | nu-highlight | less -R
+#
+# To pretty-print the default environment values, run:
+# config env --default | nu-highlight | less -R
+#
+# You can remove these comments if you want or leave
+# them for future reference.
diff --git a/crates/nu-utils/src/lib.rs b/crates/nu-utils/src/lib.rs
index 4b91d923db..413b5f8893 100644
--- a/crates/nu-utils/src/lib.rs
+++ b/crates/nu-utils/src/lib.rs
@@ -10,8 +10,9 @@ pub mod utils;
 
 pub use locale::get_system_locale;
 pub use utils::{
-    enable_vt_processing, get_default_config, get_default_env, get_ls_colors,
-    stderr_write_all_and_flush, stdout_write_all_and_flush,
+    enable_vt_processing, get_default_config, get_default_env, get_ls_colors, get_sample_config,
+    get_sample_env, get_scaffold_config, get_scaffold_env, stderr_write_all_and_flush,
+    stdout_write_all_and_flush,
 };
 
 pub use casing::IgnoreCaseExt;
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
deleted file mode 100644
index c8b398b684..0000000000
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ /dev/null
@@ -1,899 +0,0 @@
-# Nushell Config File
-#
-# version = "0.100.1"
-
-# For more information on defining custom themes, see
-# https://www.nushell.sh/book/coloring_and_theming.html
-# And here is the theme collection
-# https://github.com/nushell/nu_scripts/tree/main/themes
-let dark_theme = {
-    # color for nushell primitives
-    separator: white
-    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
-    header: green_bold
-    empty: blue
-    # Closures can be used to choose colors for specific values.
-    # The value (in this case, a bool) is piped into the closure.
-    # eg) {|| if $in { 'light_cyan' } else { 'light_gray' } }
-    bool: light_cyan
-    int: white
-    filesize: cyan
-    duration: white
-    date: purple
-    range: white
-    float: white
-    string: white
-    nothing: white
-    binary: white
-    cell-path: white
-    row_index: green_bold
-    record: white
-    list: white
-    block: white
-    hints: dark_gray
-    search_result: { bg: red fg: white }
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_external_resolved: light_yellow_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b }
-    shape_glob_interpolation: cyan_bold
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_keyword: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-    shape_raw_string: light_purple
-}
-
-let light_theme = {
-    # color for nushell primitives
-    separator: dark_gray
-    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
-    header: green_bold
-    empty: blue
-    # Closures can be used to choose colors for specific values.
-    # The value (in this case, a bool) is piped into the closure.
-    # eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } }
-    bool: dark_cyan
-    int: dark_gray
-    filesize: cyan_bold
-    duration: dark_gray
-    date: purple
-    range: dark_gray
-    float: dark_gray
-    string: dark_gray
-    nothing: dark_gray
-    binary: dark_gray
-    cell-path: dark_gray
-    row_index: green_bold
-    record: dark_gray
-    list: dark_gray
-    block: dark_gray
-    hints: dark_gray
-    search_result: { fg: white bg: red }
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_external_resolved: light_purple_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b }
-    shape_glob_interpolation: cyan_bold
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_keyword: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-    shape_raw_string: light_purple
-}
-
-# External completer example
-# let carapace_completer = {|spans|
-#     carapace $spans.0 nushell ...$spans | from json
-# }
-
-# The default config record. This is where much of your global configuration is setup.
-$env.config = {
-    show_banner: true # true or false to enable or disable the welcome banner at startup
-
-    ls: {
-        use_ls_colors: true # use the LS_COLORS environment variable to colorize output
-        clickable_links: true # enable or disable clickable links. Your terminal has to support links.
-    }
-
-    rm: {
-        always_trash: false # always act as if -t was given. Can be overridden with -p
-    }
-
-    table: {
-        mode: rounded # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other
-        index_mode: always # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column
-        show_empty: true # show 'empty list' and 'empty record' placeholders for command output
-        padding: { left: 1, right: 1 } # a left right padding of each column in a table
-        trim: {
-            methodology: wrapping # wrapping or truncating
-            wrapping_try_keep_words: true # A strategy used by the 'wrapping' methodology
-            truncating_suffix: "..." # A suffix used by the 'truncating' methodology
-        }
-        header_on_separator: false # show header text on separator/border line
-        footer_inheritance: false # render footer in parent table if child is big enough (extended table option)
-        # abbreviated_row_count: 10 # limit data rows from top and bottom after reaching a set point
-    }
-
-    error_style: "fancy" # "fancy" or "plain" for screen reader-friendly error messages
-
-    # Whether an error message should be printed if an error of a certain kind is triggered.
-    display_errors: {
-        exit_code: false # assume the external command prints an error message
-        # Core dump errors are always printed, and SIGPIPE never triggers an error.
-        # The setting below controls message printing for termination by all other signals.
-        termination_signal: true
-    }
-
-    # datetime_format determines what a datetime rendered in the shell would look like.
-    # Behavior without this configuration point will be to "humanize" the datetime display,
-    # showing something like "a day ago."
-    datetime_format: {
-        # normal: '%a, %d %b %Y %H:%M:%S %z'    # shows up in displays of variables or other datetime's outside of tables
-        # table: '%m/%d/%y %I:%M:%S%p'          # generally shows up in tabular outputs such as ls. commenting this out will change it to the default human readable datetime format
-    }
-
-    explore: {
-        status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" },
-        command_bar_text: { fg: "#C4C9C6" },
-        highlight: { fg: "black", bg: "yellow" },
-        status: {
-            error: { fg: "white", bg: "red" },
-            warn: {}
-            info: {}
-        },
-        selected_cell: { bg: light_blue },
-    }
-
-    history: {
-        max_size: 100_000 # Session has to be reloaded for this to take effect
-        sync_on_enter: true # Enable to share history between multiple sessions, else you have to close the session to write history to file
-        file_format: "plaintext" # "sqlite" or "plaintext"
-        isolation: false # only available with sqlite file_format. true enables history isolation, false disables it. true will allow the history to be isolated to the current session using up/down arrows. false will allow the history to be shared across all sessions.
-    }
-
-    completions: {
-        case_sensitive: false # set to true to enable case-sensitive completions
-        quick: true    # set this to false to prevent auto-selecting completions when only one remains
-        partial: true    # set this to false to prevent partial filling of the prompt
-        algorithm: "prefix"    # prefix or fuzzy
-        sort: "smart" # "smart" (alphabetical for prefix matching, fuzzy score for fuzzy matching) or "alphabetical"
-        external: {
-            enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow
-            max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
-            completer: null # check 'carapace_completer' above as an example
-        }
-        use_ls_colors: true # set this to true to enable file/path/directory completions using LS_COLORS
-    }
-
-    filesize: {
-        metric: false # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
-        format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
-    }
-
-    cursor_shape: {
-        emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default)
-        vi_insert: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default)
-        vi_normal: underscore # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default)
-    }
-
-    color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
-    footer_mode: 25 # always, never, number_of_rows, auto
-    float_precision: 2 # the precision for displaying floats in tables
-    buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.VISUAL and $env.EDITOR
-    use_ansi_coloring: true
-    bracketed_paste: true # enable bracketed paste, currently useless on windows
-    edit_mode: emacs # emacs, vi
-    shell_integration: {
-        # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title
-        osc2: true
-        # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
-        osc7: true
-        # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
-        osc8: true
-        # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
-        osc9_9: false
-        # osc133 is several escapes invented by Final Term which include the supported ones below.
-        # 133;A - Mark prompt start
-        # 133;B - Mark prompt end
-        # 133;C - Mark pre-execution
-        # 133;D;exit - Mark execution finished with exit code
-        # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
-        osc133: true
-        # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
-        # 633;A - Mark prompt start
-        # 633;B - Mark prompt end
-        # 633;C - Mark pre-execution
-        # 633;D;exit - Mark execution finished with exit code
-        # 633;E - Explicitly set the command line with an optional nonce
-        # 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
-        # and also helps with the run recent menu in vscode
-        osc633: true
-        # reset_application_mode is escape \x1b[?1l and was added to help ssh work better
-        reset_application_mode: true
-    }
-    render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt.
-    use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.
-    highlight_resolved_externals: false # true enables highlighting of external commands in the repl resolved by which.
-    recursion_limit: 50 # the maximum number of times nushell allows recursion before stopping it
-
-    plugins: {} # Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration.
-
-    plugin_gc: {
-        # Configuration for plugin garbage collection
-        default: {
-            enabled: true # true to enable stopping of inactive plugins
-            stop_after: 10sec # how long to wait after a plugin is inactive to stop it
-        }
-        plugins: {
-            # alternate configuration for specific plugins, by name, for example:
-            #
-            # gstat: {
-            #     enabled: false
-            # }
-        }
-    }
-
-    hooks: {
-        pre_prompt: [{ null }] # run before the prompt is shown
-        pre_execution: [{ null }] # run before the repl input is run
-        env_change: {
-            PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input
-        }
-        display_output: "if (term size).columns >= 100 { table -e } else { table }" # run to display the output of a pipeline
-        command_not_found: { null } # return an error message when a command is not found
-    }
-
-    menus: [
-        # Configuration for default nushell menus
-        # Note the lack of source parameter
-        {
-            name: completion_menu
-            only_buffer_difference: false
-            marker: "| "
-            type: {
-                layout: columnar
-                columns: 4
-                col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
-                col_padding: 2
-            }
-            style: {
-                text: green
-                selected_text: { attr: r }
-                description_text: yellow
-                match_text: { attr: u }
-                selected_match_text: { attr: ur }
-            }
-        }
-        {
-            name: ide_completion_menu
-            only_buffer_difference: false
-            marker: "| "
-            type: {
-                layout: ide
-                min_completion_width: 0,
-                max_completion_width: 50,
-                max_completion_height: 10, # will be limited by the available lines in the terminal
-                padding: 0,
-                border: true,
-                cursor_offset: 0,
-                description_mode: "prefer_right"
-                min_description_width: 0
-                max_description_width: 50
-                max_description_height: 10
-                description_offset: 1
-                # If true, the cursor pos will be corrected, so the suggestions match up with the typed text
-                #
-                # C:\> str
-                #      str join
-                #      str trim
-                #      str split
-                correct_cursor_pos: false
-            }
-            style: {
-                text: green
-                selected_text: { attr: r }
-                description_text: yellow
-                match_text: { attr: u }
-                selected_match_text: { attr: ur }
-            }
-        }
-        {
-            name: history_menu
-            only_buffer_difference: true
-            marker: "? "
-            type: {
-                layout: list
-                page_size: 10
-            }
-            style: {
-                text: green
-                selected_text: green_reverse
-                description_text: yellow
-            }
-        }
-        {
-            name: help_menu
-            only_buffer_difference: true
-            marker: "? "
-            type: {
-                layout: description
-                columns: 4
-                col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
-                col_padding: 2
-                selection_rows: 4
-                description_rows: 10
-            }
-            style: {
-                text: green
-                selected_text: green_reverse
-                description_text: yellow
-            }
-        }
-    ]
-
-    keybindings: [
-        {
-            name: completion_menu
-            modifier: none
-            keycode: tab
-            mode: [emacs vi_normal vi_insert]
-            event: {
-                until: [
-                    { send: menu name: completion_menu }
-                    { send: menunext }
-                    { edit: complete }
-                ]
-            }
-        }
-        {
-            name: completion_previous_menu
-            modifier: shift
-            keycode: backtab
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: menuprevious }
-        }
-        {
-            name: ide_completion_menu
-            modifier: control
-            keycode: space
-            mode: [emacs vi_normal vi_insert]
-            event: {
-                until: [
-                    { send: menu name: ide_completion_menu }
-                    { send: menunext }
-                    { edit: complete }
-                ]
-            }
-        }
-        {
-            name: history_menu
-            modifier: control
-            keycode: char_r
-            mode: [emacs, vi_insert, vi_normal]
-            event: { send: menu name: history_menu }
-        }
-        {
-            name: help_menu
-            modifier: none
-            keycode: f1
-            mode: [emacs, vi_insert, vi_normal]
-            event: { send: menu name: help_menu }
-        }
-        {
-            name: next_page_menu
-            modifier: control
-            keycode: char_x
-            mode: emacs
-            event: { send: menupagenext }
-        }
-        {
-            name: undo_or_previous_page_menu
-            modifier: control
-            keycode: char_z
-            mode: emacs
-            event: {
-                until: [
-                    { send: menupageprevious }
-                    { edit: undo }
-                ]
-            }
-        }
-        {
-            name: escape
-            modifier: none
-            keycode: escape
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: esc }    # NOTE: does not appear to work
-        }
-        {
-            name: cancel_command
-            modifier: control
-            keycode: char_c
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: ctrlc }
-        }
-        {
-            name: quit_shell
-            modifier: control
-            keycode: char_d
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: ctrld }
-        }
-        {
-            name: clear_screen
-            modifier: control
-            keycode: char_l
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: clearscreen }
-        }
-        {
-            name: search_history
-            modifier: control
-            keycode: char_q
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: searchhistory }
-        }
-        {
-            name: open_command_editor
-            modifier: control
-            keycode: char_o
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: openeditor }
-        }
-        {
-            name: move_up
-            modifier: none
-            keycode: up
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuup }
-                    { send: up }
-                ]
-            }
-        }
-        {
-            name: move_down
-            modifier: none
-            keycode: down
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menudown }
-                    { send: down }
-                ]
-            }
-        }
-        {
-            name: move_left
-            modifier: none
-            keycode: left
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuleft }
-                    { send: left }
-                ]
-            }
-        }
-        {
-            name: move_right_or_take_history_hint
-            modifier: none
-            keycode: right
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { send: menuright }
-                    { send: right }
-                ]
-            }
-        }
-        {
-            name: move_one_word_left
-            modifier: control
-            keycode: left
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: control
-            keycode: right
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: move_to_line_start
-            modifier: none
-            keycode: home
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_start
-            modifier: control
-            keycode: char_a
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_end_or_take_history_hint
-            modifier: none
-            keycode: end
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { edit: movetolineend }
-                ]
-            }
-        }
-        {
-            name: move_to_line_end_or_take_history_hint
-            modifier: control
-            keycode: char_e
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { edit: movetolineend }
-                ]
-            }
-        }
-        {
-            name: move_to_line_start
-            modifier: control
-            keycode: home
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_end
-            modifier: control
-            keycode: end
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolineend }
-        }
-        {
-            name: move_down
-            modifier: control
-            keycode: char_n
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menudown }
-                    { send: down }
-                ]
-            }
-        }
-        {
-            name: move_up
-            modifier: control
-            keycode: char_p
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuup }
-                    { send: up }
-                ]
-            }
-        }
-        {
-            name: delete_one_character_backward
-            modifier: none
-            keycode: backspace
-            mode: [emacs, vi_insert]
-            event: { edit: backspace }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: control
-            keycode: backspace
-            mode: [emacs, vi_insert]
-            event: { edit: backspaceword }
-        }
-        {
-            name: delete_one_character_forward
-            modifier: none
-            keycode: delete
-            mode: [emacs, vi_insert]
-            event: { edit: delete }
-        }
-        {
-            name: delete_one_character_forward
-            modifier: control
-            keycode: delete
-            mode: [emacs, vi_insert]
-            event: { edit: delete }
-        }
-        {
-            name: delete_one_character_backward
-            modifier: control
-            keycode: char_h
-            mode: [emacs, vi_insert]
-            event: { edit: backspace }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: control
-            keycode: char_w
-            mode: [emacs, vi_insert]
-            event: { edit: backspaceword }
-        }
-        {
-            name: move_left
-            modifier: none
-            keycode: backspace
-            mode: vi_normal
-            event: { edit: moveleft }
-        }
-        {
-            name: newline_or_run_command
-            modifier: none
-            keycode: enter
-            mode: emacs
-            event: { send: enter }
-        }
-        {
-            name: move_left
-            modifier: control
-            keycode: char_b
-            mode: emacs
-            event: {
-                until: [
-                    { send: menuleft }
-                    { send: left }
-                ]
-            }
-        }
-        {
-            name: move_right_or_take_history_hint
-            modifier: control
-            keycode: char_f
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { send: menuright }
-                    { send: right }
-                ]
-            }
-        }
-        {
-            name: redo_change
-            modifier: control
-            keycode: char_g
-            mode: emacs
-            event: { edit: redo }
-        }
-        {
-            name: undo_change
-            modifier: control
-            keycode: char_z
-            mode: emacs
-            event: { edit: undo }
-        }
-        {
-            name: paste_before
-            modifier: control
-            keycode: char_y
-            mode: emacs
-            event: { edit: pastecutbufferbefore }
-        }
-        {
-            name: cut_word_left
-            modifier: control
-            keycode: char_w
-            mode: emacs
-            event: { edit: cutwordleft }
-        }
-        {
-            name: cut_line_to_end
-            modifier: control
-            keycode: char_k
-            mode: emacs
-            event: { edit: cuttolineend }
-        }
-        {
-            name: cut_line_from_start
-            modifier: control
-            keycode: char_u
-            mode: emacs
-            event: { edit: cutfromstart }
-        }
-        {
-            name: swap_graphemes
-            modifier: control
-            keycode: char_t
-            mode: emacs
-            event: { edit: swapgraphemes }
-        }
-        {
-            name: move_one_word_left
-            modifier: alt
-            keycode: left
-            mode: emacs
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: alt
-            keycode: right
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: move_one_word_left
-            modifier: alt
-            keycode: char_b
-            mode: emacs
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: alt
-            keycode: char_f
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: delete_one_word_forward
-            modifier: alt
-            keycode: delete
-            mode: emacs
-            event: { edit: deleteword }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: alt
-            keycode: backspace
-            mode: emacs
-            event: { edit: backspaceword }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: alt
-            keycode: char_m
-            mode: emacs
-            event: { edit: backspaceword }
-        }
-        {
-            name: cut_word_to_right
-            modifier: alt
-            keycode: char_d
-            mode: emacs
-            event: { edit: cutwordright }
-        }
-        {
-            name: upper_case_word
-            modifier: alt
-            keycode: char_u
-            mode: emacs
-            event: { edit: uppercaseword }
-        }
-        {
-            name: lower_case_word
-            modifier: alt
-            keycode: char_l
-            mode: emacs
-            event: { edit: lowercaseword }
-        }
-        {
-            name: capitalize_char
-            modifier: alt
-            keycode: char_c
-            mode: emacs
-            event: { edit: capitalizechar }
-        }
-        # The following bindings with `*system` events require that Nushell has
-        # been compiled with the `system-clipboard` feature.
-        # If you want to use the system clipboard for visual selection or to
-        # paste directly, uncomment the respective lines and replace the version
-        # using the internal clipboard.
-        {
-            name: copy_selection
-            modifier: control_shift
-            keycode: char_c
-            mode: emacs
-            event: { edit: copyselection }
-            # event: { edit: copyselectionsystem }
-        }
-        {
-            name: cut_selection
-            modifier: control_shift
-            keycode: char_x
-            mode: emacs
-            event: { edit: cutselection }
-            # event: { edit: cutselectionsystem }
-        }
-        # {
-        #     name: paste_system
-        #     modifier: control_shift
-        #     keycode: char_v
-        #     mode: emacs
-        #     event: { edit: pastesystem }
-        # }
-        {
-            name: select_all
-            modifier: control_shift
-            keycode: char_a
-            mode: emacs
-            event: { edit: selectall }
-        }
-    ]
-}
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
deleted file mode 100644
index fb527dc112..0000000000
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ /dev/null
@@ -1,101 +0,0 @@
-# Nushell Environment Config File
-#
-# version = "0.100.1"
-
-def create_left_prompt [] {
-    let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
-        null => $env.PWD
-        '' => '~'
-        $relative_pwd => ([~ $relative_pwd] | path join)
-    }
-
-    let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
-    let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
-    let path_segment = $"($path_color)($dir)(ansi reset)"
-
-    $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
-}
-
-def create_right_prompt [] {
-    # create a right prompt in magenta with green separators and am/pm underlined
-    let time_segment = ([
-        (ansi reset)
-        (ansi magenta)
-        (date now | format date '%x %X') # try to respect user's locale
-    ] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
-        str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
-
-    let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
-        (ansi rb)
-        ($env.LAST_EXIT_CODE)
-    ] | str join)
-    } else { "" }
-
-    ([$last_exit_code, (char space), $time_segment] | str join)
-}
-
-# Use nushell functions to define your right and left prompt
-$env.PROMPT_COMMAND = {|| create_left_prompt }
-# FIXME: This default is not implemented in rust code as of 2023-09-08.
-$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
-
-# The prompt indicators are environmental variables that represent
-# the state of the prompt
-$env.PROMPT_INDICATOR = {|| "> " }
-$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " }
-$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " }
-$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
-
-# If you want previously entered commands to have a different prompt from the usual one,
-# you can uncomment one or more of the following lines.
-# This can be useful if you have a 2-line prompt and it's taking up a lot of space
-# because every command entered takes up 2 lines instead of 1. You can then uncomment
-# the line below so that previously entered commands show with a single `🚀`.
-# $env.TRANSIENT_PROMPT_COMMAND = {|| "🚀 " }
-# $env.TRANSIENT_PROMPT_INDICATOR = {|| "" }
-# $env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = {|| "" }
-# $env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = {|| "" }
-# $env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = {|| "" }
-# $env.TRANSIENT_PROMPT_COMMAND_RIGHT = {|| "" }
-
-# Specifies how environment variables are:
-# - converted from a string to a value on Nushell startup (from_string)
-# - converted from a value back to a string when running external commands (to_string)
-# Note: The conversions happen *after* config.nu is loaded
-$env.ENV_CONVERSIONS = {
-    "PATH": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-    "Path": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-}
-
-# Directories to search for scripts when calling source or use
-# The default for this is $nu.default-config-dir/scripts
-$env.NU_LIB_DIRS = [
-    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
-    ($nu.data-dir | path join 'completions') # default home for nushell completions
-]
-
-# Directories to search for plugin binaries when calling register
-# The default for this is $nu.default-config-dir/plugins
-$env.NU_PLUGIN_DIRS = [
-    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
-]
-
-# To add entries to PATH (on Windows you might use Path), you can use the following pattern:
-# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
-# An alternate way to add entries to $env.PATH is to use the custom command `path add`
-# which is built into the nushell stdlib:
-# use std "path add"
-# $env.PATH = ($env.PATH | split row (char esep))
-# path add /some/path
-# path add ($env.CARGO_HOME | path join "bin")
-# path add ($env.HOME | path join ".local" "bin")
-# $env.PATH = ($env.PATH | uniq)
-
-# To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
diff --git a/crates/nu-utils/src/utils.rs b/crates/nu-utils/src/utils.rs
index 472afc92f7..798e542be5 100644
--- a/crates/nu-utils/src/utils.rs
+++ b/crates/nu-utils/src/utils.rs
@@ -85,12 +85,29 @@ where
     ret
 }
 
+// See default_files/README.md for a description of these files
 pub fn get_default_env() -> &'static str {
-    include_str!("sample_config/default_env.nu")
+    include_str!("default_files/default_env.nu")
+}
+
+pub fn get_scaffold_env() -> &'static str {
+    include_str!("default_files/scaffold_env.nu")
+}
+
+pub fn get_sample_env() -> &'static str {
+    include_str!("default_files/sample_env.nu")
 }
 
 pub fn get_default_config() -> &'static str {
-    include_str!("sample_config/default_config.nu")
+    include_str!("default_files/default_config.nu")
+}
+
+pub fn get_scaffold_config() -> &'static str {
+    include_str!("default_files/scaffold_config.nu")
+}
+
+pub fn get_sample_config() -> &'static str {
+    include_str!("default_files/sample_config.nu")
 }
 
 pub fn get_ls_colors(lscolors_env_string: Option<String>) -> LsColors {
diff --git a/crates/nu_plugin_custom_values/src/cool_custom_value.rs b/crates/nu_plugin_custom_values/src/cool_custom_value.rs
index ea0cf8ec92..cd160e0d0c 100644
--- a/crates/nu_plugin_custom_values/src/cool_custom_value.rs
+++ b/crates/nu_plugin_custom_values/src/cool_custom_value.rs
@@ -112,7 +112,7 @@ impl CustomValue for CoolCustomValue {
     ) -> Result<Value, ShellError> {
         match operator {
             // Append the string inside `cool`
-            ast::Operator::Math(ast::Math::Append) => {
+            ast::Operator::Math(ast::Math::Concat) => {
                 if let Some(right) = right
                     .as_custom_value()
                     .ok()
diff --git a/crates/nu_plugin_example/src/commands/for_each.rs b/crates/nu_plugin_example/src/commands/for_each.rs
index e66a3841dc..20bf7e9f12 100644
--- a/crates/nu_plugin_example/src/commands/for_each.rs
+++ b/crates/nu_plugin_example/src/commands/for_each.rs
@@ -23,7 +23,7 @@ impl PluginCommand for ForEach {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_type(Type::ListStream, Type::Nothing)
+            .input_output_type(Type::list(Type::Any), Type::Nothing)
             .required(
                 "closure",
                 SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
diff --git a/crates/nu_plugin_example/src/commands/generate.rs b/crates/nu_plugin_example/src/commands/generate.rs
index de63849aef..d2d4e7a5af 100644
--- a/crates/nu_plugin_example/src/commands/generate.rs
+++ b/crates/nu_plugin_example/src/commands/generate.rs
@@ -26,7 +26,7 @@ impl PluginCommand for Generate {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_type(Type::Nothing, Type::ListStream)
+            .input_output_type(Type::Nothing, Type::list(Type::Any))
             .required(
                 "initial",
                 SyntaxShape::Any,
diff --git a/src/config_files.rs b/src/config_files.rs
index 7631a951bc..5c43764580 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -2,12 +2,13 @@ use log::warn;
 #[cfg(feature = "plugin")]
 use nu_cli::read_plugin_file;
 use nu_cli::{eval_config_contents, eval_source};
+use nu_engine::convert_env_values;
 use nu_path::canonicalize_with;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     report_parse_error, report_shell_error, Config, ParseError, PipelineData, Spanned,
 };
-use nu_utils::{get_default_config, get_default_env};
+use nu_utils::{get_default_config, get_default_env, get_scaffold_config, get_scaffold_env, perf};
 use std::{
     fs,
     fs::File,
@@ -26,12 +27,47 @@ pub(crate) fn read_config_file(
     stack: &mut Stack,
     config_file: Option<Spanned<String>>,
     is_env_config: bool,
-    ask_to_create: bool,
+    create_scaffold: bool,
 ) {
     warn!(
         "read_config_file() config_file_specified: {:?}, is_env_config: {is_env_config}",
         &config_file
     );
+
+    if is_env_config {
+        eval_default_config(engine_state, stack, get_default_env(), is_env_config);
+
+        let start_time = std::time::Instant::now();
+        let config = engine_state.get_config();
+        let use_color = config.use_ansi_coloring;
+        // Translate environment variables from Strings to Values
+        if let Err(e) = convert_env_values(engine_state, stack) {
+            report_shell_error(engine_state, &e);
+        }
+
+        perf!(
+            "translate env vars after default_env.nu",
+            start_time,
+            use_color
+        );
+    } else {
+        let start_time = std::time::Instant::now();
+        let config = engine_state.get_config();
+        let use_color = config.use_ansi_coloring;
+        if let Err(e) = convert_env_values(engine_state, stack) {
+            report_shell_error(engine_state, &e);
+        }
+        perf!(
+            "translate env vars before default_config.nu",
+            start_time,
+            use_color
+        );
+
+        eval_default_config(engine_state, stack, get_default_config(), is_env_config);
+    };
+
+    warn!("read_config_file() loading_defaults is_env_config: {is_env_config}");
+
     // Load config startup file
     if let Some(file) = config_file {
         match engine_state.cwd_as_string(Some(stack)) {
@@ -59,41 +95,16 @@ pub(crate) fn read_config_file(
         config_path.push(if is_env_config { ENV_FILE } else { CONFIG_FILE });
 
         if !config_path.exists() {
-            let file_msg = if is_env_config {
-                "environment config"
+            let scaffold_config_file = if is_env_config {
+                get_scaffold_env()
             } else {
-                "config"
+                get_scaffold_config()
             };
 
-            let will_create_file = match ask_to_create {
-                true => {
-                    println!(
-                        "No {} file found at {}",
-                        file_msg,
-                        config_path.to_string_lossy()
-                    );
-                    println!("Would you like to create one with defaults (Y/n): ");
-
-                    let mut answer = String::new();
-                    std::io::stdin()
-                        .read_line(&mut answer)
-                        .expect("Failed to read user input");
-
-                    matches!(answer.trim(), "y" | "Y" | "")
-                }
-                _ => false,
-            };
-
-            let config_file = if is_env_config {
-                get_default_env()
-            } else {
-                get_default_config()
-            };
-
-            match will_create_file {
+            match create_scaffold {
                 true => {
                     if let Ok(mut output) = File::create(&config_path) {
-                        if write!(output, "{config_file}").is_ok() {
+                        if write!(output, "{scaffold_config_file}").is_ok() {
                             let config_type = if is_env_config {
                                 "Environment config"
                             } else {
@@ -109,17 +120,14 @@ pub(crate) fn read_config_file(
                                 "Unable to write to {}, sourcing default file instead",
                                 config_path.to_string_lossy(),
                             );
-                            eval_default_config(engine_state, stack, config_file, is_env_config);
                             return;
                         }
                     } else {
-                        eprintln!("Unable to create {config_file}, sourcing default file instead");
-                        eval_default_config(engine_state, stack, config_file, is_env_config);
+                        eprintln!("Unable to create {scaffold_config_file}");
                         return;
                     }
                 }
                 _ => {
-                    eval_default_config(engine_state, stack, config_file, is_env_config);
                     return;
                 }
             }
@@ -227,11 +235,7 @@ fn eval_default_config(
     config_file: &str,
     is_env_config: bool,
 ) {
-    warn!(
-        "eval_default_config() config_file_specified: {:?}, is_env_config: {}",
-        &config_file, is_env_config
-    );
-    // Just use the contents of "default_config.nu" or "default_env.nu"
+    warn!("eval_default_config() is_env_config: {}", is_env_config);
     eval_source(
         engine_state,
         stack,
@@ -264,20 +268,14 @@ pub(crate) fn setup_config(
         &config_file, &env_file, is_login_shell
     );
 
-    let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
+    let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
     let result = catch_unwind(AssertUnwindSafe(|| {
         #[cfg(feature = "plugin")]
         read_plugin_file(engine_state, plugin_file);
 
-        read_config_file(engine_state, stack, env_file, true, ask_to_create_config);
-        read_config_file(
-            engine_state,
-            stack,
-            config_file,
-            false,
-            ask_to_create_config,
-        );
+        read_config_file(engine_state, stack, env_file, true, create_scaffold);
+        read_config_file(engine_state, stack, config_file, false, create_scaffold);
 
         if is_login_shell {
             read_loginshell_file(engine_state, stack);
diff --git a/src/main.rs b/src/main.rs
index b7c5a6a173..bef8d07caf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,8 +24,8 @@ use nu_cli::gather_parent_env_vars;
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
-    engine::EngineState, report_shell_error, ByteStream, PipelineData, ShellError, Span, Spanned,
-    Value,
+    engine::EngineState, report_shell_error, ByteStream, Config, IntoValue, PipelineData,
+    ShellError, Span, Spanned, Value,
 };
 use nu_std::load_standard_library;
 use nu_utils::perf;
@@ -257,6 +257,13 @@ fn main() -> Result<()> {
         perf!("acquire_terminal", start_time, use_color);
     }
 
+    start_time = std::time::Instant::now();
+    engine_state.add_env_var(
+        "config".into(),
+        Config::default().into_value(Span::unknown()),
+    );
+    perf!("$env.config setup", start_time, use_color);
+
     start_time = std::time::Instant::now();
     if let Some(include_path) = &parsed_nu_cli_args.include_path {
         let span = include_path.span;
@@ -280,6 +287,16 @@ fn main() -> Result<()> {
         Value::string(env!("CARGO_PKG_VERSION"), Span::unknown()),
     );
 
+    // Add SHLVL if interactive
+    if engine_state.is_interactive {
+        let mut shlvl = engine_state
+            .get_env_var("SHLVL")
+            .map(|x| x.as_str().unwrap_or("0").parse::<i64>().unwrap_or(0))
+            .unwrap_or(0);
+        shlvl += 1;
+        engine_state.add_env_var("SHLVL".to_string(), Value::int(shlvl, Span::unknown()));
+    }
+
     if parsed_nu_cli_args.no_std_lib.is_none() {
         load_standard_library(&mut engine_state)?;
     }
diff --git a/src/run.rs b/src/run.rs
index 1cbfbc03a2..89bad3866f 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -23,7 +23,7 @@ pub(crate) fn run_commands(
     trace!("run_commands");
 
     let start_time = std::time::Instant::now();
-    let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
+    let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
     let mut stack = Stack::new();
 
@@ -46,7 +46,7 @@ pub(crate) fn run_commands(
                 &mut stack,
                 parsed_nu_cli_args.env_file,
                 true,
-                ask_to_create_config,
+                create_scaffold,
             );
         } else {
             config_files::read_default_env_file(engine_state, &mut stack)
@@ -55,7 +55,7 @@ pub(crate) fn run_commands(
         perf!("read env.nu", start_time, use_color);
 
         let start_time = std::time::Instant::now();
-        let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
+        let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
         // If we have a config file parameter *OR* we have a login shell parameter, read the config file
         if parsed_nu_cli_args.config_file.is_some() || parsed_nu_cli_args.login_shell.is_some() {
@@ -64,7 +64,7 @@ pub(crate) fn run_commands(
                 &mut stack,
                 parsed_nu_cli_args.config_file,
                 false,
-                ask_to_create_config,
+                create_scaffold,
             );
         }
 
@@ -123,7 +123,7 @@ pub(crate) fn run_file(
     // if the --no-config-file(-n) flag is passed, do not load plugin, env, or config files
     if parsed_nu_cli_args.no_config_file.is_none() {
         let start_time = std::time::Instant::now();
-        let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
+        let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
         #[cfg(feature = "plugin")]
         read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file);
         perf!("read plugins", start_time, use_color);
@@ -136,7 +136,7 @@ pub(crate) fn run_file(
                 &mut stack,
                 parsed_nu_cli_args.env_file,
                 true,
-                ask_to_create_config,
+                create_scaffold,
             );
         } else {
             config_files::read_default_env_file(engine_state, &mut stack)
@@ -150,7 +150,7 @@ pub(crate) fn run_file(
                 &mut stack,
                 parsed_nu_cli_args.config_file,
                 false,
-                ask_to_create_config,
+                create_scaffold,
             );
         }
         perf!("read config.nu", start_time, use_color);
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index 0c4ff5d77c..a1744e1601 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -154,7 +154,6 @@ fn const_unary_operator(#[case] inp: &[&str], #[case] expect: &str) {
 #[case(&[r#"const x = "a" ++ "b" "#, "$x"], "ab")]
 #[case(&[r#"const x = [1,2] ++ [3]"#, "$x | describe"], "list<int>")]
 #[case(&[r#"const x = 0x[1,2] ++ 0x[3]"#, "$x | describe"], "binary")]
-#[case(&[r#"const x = 0x[1,2] ++ [3]"#, "$x | describe"], "list<any>")]
 #[case(&["const x = 1 < 2", "$x"], "true")]
 #[case(&["const x = (3 * 200) > (2 * 100)", "$x"], "true")]
 #[case(&["const x = (3 * 200) < (2 * 100)", "$x"], "false")]
diff --git a/tests/eval/mod.rs b/tests/eval/mod.rs
index 191b19eb89..b7ad76d32d 100644
--- a/tests/eval/mod.rs
+++ b/tests/eval/mod.rs
@@ -159,7 +159,7 @@ fn record_spread() {
 #[test]
 fn binary_op_example() {
     test_eval(
-        "(([1 2] ++ [3 4]) == [1 2 3 4]) and (([1 2 3] ++ 4) == ([1] ++ [2 3 4]))",
+        "(([1 2] ++ [3 4]) == [1 2 3 4]) and (([1] ++ [2 3 4]) == [1 2 3 4])",
         Eq("true"),
     )
 }
diff --git a/tests/fixtures/formats/sample_data_with_annotation.ods b/tests/fixtures/formats/sample_data_with_annotation.ods
new file mode 100644
index 0000000000..f4b5c723ea
Binary files /dev/null and b/tests/fixtures/formats/sample_data_with_annotation.ods differ
diff --git a/tests/plugins/env.rs b/tests/plugins/env.rs
index 8b307999b3..d7d1555f02 100644
--- a/tests/plugins/env.rs
+++ b/tests/plugins/env.rs
@@ -40,7 +40,17 @@ fn get_current_dir() {
         "cd tests; example env --cwd"
     );
     assert!(result.status.success());
+    #[cfg(not(windows))]
     assert_eq!(cwd, result.out);
+    #[cfg(windows)]
+    {
+        // cwd == r"e:\Study\Nushell", while result.out == r"E:\Study\Nushell"
+        assert_eq!(
+            cwd.chars().next().unwrap().to_ascii_uppercase(),
+            result.out.chars().next().unwrap().to_ascii_uppercase()
+        );
+        assert_eq!(cwd[1..], result.out[1..]);
+    }
 }
 
 #[test]
diff --git a/tests/repl/test_config_path.rs b/tests/repl/test_config_path.rs
index c812f3404c..29c090db17 100644
--- a/tests/repl/test_config_path.rs
+++ b/tests/repl/test_config_path.rs
@@ -221,8 +221,8 @@ fn test_default_config_path_symlinked_config_files() {
 
 #[test]
 fn test_alternate_config_path() {
-    let config_file = "crates/nu-utils/src/sample_config/default_config.nu";
-    let env_file = "crates/nu-utils/src/sample_config/default_env.nu";
+    let config_file = "crates/nu-utils/src/default_files/scaffold_config.nu";
+    let env_file = "crates/nu-utils/src/default_files/scaffold_env.nu";
 
     let cwd = std::env::current_dir().expect("Could not get current working directory");
 
@@ -298,3 +298,81 @@ fn test_xdg_config_symlink() {
         );
     });
 }
+
+#[test]
+fn no_config_does_not_load_env_files() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -n -c "view files | where filename =~ 'env\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "0");
+}
+
+#[test]
+fn no_config_does_not_load_config_files() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -n -c "view files | where filename =~ 'config\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "0");
+}
+
+#[test]
+fn commandstring_does_not_load_config_files() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -c "view files | where filename =~ 'config\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "0");
+}
+
+#[test]
+fn commandstring_does_not_load_user_env() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -c "view files | where filename =~ '[^_]env\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "0");
+}
+
+#[test]
+fn commandstring_loads_default_env() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -c "view files | where filename =~ 'default_env\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "1");
+}
+
+#[test]
+fn commandstring_populates_config_record() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} --no-std-lib -n -c "$env.config.show_banner"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "true");
+}
diff --git a/tests/repl/test_type_check.rs b/tests/repl/test_type_check.rs
index 95ef7f4323..07a8d99495 100644
--- a/tests/repl/test_type_check.rs
+++ b/tests/repl/test_type_check.rs
@@ -1,4 +1,5 @@
 use crate::repl::tests::{fail_test, run_test, TestResult};
+use rstest::rstest;
 
 #[test]
 fn chained_operator_typecheck() -> TestResult {
@@ -154,3 +155,20 @@ fn in_variable_expression_wrong_output_type() -> TestResult {
         "expected int",
     )
 }
+
+#[rstest]
+#[case("if true {} else { foo 1 }")]
+#[case("if true {} else if (foo 1) == null { }")]
+#[case("match 1 { 0 => { foo 1 } }")]
+#[case("try { } catch { foo 1 }")]
+/// type errors should propagate from `OneOf(Block | Closure | Expression, ..)`
+fn in_oneof_block_expected_type(#[case] input: &str) -> TestResult {
+    let def = "def foo [bar: bool] {};";
+
+    fail_test(&format!("{def} {input}"), "expected bool")
+}
+
+#[test]
+fn in_oneof_block_expected_block() -> TestResult {
+    fail_test("match 1 { 0 => { try 3 } }", "expected block")
+}
diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index 35692fdee9..34910fd98e 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -1,10 +1,7 @@
-use super::support::Trusted;
-
 use nu_test_support::fs::Stub::FileWithContent;
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, nu_repl_code, nu_with_std};
 use pretty_assertions::assert_eq;
-use serial_test::serial;
 
 #[test]
 fn env_shorthand() {
@@ -157,29 +154,6 @@ fn has_file_loc() {
     })
 }
 
-// FIXME: autoenv not currently implemented
-#[ignore]
-#[test]
-#[serial]
-fn passes_env_from_local_cfg_to_external_process() {
-    Playground::setup("autoenv_dir", |dirs, sandbox| {
-        sandbox.with_files(&[FileWithContent(
-            ".nu-env",
-            r#"[env]
-            FOO = "foo"
-            "#,
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), "
-                nu --testbin echo_env FOO
-            ")
-        });
-
-        assert_eq!(actual.out, "foo");
-    })
-}
-
 #[test]
 fn hides_env_in_block() {
     let inp = &[
diff --git a/tests/shell/environment/mod.rs b/tests/shell/environment/mod.rs
index faf884f166..b94b8e4346 100644
--- a/tests/shell/environment/mod.rs
+++ b/tests/shell/environment/mod.rs
@@ -1,22 +1 @@
 mod env;
-
-// FIXME: nu_env tests depend on autoenv which hasn't been ported yet
-// mod nu_env;
-
-pub mod support {
-    use nu_test_support::{nu, playground::*, Outcome};
-
-    pub struct Trusted;
-
-    impl Trusted {
-        pub fn in_path(dirs: &Dirs, block: impl FnOnce() -> Outcome) -> Outcome {
-            let for_env_manifest = dirs.test().to_string_lossy();
-
-            nu!(cwd: dirs.root(), "autoenv trust \"{}\"", for_env_manifest);
-            let out = block();
-            nu!(cwd: dirs.root(), "autoenv untrust \"{}\"", for_env_manifest);
-
-            out
-        }
-    }
-}
diff --git a/tests/shell/environment/nu_env.rs b/tests/shell/environment/nu_env.rs
deleted file mode 100644
index d249d90678..0000000000
--- a/tests/shell/environment/nu_env.rs
+++ /dev/null
@@ -1,668 +0,0 @@
-use super::support::Trusted;
-
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-use pretty_assertions::assert_eq;
-
-use serial_test::serial;
-
-const SCRIPTS: &str = r#"startup = ["touch hello.txt"]
-    on_exit = ["touch bye.txt"]"#;
-
-#[test]
-#[serial]
-fn picks_up_env_keys_when_entering_trusted_directory() {
-    Playground::setup("autoenv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let expected = "testvalue";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $env.testkey"));
-
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[test]
-#[serial]
-fn picks_up_and_lets_go_env_keys_when_entering_trusted_directory_with_implied_cd() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-               testkey = "testvalue"
-                "#,
-            ),
-            FileWithContent(
-                "foo/bar/.nu-env",
-                r#"
-                [env]
-               bar = "true"
-                "#,
-            ),
-        ]);
-        let actual = nu!(
-            cwd: dirs.test(),
-            "
-            do {autoenv trust -q foo ; = null }
-            foo
-            echo $env.testkey"
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is gone when leaving foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "
-            do {autoenv trust -q foo; = null } ;
-            foo
-            ..
-            echo $env.testkey
-            "
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert testkey is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "
-            do {autoenv trust -q foo; = null } ;
-            do {autoenv trust -q foo/bar; = null } ;
-            foo/bar
-            echo $env.testkey
-            echo $env.bar
-            "
-        );
-        assert_eq!(actual.out, "testvaluetrue");
-        //Assert bar removed after leaving bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo;
-               foo/bar
-               ../..
-               echo $env.bar"
-        );
-        assert!(actual.err.contains("Unknown"));
-    });
-}
-
-#[test]
-#[serial]
-#[ignore]
-fn picks_up_script_vars_when_entering_trusted_directory() {
-    Playground::setup("autoenv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let expected = "myval";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $env.myscript"));
-
-        // scriptvars are not supported
-        // and why is myval expected when myscript is "echo myval"
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[test]
-#[serial]
-fn picks_up_env_keys_when_entering_trusted_directory_indirectly() {
-    Playground::setup("autoenv_test_3", |dirs, sandbox| {
-        sandbox.mkdir("crates");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            r#"[env]
-                nu-ver = "0.30.0" "#,
-        )]);
-
-        let expected = "0.30.0";
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().join("crates"), "
-                cd ../../autoenv_test_3
-                echo $env.nu-ver
-            ")
-        });
-
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[test]
-#[serial]
-fn entering_a_trusted_directory_runs_entry_scripts() {
-    Playground::setup("autoenv_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), pipeline(r#"
-                ls
-                | where name == "hello.txt"
-                | get name
-            "#))
-        });
-
-        assert_eq!(actual.out, "hello.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn leaving_a_trusted_directory_runs_exit_scripts() {
-    Playground::setup("autoenv_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-              cd ..
-              ls autoenv_test_5 | get name | path basename | where $it == "bye.txt"
-            "#)
-        });
-
-        assert_eq!(actual.out, "bye.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn entry_scripts_are_called_when_revisiting_a_trusted_directory() {
-    Playground::setup("autoenv_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                do { rm hello.txt | ignore } ; # Silence file deletion message from output
-                cd ..
-                cd autoenv_test_6
-                ls | where name == "hello.txt" | get name
-            "#)
-        });
-
-        assert_eq!(actual.out, "hello.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_trusted_directory_with_entry_scripts_when_entering_a_subdirectory_entry_scripts_are_not_called(
-) {
-    Playground::setup("autoenv_test_7", |dirs, sandbox| {
-        sandbox.mkdir("time_to_cook_arepas");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                cd time_to_cook_arepas
-                ls | where name == "hello.txt" | length
-            "#)
-        });
-
-        assert_eq!(actual.out, "0");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_trusted_directory_with_exit_scripts_when_entering_a_subdirectory_exit_scripts_are_not_called(
-) {
-    Playground::setup("autoenv_test_8", |dirs, sandbox| {
-        sandbox.mkdir("time_to_cook_arepas");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                cd time_to_cook_arepas
-                ls | where name == "bye.txt" | length
-            "#)
-        });
-
-        assert_eq!(actual.out, "0");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_hierarchy_of_trusted_directories_when_entering_in_any_nested_ones_should_carry_over_variables_set_from_the_root(
-) {
-    Playground::setup("autoenv_test_9", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                language = "Ruby""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), "
-                do { autoenv trust -q autoenv_test_9/nu_plugin_rb ; = null } # Silence autoenv trust -q message from output
-                cd autoenv_test_9/nu_plugin_rb
-                echo $env.organization
-            ")
-        });
-
-        assert_eq!(actual.out, "nushell");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_hierarchy_of_trusted_directories_nested_ones_should_overwrite_variables_from_parent_directories(
-) {
-    Playground::setup("autoenv_test_10", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                organization = "Andrab""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), "
-                do { autoenv trust -q autoenv_test_10/nu_plugin_rb ; = null } # Silence autoenv trust -q message from output
-                cd autoenv_test_10/nu_plugin_rb
-                echo $env.organization
-            ")
-        });
-
-        assert_eq!(actual.out, "Andrab");
-    })
-}
-
-#[test]
-#[serial]
-#[cfg(not(windows))] //TODO figure out why this test doesn't work on windows
-fn local_config_should_not_be_added_when_running_scripts() {
-    Playground::setup("autoenv_test_10", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nu""#,
-            ),
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-                organization = "foo""#,
-            ),
-            FileWithContent(
-                "script.nu",
-                "cd foo
-                echo $env.organization",
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), "
-                do { autoenv trust -q foo } # Silence autoenv trust message from output
-                nu script.nu
-            ")
-        });
-
-        assert_eq!(actual.out, "nu");
-    })
-}
-#[test]
-#[serial]
-fn given_a_hierarchy_of_trusted_directories_going_back_restores_overwritten_variables() {
-    Playground::setup("autoenv_test_11", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                organization = "Andrab""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), "
-                do { autoenv trust -q autoenv_test_11/nu_plugin_rb } # Silence autoenv trust message from output
-                cd autoenv_test_11
-                cd nu_plugin_rb
-                do { rm ../.nu-env | ignore } # By deleting the root nu-env we have guarantees that the variable gets restored (not by autoenv when re-entering)
-                cd ..
-                echo $env.organization
-            ")
-        });
-
-        assert_eq!(actual.out, "nushell");
-    })
-}
-
-#[test]
-#[serial]
-fn local_config_env_var_present_and_removed_correctly() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![FileWithContent(
-            "foo/.nu-env",
-            r#"[env]
-               testkey = "testvalue"
-                "#,
-        )]);
-        //Assert testkey is not present before entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo;
-               echo $env.testkey"
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert testkey is present in foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo
-               echo $env.testkey"
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is present also in subdirectories
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo
-               cd bar
-               echo $env.testkey"
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo/bar
-               echo $env.testkey"
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey removed after leaving foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo
-               cd ..
-               echo $env.testkey"
-        );
-        assert!(actual.err.contains("Unknown"));
-    });
-}
-
-#[test]
-#[serial]
-fn local_config_env_var_gets_overwritten() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-                overwrite_me = "foo"
-                "#,
-            ),
-            FileWithContent(
-                "foo/bar/.nu-env",
-                r#"[env]
-                overwrite_me = "bar"
-                "#,
-            ),
-        ]);
-        //Assert overwrite_me is not present before entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo;
-               echo $env.overwrite_me"
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert overwrite_me is foo in foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo
-               echo $env.overwrite_me"
-        );
-        assert_eq!(actual.out, "foo");
-        //Assert overwrite_me is bar in bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo
-               autoenv trust -q foo/bar
-               cd foo
-               cd bar
-               echo $env.overwrite_me"
-        );
-        assert_eq!(actual.out, "bar");
-        //Assert overwrite_me is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; autoenv trust -q foo/bar; cd foo/bar
-               echo $env.overwrite_me
-            "
-        );
-        assert_eq!(actual.out, "bar");
-        //Assert overwrite_me removed after leaving bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; autoenv trust -q foo/bar; cd foo
-               cd bar
-               cd ..
-               echo $env.overwrite_me"
-        );
-        assert_eq!(actual.out, "foo");
-    });
-}
-
-#[test]
-#[serial]
-fn autoenv_test_entry_scripts() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar");
-
-        // Windows uses a different command to create an empty file so we need to have different content on windows.
-        let nu_env = if cfg!(target_os = "windows") {
-            r#"startup = ["echo nul > hello.txt"]"#
-        } else {
-            r#"startup = ["touch hello.txt"]"#
-        };
-
-        sandbox.with_files(vec![FileWithContent("foo/.nu-env", nu_env)]);
-
-        // Make sure entryscript is run when entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               ls | where name == "hello.txt" | get name"#
-        );
-        assert!(actual.out.contains("hello.txt"));
-
-        // Make sure entry scripts are also run when jumping over directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo/bar
-               ls .. | where name == "../hello.txt" | get name"#
-        );
-        assert!(actual.out.contains("hello.txt"));
-
-        // Entryscripts should not run after changing to a subdirectory.
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               rm hello.txt
-               cd bar
-               ls .. | where name == "../hello.txt" | length"#
-        );
-        assert!(actual.out.contains('0'));
-    });
-}
-
-#[test]
-#[serial]
-fn autoenv_test_exit_scripts() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar");
-
-        // Windows uses a different command to create an empty file so we need to have different content on windows.
-        let nu_env = r#"on_exit = ["touch bye.txt"]"#;
-
-        sandbox.with_files(vec![FileWithContent("foo/.nu-env", nu_env)]);
-
-        // Make sure exitscript is run
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               cd ..
-               ls foo | where name =~ "bye.txt" | length
-               rm foo/bye.txt | ignore; cd .
-               "#
-        );
-        assert_eq!(actual.out, "1");
-
-        // Entering a subdir should not trigger exitscripts
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               cd bar
-               ls .. | where name =~ "bye.txt" | length"#
-        );
-        assert_eq!(actual.out, "0");
-
-        // Also run exitscripts when jumping over directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo/bar
-               cd ../..
-               ls foo | where name =~ "bye.txt" | length
-               rm foo/bye.txt | ignore; cd ."#
-        );
-        assert_eq!(actual.out, "1");
-    });
-}
-
-#[test]
-#[serial]
-#[cfg(unix)]
-fn prepends_path_from_local_config() {
-    //If this test fails for you, make sure that your environment from which you start nu
-    //contains some env vars
-    Playground::setup("autoenv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            r#"
-            path = ["/hi", "/nushell"]
-            "#,
-        )]);
-
-        let expected = "[\"/hi\",\"/nushell\",";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $nu.path | to json"));
-        // assert_eq!("", actual.out);
-        assert!(actual.out.starts_with(expected));
-        assert!(actual.out.len() > expected.len());
-    })
-}