diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 0000000000..2f845d29ef
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,10 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = [
+	"-C", "link-arg=/STACK:8000000"
+]
+
+# 64 bit Mingw
+[target.x86_64-pc-windows-gnu]
+rustflags = [
+    "-C", "link-arg=-Wl,--stack,8000000"
+]
\ No newline at end of file
diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index a5af1c05a3..7e9f99ea98 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -18,3 +18,5 @@ jobs:
         uses: actions/checkout@v4
       - name: Check spelling
         uses: crate-ci/typos@master
+        with:
+          config: .typos.toml
\ No newline at end of file
diff --git a/.lintstagedrc.mjs b/.lintstagedrc.mjs
index 6cfb63d559..a600ad7789 100644
--- a/.lintstagedrc.mjs
+++ b/.lintstagedrc.mjs
@@ -8,5 +8,5 @@ export default {
   ],
   "*.py": ["ruff format --check", "ruff check"],
   "*.{ts,js,tsx,jsx,mjs}": "prettier --check",
-  "!(*test*)*": "typos",
+  "!(*test*)*": "typos --config .typos.toml",
 };
diff --git a/.typos.toml b/.typos.toml
new file mode 100644
index 0000000000..a28a44b23f
--- /dev/null
+++ b/.typos.toml
@@ -0,0 +1,4 @@
+[files]
+
+[default.extend-words]
+mmaped = "mmaped"
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index e42a889e24..3d3463ceb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,7 +62,7 @@ dependencies = [
 name = "alacritty_terminal"
 version = "1.10.1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "camino",
  "serde",
  "serde_json",
@@ -87,13 +87,13 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "amzn-codewhisperer-client"
-version = "0.1.8200"
+version = "0.1.8702"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.60.12",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -106,14 +106,14 @@ dependencies = [
 
 [[package]]
 name = "amzn-codewhisperer-streaming-client"
-version = "0.1.8200"
+version = "0.1.8702"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
  "aws-smithy-eventstream",
- "aws-smithy-http 0.60.12",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -125,13 +125,13 @@ dependencies = [
 
 [[package]]
 name = "amzn-consolas-client"
-version = "0.1.8200"
+version = "0.1.8702"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.60.12",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -144,14 +144,14 @@ dependencies = [
 
 [[package]]
 name = "amzn-qdeveloper-streaming-client"
-version = "0.1.8200"
+version = "0.1.8702"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
  "aws-smithy-eventstream",
- "aws-smithy-http 0.60.12",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -169,8 +169,8 @@ dependencies = [
  "aws-http",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.60.12",
- "aws-smithy-json 0.60.7",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -201,6 +201,24 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
+[[package]]
+name = "anndists"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4747593401c8d692fb589ac2a208a27ef968b95f9392af837728933348fc199c"
+dependencies = [
+ "anyhow",
+ "cfg-if",
+ "cpu-time",
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "num-traits",
+ "num_cpus",
+ "rand 0.8.5",
+ "rayon",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.18"
@@ -335,7 +353,7 @@ dependencies = [
  "serde",
  "serde_repr",
  "url",
- "zbus 5.6.0",
+ "zbus 5.7.0",
 ]
 
 [[package]]
@@ -617,9 +635,9 @@ dependencies = [
 
 [[package]]
 name = "aws-config"
-version = "1.6.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fcc63c9860579e4cb396239570e979376e70aab79e496621748a09913f8b36"
+checksum = "02a18fd934af6ae7ca52410d4548b98eb895aab0f1ea417d168d85db1434a141"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -627,8 +645,8 @@ dependencies = [
  "aws-sdk-ssooidc",
  "aws-sdk-sts",
  "aws-smithy-async",
- "aws-smithy-http 0.62.1",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -698,7 +716,7 @@ dependencies = [
  "aws-credential-types",
  "aws-sigv4",
  "aws-smithy-async",
- "aws-smithy-http 0.62.1",
+ "aws-smithy-http",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -715,15 +733,15 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-cognitoidentity"
-version = "1.68.0"
+version = "1.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3e37d3998efbefaeb12b115aaf3a90de61089ef97fba42665b772b1d93c1109"
+checksum = "d9dbf971a10bfb7d2893c6a741b8da97013c6c0b9ad5bab36f912b25f278eb15"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.62.1",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -731,22 +749,21 @@ dependencies = [
  "bytes",
  "fastrand",
  "http 0.2.12",
- "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-cognitoidentityprovider"
-version = "1.79.0"
+version = "1.81.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "032f02854414bed90f9bc9eb57d1eaee9c7c639455cf133951e37c940f9c7227"
+checksum = "ef8d5d7f21213ae1c68c15ce5fabad492c777fd094466632a6e253356e5f9deb"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.62.1",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -754,22 +771,21 @@ dependencies = [
  "bytes",
  "fastrand",
  "http 0.2.12",
- "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.67.0"
+version = "1.68.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4863da26489d1e6da91d7e12b10c17e86c14f94c53f416bd10e0a9c34057ba"
+checksum = "bd5f01ea61fed99b5fe4877abff6c56943342a56ff145e9e0c7e2494419008be"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.62.1",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -777,22 +793,21 @@ dependencies = [
  "bytes",
  "fastrand",
  "http 0.2.12",
- "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.68.0"
+version = "1.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95caa3998d7237789b57b95a8e031f60537adab21fa84c91e35bef9455c652e4"
+checksum = "27454e4c55aaa4ef65647e3a1cf095cb834ca6d54e959e2909f1fef96ad87860"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.62.1",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -800,22 +815,21 @@ dependencies = [
  "bytes",
  "fastrand",
  "http 0.2.12",
- "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.68.0"
+version = "1.69.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4939f6f449a37308a78c5a910fd91265479bd2bb11d186f0b8fc114d89ec828d"
+checksum = "ffd6ef5d00c94215960fabcdf2d9fe7c090eed8be482d66d47b92d4aba1dd4aa"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http 0.62.1",
- "aws-smithy-json 0.61.3",
+ "aws-smithy-http",
+ "aws-smithy-json",
  "aws-smithy-query",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -824,19 +838,18 @@ dependencies = [
  "aws-types",
  "fastrand",
  "http 0.2.12",
- "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sigv4"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea"
+checksum = "3734aecf9ff79aa401a6ca099d076535ab465ff76b46440cf567c8e70b65dc13"
 dependencies = [
  "aws-credential-types",
- "aws-smithy-http 0.62.1",
+ "aws-smithy-http",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
@@ -873,33 +886,13 @@ dependencies = [
  "crc32fast",
 ]
 
-[[package]]
-name = "aws-smithy-http"
-version = "0.60.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc"
-dependencies = [
- "aws-smithy-eventstream",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes",
- "bytes-utils",
- "futures-core",
- "http 0.2.12",
- "http-body 0.4.6",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "pin-utils",
- "tracing",
-]
-
 [[package]]
 name = "aws-smithy-http"
 version = "0.62.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99335bec6cdc50a346fda1437f9fefe33abf8c99060739a546a16457f2862ca9"
 dependencies = [
+ "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
@@ -948,15 +941,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "aws-smithy-json"
-version = "0.60.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6"
-dependencies = [
- "aws-smithy-types",
-]
-
 [[package]]
 name = "aws-smithy-json"
 version = "0.61.3"
@@ -1011,7 +995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14302f06d1d5b7d333fd819943075b13d27c7700b414f574c3c35859bfb55d5e"
 dependencies = [
  "aws-smithy-async",
- "aws-smithy-http 0.62.1",
+ "aws-smithy-http",
  "aws-smithy-http-client",
  "aws-smithy-observability",
  "aws-smithy-runtime-api",
@@ -1123,6 +1107,12 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -1166,7 +1156,7 @@ version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -1189,7 +1179,7 @@ version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -1207,7 +1197,7 @@ version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -1221,15 +1211,30 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec 0.6.3",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.8.0",
 ]
 
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
@@ -1250,9 +1255,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 dependencies = [
  "serde",
 ]
@@ -1309,6 +1314,21 @@ dependencies = [
  "piper",
 ]
 
+[[package]]
+name = "bm25"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9874599901ae2aaa19b1485145be2fa4e9af42d1b127672a03a7099ab6350bac"
+dependencies = [
+ "cached",
+ "deunicode",
+ "fxhash",
+ "rust-stemmers",
+ "stop-words",
+ "unicode-segmentation",
+ "whichlang",
+]
+
 [[package]]
 name = "bs58"
 version = "0.5.1"
@@ -1346,6 +1366,20 @@ name = "bytemuck"
 version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "byteorder"
@@ -1375,13 +1409,46 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "cached"
+version = "0.55.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0839c297f8783316fcca9d90344424e968395413f0662a5481f79c6648bbc14"
+dependencies = [
+ "ahash",
+ "cached_proc_macro",
+ "cached_proc_macro_types",
+ "hashbrown 0.14.5",
+ "once_cell",
+ "thiserror 2.0.12",
+ "web-time",
+]
+
+[[package]]
+name = "cached_proc_macro"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673992d934f0711b68ebb3e1b79cdc4be31634b37c98f26867ced0438ca5c603"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "cached_proc_macro_types"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
+
 [[package]]
 name = "cairo-rs"
 version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -1409,6 +1476,62 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "candle-core"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9f51e2ecf6efe9737af8f993433c839f956d2b6ed4fd2dd4a7c6d8b0fa667ff"
+dependencies = [
+ "byteorder",
+ "gemm 0.17.1",
+ "half",
+ "memmap2",
+ "num-traits",
+ "num_cpus",
+ "rand 0.9.1",
+ "rand_distr",
+ "rayon",
+ "safetensors",
+ "thiserror 1.0.69",
+ "ug",
+ "yoke 0.7.5",
+ "zip",
+]
+
+[[package]]
+name = "candle-nn"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1980d53280c8f9e2c6cbe1785855d7ff8010208b46e21252b978badf13ad69d"
+dependencies = [
+ "candle-core",
+ "half",
+ "num-traits",
+ "rayon",
+ "safetensors",
+ "serde",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "candle-transformers"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186cb80045dbe47e0b387ea6d3e906f02fb3056297080d9922984c90e90a72b0"
+dependencies = [
+ "byteorder",
+ "candle-core",
+ "candle-nn",
+ "fancy-regex 0.13.0",
+ "num-traits",
+ "rand 0.9.1",
+ "rayon",
+ "serde",
+ "serde_json",
+ "serde_plain",
+ "tracing",
+]
+
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -1436,9 +1559,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.22"
+version = "1.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1"
+checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
 dependencies = [
  "jobserver",
  "libc",
@@ -1516,7 +1639,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "base64 0.22.1",
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bstr",
  "bytes",
  "camino",
@@ -1670,14 +1793,14 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.8.6",
+ "libloading 0.8.7",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.37"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1685,9 +1808,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.37"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1761,7 +1884,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block",
  "cocoa-foundation",
  "core-foundation 0.10.0",
@@ -1777,7 +1900,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block",
  "core-foundation 0.10.0",
  "core-graphics-types",
@@ -1982,7 +2105,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.10.0",
  "core-graphics-types",
  "foreign-types",
@@ -1995,11 +2118,21 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.10.0",
  "libc",
 ]
 
+[[package]]
+name = "cpu-time"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -2020,25 +2153,22 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679"
 dependencies = [
  "anes",
  "cast",
  "ciborium",
  "clap",
  "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
+ "itertools 0.13.0",
  "num-traits",
- "once_cell",
  "oorandom",
  "plotters",
  "rayon",
  "regex",
  "serde",
- "serde_derive",
  "serde_json",
  "tinytemplate",
  "walkdir",
@@ -2116,7 +2246,7 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "crossterm_winapi",
  "futures-core",
  "mio",
@@ -2181,11 +2311,11 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.6"
+version = "3.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697b5419f348fd5ae2478e8018cb016c00a5881c7f46c717de98ffd135a5651c"
+checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
 dependencies = [
- "nix 0.29.0",
+ "nix 0.30.1",
  "windows-sys 0.59.0",
 ]
 
@@ -2337,6 +2467,12 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "deunicode"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
+
 [[package]]
 name = "dialoguer"
 version = "0.11.0"
@@ -2449,7 +2585,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a0d569e003ff27784e0e14e4a594048698e0c0f0b66cabcb51511be55a7caa0"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.6.1",
  "libc",
  "objc2 0.6.1",
@@ -2461,7 +2597,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "objc2 0.6.1",
 ]
 
@@ -2559,6 +2695,25 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
+[[package]]
+name = "dyn-stack"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b"
+dependencies = [
+ "bytemuck",
+ "reborrow",
+]
+
+[[package]]
+name = "dyn-stack"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490bd48eb68fffcfed519b4edbfd82c69cbe741d175b84f0e0cbe8c57cbe0bdd"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -2592,6 +2747,18 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
+[[package]]
+name = "enum-as-inner"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "enumflags2"
 version = "0.7.11"
@@ -2629,6 +2796,19 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe"
 
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.11.8"
@@ -2660,9 +2840,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -2674,6 +2854,15 @@ version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
 
+[[package]]
+name = "esaxx-rs"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "event-listener"
 version = "5.4.0"
@@ -2744,13 +2933,24 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
+[[package]]
+name = "fancy-regex"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
+dependencies = [
+ "bit-set 0.5.3",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
+]
+
 [[package]]
 name = "fancy-regex"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
 dependencies = [
- "bit-set",
+ "bit-set 0.8.0",
  "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
@@ -3061,7 +3261,7 @@ dependencies = [
 name = "fig_install"
 version = "1.10.1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bytes",
  "camino",
  "cfg-if",
@@ -3396,7 +3596,7 @@ dependencies = [
  "assert_cmd",
  "async-trait",
  "aws-types",
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bstr",
  "bytes",
  "cfg-if",
@@ -3839,51 +4039,289 @@ dependencies = [
 ]
 
 [[package]]
-name = "generator"
-version = "0.8.4"
+name = "gemm"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
+checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32"
 dependencies = [
- "cfg-if",
- "libc",
- "log",
- "rustversion",
- "windows 0.58.0",
+ "dyn-stack 0.10.0",
+ "gemm-c32 0.17.1",
+ "gemm-c64 0.17.1",
+ "gemm-common 0.17.1",
+ "gemm-f16 0.17.1",
+ "gemm-f32 0.17.1",
+ "gemm-f64 0.17.1",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 10.7.0",
+ "seq-macro",
 ]
 
 [[package]]
-name = "generic-array"
-version = "0.14.7"
+name = "gemm"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "ab96b703d31950f1aeddded248bc95543c9efc7ac9c4a21fda8703a83ee35451"
 dependencies = [
- "typenum",
- "version_check",
+ "dyn-stack 0.13.0",
+ "gemm-c32 0.18.2",
+ "gemm-c64 0.18.2",
+ "gemm-common 0.18.2",
+ "gemm-f16 0.18.2",
+ "gemm-f32 0.18.2",
+ "gemm-f64 0.18.2",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 11.5.0",
+ "seq-macro",
 ]
 
 [[package]]
-name = "gethostname"
-version = "0.4.3"
+name = "gemm-c32"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0"
 dependencies = [
- "libc",
- "windows-targets 0.48.5",
+ "dyn-stack 0.10.0",
+ "gemm-common 0.17.1",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 10.7.0",
+ "seq-macro",
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.1.16"
+name = "gemm-c32"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+checksum = "f6db9fd9f40421d00eea9dd0770045a5603b8d684654816637732463f4073847"
 dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "dyn-stack 0.13.0",
+ "gemm-common 0.18.2",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 11.5.0",
+ "seq-macro",
 ]
 
 [[package]]
-name = "getrandom"
+name = "gemm-c64"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a"
+dependencies = [
+ "dyn-stack 0.10.0",
+ "gemm-common 0.17.1",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 10.7.0",
+ "seq-macro",
+]
+
+[[package]]
+name = "gemm-c64"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfcad8a3d35a43758330b635d02edad980c1e143dc2f21e6fd25f9e4eada8edf"
+dependencies = [
+ "dyn-stack 0.13.0",
+ "gemm-common 0.18.2",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 11.5.0",
+ "seq-macro",
+]
+
+[[package]]
+name = "gemm-common"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8"
+dependencies = [
+ "bytemuck",
+ "dyn-stack 0.10.0",
+ "half",
+ "num-complex",
+ "num-traits",
+ "once_cell",
+ "paste",
+ "pulp 0.18.22",
+ "raw-cpuid 10.7.0",
+ "rayon",
+ "seq-macro",
+ "sysctl 0.5.5",
+]
+
+[[package]]
+name = "gemm-common"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a352d4a69cbe938b9e2a9cb7a3a63b7e72f9349174a2752a558a8a563510d0f3"
+dependencies = [
+ "bytemuck",
+ "dyn-stack 0.13.0",
+ "half",
+ "libm",
+ "num-complex",
+ "num-traits",
+ "once_cell",
+ "paste",
+ "pulp 0.21.5",
+ "raw-cpuid 11.5.0",
+ "rayon",
+ "seq-macro",
+ "sysctl 0.6.0",
+]
+
+[[package]]
+name = "gemm-f16"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4"
+dependencies = [
+ "dyn-stack 0.10.0",
+ "gemm-common 0.17.1",
+ "gemm-f32 0.17.1",
+ "half",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 10.7.0",
+ "rayon",
+ "seq-macro",
+]
+
+[[package]]
+name = "gemm-f16"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff95ae3259432f3c3410eaa919033cd03791d81cebd18018393dc147952e109"
+dependencies = [
+ "dyn-stack 0.13.0",
+ "gemm-common 0.18.2",
+ "gemm-f32 0.18.2",
+ "half",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 11.5.0",
+ "rayon",
+ "seq-macro",
+]
+
+[[package]]
+name = "gemm-f32"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113"
+dependencies = [
+ "dyn-stack 0.10.0",
+ "gemm-common 0.17.1",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 10.7.0",
+ "seq-macro",
+]
+
+[[package]]
+name = "gemm-f32"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc8d3d4385393304f407392f754cd2dc4b315d05063f62cf09f47b58de276864"
+dependencies = [
+ "dyn-stack 0.13.0",
+ "gemm-common 0.18.2",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 11.5.0",
+ "seq-macro",
+]
+
+[[package]]
+name = "gemm-f64"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0"
+dependencies = [
+ "dyn-stack 0.10.0",
+ "gemm-common 0.17.1",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 10.7.0",
+ "seq-macro",
+]
+
+[[package]]
+name = "gemm-f64"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35b2a4f76ce4b8b16eadc11ccf2e083252d8237c1b589558a49b0183545015bd"
+dependencies = [
+ "dyn-stack 0.13.0",
+ "gemm-common 0.18.2",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "raw-cpuid 11.5.0",
+ "seq-macro",
+]
+
+[[package]]
+name = "generator"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows 0.61.1",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
 version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
@@ -3963,7 +4401,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -4130,8 +4568,12 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
+ "bytemuck",
  "cfg-if",
  "crunchy",
+ "num-traits",
+ "rand 0.9.1",
+ "rand_distr",
 ]
 
 [[package]]
@@ -4156,6 +4598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -4201,6 +4644,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
 [[package]]
 name = "hermit-abi"
 version = "0.4.0"
@@ -4219,6 +4668,29 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hf-hub"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc03dcb0b0a83ae3f3363ec811014ae669f083e4e499c66602f447c4828737a1"
+dependencies = [
+ "dirs 5.0.1",
+ "futures",
+ "http 1.3.1",
+ "indicatif",
+ "libc",
+ "log",
+ "num_cpus",
+ "rand 0.8.5",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
+ "tokio",
+ "ureq",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -4228,6 +4700,31 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "hnsw_rs"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e59cf4d04a56c67454ad104938ae4c785bc5db7ac17d27b93e3cb5a9abe6a5"
+dependencies = [
+ "anndists",
+ "anyhow",
+ "bincode",
+ "cfg-if",
+ "cpu-time",
+ "env_logger 0.10.2",
+ "hashbrown 0.14.5",
+ "indexmap 2.9.0",
+ "lazy_static",
+ "log",
+ "mmap-rs",
+ "num-traits",
+ "num_cpus",
+ "parking_lot",
+ "rand 0.8.5",
+ "rayon",
+ "serde",
+]
+
 [[package]]
 name = "home"
 version = "0.5.11"
@@ -4319,6 +4816,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humantime"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
+
 [[package]]
 name = "hyper"
 version = "0.14.32"
@@ -4401,9 +4904,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -4431,7 +4934,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.61.0",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
@@ -4451,7 +4954,7 @@ checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
  "potential_utf",
- "yoke",
+ "yoke 0.8.0",
  "zerofrom",
  "zerovec",
 ]
@@ -4492,9 +4995,9 @@ checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -4508,9 +5011,9 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
@@ -4523,7 +5026,7 @@ dependencies = [
  "stable_deref_trait",
  "tinystr",
  "writeable",
- "yoke",
+ "yoke 0.8.0",
  "zerofrom",
  "zerotrie",
  "zerovec",
@@ -4656,7 +5159,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "inotify-sys",
  "libc",
 ]
@@ -4748,6 +5251,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -4888,7 +5400,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "serde",
  "unicode-segmentation",
 ]
@@ -4899,7 +5411,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6e0f18953c66af118a70064505bd3780a226d65b06553b7293fb8933067967"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "serde",
 ]
 
@@ -5006,14 +5518,20 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.53.0",
 ]
 
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
 [[package]]
 name = "libmimalloc-sys"
 version = "0.1.42"
@@ -5041,7 +5559,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "libc",
  "redox_syscall",
 ]
@@ -5192,6 +5710,22 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "macro_rules_attribute"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13"
+dependencies = [
+ "macro_rules_attribute-proc_macro",
+ "paste",
+]
+
+[[package]]
+name = "macro_rules_attribute-proc_macro"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568"
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -5252,6 +5786,16 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
+[[package]]
+name = "memmap2"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+dependencies = [
+ "libc",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "memmem"
 version = "0.1.1"
@@ -5267,6 +5811,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.9.1"
@@ -5347,6 +5900,23 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "mmap-rs"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86968d85441db75203c34deefd0c88032f275aaa85cee19a1dcfff6ae9df56da"
+dependencies = [
+ "bitflags 1.3.2",
+ "combine",
+ "libc",
+ "mach2",
+ "nix 0.26.4",
+ "sysctl 0.5.5",
+ "thiserror 1.0.69",
+ "widestring",
+ "windows 0.48.0",
+]
+
 [[package]]
 name = "mockito"
 version = "1.7.0"
@@ -5393,6 +5963,27 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "monostate"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafe1be9d0c75642e3e50fedc7ecadf1ef1cbce6eb66462153fc44245343fbee"
+dependencies = [
+ "monostate-impl",
+ "serde",
+]
+
+[[package]]
+name = "monostate-impl"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c402a4092d5e204f32c9e155431046831fa712637043c58cb73bc6bc6c9663b5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "muda"
 version = "0.15.3"
@@ -5414,9 +6005,9 @@ dependencies = [
 
 [[package]]
 name = "multimap"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
 [[package]]
 name = "nanorand"
@@ -5433,7 +6024,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "jni-sys",
  "log",
  "ndk-sys",
@@ -5497,13 +6088,39 @@ dependencies = [
  "pin-utils",
 ]
 
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset 0.7.1",
+ "pin-utils",
+]
+
 [[package]]
 name = "nix"
 version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset 0.9.1",
+]
+
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags 2.9.1",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -5544,7 +6161,7 @@ version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "filetime",
  "fsevent-sys",
  "inotify",
@@ -5704,7 +6321,7 @@ dependencies = [
  "chrono-humanize",
  "dirs 5.0.1",
  "dirs-sys 0.4.1",
- "fancy-regex",
+ "fancy-regex 0.14.0",
  "heck 0.5.0",
  "indexmap 2.9.0",
  "log",
@@ -5755,7 +6372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "327999b774d78b301a6b68c33d312a1a8047c59fb8971b6552ebf823251f1481"
 dependencies = [
  "crossterm_winapi",
- "fancy-regex",
+ "fancy-regex 0.14.0",
  "log",
  "lscolors",
  "nix 0.29.0",
@@ -5767,6 +6384,20 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -5777,6 +6408,16 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "bytemuck",
+ "num-traits",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -5813,6 +6454,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-rational"
 version = "0.4.2"
@@ -5831,6 +6483,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
 ]
 
 [[package]]
@@ -5912,7 +6575,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -5928,7 +6591,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.6.1",
  "objc2 0.6.1",
  "objc2-core-foundation",
@@ -5942,7 +6605,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -5966,7 +6629,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -5978,7 +6641,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "dispatch2 0.3.0",
  "objc2 0.6.1",
 ]
@@ -5989,7 +6652,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "dispatch2 0.3.0",
  "objc2 0.6.1",
  "objc2-core-foundation",
@@ -6032,7 +6695,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -6044,7 +6707,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.6.1",
  "objc2 0.6.1",
  "objc2-core-foundation",
@@ -6067,7 +6730,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "objc2 0.6.1",
  "objc2-core-foundation",
 ]
@@ -6090,7 +6753,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -6102,7 +6765,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -6125,7 +6788,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
@@ -6157,7 +6820,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -6170,7 +6833,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
@@ -6291,9 +6954,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owo-colors"
-version = "4.2.0"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564"
+checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec"
 
 [[package]]
 name = "pango"
@@ -6827,7 +7490,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "chrono",
  "flate2",
  "hex",
@@ -6841,7 +7504,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "chrono",
  "hex",
 ]
@@ -6974,11 +7637,37 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "memchr",
  "unicase",
 ]
 
+[[package]]
+name = "pulp"
+version = "0.18.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6"
+dependencies = [
+ "bytemuck",
+ "libm",
+ "num-complex",
+ "reborrow",
+]
+
+[[package]]
+name = "pulp"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96b86df24f0a7ddd5e4b95c94fc9ed8a98f1ca94d3b01bdce2824097e7835907"
+dependencies = [
+ "bytemuck",
+ "cfg-if",
+ "libm",
+ "num-complex",
+ "reborrow",
+ "version_check",
+]
+
 [[package]]
 name = "pure-rust-locales"
 version = "0.8.1"
@@ -7007,7 +7696,7 @@ dependencies = [
  "assert_cmd",
  "async-trait",
  "base64 0.22.1",
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bytes",
  "cfg-if",
  "clap",
@@ -7316,6 +8005,16 @@ dependencies = [
  "getrandom 0.3.3",
 ]
 
+[[package]]
+name = "rand_distr"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
+dependencies = [
+ "num-traits",
+ "rand 0.9.1",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -7384,6 +8083,24 @@ dependencies = [
  "rgb",
 ]
 
+[[package]]
+name = "raw-cpuid"
+version = "10.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146"
+dependencies = [
+ "bitflags 2.9.1",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -7400,6 +8117,17 @@ dependencies = [
  "rayon-core",
 ]
 
+[[package]]
+name = "rayon-cond"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9"
+dependencies = [
+ "either",
+ "itertools 0.11.0",
+ "rayon",
+]
+
 [[package]]
 name = "rayon-core"
 version = "1.12.1"
@@ -7410,13 +8138,19 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "reborrow"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430"
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -7548,6 +8282,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
+ "system-configuration",
  "tokio",
  "tokio-rustls 0.26.2",
  "tokio-socks",
@@ -7557,6 +8292,7 @@ dependencies = [
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
  "webpki-roots",
  "windows-registry",
@@ -7655,7 +8391,7 @@ version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
@@ -7674,6 +8410,16 @@ dependencies = [
  "ordered-multimap",
 ]
 
+[[package]]
+name = "rust-stemmers"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -7707,7 +8453,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -7720,7 +8466,7 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -7841,7 +8587,7 @@ version = "15.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ee1e066dc922e513bda599c6ccb5f3bb2b0ea5870a579448f2622993f0a9a2f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "clipboard-win",
  "fd-lock",
@@ -7874,6 +8620,16 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
+[[package]]
+name = "safetensors"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44560c11236a6130a46ce36c836a62936dc81ebf8c36a37947423571be0e55b6"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -7929,7 +8685,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -7942,7 +8698,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
@@ -7979,6 +8735,33 @@ dependencies = [
  "thin-slice",
 ]
 
+[[package]]
+name = "semantic_search_client"
+version = "1.10.1"
+dependencies = [
+ "anyhow",
+ "bm25",
+ "candle-core",
+ "candle-nn",
+ "candle-transformers",
+ "chrono",
+ "dirs 5.0.1",
+ "hf-hub",
+ "hnsw_rs",
+ "indicatif",
+ "once_cell",
+ "rayon",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "thiserror 2.0.12",
+ "tokenizers",
+ "tokio",
+ "tracing",
+ "uuid",
+ "walkdir",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.26"
@@ -7994,6 +8777,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
 
+[[package]]
+name = "seq-macro"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
+
 [[package]]
 name = "serde"
 version = "1.0.219"
@@ -8190,7 +8979,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fce6d5bc71503c9ec2337c80dc41f4fb2ac62fe52d6ab7500d899db19ae436f8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "nu-ansi-term 0.50.1",
  "nu-color-config",
 ]
@@ -8199,7 +8988,7 @@ dependencies = [
 name = "shell-color"
 version = "1.10.1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "fig_test",
  "nu-ansi-term 0.50.1",
  "nu-color-config",
@@ -8311,7 +9100,7 @@ dependencies = [
  "crossbeam",
  "defer-drop",
  "derive_builder",
- "env_logger",
+ "env_logger 0.11.8",
  "fuzzy-matcher",
  "indexmap 2.9.0",
  "log",
@@ -8354,6 +9143,17 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "socks"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b"
+dependencies = [
+ "byteorder",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "soup3"
 version = "0.5.0"
@@ -8400,6 +9200,18 @@ dependencies = [
  "strum 0.24.1",
 ]
 
+[[package]]
+name = "spm_precompiled"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326"
+dependencies = [
+ "base64 0.13.1",
+ "nom",
+ "serde",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -8412,6 +9224,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "stop-words"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c6a86be9f7fa4559b7339669e72026eb437f5e9c5a85c207fe1033079033a17"
+dependencies = [
+ "serde_json",
+]
+
 [[package]]
 name = "string_cache"
 version = "0.8.9"
@@ -8615,6 +9436,34 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "sysctl"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea"
+dependencies = [
+ "bitflags 2.9.1",
+ "byteorder",
+ "enum-as-inner",
+ "libc",
+ "thiserror 1.0.69",
+ "walkdir",
+]
+
+[[package]]
+name = "sysctl"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01198a2debb237c62b6826ec7081082d951f46dbb64b0e8c7649a452230d1dfc"
+dependencies = [
+ "bitflags 2.9.1",
+ "byteorder",
+ "enum-as-inner",
+ "libc",
+ "thiserror 1.0.69",
+ "walkdir",
+]
+
 [[package]]
 name = "sysinfo"
 version = "0.33.1"
@@ -8635,7 +9484,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -8675,7 +9524,7 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3731d04d4ac210cd5f344087733943b9bfb1a32654387dad4d1c70de21aee2c9"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cocoa",
  "core-foundation 0.10.0",
  "core-graphics",
@@ -8738,9 +9587,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.19.1"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
  "fastrand",
  "getrandom 0.3.3",
@@ -8771,6 +9620,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "terminal_size"
 version = "0.4.2"
@@ -8980,6 +9838,38 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
+[[package]]
+name = "tokenizers"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3169b3195f925496c895caee7978a335d49218488ef22375267fba5a46a40bd7"
+dependencies = [
+ "aho-corasick",
+ "derive_builder",
+ "esaxx-rs",
+ "getrandom 0.2.16",
+ "indicatif",
+ "itertools 0.13.0",
+ "lazy_static",
+ "log",
+ "macro_rules_attribute",
+ "monostate",
+ "onig",
+ "paste",
+ "rand 0.8.5",
+ "rayon",
+ "rayon-cond",
+ "regex",
+ "regex-syntax 0.8.5",
+ "serde",
+ "serde_json",
+ "spm_precompiled",
+ "thiserror 2.0.12",
+ "unicode-normalization-alignments",
+ "unicode-segmentation",
+ "unicode_categories",
+]
+
 [[package]]
 name = "tokio"
 version = "1.45.0"
@@ -9409,6 +10299,27 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ug"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90b70b37e9074642bc5f60bb23247fd072a84314ca9e71cdf8527593406a0dd3"
+dependencies = [
+ "gemm 0.18.2",
+ "half",
+ "libloading 0.8.7",
+ "memmap2",
+ "num",
+ "num-traits",
+ "num_cpus",
+ "rayon",
+ "safetensors",
+ "serde",
+ "thiserror 1.0.69",
+ "tracing",
+ "yoke 0.7.5",
+]
+
 [[package]]
 name = "unicase"
 version = "2.8.1"
@@ -9427,6 +10338,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
+[[package]]
+name = "unicode-normalization-alignments"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
@@ -9445,6 +10365,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
+[[package]]
+name = "unicode_categories"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"
@@ -9457,6 +10383,25 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
+[[package]]
+name = "ureq"
+version = "2.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
+dependencies = [
+ "base64 0.22.1",
+ "flate2",
+ "log",
+ "once_cell",
+ "rustls 0.23.27",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "socks",
+ "url",
+ "webpki-roots",
+]
+
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -9700,6 +10645,19 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "wayland-backend"
 version = "0.3.10"
@@ -9719,7 +10677,7 @@ version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "rustix 0.38.44",
  "wayland-backend",
  "wayland-scanner",
@@ -9731,7 +10689,7 @@ version = "0.32.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -9743,7 +10701,7 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -9921,6 +10879,12 @@ dependencies = [
  "winsafe",
 ]
 
+[[package]]
+name = "whichlang"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9aa3ad29c3d08283ac6b769e3ec15ad1ddb88af7d2e9bc402c574973b937e7"
+
 [[package]]
 name = "whoami"
 version = "1.6.0"
@@ -9932,6 +10896,12 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -9963,6 +10933,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows"
 version = "0.56.0"
@@ -10000,7 +10979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
 dependencies = [
  "windows-collections",
- "windows-core 0.61.0",
+ "windows-core 0.61.2",
  "windows-future",
  "windows-link",
  "windows-numerics",
@@ -10012,7 +10991,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
 dependencies = [
- "windows-core 0.61.0",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
@@ -10054,25 +11033,26 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.61.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
  "windows-implement 0.60.0",
  "windows-interface 0.59.1",
  "windows-link",
- "windows-result 0.3.2",
- "windows-strings 0.4.0",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
 name = "windows-future"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
- "windows-core 0.61.0",
+ "windows-core 0.61.2",
  "windows-link",
+ "windows-threading",
 ]
 
 [[package]]
@@ -10175,7 +11155,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-core 0.61.0",
+ "windows-core 0.61.2",
  "windows-link",
 ]
 
@@ -10185,7 +11165,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
- "windows-result 0.3.2",
+ "windows-result 0.3.4",
  "windows-strings 0.3.1",
  "windows-targets 0.53.0",
 ]
@@ -10210,9 +11190,9 @@ dependencies = [
 
 [[package]]
 name = "windows-result"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
  "windows-link",
 ]
@@ -10238,9 +11218,9 @@ dependencies = [
 
 [[package]]
 name = "windows-strings"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
  "windows-link",
 ]
@@ -10343,6 +11323,15 @@ dependencies = [
  "windows_x86_64_msvc 0.53.0",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-version"
 version = "0.1.4"
@@ -10590,7 +11579,7 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -10746,6 +11735,18 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive 0.7.5",
+ "zerofrom",
+]
+
 [[package]]
 name = "yoke"
 version = "0.8.0"
@@ -10754,10 +11755,22 @@ checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
- "yoke-derive",
+ "yoke-derive 0.8.0",
  "zerofrom",
 ]
 
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+ "synstructure",
+]
+
 [[package]]
 name = "yoke-derive"
 version = "0.8.0"
@@ -10817,9 +11830,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.6.0"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2522b82023923eecb0b366da727ec883ace092e7887b61d3da5139f26b44da58"
+checksum = "88232b74ba057a0c85472ec1bae8a17569960be17da2d5e5ad30d5efe7ea6719"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -10835,7 +11848,7 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex",
- "nix 0.29.0",
+ "nix 0.30.1",
  "ordered-stream",
  "serde",
  "serde_repr",
@@ -10843,9 +11856,9 @@ dependencies = [
  "uds_windows",
  "windows-sys 0.59.0",
  "winnow 0.7.10",
- "zbus_macros 5.6.0",
+ "zbus_macros 5.7.0",
  "zbus_names 4.2.0",
- "zvariant 5.5.1",
+ "zvariant 5.5.3",
 ]
 
 [[package]]
@@ -10863,16 +11876,16 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.6.0"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d2e12843c75108c00c618c2e8ef9675b50b6ec095b36dc965f2e5aed463c15"
+checksum = "6969c06899233334676e60da1675740539cf034ee472a6c5b5c54e50a0a554c9"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
  "zbus_names 4.2.0",
- "zvariant 5.5.1",
+ "zvariant 5.5.3",
  "zvariant_utils 3.2.0",
 ]
 
@@ -10905,7 +11918,7 @@ dependencies = [
  "serde",
  "static_assertions",
  "winnow 0.7.10",
- "zvariant 5.5.1",
+ "zvariant 5.5.3",
 ]
 
 [[package]]
@@ -10975,7 +11988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
 dependencies = [
  "displaydoc",
- "yoke",
+ "yoke 0.8.0",
  "zerofrom",
 ]
 
@@ -10985,7 +11998,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
- "yoke",
+ "yoke 0.8.0",
  "zerofrom",
  "zerovec-derive",
 ]
@@ -11001,6 +12014,21 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "zip"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "crossbeam-utils",
+ "displaydoc",
+ "indexmap 2.9.0",
+ "num_enum",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "zstd"
 version = "0.13.3"
@@ -11073,16 +12101,16 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.5.1"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "557e89d54880377a507c94cd5452f20e35d14325faf9d2958ebeadce0966c1b2"
+checksum = "9d30786f75e393ee63a21de4f9074d4c038d52c5b1bb4471f955db249f9dffb1"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
  "url",
  "winnow 0.7.10",
- "zvariant_derive 5.5.1",
+ "zvariant_derive 5.5.3",
  "zvariant_utils 3.2.0",
 ]
 
@@ -11101,9 +12129,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.5.1"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "757779842a0d242061d24c28be589ce392e45350dfb9186dfd7a042a2e19870c"
+checksum = "75fda702cd42d735ccd48117b1630432219c0e9616bf6cb0f8350844ee4d9580"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 2bb7a35922..ca543ccfdf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,6 +48,7 @@ clap = { version = "4.5.32", features = [
     "unicode",
     "wrap_help",
 ] }
+chrono = { version = "0.4", features = ["serde"] }
 cocoa = "0.26.0"
 color-print = "0.3.5"
 convert_case = "0.8.0"
@@ -102,12 +103,14 @@ objc2 = "0.5.2"
 objc2-app-kit = "0.2.2"
 objc2-foundation = "0.2.2"
 objc2-input-method-kit = "0.2.2"
+once_cell = "1.19.0"
 parking_lot = "0.12.3"
 percent-encoding = "2.2.0"
 portable-pty = "0.8.1"
 r2d2 = "0.8.10"
 r2d2_sqlite = "0.25.0"
 rand = "0.9.0"
+rayon = "1.8.0"
 regex = "1.7.0"
 reqwest = { version = "0.12.14", default-features = false, features = [
     # defaults except tls
diff --git a/crates/amzn-codewhisperer-client/Cargo.toml b/crates/amzn-codewhisperer-client/Cargo.toml
index 792ed67667..4f6a87731e 100644
--- a/crates/amzn-codewhisperer-client/Cargo.toml
+++ b/crates/amzn-codewhisperer-client/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "amzn-codewhisperer-client"
-version = "0.1.8200"
+version = "0.1.8702"
 authors = ["Grant Gurvis <grangurv@amazon.com>"]
 build = false
 exclude = [
@@ -64,10 +64,10 @@ version = "1.5.5"
 version = "1.2.4"
 
 [dependencies.aws-smithy-http]
-version = "0.60.12"
+version = "0.62.1"
 
 [dependencies.aws-smithy-json]
-version = "0.61.2"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.7.8"
diff --git a/crates/amzn-codewhisperer-client/src/client.rs b/crates/amzn-codewhisperer-client/src/client.rs
index a04b724dcb..75b77f97e7 100644
--- a/crates/amzn-codewhisperer-client/src/client.rs
+++ b/crates/amzn-codewhisperer-client/src/client.rs
@@ -78,6 +78,8 @@ impl Client {
 
 mod create_artifact_upload_url;
 
+mod create_subscription_token;
+
 mod create_task_assist_conversation;
 
 mod create_upload_url;
@@ -109,6 +111,8 @@ mod get_transformation;
 
 mod get_transformation_plan;
 
+mod get_usage_limits;
+
 mod list_available_customizations;
 
 mod list_available_profiles;
@@ -140,3 +144,5 @@ mod start_test_generation;
 mod start_transformation;
 
 mod stop_transformation;
+
+mod update_usage_limits;
diff --git a/crates/amzn-codewhisperer-client/src/client/create_subscription_token.rs b/crates/amzn-codewhisperer-client/src/client/create_subscription_token.rs
new file mode 100644
index 0000000000..c2d7a8ee56
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/client/create_subscription_token.rs
@@ -0,0 +1,25 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+impl super::Client {
+    /// Constructs a fluent builder for the
+    /// [`CreateSubscriptionToken`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder)
+    /// operation.
+    ///
+    /// - The fluent builder is configurable:
+    ///   - [`account_id(impl Into<String>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::account_id) / [`set_account_id(Option<String>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::set_account_id):<br>required: **true**<br>Represents the AWS account ID of the customer<br>
+    ///   - [`client_token(impl Into<String>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::client_token) / [`set_client_token(Option<String>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::set_client_token):<br>required: **false**<br>(undocumented)<br>
+    /// - On success, responds with
+    ///   [`CreateSubscriptionTokenOutput`](crate::operation::create_subscription_token::CreateSubscriptionTokenOutput)
+    ///   with field(s):
+    ///   - [`encoded_verification_url(String)`](crate::operation::create_subscription_token::CreateSubscriptionTokenOutput::encoded_verification_url): (undocumented)
+    ///   - [`token(String)`](crate::operation::create_subscription_token::CreateSubscriptionTokenOutput::token): (undocumented)
+    ///   - [`status(SubscriptionStatus)`](crate::operation::create_subscription_token::CreateSubscriptionTokenOutput::status): (undocumented)
+    /// - On failure, responds with
+    ///   [`SdkError<CreateSubscriptionTokenError>`](crate::operation::create_subscription_token::CreateSubscriptionTokenError)
+    pub fn create_subscription_token(
+        &self,
+    ) -> crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder {
+        crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::new(
+            self.handle.clone(),
+        )
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/client/generate_completions.rs b/crates/amzn-codewhisperer-client/src/client/generate_completions.rs
index 57910e361e..5710309005 100644
--- a/crates/amzn-codewhisperer-client/src/client/generate_completions.rs
+++ b/crates/amzn-codewhisperer-client/src/client/generate_completions.rs
@@ -19,12 +19,14 @@ impl super::Client {
     ///   - [`user_context(UserContext)`](crate::operation::generate_completions::builders::GenerateCompletionsFluentBuilder::user_context) / [`set_user_context(Option<UserContext>)`](crate::operation::generate_completions::builders::GenerateCompletionsFluentBuilder::set_user_context):<br>required: **false**<br>(undocumented)<br>
     ///   - [`profile_arn(impl Into<String>)`](crate::operation::generate_completions::builders::GenerateCompletionsFluentBuilder::profile_arn) / [`set_profile_arn(Option<String>)`](crate::operation::generate_completions::builders::GenerateCompletionsFluentBuilder::set_profile_arn):<br>required: **false**<br>(undocumented)<br>
     ///   - [`workspace_id(impl Into<String>)`](crate::operation::generate_completions::builders::GenerateCompletionsFluentBuilder::workspace_id) / [`set_workspace_id(Option<String>)`](crate::operation::generate_completions::builders::GenerateCompletionsFluentBuilder::set_workspace_id):<br>required: **false**<br>(undocumented)<br>
+    ///   - [`model_id(impl Into<String>)`](crate::operation::generate_completions::builders::GenerateCompletionsFluentBuilder::model_id) / [`set_model_id(Option<String>)`](crate::operation::generate_completions::builders::GenerateCompletionsFluentBuilder::set_model_id):<br>required: **false**<br>Unique identifier for the model<br>
     /// - On success, responds with
     ///   [`GenerateCompletionsOutput`](crate::operation::generate_completions::GenerateCompletionsOutput)
     ///   with field(s):
     ///   - [`predictions(Option<Vec::<Prediction>>)`](crate::operation::generate_completions::GenerateCompletionsOutput::predictions): (undocumented)
     ///   - [`completions(Option<Vec::<Completion>>)`](crate::operation::generate_completions::GenerateCompletionsOutput::completions): (undocumented)
     ///   - [`next_token(Option<String>)`](crate::operation::generate_completions::GenerateCompletionsOutput::next_token): (undocumented)
+    ///   - [`model_id(Option<String>)`](crate::operation::generate_completions::GenerateCompletionsOutput::model_id): Unique identifier for the model
     /// - On failure, responds with
     ///   [`SdkError<GenerateCompletionsError>`](crate::operation::generate_completions::GenerateCompletionsError)
     pub fn generate_completions(
diff --git a/crates/amzn-codewhisperer-client/src/client/get_usage_limits.rs b/crates/amzn-codewhisperer-client/src/client/get_usage_limits.rs
new file mode 100644
index 0000000000..56c9b0be4c
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/client/get_usage_limits.rs
@@ -0,0 +1,19 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+impl super::Client {
+    /// Constructs a fluent builder for the
+    /// [`GetUsageLimits`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder)
+    /// operation.
+    ///
+    /// - The fluent builder is configurable:
+    ///   - [`profile_arn(impl Into<String>)`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::profile_arn) / [`set_profile_arn(Option<String>)`](crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::set_profile_arn):<br>required: **false**<br>The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder ID users.<br>
+    /// - On success, responds with
+    ///   [`GetUsageLimitsOutput`](crate::operation::get_usage_limits::GetUsageLimitsOutput) with
+    ///   field(s):
+    ///   - [`limits(Vec::<UsageLimitList>)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::limits): (undocumented)
+    ///   - [`days_until_reset(i32)`](crate::operation::get_usage_limits::GetUsageLimitsOutput::days_until_reset): Number of days remaining until the usage metrics reset
+    /// - On failure, responds with
+    ///   [`SdkError<GetUsageLimitsError>`](crate::operation::get_usage_limits::GetUsageLimitsError)
+    pub fn get_usage_limits(&self) -> crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder {
+        crate::operation::get_usage_limits::builders::GetUsageLimitsFluentBuilder::new(self.handle.clone())
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/client/push_telemetry_event.rs b/crates/amzn-codewhisperer-client/src/client/push_telemetry_event.rs
index 0e5278f91a..28d237f1f1 100644
--- a/crates/amzn-codewhisperer-client/src/client/push_telemetry_event.rs
+++ b/crates/amzn-codewhisperer-client/src/client/push_telemetry_event.rs
@@ -6,8 +6,7 @@ impl super::Client {
     ///
     /// - The fluent builder is configurable:
     ///   - [`client_token(impl Into<String>)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::client_token) / [`set_client_token(Option<String>)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::set_client_token):<br>required: **false**<br>(undocumented)<br>
-    ///   - [`timestamp(DateTime)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::timestamp) / [`set_timestamp(Option<DateTime>)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::set_timestamp):<br>required: **true**<br>(undocumented)<br>
-    ///   - [`event_id(impl Into<String>)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::event_id) / [`set_event_id(Option<String>)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::set_event_id):<br>required: **true**<br>(undocumented)<br>
+    ///   - [`event_type(impl Into<String>)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::event_type) / [`set_event_type(Option<String>)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::set_event_type):<br>required: **true**<br>(undocumented)<br>
     ///   - [`event(Document)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::event) / [`set_event(Option<Document>)`](crate::operation::push_telemetry_event::builders::PushTelemetryEventFluentBuilder::set_event):<br>required: **true**<br>(undocumented)<br>
     /// - On success, responds with
     ///   [`PushTelemetryEventOutput`](crate::operation::push_telemetry_event::PushTelemetryEventOutput)
diff --git a/crates/amzn-codewhisperer-client/src/client/send_telemetry_event.rs b/crates/amzn-codewhisperer-client/src/client/send_telemetry_event.rs
index 4bd3a694bf..f0d9aedeff 100644
--- a/crates/amzn-codewhisperer-client/src/client/send_telemetry_event.rs
+++ b/crates/amzn-codewhisperer-client/src/client/send_telemetry_event.rs
@@ -10,6 +10,7 @@ impl super::Client {
     ///   - [`opt_out_preference(OptOutPreference)`](crate::operation::send_telemetry_event::builders::SendTelemetryEventFluentBuilder::opt_out_preference) / [`set_opt_out_preference(Option<OptOutPreference>)`](crate::operation::send_telemetry_event::builders::SendTelemetryEventFluentBuilder::set_opt_out_preference):<br>required: **false**<br>(undocumented)<br>
     ///   - [`user_context(UserContext)`](crate::operation::send_telemetry_event::builders::SendTelemetryEventFluentBuilder::user_context) / [`set_user_context(Option<UserContext>)`](crate::operation::send_telemetry_event::builders::SendTelemetryEventFluentBuilder::set_user_context):<br>required: **false**<br>(undocumented)<br>
     ///   - [`profile_arn(impl Into<String>)`](crate::operation::send_telemetry_event::builders::SendTelemetryEventFluentBuilder::profile_arn) / [`set_profile_arn(Option<String>)`](crate::operation::send_telemetry_event::builders::SendTelemetryEventFluentBuilder::set_profile_arn):<br>required: **false**<br>(undocumented)<br>
+    ///   - [`model_id(impl Into<String>)`](crate::operation::send_telemetry_event::builders::SendTelemetryEventFluentBuilder::model_id) / [`set_model_id(Option<String>)`](crate::operation::send_telemetry_event::builders::SendTelemetryEventFluentBuilder::set_model_id):<br>required: **false**<br>Unique identifier for the model<br>
     /// - On success, responds with
     ///   [`SendTelemetryEventOutput`](crate::operation::send_telemetry_event::SendTelemetryEventOutput)
     /// - On failure, responds with
diff --git a/crates/amzn-codewhisperer-client/src/client/update_usage_limits.rs b/crates/amzn-codewhisperer-client/src/client/update_usage_limits.rs
new file mode 100644
index 0000000000..007c838aeb
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/client/update_usage_limits.rs
@@ -0,0 +1,26 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+impl super::Client {
+    /// Constructs a fluent builder for the
+    /// [`UpdateUsageLimits`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder)
+    /// operation.
+    ///
+    /// - The fluent builder is configurable:
+    ///   - [`account_id(impl Into<String>)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::account_id) / [`set_account_id(Option<String>)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::set_account_id):<br>required: **true**<br>(undocumented)<br>
+    ///   - [`accountless_user_id(impl Into<String>)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::accountless_user_id) / [`set_accountless_user_id(Option<String>)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::set_accountless_user_id):<br>required: **false**<br>(undocumented)<br>
+    ///   - [`feature_type(UsageLimitType)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::feature_type) / [`set_feature_type(Option<UsageLimitType>)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::set_feature_type):<br>required: **true**<br>(undocumented)<br>
+    ///   - [`requested_limit(i64)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::requested_limit) / [`set_requested_limit(Option<i64>)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::set_requested_limit):<br>required: **true**<br>(undocumented)<br>
+    ///   - [`justification(impl Into<String>)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::justification) / [`set_justification(Option<String>)`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::set_justification):<br>required: **false**<br>(undocumented)<br>
+    /// - On success, responds with
+    ///   [`UpdateUsageLimitsOutput`](crate::operation::update_usage_limits::UpdateUsageLimitsOutput)
+    ///   with field(s):
+    ///   - [`status(UsageLimitUpdateRequestStatus)`](crate::operation::update_usage_limits::UpdateUsageLimitsOutput::status): (undocumented)
+    ///   - [`approved_limit(Option<i64>)`](crate::operation::update_usage_limits::UpdateUsageLimitsOutput::approved_limit): (undocumented)
+    ///   - [`remaining_requests_this_month(Option<i32>)`](crate::operation::update_usage_limits::UpdateUsageLimitsOutput::remaining_requests_this_month): (undocumented)
+    /// - On failure, responds with
+    ///   [`SdkError<UpdateUsageLimitsError>`](crate::operation::update_usage_limits::UpdateUsageLimitsError)
+    pub fn update_usage_limits(
+        &self,
+    ) -> crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder {
+        crate::operation::update_usage_limits::builders::UpdateUsageLimitsFluentBuilder::new(self.handle.clone())
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/config.rs b/crates/amzn-codewhisperer-client/src/config.rs
index 180b8afcca..3fd4d42e44 100644
--- a/crates/amzn-codewhisperer-client/src/config.rs
+++ b/crates/amzn-codewhisperer-client/src/config.rs
@@ -609,6 +609,7 @@ impl Builder {
     /// # Examples
     ///
     /// Disabling identity caching:
+    ///
     /// ```no_run
     /// use amzn_codewhisperer_client::config::IdentityCache;
     ///
@@ -620,6 +621,7 @@ impl Builder {
     /// ```
     ///
     /// Customizing lazy caching:
+    ///
     /// ```no_run
     /// use std::time::Duration;
     ///
@@ -656,6 +658,7 @@ impl Builder {
     /// # Examples
     ///
     /// Disabling identity caching:
+    ///
     /// ```no_run
     /// use amzn_codewhisperer_client::config::IdentityCache;
     ///
@@ -667,6 +670,7 @@ impl Builder {
     /// ```
     ///
     /// Customizing lazy caching:
+    ///
     /// ```no_run
     /// use std::time::Duration;
     ///
@@ -1167,6 +1171,7 @@ impl Builder {
     ///
     /// Set the behavior major version to `latest`. This is equivalent to enabling the
     /// `behavior-version-latest` cargo feature.
+    ///
     /// ```no_run
     /// use amzn_codewhisperer_client::config::BehaviorVersion;
     ///
@@ -1178,6 +1183,7 @@ impl Builder {
     /// ```
     ///
     /// Customizing behavior major version:
+    ///
     /// ```no_run
     /// use amzn_codewhisperer_client::config::BehaviorVersion;
     ///
diff --git a/crates/amzn-codewhisperer-client/src/error_meta.rs b/crates/amzn-codewhisperer-client/src/error_meta.rs
index ec83656d1a..478e302ab1 100644
--- a/crates/amzn-codewhisperer-client/src/error_meta.rs
+++ b/crates/amzn-codewhisperer-client/src/error_meta.rs
@@ -18,6 +18,9 @@ pub enum Error {
     ServiceQuotaExceededError(crate::types::error::ServiceQuotaExceededError),
     /// This exception is thrown when request was denied due to request throttling.
     ThrottlingError(crate::types::error::ThrottlingError),
+    /// Exception thrown when the number of usage limit update requests exceeds the monthly quota
+    /// (default 3 requests per month)
+    UpdateUsageLimitQuotaExceededError(crate::types::error::UpdateUsageLimitQuotaExceededError),
     /// This exception is thrown when the input fails to satisfy the constraints specified by the
     /// service.
     ValidationError(crate::types::error::ValidationError),
@@ -42,6 +45,7 @@ impl ::std::fmt::Display for Error {
             Error::ResourceNotFoundError(inner) => inner.fmt(f),
             Error::ServiceQuotaExceededError(inner) => inner.fmt(f),
             Error::ThrottlingError(inner) => inner.fmt(f),
+            Error::UpdateUsageLimitQuotaExceededError(inner) => inner.fmt(f),
             Error::ValidationError(inner) => inner.fmt(f),
             Error::Unhandled(_) => {
                 if let ::std::option::Option::Some(code) =
@@ -72,6 +76,7 @@ impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for Error {
             Self::ResourceNotFoundError(inner) => inner.meta(),
             Self::ServiceQuotaExceededError(inner) => inner.meta(),
             Self::ThrottlingError(inner) => inner.meta(),
+            Self::UpdateUsageLimitQuotaExceededError(inner) => inner.meta(),
             Self::ValidationError(inner) => inner.meta(),
             Self::Unhandled(inner) => &inner.meta,
         }
@@ -123,6 +128,55 @@ impl From<crate::operation::create_artifact_upload_url::CreateArtifactUploadUrlE
         }
     }
 }
+impl<R>
+    From<
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+            R,
+        >,
+    > for Error
+where
+    R: Send + Sync + std::fmt::Debug + 'static,
+{
+    fn from(
+        err: ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+            R,
+        >,
+    ) -> Self {
+        match err {
+            ::aws_smithy_runtime_api::client::result::SdkError::ServiceError(context) => Self::from(context.into_err()),
+            _ => Error::Unhandled(crate::error::sealed_unhandled::Unhandled {
+                meta: ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(&err).clone(),
+                source: err.into(),
+            }),
+        }
+    }
+}
+impl From<crate::operation::create_subscription_token::CreateSubscriptionTokenError> for Error {
+    fn from(err: crate::operation::create_subscription_token::CreateSubscriptionTokenError) -> Self {
+        match err {
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::ValidationError(inner) => {
+                Error::ValidationError(inner)
+            },
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::AccessDeniedError(inner) => {
+                Error::AccessDeniedError(inner)
+            },
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::InternalServerError(inner) => {
+                Error::InternalServerError(inner)
+            },
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::ThrottlingError(inner) => {
+                Error::ThrottlingError(inner)
+            },
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::ConflictError(inner) => {
+                Error::ConflictError(inner)
+            },
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::Unhandled(inner) => {
+                Error::Unhandled(inner)
+            },
+        }
+    }
+}
 impl<R>
     From<
         ::aws_smithy_runtime_api::client::result::SdkError<
@@ -783,6 +837,46 @@ impl From<crate::operation::get_transformation_plan::GetTransformationPlanError>
         }
     }
 }
+impl<R>
+    From<::aws_smithy_runtime_api::client::result::SdkError<crate::operation::get_usage_limits::GetUsageLimitsError, R>>
+    for Error
+where
+    R: Send + Sync + std::fmt::Debug + 'static,
+{
+    fn from(
+        err: ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::get_usage_limits::GetUsageLimitsError,
+            R,
+        >,
+    ) -> Self {
+        match err {
+            ::aws_smithy_runtime_api::client::result::SdkError::ServiceError(context) => Self::from(context.into_err()),
+            _ => Error::Unhandled(crate::error::sealed_unhandled::Unhandled {
+                meta: ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(&err).clone(),
+                source: err.into(),
+            }),
+        }
+    }
+}
+impl From<crate::operation::get_usage_limits::GetUsageLimitsError> for Error {
+    fn from(err: crate::operation::get_usage_limits::GetUsageLimitsError) -> Self {
+        match err {
+            crate::operation::get_usage_limits::GetUsageLimitsError::ValidationError(inner) => {
+                Error::ValidationError(inner)
+            },
+            crate::operation::get_usage_limits::GetUsageLimitsError::AccessDeniedError(inner) => {
+                Error::AccessDeniedError(inner)
+            },
+            crate::operation::get_usage_limits::GetUsageLimitsError::ThrottlingError(inner) => {
+                Error::ThrottlingError(inner)
+            },
+            crate::operation::get_usage_limits::GetUsageLimitsError::InternalServerError(inner) => {
+                Error::InternalServerError(inner)
+            },
+            crate::operation::get_usage_limits::GetUsageLimitsError::Unhandled(inner) => Error::Unhandled(inner),
+        }
+    }
+}
 impl<R>
     From<
         ::aws_smithy_runtime_api::client::result::SdkError<
@@ -1528,6 +1622,53 @@ impl From<crate::operation::stop_transformation::StopTransformationError> for Er
         }
     }
 }
+impl<R>
+    From<
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::update_usage_limits::UpdateUsageLimitsError,
+            R,
+        >,
+    > for Error
+where
+    R: Send + Sync + std::fmt::Debug + 'static,
+{
+    fn from(
+        err: ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::update_usage_limits::UpdateUsageLimitsError,
+            R,
+        >,
+    ) -> Self {
+        match err {
+            ::aws_smithy_runtime_api::client::result::SdkError::ServiceError(context) => Self::from(context.into_err()),
+            _ => Error::Unhandled(crate::error::sealed_unhandled::Unhandled {
+                meta: ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(&err).clone(),
+                source: err.into(),
+            }),
+        }
+    }
+}
+impl From<crate::operation::update_usage_limits::UpdateUsageLimitsError> for Error {
+    fn from(err: crate::operation::update_usage_limits::UpdateUsageLimitsError) -> Self {
+        match err {
+            crate::operation::update_usage_limits::UpdateUsageLimitsError::ValidationError(inner) => {
+                Error::ValidationError(inner)
+            },
+            crate::operation::update_usage_limits::UpdateUsageLimitsError::AccessDeniedError(inner) => {
+                Error::AccessDeniedError(inner)
+            },
+            crate::operation::update_usage_limits::UpdateUsageLimitsError::ThrottlingError(inner) => {
+                Error::ThrottlingError(inner)
+            },
+            crate::operation::update_usage_limits::UpdateUsageLimitsError::InternalServerError(inner) => {
+                Error::InternalServerError(inner)
+            },
+            crate::operation::update_usage_limits::UpdateUsageLimitsError::UpdateUsageLimitQuotaExceededError(
+                inner,
+            ) => Error::UpdateUsageLimitQuotaExceededError(inner),
+            crate::operation::update_usage_limits::UpdateUsageLimitsError::Unhandled(inner) => Error::Unhandled(inner),
+        }
+    }
+}
 impl ::std::error::Error for Error {
     fn source(&self) -> std::option::Option<&(dyn ::std::error::Error + 'static)> {
         match self {
@@ -1537,6 +1678,7 @@ impl ::std::error::Error for Error {
             Error::ResourceNotFoundError(inner) => inner.source(),
             Error::ServiceQuotaExceededError(inner) => inner.source(),
             Error::ThrottlingError(inner) => inner.source(),
+            Error::UpdateUsageLimitQuotaExceededError(inner) => inner.source(),
             Error::ValidationError(inner) => inner.source(),
             Error::Unhandled(inner) => ::std::option::Option::Some(&*inner.source),
         }
@@ -1551,6 +1693,7 @@ impl ::aws_types::request_id::RequestId for Error {
             Self::ResourceNotFoundError(e) => e.request_id(),
             Self::ServiceQuotaExceededError(e) => e.request_id(),
             Self::ThrottlingError(e) => e.request_id(),
+            Self::UpdateUsageLimitQuotaExceededError(e) => e.request_id(),
             Self::ValidationError(e) => e.request_id(),
             Self::Unhandled(e) => e.meta.request_id(),
         }
diff --git a/crates/amzn-codewhisperer-client/src/operation.rs b/crates/amzn-codewhisperer-client/src/operation.rs
index f6a83c7578..032d7340ea 100644
--- a/crates/amzn-codewhisperer-client/src/operation.rs
+++ b/crates/amzn-codewhisperer-client/src/operation.rs
@@ -4,6 +4,9 @@ pub use ::aws_types::request_id::RequestId;
 /// Types for the `CreateArtifactUploadUrl` operation.
 pub mod create_artifact_upload_url;
 
+/// Types for the `CreateSubscriptionToken` operation.
+pub mod create_subscription_token;
+
 /// Types for the `CreateTaskAssistConversation` operation.
 pub mod create_task_assist_conversation;
 
@@ -46,6 +49,9 @@ pub mod get_transformation;
 /// Types for the `GetTransformationPlan` operation.
 pub mod get_transformation_plan;
 
+/// Types for the `GetUsageLimits` operation.
+pub mod get_usage_limits;
+
 /// Types for the `ListAvailableCustomizations` operation.
 pub mod list_available_customizations;
 
@@ -93,3 +99,6 @@ pub mod start_transformation;
 
 /// Types for the `StopTransformation` operation.
 pub mod stop_transformation;
+
+/// Types for the `UpdateUsageLimits` operation.
+pub mod update_usage_limits;
diff --git a/crates/amzn-codewhisperer-client/src/operation/create_subscription_token.rs b/crates/amzn-codewhisperer-client/src/operation/create_subscription_token.rs
new file mode 100644
index 0000000000..2d66c13f71
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/create_subscription_token.rs
@@ -0,0 +1,466 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+/// Orchestration and serialization glue logic for `CreateSubscriptionToken`.
+#[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct CreateSubscriptionToken;
+impl CreateSubscriptionToken {
+    /// Creates a new `CreateSubscriptionToken`
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub(crate) async fn orchestrate(
+        runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        input: crate::operation::create_subscription_token::CreateSubscriptionTokenInput,
+    ) -> ::std::result::Result<
+        crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let map_err = |err: ::aws_smithy_runtime_api::client::result::SdkError<
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >| {
+            err.map_service_error(|err| {
+                err.downcast::<crate::operation::create_subscription_token::CreateSubscriptionTokenError>()
+                    .expect("correct error type")
+            })
+        };
+        let context = Self::orchestrate_with_stop_point(
+            runtime_plugins,
+            input,
+            ::aws_smithy_runtime::client::orchestrator::StopPoint::None,
+        )
+        .await
+        .map_err(map_err)?;
+        let output = context.finalize().map_err(map_err)?;
+        ::std::result::Result::Ok(
+            output
+                .downcast::<crate::operation::create_subscription_token::CreateSubscriptionTokenOutput>()
+                .expect("correct output type"),
+        )
+    }
+
+    pub(crate) async fn orchestrate_with_stop_point(
+        runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        input: crate::operation::create_subscription_token::CreateSubscriptionTokenInput,
+        stop_point: ::aws_smithy_runtime::client::orchestrator::StopPoint,
+    ) -> ::std::result::Result<
+        ::aws_smithy_runtime_api::client::interceptors::context::InterceptorContext,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let input = ::aws_smithy_runtime_api::client::interceptors::context::Input::erase(input);
+        ::aws_smithy_runtime::client::orchestrator::invoke_with_stop_point(
+            "codewhispererruntime",
+            "CreateSubscriptionToken",
+            input,
+            runtime_plugins,
+            stop_point,
+        )
+        .await
+    }
+
+    pub(crate) fn operation_runtime_plugins(
+        client_runtime_plugins: ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        client_config: &crate::config::Config,
+        config_override: ::std::option::Option<crate::config::Builder>,
+    ) -> ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins {
+        let mut runtime_plugins = client_runtime_plugins.with_operation_plugin(Self::new());
+        runtime_plugins = runtime_plugins
+            .with_operation_plugin(crate::client_idempotency_token::IdempotencyTokenRuntimePlugin::new(
+                |token_provider, input| {
+                    let input: &mut crate::operation::create_subscription_token::CreateSubscriptionTokenInput =
+                        input.downcast_mut().expect("correct type");
+                    if input.client_token.is_none() {
+                        input.client_token = ::std::option::Option::Some(token_provider.make_idempotency_token());
+                    }
+                },
+            ))
+            .with_client_plugin(crate::auth_plugin::DefaultAuthOptionsPlugin::new(vec![
+                ::aws_smithy_runtime_api::client::auth::http::HTTP_BEARER_AUTH_SCHEME_ID,
+            ]));
+        if let ::std::option::Option::Some(config_override) = config_override {
+            for plugin in config_override.runtime_plugins.iter().cloned() {
+                runtime_plugins = runtime_plugins.with_operation_plugin(plugin);
+            }
+            runtime_plugins = runtime_plugins.with_operation_plugin(crate::config::ConfigOverrideRuntimePlugin::new(
+                config_override,
+                client_config.config.clone(),
+                &client_config.runtime_components,
+            ));
+        }
+        runtime_plugins
+    }
+}
+impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin for CreateSubscriptionToken {
+    fn config(&self) -> ::std::option::Option<::aws_smithy_types::config_bag::FrozenLayer> {
+        let mut cfg = ::aws_smithy_types::config_bag::Layer::new("CreateSubscriptionToken");
+
+        cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedRequestSerializer::new(
+            CreateSubscriptionTokenRequestSerializer,
+        ));
+        cfg.store_put(
+            ::aws_smithy_runtime_api::client::ser_de::SharedResponseDeserializer::new(
+                CreateSubscriptionTokenResponseDeserializer,
+            ),
+        );
+
+        cfg.store_put(
+            ::aws_smithy_runtime_api::client::auth::AuthSchemeOptionResolverParams::new(
+                ::aws_smithy_runtime_api::client::auth::static_resolver::StaticAuthSchemeOptionResolverParams::new(),
+            ),
+        );
+
+        cfg.store_put(::aws_smithy_runtime_api::client::orchestrator::Metadata::new(
+            "CreateSubscriptionToken",
+            "codewhispererruntime",
+        ));
+
+        ::std::option::Option::Some(cfg.freeze())
+    }
+
+    fn runtime_components(
+        &self,
+        _: &::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,
+    ) -> ::std::borrow::Cow<'_, ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder> {
+        #[allow(unused_mut)]
+        let mut rcb = ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder::new(
+            "CreateSubscriptionToken",
+        )
+        .with_interceptor(
+            ::aws_smithy_runtime::client::stalled_stream_protection::StalledStreamProtectionInterceptor::default(),
+        )
+        .with_interceptor(CreateSubscriptionTokenEndpointParamsInterceptor)
+        .with_retry_classifier(
+            ::aws_smithy_runtime::client::retries::classifiers::TransientErrorClassifier::<
+                crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+            >::new(),
+        )
+        .with_retry_classifier(
+            ::aws_smithy_runtime::client::retries::classifiers::ModeledAsRetryableClassifier::<
+                crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+            >::new(),
+        )
+        .with_retry_classifier(::aws_runtime::retries::classifiers::AwsErrorCodeClassifier::<
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+        >::new());
+
+        ::std::borrow::Cow::Owned(rcb)
+    }
+}
+
+#[derive(Debug)]
+struct CreateSubscriptionTokenResponseDeserializer;
+impl ::aws_smithy_runtime_api::client::ser_de::DeserializeResponse for CreateSubscriptionTokenResponseDeserializer {
+    fn deserialize_nonstreaming(
+        &self,
+        response: &::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+    ) -> ::aws_smithy_runtime_api::client::interceptors::context::OutputOrError {
+        let (success, status) = (response.status().is_success(), response.status().as_u16());
+        let headers = response.headers();
+        let body = response.body().bytes().expect("body loaded");
+        #[allow(unused_mut)]
+        let mut force_error = false;
+        ::tracing::debug!(request_id = ?::aws_types::request_id::RequestId::request_id(response));
+        let parse_result = if !success && status != 200 || force_error {
+            crate::protocol_serde::shape_create_subscription_token::de_create_subscription_token_http_error(
+                status, headers, body,
+            )
+        } else {
+            crate::protocol_serde::shape_create_subscription_token::de_create_subscription_token_http_response(
+                status, headers, body,
+            )
+        };
+        crate::protocol_serde::type_erase_result(parse_result)
+    }
+}
+#[derive(Debug)]
+struct CreateSubscriptionTokenRequestSerializer;
+impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for CreateSubscriptionTokenRequestSerializer {
+    #[allow(
+        unused_mut,
+        clippy::let_and_return,
+        clippy::needless_borrow,
+        clippy::useless_conversion
+    )]
+    fn serialize_input(
+        &self,
+        input: ::aws_smithy_runtime_api::client::interceptors::context::Input,
+        _cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
+    ) -> ::std::result::Result<
+        ::aws_smithy_runtime_api::client::orchestrator::HttpRequest,
+        ::aws_smithy_runtime_api::box_error::BoxError,
+    > {
+        let input = input
+            .downcast::<crate::operation::create_subscription_token::CreateSubscriptionTokenInput>()
+            .expect("correct type");
+        let _header_serialization_settings = _cfg
+            .load::<crate::serialization_settings::HeaderSerializationSettings>()
+            .cloned()
+            .unwrap_or_default();
+        let mut request_builder = {
+            fn uri_base(
+                _input: &crate::operation::create_subscription_token::CreateSubscriptionTokenInput,
+                output: &mut ::std::string::String,
+            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
+                use ::std::fmt::Write as _;
+                ::std::write!(output, "/").expect("formatting should succeed");
+                ::std::result::Result::Ok(())
+            }
+            #[allow(clippy::unnecessary_wraps)]
+            fn update_http_builder(
+                input: &crate::operation::create_subscription_token::CreateSubscriptionTokenInput,
+                builder: ::http::request::Builder,
+            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError>
+            {
+                let mut uri = ::std::string::String::new();
+                uri_base(input, &mut uri)?;
+                ::std::result::Result::Ok(builder.method("POST").uri(uri))
+            }
+            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
+            builder = _header_serialization_settings.set_default_header(
+                builder,
+                ::http::header::CONTENT_TYPE,
+                "application/x-amz-json-1.0",
+            );
+            builder = _header_serialization_settings.set_default_header(
+                builder,
+                ::http::header::HeaderName::from_static("x-amz-target"),
+                "AmazonCodeWhispererService.CreateSubscriptionToken",
+            );
+            builder
+        };
+        let body = ::aws_smithy_types::body::SdkBody::from(
+            crate::protocol_serde::shape_create_subscription_token::ser_create_subscription_token_input(&input)?,
+        );
+        if let Some(content_length) = body.content_length() {
+            let content_length = content_length.to_string();
+            request_builder = _header_serialization_settings.set_default_header(
+                request_builder,
+                ::http::header::CONTENT_LENGTH,
+                &content_length,
+            );
+        }
+        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
+    }
+}
+#[derive(Debug)]
+struct CreateSubscriptionTokenEndpointParamsInterceptor;
+
+impl ::aws_smithy_runtime_api::client::interceptors::Intercept for CreateSubscriptionTokenEndpointParamsInterceptor {
+    fn name(&self) -> &'static str {
+        "CreateSubscriptionTokenEndpointParamsInterceptor"
+    }
+
+    fn read_before_execution(
+        &self,
+        context: &::aws_smithy_runtime_api::client::interceptors::context::BeforeSerializationInterceptorContextRef<
+            '_,
+            ::aws_smithy_runtime_api::client::interceptors::context::Input,
+            ::aws_smithy_runtime_api::client::interceptors::context::Output,
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+        >,
+        cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
+    ) -> ::std::result::Result<(), ::aws_smithy_runtime_api::box_error::BoxError> {
+        let _input = context
+            .input()
+            .downcast_ref::<CreateSubscriptionTokenInput>()
+            .ok_or("failed to downcast to CreateSubscriptionTokenInput")?;
+
+        let params = crate::config::endpoint::Params::builder().build().map_err(|err| {
+            ::aws_smithy_runtime_api::client::interceptors::error::ContextAttachedError::new(
+                "endpoint params could not be built",
+                err,
+            )
+        })?;
+        cfg.interceptor_state()
+            .store_put(::aws_smithy_runtime_api::client::endpoint::EndpointResolverParams::new(
+                params,
+            ));
+        ::std::result::Result::Ok(())
+    }
+}
+
+// The get_* functions below are generated from JMESPath expressions in the
+// operationContextParams trait. They target the operation's input shape.
+
+/// Error type for the `CreateSubscriptionTokenError` operation.
+#[non_exhaustive]
+#[derive(::std::fmt::Debug)]
+pub enum CreateSubscriptionTokenError {
+    /// This exception is thrown when the input fails to satisfy the constraints specified by the
+    /// service.
+    ValidationError(crate::types::error::ValidationError),
+    /// This exception is thrown when the user does not have sufficient access to perform this
+    /// action.
+    AccessDeniedError(crate::types::error::AccessDeniedError),
+    /// This exception is thrown when an unexpected error occurred during the processing of a
+    /// request.
+    InternalServerError(crate::types::error::InternalServerError),
+    /// This exception is thrown when request was denied due to request throttling.
+    ThrottlingError(crate::types::error::ThrottlingError),
+    /// This exception is thrown when the action to perform could not be completed because the
+    /// resource is in a conflicting state.
+    ConflictError(crate::types::error::ConflictError),
+    /// An unexpected error occurred (e.g., invalid JSON returned by the service or an unknown error
+    /// code).
+    #[deprecated(
+        note = "Matching `Unhandled` directly is not forwards compatible. Instead, match using a \
+    variable wildcard pattern and check `.code()`:
+     \
+    &nbsp;&nbsp;&nbsp;`err if err.code() == Some(\"SpecificExceptionCode\") => { /* handle the error */ }`
+     \
+    See [`ProvideErrorMetadata`](#impl-ProvideErrorMetadata-for-CreateSubscriptionTokenError) for what information is available for the error."
+    )]
+    Unhandled(crate::error::sealed_unhandled::Unhandled),
+}
+impl CreateSubscriptionTokenError {
+    /// Creates the `CreateSubscriptionTokenError::Unhandled` variant from any error type.
+    pub fn unhandled(
+        err: impl ::std::convert::Into<
+            ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
+        >,
+    ) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source: err.into(),
+            meta: ::std::default::Default::default(),
+        })
+    }
+
+    /// Creates the `CreateSubscriptionTokenError::Unhandled` variant from an
+    /// [`ErrorMetadata`](::aws_smithy_types::error::ErrorMetadata).
+    pub fn generic(err: ::aws_smithy_types::error::ErrorMetadata) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source: err.clone().into(),
+            meta: err,
+        })
+    }
+
+    /// Returns error metadata, which includes the error code, message,
+    /// request ID, and potentially additional information.
+    pub fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
+        match self {
+            Self::ValidationError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::AccessDeniedError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::InternalServerError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::ThrottlingError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::ConflictError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::Unhandled(e) => &e.meta,
+        }
+    }
+
+    /// Returns `true` if the error kind is `CreateSubscriptionTokenError::ValidationError`.
+    pub fn is_validation_error(&self) -> bool {
+        matches!(self, Self::ValidationError(_))
+    }
+
+    /// Returns `true` if the error kind is `CreateSubscriptionTokenError::AccessDeniedError`.
+    pub fn is_access_denied_error(&self) -> bool {
+        matches!(self, Self::AccessDeniedError(_))
+    }
+
+    /// Returns `true` if the error kind is `CreateSubscriptionTokenError::InternalServerError`.
+    pub fn is_internal_server_error(&self) -> bool {
+        matches!(self, Self::InternalServerError(_))
+    }
+
+    /// Returns `true` if the error kind is `CreateSubscriptionTokenError::ThrottlingError`.
+    pub fn is_throttling_error(&self) -> bool {
+        matches!(self, Self::ThrottlingError(_))
+    }
+
+    /// Returns `true` if the error kind is `CreateSubscriptionTokenError::ConflictError`.
+    pub fn is_conflict_error(&self) -> bool {
+        matches!(self, Self::ConflictError(_))
+    }
+}
+impl ::std::error::Error for CreateSubscriptionTokenError {
+    fn source(&self) -> ::std::option::Option<&(dyn ::std::error::Error + 'static)> {
+        match self {
+            Self::ValidationError(_inner) => ::std::option::Option::Some(_inner),
+            Self::AccessDeniedError(_inner) => ::std::option::Option::Some(_inner),
+            Self::InternalServerError(_inner) => ::std::option::Option::Some(_inner),
+            Self::ThrottlingError(_inner) => ::std::option::Option::Some(_inner),
+            Self::ConflictError(_inner) => ::std::option::Option::Some(_inner),
+            Self::Unhandled(_inner) => ::std::option::Option::Some(&*_inner.source),
+        }
+    }
+}
+impl ::std::fmt::Display for CreateSubscriptionTokenError {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        match self {
+            Self::ValidationError(_inner) => _inner.fmt(f),
+            Self::AccessDeniedError(_inner) => _inner.fmt(f),
+            Self::InternalServerError(_inner) => _inner.fmt(f),
+            Self::ThrottlingError(_inner) => _inner.fmt(f),
+            Self::ConflictError(_inner) => _inner.fmt(f),
+            Self::Unhandled(_inner) => {
+                if let ::std::option::Option::Some(code) =
+                    ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
+                {
+                    write!(f, "unhandled error ({code})")
+                } else {
+                    f.write_str("unhandled error")
+                }
+            },
+        }
+    }
+}
+impl ::aws_smithy_types::retry::ProvideErrorKind for CreateSubscriptionTokenError {
+    fn code(&self) -> ::std::option::Option<&str> {
+        ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
+    }
+
+    fn retryable_error_kind(&self) -> ::std::option::Option<::aws_smithy_types::retry::ErrorKind> {
+        match self {
+            Self::InternalServerError(inner) => ::std::option::Option::Some(inner.retryable_error_kind()),
+            Self::ThrottlingError(inner) => ::std::option::Option::Some(inner.retryable_error_kind()),
+            _ => ::std::option::Option::None,
+        }
+    }
+}
+impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for CreateSubscriptionTokenError {
+    fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
+        match self {
+            Self::ValidationError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::AccessDeniedError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::InternalServerError(_inner) => {
+                ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner)
+            },
+            Self::ThrottlingError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::ConflictError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::Unhandled(_inner) => &_inner.meta,
+        }
+    }
+}
+impl ::aws_smithy_runtime_api::client::result::CreateUnhandledError for CreateSubscriptionTokenError {
+    fn create_unhandled_error(
+        source: ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
+        meta: ::std::option::Option<::aws_smithy_types::error::ErrorMetadata>,
+    ) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source,
+            meta: meta.unwrap_or_default(),
+        })
+    }
+}
+impl ::aws_types::request_id::RequestId for crate::operation::create_subscription_token::CreateSubscriptionTokenError {
+    fn request_id(&self) -> Option<&str> {
+        self.meta().request_id()
+    }
+}
+
+pub use crate::operation::create_subscription_token::_create_subscription_token_input::CreateSubscriptionTokenInput;
+pub use crate::operation::create_subscription_token::_create_subscription_token_output::CreateSubscriptionTokenOutput;
+
+mod _create_subscription_token_input;
+
+mod _create_subscription_token_output;
+
+/// Builders
+pub mod builders;
diff --git a/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/_create_subscription_token_input.rs b/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/_create_subscription_token_input.rs
new file mode 100644
index 0000000000..d519220b93
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/_create_subscription_token_input.rs
@@ -0,0 +1,89 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
+pub struct CreateSubscriptionTokenInput {
+    /// Represents the AWS account ID of the customer
+    pub account_id: ::std::option::Option<::std::string::String>,
+    #[allow(missing_docs)] // documentation missing in model
+    pub client_token: ::std::option::Option<::std::string::String>,
+}
+impl CreateSubscriptionTokenInput {
+    /// Represents the AWS account ID of the customer
+    pub fn account_id(&self) -> ::std::option::Option<&str> {
+        self.account_id.as_deref()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn client_token(&self) -> ::std::option::Option<&str> {
+        self.client_token.as_deref()
+    }
+}
+impl CreateSubscriptionTokenInput {
+    /// Creates a new builder-style object to manufacture
+    /// [`CreateSubscriptionTokenInput`](crate::operation::create_subscription_token::CreateSubscriptionTokenInput).
+    pub fn builder() -> crate::operation::create_subscription_token::builders::CreateSubscriptionTokenInputBuilder {
+        crate::operation::create_subscription_token::builders::CreateSubscriptionTokenInputBuilder::default()
+    }
+}
+
+/// A builder for
+/// [`CreateSubscriptionTokenInput`](crate::operation::create_subscription_token::CreateSubscriptionTokenInput).
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct CreateSubscriptionTokenInputBuilder {
+    pub(crate) account_id: ::std::option::Option<::std::string::String>,
+    pub(crate) client_token: ::std::option::Option<::std::string::String>,
+}
+impl CreateSubscriptionTokenInputBuilder {
+    /// Represents the AWS account ID of the customer
+    /// This field is required.
+    pub fn account_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.account_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// Represents the AWS account ID of the customer
+    pub fn set_account_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.account_id = input;
+        self
+    }
+
+    /// Represents the AWS account ID of the customer
+    pub fn get_account_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.account_id
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn client_token(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.client_token = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_client_token(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.client_token = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_client_token(&self) -> &::std::option::Option<::std::string::String> {
+        &self.client_token
+    }
+
+    /// Consumes the builder and constructs a
+    /// [`CreateSubscriptionTokenInput`](crate::operation::create_subscription_token::CreateSubscriptionTokenInput).
+    pub fn build(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::create_subscription_token::CreateSubscriptionTokenInput,
+        ::aws_smithy_types::error::operation::BuildError,
+    > {
+        ::std::result::Result::Ok(
+            crate::operation::create_subscription_token::CreateSubscriptionTokenInput {
+                account_id: self.account_id,
+                client_token: self.client_token,
+            },
+        )
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/_create_subscription_token_output.rs b/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/_create_subscription_token_output.rs
new file mode 100644
index 0000000000..1b232fe03b
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/_create_subscription_token_output.rs
@@ -0,0 +1,154 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
+pub struct CreateSubscriptionTokenOutput {
+    #[allow(missing_docs)] // documentation missing in model
+    pub encoded_verification_url: ::std::string::String,
+    #[allow(missing_docs)] // documentation missing in model
+    pub token: ::std::string::String,
+    #[allow(missing_docs)] // documentation missing in model
+    pub status: crate::types::SubscriptionStatus,
+    _request_id: Option<String>,
+}
+impl CreateSubscriptionTokenOutput {
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn encoded_verification_url(&self) -> &str {
+        use std::ops::Deref;
+        self.encoded_verification_url.deref()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn token(&self) -> &str {
+        use std::ops::Deref;
+        self.token.deref()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn status(&self) -> &crate::types::SubscriptionStatus {
+        &self.status
+    }
+}
+impl ::aws_types::request_id::RequestId for CreateSubscriptionTokenOutput {
+    fn request_id(&self) -> Option<&str> {
+        self._request_id.as_deref()
+    }
+}
+impl CreateSubscriptionTokenOutput {
+    /// Creates a new builder-style object to manufacture
+    /// [`CreateSubscriptionTokenOutput`](crate::operation::create_subscription_token::CreateSubscriptionTokenOutput).
+    pub fn builder() -> crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder {
+        crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder::default()
+    }
+}
+
+/// A builder for
+/// [`CreateSubscriptionTokenOutput`](crate::operation::create_subscription_token::CreateSubscriptionTokenOutput).
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct CreateSubscriptionTokenOutputBuilder {
+    pub(crate) encoded_verification_url: ::std::option::Option<::std::string::String>,
+    pub(crate) token: ::std::option::Option<::std::string::String>,
+    pub(crate) status: ::std::option::Option<crate::types::SubscriptionStatus>,
+    _request_id: Option<String>,
+}
+impl CreateSubscriptionTokenOutputBuilder {
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn encoded_verification_url(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.encoded_verification_url = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_encoded_verification_url(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.encoded_verification_url = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_encoded_verification_url(&self) -> &::std::option::Option<::std::string::String> {
+        &self.encoded_verification_url
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn token(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.token = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_token(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.token = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_token(&self) -> &::std::option::Option<::std::string::String> {
+        &self.token
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn status(mut self, input: crate::types::SubscriptionStatus) -> Self {
+        self.status = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_status(mut self, input: ::std::option::Option<crate::types::SubscriptionStatus>) -> Self {
+        self.status = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_status(&self) -> &::std::option::Option<crate::types::SubscriptionStatus> {
+        &self.status
+    }
+
+    pub(crate) fn _request_id(mut self, request_id: impl Into<String>) -> Self {
+        self._request_id = Some(request_id.into());
+        self
+    }
+
+    pub(crate) fn _set_request_id(&mut self, request_id: Option<String>) -> &mut Self {
+        self._request_id = request_id;
+        self
+    }
+
+    /// Consumes the builder and constructs a
+    /// [`CreateSubscriptionTokenOutput`](crate::operation::create_subscription_token::CreateSubscriptionTokenOutput).
+    /// This method will fail if any of the following fields are not set:
+    /// - [`encoded_verification_url`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder::encoded_verification_url)
+    /// - [`token`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder::token)
+    /// - [`status`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder::status)
+    pub fn build(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+        ::aws_smithy_types::error::operation::BuildError,
+    > {
+        ::std::result::Result::Ok(crate::operation::create_subscription_token::CreateSubscriptionTokenOutput {
+            encoded_verification_url: self.encoded_verification_url.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "encoded_verification_url",
+                    "encoded_verification_url was not specified but it is required when building CreateSubscriptionTokenOutput",
+                )
+            })?,
+            token: self.token.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "token",
+                    "token was not specified but it is required when building CreateSubscriptionTokenOutput",
+                )
+            })?,
+            status: self.status.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "status",
+                    "status was not specified but it is required when building CreateSubscriptionTokenOutput",
+                )
+            })?,
+            _request_id: self._request_id,
+        })
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/builders.rs b/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/builders.rs
new file mode 100644
index 0000000000..0c5bb0690f
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/create_subscription_token/builders.rs
@@ -0,0 +1,155 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub use crate::operation::create_subscription_token::_create_subscription_token_input::CreateSubscriptionTokenInputBuilder;
+pub use crate::operation::create_subscription_token::_create_subscription_token_output::CreateSubscriptionTokenOutputBuilder;
+
+impl crate::operation::create_subscription_token::builders::CreateSubscriptionTokenInputBuilder {
+    /// Sends a request with this input using the given client.
+    pub async fn send_with(
+        self,
+        client: &crate::Client,
+    ) -> ::std::result::Result<
+        crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let mut fluent_builder = client.create_subscription_token();
+        fluent_builder.inner = self;
+        fluent_builder.send().await
+    }
+}
+/// Fluent builder constructing a request to `CreateSubscriptionToken`.
+#[derive(::std::clone::Clone, ::std::fmt::Debug)]
+pub struct CreateSubscriptionTokenFluentBuilder {
+    handle: ::std::sync::Arc<crate::client::Handle>,
+    inner: crate::operation::create_subscription_token::builders::CreateSubscriptionTokenInputBuilder,
+    config_override: ::std::option::Option<crate::config::Builder>,
+}
+impl
+    crate::client::customize::internal::CustomizableSend<
+        crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+        crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+    > for CreateSubscriptionTokenFluentBuilder
+{
+    fn send(
+        self,
+        config_override: crate::config::Builder,
+    ) -> crate::client::customize::internal::BoxFuture<
+        crate::client::customize::internal::SendResult<
+            crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+        >,
+    > {
+        ::std::boxed::Box::pin(async move { self.config_override(config_override).send().await })
+    }
+}
+impl CreateSubscriptionTokenFluentBuilder {
+    /// Creates a new `CreateSubscriptionTokenFluentBuilder`.
+    pub(crate) fn new(handle: ::std::sync::Arc<crate::client::Handle>) -> Self {
+        Self {
+            handle,
+            inner: ::std::default::Default::default(),
+            config_override: ::std::option::Option::None,
+        }
+    }
+
+    /// Access the CreateSubscriptionToken as a reference.
+    pub fn as_input(
+        &self,
+    ) -> &crate::operation::create_subscription_token::builders::CreateSubscriptionTokenInputBuilder {
+        &self.inner
+    }
+
+    /// Sends the request and returns the response.
+    ///
+    /// If an error occurs, an `SdkError` will be returned with additional details that
+    /// can be matched against.
+    ///
+    /// By default, any retryable failures will be retried twice. Retry behavior
+    /// is configurable with the [RetryConfig](aws_smithy_types::retry::RetryConfig), which can be
+    /// set when configuring the client.
+    pub async fn send(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let input = self
+            .inner
+            .build()
+            .map_err(::aws_smithy_runtime_api::client::result::SdkError::construction_failure)?;
+        let runtime_plugins =
+            crate::operation::create_subscription_token::CreateSubscriptionToken::operation_runtime_plugins(
+                self.handle.runtime_plugins.clone(),
+                &self.handle.conf,
+                self.config_override,
+            );
+        crate::operation::create_subscription_token::CreateSubscriptionToken::orchestrate(&runtime_plugins, input).await
+    }
+
+    /// Consumes this builder, creating a customizable operation that can be modified before being
+    /// sent.
+    pub fn customize(
+        self,
+    ) -> crate::client::customize::CustomizableOperation<
+        crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+        crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+        Self,
+    > {
+        crate::client::customize::CustomizableOperation::new(self)
+    }
+
+    pub(crate) fn config_override(
+        mut self,
+        config_override: impl ::std::convert::Into<crate::config::Builder>,
+    ) -> Self {
+        self.set_config_override(::std::option::Option::Some(config_override.into()));
+        self
+    }
+
+    pub(crate) fn set_config_override(
+        &mut self,
+        config_override: ::std::option::Option<crate::config::Builder>,
+    ) -> &mut Self {
+        self.config_override = config_override;
+        self
+    }
+
+    /// Represents the AWS account ID of the customer
+    pub fn account_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.account_id(input.into());
+        self
+    }
+
+    /// Represents the AWS account ID of the customer
+    pub fn set_account_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_account_id(input);
+        self
+    }
+
+    /// Represents the AWS account ID of the customer
+    pub fn get_account_id(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_account_id()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn client_token(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.client_token(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_client_token(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_client_token(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_client_token(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_client_token()
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/operation/generate_completions/_generate_completions_input.rs b/crates/amzn-codewhisperer-client/src/operation/generate_completions/_generate_completions_input.rs
index b53a954829..03dad1b55a 100644
--- a/crates/amzn-codewhisperer-client/src/operation/generate_completions/_generate_completions_input.rs
+++ b/crates/amzn-codewhisperer-client/src/operation/generate_completions/_generate_completions_input.rs
@@ -27,6 +27,8 @@ pub struct GenerateCompletionsInput {
     pub profile_arn: ::std::option::Option<::std::string::String>,
     #[allow(missing_docs)] // documentation missing in model
     pub workspace_id: ::std::option::Option<::std::string::String>,
+    /// Unique identifier for the model
+    pub model_id: ::std::option::Option<::std::string::String>,
 }
 impl GenerateCompletionsInput {
     #[allow(missing_docs)] // documentation missing in model
@@ -94,6 +96,11 @@ impl GenerateCompletionsInput {
     pub fn workspace_id(&self) -> ::std::option::Option<&str> {
         self.workspace_id.as_deref()
     }
+
+    /// Unique identifier for the model
+    pub fn model_id(&self) -> ::std::option::Option<&str> {
+        self.model_id.as_deref()
+    }
 }
 impl ::std::fmt::Debug for GenerateCompletionsInput {
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
@@ -110,6 +117,7 @@ impl ::std::fmt::Debug for GenerateCompletionsInput {
         formatter.field("user_context", &self.user_context);
         formatter.field("profile_arn", &self.profile_arn);
         formatter.field("workspace_id", &self.workspace_id);
+        formatter.field("model_id", &self.model_id);
         formatter.finish()
     }
 }
@@ -138,6 +146,7 @@ pub struct GenerateCompletionsInputBuilder {
     pub(crate) user_context: ::std::option::Option<crate::types::UserContext>,
     pub(crate) profile_arn: ::std::option::Option<::std::string::String>,
     pub(crate) workspace_id: ::std::option::Option<::std::string::String>,
+    pub(crate) model_id: ::std::option::Option<::std::string::String>,
 }
 impl GenerateCompletionsInputBuilder {
     #[allow(missing_docs)] // documentation missing in model
@@ -368,6 +377,23 @@ impl GenerateCompletionsInputBuilder {
         &self.workspace_id
     }
 
+    /// Unique identifier for the model
+    pub fn model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.model_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn set_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.model_id = input;
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn get_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.model_id
+    }
+
     /// Consumes the builder and constructs a
     /// [`GenerateCompletionsInput`](crate::operation::generate_completions::GenerateCompletionsInput).
     pub fn build(
@@ -389,6 +415,7 @@ impl GenerateCompletionsInputBuilder {
             user_context: self.user_context,
             profile_arn: self.profile_arn,
             workspace_id: self.workspace_id,
+            model_id: self.model_id,
         })
     }
 }
@@ -407,6 +434,7 @@ impl ::std::fmt::Debug for GenerateCompletionsInputBuilder {
         formatter.field("user_context", &self.user_context);
         formatter.field("profile_arn", &self.profile_arn);
         formatter.field("workspace_id", &self.workspace_id);
+        formatter.field("model_id", &self.model_id);
         formatter.finish()
     }
 }
diff --git a/crates/amzn-codewhisperer-client/src/operation/generate_completions/_generate_completions_output.rs b/crates/amzn-codewhisperer-client/src/operation/generate_completions/_generate_completions_output.rs
index bc0795c1d2..df3574fec2 100644
--- a/crates/amzn-codewhisperer-client/src/operation/generate_completions/_generate_completions_output.rs
+++ b/crates/amzn-codewhisperer-client/src/operation/generate_completions/_generate_completions_output.rs
@@ -9,6 +9,8 @@ pub struct GenerateCompletionsOutput {
     pub completions: ::std::option::Option<::std::vec::Vec<crate::types::Completion>>,
     #[allow(missing_docs)] // documentation missing in model
     pub next_token: ::std::option::Option<::std::string::String>,
+    /// Unique identifier for the model
+    pub model_id: ::std::option::Option<::std::string::String>,
     _request_id: Option<String>,
 }
 impl GenerateCompletionsOutput {
@@ -30,6 +32,11 @@ impl GenerateCompletionsOutput {
     pub fn next_token(&self) -> ::std::option::Option<&str> {
         self.next_token.as_deref()
     }
+
+    /// Unique identifier for the model
+    pub fn model_id(&self) -> ::std::option::Option<&str> {
+        self.model_id.as_deref()
+    }
 }
 impl ::std::fmt::Debug for GenerateCompletionsOutput {
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
@@ -37,6 +44,7 @@ impl ::std::fmt::Debug for GenerateCompletionsOutput {
         formatter.field("predictions", &self.predictions);
         formatter.field("completions", &self.completions);
         formatter.field("next_token", &"*** Sensitive Data Redacted ***");
+        formatter.field("model_id", &self.model_id);
         formatter.field("_request_id", &self._request_id);
         formatter.finish()
     }
@@ -62,6 +70,7 @@ pub struct GenerateCompletionsOutputBuilder {
     pub(crate) predictions: ::std::option::Option<::std::vec::Vec<crate::types::Prediction>>,
     pub(crate) completions: ::std::option::Option<::std::vec::Vec<crate::types::Completion>>,
     pub(crate) next_token: ::std::option::Option<::std::string::String>,
+    pub(crate) model_id: ::std::option::Option<::std::string::String>,
     _request_id: Option<String>,
 }
 impl GenerateCompletionsOutputBuilder {
@@ -124,6 +133,23 @@ impl GenerateCompletionsOutputBuilder {
         &self.next_token
     }
 
+    /// Unique identifier for the model
+    pub fn model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.model_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn set_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.model_id = input;
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn get_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.model_id
+    }
+
     pub(crate) fn _request_id(mut self, request_id: impl Into<String>) -> Self {
         self._request_id = Some(request_id.into());
         self
@@ -141,6 +167,7 @@ impl GenerateCompletionsOutputBuilder {
             predictions: self.predictions,
             completions: self.completions,
             next_token: self.next_token,
+            model_id: self.model_id,
             _request_id: self._request_id,
         }
     }
@@ -151,6 +178,7 @@ impl ::std::fmt::Debug for GenerateCompletionsOutputBuilder {
         formatter.field("predictions", &self.predictions);
         formatter.field("completions", &self.completions);
         formatter.field("next_token", &"*** Sensitive Data Redacted ***");
+        formatter.field("model_id", &self.model_id);
         formatter.field("_request_id", &self._request_id);
         formatter.finish()
     }
diff --git a/crates/amzn-codewhisperer-client/src/operation/generate_completions/builders.rs b/crates/amzn-codewhisperer-client/src/operation/generate_completions/builders.rs
index 3d0b268deb..e025777663 100644
--- a/crates/amzn-codewhisperer-client/src/operation/generate_completions/builders.rs
+++ b/crates/amzn-codewhisperer-client/src/operation/generate_completions/builders.rs
@@ -352,4 +352,21 @@ impl GenerateCompletionsFluentBuilder {
     pub fn get_workspace_id(&self) -> &::std::option::Option<::std::string::String> {
         self.inner.get_workspace_id()
     }
+
+    /// Unique identifier for the model
+    pub fn model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.model_id(input.into());
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn set_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_model_id(input);
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn get_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_model_id()
+    }
 }
diff --git a/crates/amzn-codewhisperer-client/src/operation/get_usage_limits.rs b/crates/amzn-codewhisperer-client/src/operation/get_usage_limits.rs
new file mode 100644
index 0000000000..7de3892101
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/get_usage_limits.rs
@@ -0,0 +1,453 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+/// Orchestration and serialization glue logic for `GetUsageLimits`.
+#[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct GetUsageLimits;
+impl GetUsageLimits {
+    /// Creates a new `GetUsageLimits`
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub(crate) async fn orchestrate(
+        runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        input: crate::operation::get_usage_limits::GetUsageLimitsInput,
+    ) -> ::std::result::Result<
+        crate::operation::get_usage_limits::GetUsageLimitsOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::get_usage_limits::GetUsageLimitsError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let map_err = |err: ::aws_smithy_runtime_api::client::result::SdkError<
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >| {
+            err.map_service_error(|err| {
+                err.downcast::<crate::operation::get_usage_limits::GetUsageLimitsError>()
+                    .expect("correct error type")
+            })
+        };
+        let context = Self::orchestrate_with_stop_point(
+            runtime_plugins,
+            input,
+            ::aws_smithy_runtime::client::orchestrator::StopPoint::None,
+        )
+        .await
+        .map_err(map_err)?;
+        let output = context.finalize().map_err(map_err)?;
+        ::std::result::Result::Ok(
+            output
+                .downcast::<crate::operation::get_usage_limits::GetUsageLimitsOutput>()
+                .expect("correct output type"),
+        )
+    }
+
+    pub(crate) async fn orchestrate_with_stop_point(
+        runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        input: crate::operation::get_usage_limits::GetUsageLimitsInput,
+        stop_point: ::aws_smithy_runtime::client::orchestrator::StopPoint,
+    ) -> ::std::result::Result<
+        ::aws_smithy_runtime_api::client::interceptors::context::InterceptorContext,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let input = ::aws_smithy_runtime_api::client::interceptors::context::Input::erase(input);
+        ::aws_smithy_runtime::client::orchestrator::invoke_with_stop_point(
+            "codewhispererruntime",
+            "GetUsageLimits",
+            input,
+            runtime_plugins,
+            stop_point,
+        )
+        .await
+    }
+
+    pub(crate) fn operation_runtime_plugins(
+        client_runtime_plugins: ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        client_config: &crate::config::Config,
+        config_override: ::std::option::Option<crate::config::Builder>,
+    ) -> ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins {
+        let mut runtime_plugins = client_runtime_plugins.with_operation_plugin(Self::new());
+        runtime_plugins = runtime_plugins.with_client_plugin(crate::auth_plugin::DefaultAuthOptionsPlugin::new(vec![
+            ::aws_smithy_runtime_api::client::auth::http::HTTP_BEARER_AUTH_SCHEME_ID,
+        ]));
+        if let ::std::option::Option::Some(config_override) = config_override {
+            for plugin in config_override.runtime_plugins.iter().cloned() {
+                runtime_plugins = runtime_plugins.with_operation_plugin(plugin);
+            }
+            runtime_plugins = runtime_plugins.with_operation_plugin(crate::config::ConfigOverrideRuntimePlugin::new(
+                config_override,
+                client_config.config.clone(),
+                &client_config.runtime_components,
+            ));
+        }
+        runtime_plugins
+    }
+}
+impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin for GetUsageLimits {
+    fn config(&self) -> ::std::option::Option<::aws_smithy_types::config_bag::FrozenLayer> {
+        let mut cfg = ::aws_smithy_types::config_bag::Layer::new("GetUsageLimits");
+
+        cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedRequestSerializer::new(
+            GetUsageLimitsRequestSerializer,
+        ));
+        cfg.store_put(
+            ::aws_smithy_runtime_api::client::ser_de::SharedResponseDeserializer::new(
+                GetUsageLimitsResponseDeserializer,
+            ),
+        );
+
+        cfg.store_put(
+            ::aws_smithy_runtime_api::client::auth::AuthSchemeOptionResolverParams::new(
+                ::aws_smithy_runtime_api::client::auth::static_resolver::StaticAuthSchemeOptionResolverParams::new(),
+            ),
+        );
+
+        cfg.store_put(::aws_smithy_runtime_api::client::orchestrator::Metadata::new(
+            "GetUsageLimits",
+            "codewhispererruntime",
+        ));
+
+        ::std::option::Option::Some(cfg.freeze())
+    }
+
+    fn runtime_components(
+        &self,
+        _: &::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,
+    ) -> ::std::borrow::Cow<'_, ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder> {
+        #[allow(unused_mut)]
+        let mut rcb = ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder::new(
+            "GetUsageLimits",
+        )
+        .with_interceptor(
+            ::aws_smithy_runtime::client::stalled_stream_protection::StalledStreamProtectionInterceptor::default(),
+        )
+        .with_interceptor(GetUsageLimitsEndpointParamsInterceptor)
+        .with_retry_classifier(
+            ::aws_smithy_runtime::client::retries::classifiers::TransientErrorClassifier::<
+                crate::operation::get_usage_limits::GetUsageLimitsError,
+            >::new(),
+        )
+        .with_retry_classifier(
+            ::aws_smithy_runtime::client::retries::classifiers::ModeledAsRetryableClassifier::<
+                crate::operation::get_usage_limits::GetUsageLimitsError,
+            >::new(),
+        )
+        .with_retry_classifier(::aws_runtime::retries::classifiers::AwsErrorCodeClassifier::<
+            crate::operation::get_usage_limits::GetUsageLimitsError,
+        >::new());
+
+        ::std::borrow::Cow::Owned(rcb)
+    }
+}
+
+#[derive(Debug)]
+struct GetUsageLimitsResponseDeserializer;
+impl ::aws_smithy_runtime_api::client::ser_de::DeserializeResponse for GetUsageLimitsResponseDeserializer {
+    fn deserialize_nonstreaming(
+        &self,
+        response: &::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+    ) -> ::aws_smithy_runtime_api::client::interceptors::context::OutputOrError {
+        let (success, status) = (response.status().is_success(), response.status().as_u16());
+        let headers = response.headers();
+        let body = response.body().bytes().expect("body loaded");
+        #[allow(unused_mut)]
+        let mut force_error = false;
+        ::tracing::debug!(request_id = ?::aws_types::request_id::RequestId::request_id(response));
+        let parse_result = if !success && status != 200 || force_error {
+            crate::protocol_serde::shape_get_usage_limits::de_get_usage_limits_http_error(status, headers, body)
+        } else {
+            crate::protocol_serde::shape_get_usage_limits::de_get_usage_limits_http_response(status, headers, body)
+        };
+        crate::protocol_serde::type_erase_result(parse_result)
+    }
+}
+#[derive(Debug)]
+struct GetUsageLimitsRequestSerializer;
+impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for GetUsageLimitsRequestSerializer {
+    #[allow(
+        unused_mut,
+        clippy::let_and_return,
+        clippy::needless_borrow,
+        clippy::useless_conversion
+    )]
+    fn serialize_input(
+        &self,
+        input: ::aws_smithy_runtime_api::client::interceptors::context::Input,
+        _cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
+    ) -> ::std::result::Result<
+        ::aws_smithy_runtime_api::client::orchestrator::HttpRequest,
+        ::aws_smithy_runtime_api::box_error::BoxError,
+    > {
+        let input = input
+            .downcast::<crate::operation::get_usage_limits::GetUsageLimitsInput>()
+            .expect("correct type");
+        let _header_serialization_settings = _cfg
+            .load::<crate::serialization_settings::HeaderSerializationSettings>()
+            .cloned()
+            .unwrap_or_default();
+        let mut request_builder = {
+            fn uri_base(
+                _input: &crate::operation::get_usage_limits::GetUsageLimitsInput,
+                output: &mut ::std::string::String,
+            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
+                use ::std::fmt::Write as _;
+                ::std::write!(output, "/").expect("formatting should succeed");
+                ::std::result::Result::Ok(())
+            }
+            fn uri_query(
+                _input: &crate::operation::get_usage_limits::GetUsageLimitsInput,
+                mut output: &mut ::std::string::String,
+            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
+                let mut query = ::aws_smithy_http::query::Writer::new(output);
+                if let ::std::option::Option::Some(inner_1) = &_input.profile_arn {
+                    {
+                        query.push_kv("profileArn", &::aws_smithy_http::query::fmt_string(inner_1));
+                    }
+                }
+                ::std::result::Result::Ok(())
+            }
+            #[allow(clippy::unnecessary_wraps)]
+            fn update_http_builder(
+                input: &crate::operation::get_usage_limits::GetUsageLimitsInput,
+                builder: ::http::request::Builder,
+            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError>
+            {
+                let mut uri = ::std::string::String::new();
+                uri_base(input, &mut uri)?;
+                uri_query(input, &mut uri)?;
+                ::std::result::Result::Ok(builder.method("POST").uri(uri))
+            }
+            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
+            builder = _header_serialization_settings.set_default_header(
+                builder,
+                ::http::header::CONTENT_TYPE,
+                "application/x-amz-json-1.0",
+            );
+            builder = _header_serialization_settings.set_default_header(
+                builder,
+                ::http::header::HeaderName::from_static("x-amz-target"),
+                "AmazonCodeWhispererService.GetUsageLimits",
+            );
+            builder
+        };
+        let body = ::aws_smithy_types::body::SdkBody::from(
+            crate::protocol_serde::shape_get_usage_limits::ser_get_usage_limits_input(&input)?,
+        );
+        if let Some(content_length) = body.content_length() {
+            let content_length = content_length.to_string();
+            request_builder = _header_serialization_settings.set_default_header(
+                request_builder,
+                ::http::header::CONTENT_LENGTH,
+                &content_length,
+            );
+        }
+        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
+    }
+}
+#[derive(Debug)]
+struct GetUsageLimitsEndpointParamsInterceptor;
+
+impl ::aws_smithy_runtime_api::client::interceptors::Intercept for GetUsageLimitsEndpointParamsInterceptor {
+    fn name(&self) -> &'static str {
+        "GetUsageLimitsEndpointParamsInterceptor"
+    }
+
+    fn read_before_execution(
+        &self,
+        context: &::aws_smithy_runtime_api::client::interceptors::context::BeforeSerializationInterceptorContextRef<
+            '_,
+            ::aws_smithy_runtime_api::client::interceptors::context::Input,
+            ::aws_smithy_runtime_api::client::interceptors::context::Output,
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+        >,
+        cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
+    ) -> ::std::result::Result<(), ::aws_smithy_runtime_api::box_error::BoxError> {
+        let _input = context
+            .input()
+            .downcast_ref::<GetUsageLimitsInput>()
+            .ok_or("failed to downcast to GetUsageLimitsInput")?;
+
+        let params = crate::config::endpoint::Params::builder().build().map_err(|err| {
+            ::aws_smithy_runtime_api::client::interceptors::error::ContextAttachedError::new(
+                "endpoint params could not be built",
+                err,
+            )
+        })?;
+        cfg.interceptor_state()
+            .store_put(::aws_smithy_runtime_api::client::endpoint::EndpointResolverParams::new(
+                params,
+            ));
+        ::std::result::Result::Ok(())
+    }
+}
+
+// The get_* functions below are generated from JMESPath expressions in the
+// operationContextParams trait. They target the operation's input shape.
+
+/// Error type for the `GetUsageLimitsError` operation.
+#[non_exhaustive]
+#[derive(::std::fmt::Debug)]
+pub enum GetUsageLimitsError {
+    /// This exception is thrown when the input fails to satisfy the constraints specified by the
+    /// service.
+    ValidationError(crate::types::error::ValidationError),
+    /// This exception is thrown when the user does not have sufficient access to perform this
+    /// action.
+    AccessDeniedError(crate::types::error::AccessDeniedError),
+    /// This exception is thrown when request was denied due to request throttling.
+    ThrottlingError(crate::types::error::ThrottlingError),
+    /// This exception is thrown when an unexpected error occurred during the processing of a
+    /// request.
+    InternalServerError(crate::types::error::InternalServerError),
+    /// An unexpected error occurred (e.g., invalid JSON returned by the service or an unknown error
+    /// code).
+    #[deprecated(
+        note = "Matching `Unhandled` directly is not forwards compatible. Instead, match using a \
+    variable wildcard pattern and check `.code()`:
+     \
+    &nbsp;&nbsp;&nbsp;`err if err.code() == Some(\"SpecificExceptionCode\") => { /* handle the error */ }`
+     \
+    See [`ProvideErrorMetadata`](#impl-ProvideErrorMetadata-for-GetUsageLimitsError) for what information is available for the error."
+    )]
+    Unhandled(crate::error::sealed_unhandled::Unhandled),
+}
+impl GetUsageLimitsError {
+    /// Creates the `GetUsageLimitsError::Unhandled` variant from any error type.
+    pub fn unhandled(
+        err: impl ::std::convert::Into<
+            ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
+        >,
+    ) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source: err.into(),
+            meta: ::std::default::Default::default(),
+        })
+    }
+
+    /// Creates the `GetUsageLimitsError::Unhandled` variant from an
+    /// [`ErrorMetadata`](::aws_smithy_types::error::ErrorMetadata).
+    pub fn generic(err: ::aws_smithy_types::error::ErrorMetadata) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source: err.clone().into(),
+            meta: err,
+        })
+    }
+
+    /// Returns error metadata, which includes the error code, message,
+    /// request ID, and potentially additional information.
+    pub fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
+        match self {
+            Self::ValidationError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::AccessDeniedError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::ThrottlingError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::InternalServerError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::Unhandled(e) => &e.meta,
+        }
+    }
+
+    /// Returns `true` if the error kind is `GetUsageLimitsError::ValidationError`.
+    pub fn is_validation_error(&self) -> bool {
+        matches!(self, Self::ValidationError(_))
+    }
+
+    /// Returns `true` if the error kind is `GetUsageLimitsError::AccessDeniedError`.
+    pub fn is_access_denied_error(&self) -> bool {
+        matches!(self, Self::AccessDeniedError(_))
+    }
+
+    /// Returns `true` if the error kind is `GetUsageLimitsError::ThrottlingError`.
+    pub fn is_throttling_error(&self) -> bool {
+        matches!(self, Self::ThrottlingError(_))
+    }
+
+    /// Returns `true` if the error kind is `GetUsageLimitsError::InternalServerError`.
+    pub fn is_internal_server_error(&self) -> bool {
+        matches!(self, Self::InternalServerError(_))
+    }
+}
+impl ::std::error::Error for GetUsageLimitsError {
+    fn source(&self) -> ::std::option::Option<&(dyn ::std::error::Error + 'static)> {
+        match self {
+            Self::ValidationError(_inner) => ::std::option::Option::Some(_inner),
+            Self::AccessDeniedError(_inner) => ::std::option::Option::Some(_inner),
+            Self::ThrottlingError(_inner) => ::std::option::Option::Some(_inner),
+            Self::InternalServerError(_inner) => ::std::option::Option::Some(_inner),
+            Self::Unhandled(_inner) => ::std::option::Option::Some(&*_inner.source),
+        }
+    }
+}
+impl ::std::fmt::Display for GetUsageLimitsError {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        match self {
+            Self::ValidationError(_inner) => _inner.fmt(f),
+            Self::AccessDeniedError(_inner) => _inner.fmt(f),
+            Self::ThrottlingError(_inner) => _inner.fmt(f),
+            Self::InternalServerError(_inner) => _inner.fmt(f),
+            Self::Unhandled(_inner) => {
+                if let ::std::option::Option::Some(code) =
+                    ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
+                {
+                    write!(f, "unhandled error ({code})")
+                } else {
+                    f.write_str("unhandled error")
+                }
+            },
+        }
+    }
+}
+impl ::aws_smithy_types::retry::ProvideErrorKind for GetUsageLimitsError {
+    fn code(&self) -> ::std::option::Option<&str> {
+        ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
+    }
+
+    fn retryable_error_kind(&self) -> ::std::option::Option<::aws_smithy_types::retry::ErrorKind> {
+        match self {
+            Self::ThrottlingError(inner) => ::std::option::Option::Some(inner.retryable_error_kind()),
+            Self::InternalServerError(inner) => ::std::option::Option::Some(inner.retryable_error_kind()),
+            _ => ::std::option::Option::None,
+        }
+    }
+}
+impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for GetUsageLimitsError {
+    fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
+        match self {
+            Self::ValidationError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::AccessDeniedError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::ThrottlingError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::InternalServerError(_inner) => {
+                ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner)
+            },
+            Self::Unhandled(_inner) => &_inner.meta,
+        }
+    }
+}
+impl ::aws_smithy_runtime_api::client::result::CreateUnhandledError for GetUsageLimitsError {
+    fn create_unhandled_error(
+        source: ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
+        meta: ::std::option::Option<::aws_smithy_types::error::ErrorMetadata>,
+    ) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source,
+            meta: meta.unwrap_or_default(),
+        })
+    }
+}
+impl ::aws_types::request_id::RequestId for crate::operation::get_usage_limits::GetUsageLimitsError {
+    fn request_id(&self) -> Option<&str> {
+        self.meta().request_id()
+    }
+}
+
+pub use crate::operation::get_usage_limits::_get_usage_limits_input::GetUsageLimitsInput;
+pub use crate::operation::get_usage_limits::_get_usage_limits_output::GetUsageLimitsOutput;
+
+mod _get_usage_limits_input;
+
+mod _get_usage_limits_output;
+
+/// Builders
+pub mod builders;
diff --git a/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/_get_usage_limits_input.rs b/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/_get_usage_limits_input.rs
new file mode 100644
index 0000000000..d64b3f706a
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/_get_usage_limits_input.rs
@@ -0,0 +1,64 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
+pub struct GetUsageLimitsInput {
+    /// The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder
+    /// ID users.
+    pub profile_arn: ::std::option::Option<::std::string::String>,
+}
+impl GetUsageLimitsInput {
+    /// The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder
+    /// ID users.
+    pub fn profile_arn(&self) -> ::std::option::Option<&str> {
+        self.profile_arn.as_deref()
+    }
+}
+impl GetUsageLimitsInput {
+    /// Creates a new builder-style object to manufacture
+    /// [`GetUsageLimitsInput`](crate::operation::get_usage_limits::GetUsageLimitsInput).
+    pub fn builder() -> crate::operation::get_usage_limits::builders::GetUsageLimitsInputBuilder {
+        crate::operation::get_usage_limits::builders::GetUsageLimitsInputBuilder::default()
+    }
+}
+
+/// A builder for [`GetUsageLimitsInput`](crate::operation::get_usage_limits::GetUsageLimitsInput).
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct GetUsageLimitsInputBuilder {
+    pub(crate) profile_arn: ::std::option::Option<::std::string::String>,
+}
+impl GetUsageLimitsInputBuilder {
+    /// The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder
+    /// ID users.
+    pub fn profile_arn(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.profile_arn = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder
+    /// ID users.
+    pub fn set_profile_arn(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.profile_arn = input;
+        self
+    }
+
+    /// The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder
+    /// ID users.
+    pub fn get_profile_arn(&self) -> &::std::option::Option<::std::string::String> {
+        &self.profile_arn
+    }
+
+    /// Consumes the builder and constructs a
+    /// [`GetUsageLimitsInput`](crate::operation::get_usage_limits::GetUsageLimitsInput).
+    pub fn build(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::get_usage_limits::GetUsageLimitsInput,
+        ::aws_smithy_types::error::operation::BuildError,
+    > {
+        ::std::result::Result::Ok(crate::operation::get_usage_limits::GetUsageLimitsInput {
+            profile_arn: self.profile_arn,
+        })
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/_get_usage_limits_output.rs b/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/_get_usage_limits_output.rs
new file mode 100644
index 0000000000..2c6d804bcd
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/_get_usage_limits_output.rs
@@ -0,0 +1,123 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
+pub struct GetUsageLimitsOutput {
+    #[allow(missing_docs)] // documentation missing in model
+    pub limits: ::std::vec::Vec<crate::types::UsageLimitList>,
+    /// Number of days remaining until the usage metrics reset
+    pub days_until_reset: i32,
+    _request_id: Option<String>,
+}
+impl GetUsageLimitsOutput {
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn limits(&self) -> &[crate::types::UsageLimitList] {
+        use std::ops::Deref;
+        self.limits.deref()
+    }
+
+    /// Number of days remaining until the usage metrics reset
+    pub fn days_until_reset(&self) -> i32 {
+        self.days_until_reset
+    }
+}
+impl ::aws_types::request_id::RequestId for GetUsageLimitsOutput {
+    fn request_id(&self) -> Option<&str> {
+        self._request_id.as_deref()
+    }
+}
+impl GetUsageLimitsOutput {
+    /// Creates a new builder-style object to manufacture
+    /// [`GetUsageLimitsOutput`](crate::operation::get_usage_limits::GetUsageLimitsOutput).
+    pub fn builder() -> crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder {
+        crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder::default()
+    }
+}
+
+/// A builder for
+/// [`GetUsageLimitsOutput`](crate::operation::get_usage_limits::GetUsageLimitsOutput).
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct GetUsageLimitsOutputBuilder {
+    pub(crate) limits: ::std::option::Option<::std::vec::Vec<crate::types::UsageLimitList>>,
+    pub(crate) days_until_reset: ::std::option::Option<i32>,
+    _request_id: Option<String>,
+}
+impl GetUsageLimitsOutputBuilder {
+    /// Appends an item to `limits`.
+    ///
+    /// To override the contents of this collection use [`set_limits`](Self::set_limits).
+    pub fn limits(mut self, input: crate::types::UsageLimitList) -> Self {
+        let mut v = self.limits.unwrap_or_default();
+        v.push(input);
+        self.limits = ::std::option::Option::Some(v);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_limits(mut self, input: ::std::option::Option<::std::vec::Vec<crate::types::UsageLimitList>>) -> Self {
+        self.limits = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_limits(&self) -> &::std::option::Option<::std::vec::Vec<crate::types::UsageLimitList>> {
+        &self.limits
+    }
+
+    /// Number of days remaining until the usage metrics reset
+    /// This field is required.
+    pub fn days_until_reset(mut self, input: i32) -> Self {
+        self.days_until_reset = ::std::option::Option::Some(input);
+        self
+    }
+
+    /// Number of days remaining until the usage metrics reset
+    pub fn set_days_until_reset(mut self, input: ::std::option::Option<i32>) -> Self {
+        self.days_until_reset = input;
+        self
+    }
+
+    /// Number of days remaining until the usage metrics reset
+    pub fn get_days_until_reset(&self) -> &::std::option::Option<i32> {
+        &self.days_until_reset
+    }
+
+    pub(crate) fn _request_id(mut self, request_id: impl Into<String>) -> Self {
+        self._request_id = Some(request_id.into());
+        self
+    }
+
+    pub(crate) fn _set_request_id(&mut self, request_id: Option<String>) -> &mut Self {
+        self._request_id = request_id;
+        self
+    }
+
+    /// Consumes the builder and constructs a
+    /// [`GetUsageLimitsOutput`](crate::operation::get_usage_limits::GetUsageLimitsOutput). This
+    /// method will fail if any of the following fields are not set:
+    /// - [`limits`](crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder::limits)
+    /// - [`days_until_reset`](crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder::days_until_reset)
+    pub fn build(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::get_usage_limits::GetUsageLimitsOutput,
+        ::aws_smithy_types::error::operation::BuildError,
+    > {
+        ::std::result::Result::Ok(crate::operation::get_usage_limits::GetUsageLimitsOutput {
+            limits: self.limits.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "limits",
+                    "limits was not specified but it is required when building GetUsageLimitsOutput",
+                )
+            })?,
+            days_until_reset: self.days_until_reset.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "days_until_reset",
+                    "days_until_reset was not specified but it is required when building GetUsageLimitsOutput",
+                )
+            })?,
+            _request_id: self._request_id,
+        })
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/builders.rs b/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/builders.rs
new file mode 100644
index 0000000000..2fa72d2e47
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/get_usage_limits/builders.rs
@@ -0,0 +1,140 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub use crate::operation::get_usage_limits::_get_usage_limits_input::GetUsageLimitsInputBuilder;
+pub use crate::operation::get_usage_limits::_get_usage_limits_output::GetUsageLimitsOutputBuilder;
+
+impl crate::operation::get_usage_limits::builders::GetUsageLimitsInputBuilder {
+    /// Sends a request with this input using the given client.
+    pub async fn send_with(
+        self,
+        client: &crate::Client,
+    ) -> ::std::result::Result<
+        crate::operation::get_usage_limits::GetUsageLimitsOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::get_usage_limits::GetUsageLimitsError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let mut fluent_builder = client.get_usage_limits();
+        fluent_builder.inner = self;
+        fluent_builder.send().await
+    }
+}
+/// Fluent builder constructing a request to `GetUsageLimits`.
+///
+/// API to get current usage limits
+#[derive(::std::clone::Clone, ::std::fmt::Debug)]
+pub struct GetUsageLimitsFluentBuilder {
+    handle: ::std::sync::Arc<crate::client::Handle>,
+    inner: crate::operation::get_usage_limits::builders::GetUsageLimitsInputBuilder,
+    config_override: ::std::option::Option<crate::config::Builder>,
+}
+impl
+    crate::client::customize::internal::CustomizableSend<
+        crate::operation::get_usage_limits::GetUsageLimitsOutput,
+        crate::operation::get_usage_limits::GetUsageLimitsError,
+    > for GetUsageLimitsFluentBuilder
+{
+    fn send(
+        self,
+        config_override: crate::config::Builder,
+    ) -> crate::client::customize::internal::BoxFuture<
+        crate::client::customize::internal::SendResult<
+            crate::operation::get_usage_limits::GetUsageLimitsOutput,
+            crate::operation::get_usage_limits::GetUsageLimitsError,
+        >,
+    > {
+        ::std::boxed::Box::pin(async move { self.config_override(config_override).send().await })
+    }
+}
+impl GetUsageLimitsFluentBuilder {
+    /// Creates a new `GetUsageLimitsFluentBuilder`.
+    pub(crate) fn new(handle: ::std::sync::Arc<crate::client::Handle>) -> Self {
+        Self {
+            handle,
+            inner: ::std::default::Default::default(),
+            config_override: ::std::option::Option::None,
+        }
+    }
+
+    /// Access the GetUsageLimits as a reference.
+    pub fn as_input(&self) -> &crate::operation::get_usage_limits::builders::GetUsageLimitsInputBuilder {
+        &self.inner
+    }
+
+    /// Sends the request and returns the response.
+    ///
+    /// If an error occurs, an `SdkError` will be returned with additional details that
+    /// can be matched against.
+    ///
+    /// By default, any retryable failures will be retried twice. Retry behavior
+    /// is configurable with the [RetryConfig](aws_smithy_types::retry::RetryConfig), which can be
+    /// set when configuring the client.
+    pub async fn send(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::get_usage_limits::GetUsageLimitsOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::get_usage_limits::GetUsageLimitsError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let input = self
+            .inner
+            .build()
+            .map_err(::aws_smithy_runtime_api::client::result::SdkError::construction_failure)?;
+        let runtime_plugins = crate::operation::get_usage_limits::GetUsageLimits::operation_runtime_plugins(
+            self.handle.runtime_plugins.clone(),
+            &self.handle.conf,
+            self.config_override,
+        );
+        crate::operation::get_usage_limits::GetUsageLimits::orchestrate(&runtime_plugins, input).await
+    }
+
+    /// Consumes this builder, creating a customizable operation that can be modified before being
+    /// sent.
+    pub fn customize(
+        self,
+    ) -> crate::client::customize::CustomizableOperation<
+        crate::operation::get_usage_limits::GetUsageLimitsOutput,
+        crate::operation::get_usage_limits::GetUsageLimitsError,
+        Self,
+    > {
+        crate::client::customize::CustomizableOperation::new(self)
+    }
+
+    pub(crate) fn config_override(
+        mut self,
+        config_override: impl ::std::convert::Into<crate::config::Builder>,
+    ) -> Self {
+        self.set_config_override(::std::option::Option::Some(config_override.into()));
+        self
+    }
+
+    pub(crate) fn set_config_override(
+        &mut self,
+        config_override: ::std::option::Option<crate::config::Builder>,
+    ) -> &mut Self {
+        self.config_override = config_override;
+        self
+    }
+
+    /// The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder
+    /// ID users.
+    pub fn profile_arn(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.profile_arn(input.into());
+        self
+    }
+
+    /// The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder
+    /// ID users.
+    pub fn set_profile_arn(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_profile_arn(input);
+        self
+    }
+
+    /// The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder
+    /// ID users.
+    pub fn get_profile_arn(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_profile_arn()
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/operation/push_telemetry_event/_push_telemetry_event_input.rs b/crates/amzn-codewhisperer-client/src/operation/push_telemetry_event/_push_telemetry_event_input.rs
index bae6de02d7..43bf2ebb76 100644
--- a/crates/amzn-codewhisperer-client/src/operation/push_telemetry_event/_push_telemetry_event_input.rs
+++ b/crates/amzn-codewhisperer-client/src/operation/push_telemetry_event/_push_telemetry_event_input.rs
@@ -6,9 +6,7 @@ pub struct PushTelemetryEventInput {
     #[allow(missing_docs)] // documentation missing in model
     pub client_token: ::std::option::Option<::std::string::String>,
     #[allow(missing_docs)] // documentation missing in model
-    pub timestamp: ::std::option::Option<::aws_smithy_types::DateTime>,
-    #[allow(missing_docs)] // documentation missing in model
-    pub event_id: ::std::option::Option<::std::string::String>,
+    pub event_type: ::std::option::Option<::std::string::String>,
     #[allow(missing_docs)] // documentation missing in model
     pub event: ::std::option::Option<::aws_smithy_types::Document>,
 }
@@ -19,13 +17,8 @@ impl PushTelemetryEventInput {
     }
 
     #[allow(missing_docs)] // documentation missing in model
-    pub fn timestamp(&self) -> ::std::option::Option<&::aws_smithy_types::DateTime> {
-        self.timestamp.as_ref()
-    }
-
-    #[allow(missing_docs)] // documentation missing in model
-    pub fn event_id(&self) -> ::std::option::Option<&str> {
-        self.event_id.as_deref()
+    pub fn event_type(&self) -> ::std::option::Option<&str> {
+        self.event_type.as_deref()
     }
 
     #[allow(missing_docs)] // documentation missing in model
@@ -47,8 +40,7 @@ impl PushTelemetryEventInput {
 #[non_exhaustive]
 pub struct PushTelemetryEventInputBuilder {
     pub(crate) client_token: ::std::option::Option<::std::string::String>,
-    pub(crate) timestamp: ::std::option::Option<::aws_smithy_types::DateTime>,
-    pub(crate) event_id: ::std::option::Option<::std::string::String>,
+    pub(crate) event_type: ::std::option::Option<::std::string::String>,
     pub(crate) event: ::std::option::Option<::aws_smithy_types::Document>,
 }
 impl PushTelemetryEventInputBuilder {
@@ -71,38 +63,20 @@ impl PushTelemetryEventInputBuilder {
 
     #[allow(missing_docs)] // documentation missing in model
     /// This field is required.
-    pub fn timestamp(mut self, input: ::aws_smithy_types::DateTime) -> Self {
-        self.timestamp = ::std::option::Option::Some(input);
-        self
-    }
-
-    #[allow(missing_docs)] // documentation missing in model
-    pub fn set_timestamp(mut self, input: ::std::option::Option<::aws_smithy_types::DateTime>) -> Self {
-        self.timestamp = input;
-        self
-    }
-
-    #[allow(missing_docs)] // documentation missing in model
-    pub fn get_timestamp(&self) -> &::std::option::Option<::aws_smithy_types::DateTime> {
-        &self.timestamp
-    }
-
-    #[allow(missing_docs)] // documentation missing in model
-    /// This field is required.
-    pub fn event_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
-        self.event_id = ::std::option::Option::Some(input.into());
+    pub fn event_type(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.event_type = ::std::option::Option::Some(input.into());
         self
     }
 
     #[allow(missing_docs)] // documentation missing in model
-    pub fn set_event_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
-        self.event_id = input;
+    pub fn set_event_type(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.event_type = input;
         self
     }
 
     #[allow(missing_docs)] // documentation missing in model
-    pub fn get_event_id(&self) -> &::std::option::Option<::std::string::String> {
-        &self.event_id
+    pub fn get_event_type(&self) -> &::std::option::Option<::std::string::String> {
+        &self.event_type
     }
 
     #[allow(missing_docs)] // documentation missing in model
@@ -133,8 +107,7 @@ impl PushTelemetryEventInputBuilder {
     > {
         ::std::result::Result::Ok(crate::operation::push_telemetry_event::PushTelemetryEventInput {
             client_token: self.client_token,
-            timestamp: self.timestamp,
-            event_id: self.event_id,
+            event_type: self.event_type,
             event: self.event,
         })
     }
diff --git a/crates/amzn-codewhisperer-client/src/operation/push_telemetry_event/builders.rs b/crates/amzn-codewhisperer-client/src/operation/push_telemetry_event/builders.rs
index 2d19c6fc1f..9dfa41df90 100644
--- a/crates/amzn-codewhisperer-client/src/operation/push_telemetry_event/builders.rs
+++ b/crates/amzn-codewhisperer-client/src/operation/push_telemetry_event/builders.rs
@@ -136,37 +136,20 @@ impl PushTelemetryEventFluentBuilder {
     }
 
     #[allow(missing_docs)] // documentation missing in model
-    pub fn timestamp(mut self, input: ::aws_smithy_types::DateTime) -> Self {
-        self.inner = self.inner.timestamp(input);
+    pub fn event_type(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.event_type(input.into());
         self
     }
 
     #[allow(missing_docs)] // documentation missing in model
-    pub fn set_timestamp(mut self, input: ::std::option::Option<::aws_smithy_types::DateTime>) -> Self {
-        self.inner = self.inner.set_timestamp(input);
+    pub fn set_event_type(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_event_type(input);
         self
     }
 
     #[allow(missing_docs)] // documentation missing in model
-    pub fn get_timestamp(&self) -> &::std::option::Option<::aws_smithy_types::DateTime> {
-        self.inner.get_timestamp()
-    }
-
-    #[allow(missing_docs)] // documentation missing in model
-    pub fn event_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
-        self.inner = self.inner.event_id(input.into());
-        self
-    }
-
-    #[allow(missing_docs)] // documentation missing in model
-    pub fn set_event_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
-        self.inner = self.inner.set_event_id(input);
-        self
-    }
-
-    #[allow(missing_docs)] // documentation missing in model
-    pub fn get_event_id(&self) -> &::std::option::Option<::std::string::String> {
-        self.inner.get_event_id()
+    pub fn get_event_type(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_event_type()
     }
 
     #[allow(missing_docs)] // documentation missing in model
diff --git a/crates/amzn-codewhisperer-client/src/operation/send_telemetry_event/_send_telemetry_event_input.rs b/crates/amzn-codewhisperer-client/src/operation/send_telemetry_event/_send_telemetry_event_input.rs
index f7e6abdc9a..0c9ce79acb 100644
--- a/crates/amzn-codewhisperer-client/src/operation/send_telemetry_event/_send_telemetry_event_input.rs
+++ b/crates/amzn-codewhisperer-client/src/operation/send_telemetry_event/_send_telemetry_event_input.rs
@@ -13,6 +13,8 @@ pub struct SendTelemetryEventInput {
     pub user_context: ::std::option::Option<crate::types::UserContext>,
     #[allow(missing_docs)] // documentation missing in model
     pub profile_arn: ::std::option::Option<::std::string::String>,
+    /// Unique identifier for the model
+    pub model_id: ::std::option::Option<::std::string::String>,
 }
 impl SendTelemetryEventInput {
     #[allow(missing_docs)] // documentation missing in model
@@ -39,6 +41,11 @@ impl SendTelemetryEventInput {
     pub fn profile_arn(&self) -> ::std::option::Option<&str> {
         self.profile_arn.as_deref()
     }
+
+    /// Unique identifier for the model
+    pub fn model_id(&self) -> ::std::option::Option<&str> {
+        self.model_id.as_deref()
+    }
 }
 impl SendTelemetryEventInput {
     /// Creates a new builder-style object to manufacture
@@ -58,6 +65,7 @@ pub struct SendTelemetryEventInputBuilder {
     pub(crate) opt_out_preference: ::std::option::Option<crate::types::OptOutPreference>,
     pub(crate) user_context: ::std::option::Option<crate::types::UserContext>,
     pub(crate) profile_arn: ::std::option::Option<::std::string::String>,
+    pub(crate) model_id: ::std::option::Option<::std::string::String>,
 }
 impl SendTelemetryEventInputBuilder {
     #[allow(missing_docs)] // documentation missing in model
@@ -146,6 +154,23 @@ impl SendTelemetryEventInputBuilder {
         &self.profile_arn
     }
 
+    /// Unique identifier for the model
+    pub fn model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.model_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn set_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.model_id = input;
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn get_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.model_id
+    }
+
     /// Consumes the builder and constructs a
     /// [`SendTelemetryEventInput`](crate::operation::send_telemetry_event::SendTelemetryEventInput).
     pub fn build(
@@ -160,6 +185,7 @@ impl SendTelemetryEventInputBuilder {
             opt_out_preference: self.opt_out_preference,
             user_context: self.user_context,
             profile_arn: self.profile_arn,
+            model_id: self.model_id,
         })
     }
 }
diff --git a/crates/amzn-codewhisperer-client/src/operation/send_telemetry_event/builders.rs b/crates/amzn-codewhisperer-client/src/operation/send_telemetry_event/builders.rs
index 6f4b057af9..f7a95f892f 100644
--- a/crates/amzn-codewhisperer-client/src/operation/send_telemetry_event/builders.rs
+++ b/crates/amzn-codewhisperer-client/src/operation/send_telemetry_event/builders.rs
@@ -202,4 +202,21 @@ impl SendTelemetryEventFluentBuilder {
     pub fn get_profile_arn(&self) -> &::std::option::Option<::std::string::String> {
         self.inner.get_profile_arn()
     }
+
+    /// Unique identifier for the model
+    pub fn model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.model_id(input.into());
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn set_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_model_id(input);
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn get_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_model_id()
+    }
 }
diff --git a/crates/amzn-codewhisperer-client/src/operation/update_usage_limits.rs b/crates/amzn-codewhisperer-client/src/operation/update_usage_limits.rs
new file mode 100644
index 0000000000..3762cb3d4b
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/update_usage_limits.rs
@@ -0,0 +1,459 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+/// Orchestration and serialization glue logic for `UpdateUsageLimits`.
+#[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct UpdateUsageLimits;
+impl UpdateUsageLimits {
+    /// Creates a new `UpdateUsageLimits`
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub(crate) async fn orchestrate(
+        runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        input: crate::operation::update_usage_limits::UpdateUsageLimitsInput,
+    ) -> ::std::result::Result<
+        crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::update_usage_limits::UpdateUsageLimitsError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let map_err = |err: ::aws_smithy_runtime_api::client::result::SdkError<
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >| {
+            err.map_service_error(|err| {
+                err.downcast::<crate::operation::update_usage_limits::UpdateUsageLimitsError>()
+                    .expect("correct error type")
+            })
+        };
+        let context = Self::orchestrate_with_stop_point(
+            runtime_plugins,
+            input,
+            ::aws_smithy_runtime::client::orchestrator::StopPoint::None,
+        )
+        .await
+        .map_err(map_err)?;
+        let output = context.finalize().map_err(map_err)?;
+        ::std::result::Result::Ok(
+            output
+                .downcast::<crate::operation::update_usage_limits::UpdateUsageLimitsOutput>()
+                .expect("correct output type"),
+        )
+    }
+
+    pub(crate) async fn orchestrate_with_stop_point(
+        runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        input: crate::operation::update_usage_limits::UpdateUsageLimitsInput,
+        stop_point: ::aws_smithy_runtime::client::orchestrator::StopPoint,
+    ) -> ::std::result::Result<
+        ::aws_smithy_runtime_api::client::interceptors::context::InterceptorContext,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let input = ::aws_smithy_runtime_api::client::interceptors::context::Input::erase(input);
+        ::aws_smithy_runtime::client::orchestrator::invoke_with_stop_point(
+            "codewhispererruntime",
+            "UpdateUsageLimits",
+            input,
+            runtime_plugins,
+            stop_point,
+        )
+        .await
+    }
+
+    pub(crate) fn operation_runtime_plugins(
+        client_runtime_plugins: ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
+        client_config: &crate::config::Config,
+        config_override: ::std::option::Option<crate::config::Builder>,
+    ) -> ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins {
+        let mut runtime_plugins = client_runtime_plugins.with_operation_plugin(Self::new());
+        runtime_plugins = runtime_plugins.with_client_plugin(crate::auth_plugin::DefaultAuthOptionsPlugin::new(vec![
+            ::aws_smithy_runtime_api::client::auth::http::HTTP_BEARER_AUTH_SCHEME_ID,
+        ]));
+        if let ::std::option::Option::Some(config_override) = config_override {
+            for plugin in config_override.runtime_plugins.iter().cloned() {
+                runtime_plugins = runtime_plugins.with_operation_plugin(plugin);
+            }
+            runtime_plugins = runtime_plugins.with_operation_plugin(crate::config::ConfigOverrideRuntimePlugin::new(
+                config_override,
+                client_config.config.clone(),
+                &client_config.runtime_components,
+            ));
+        }
+        runtime_plugins
+    }
+}
+impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin for UpdateUsageLimits {
+    fn config(&self) -> ::std::option::Option<::aws_smithy_types::config_bag::FrozenLayer> {
+        let mut cfg = ::aws_smithy_types::config_bag::Layer::new("UpdateUsageLimits");
+
+        cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedRequestSerializer::new(
+            UpdateUsageLimitsRequestSerializer,
+        ));
+        cfg.store_put(
+            ::aws_smithy_runtime_api::client::ser_de::SharedResponseDeserializer::new(
+                UpdateUsageLimitsResponseDeserializer,
+            ),
+        );
+
+        cfg.store_put(
+            ::aws_smithy_runtime_api::client::auth::AuthSchemeOptionResolverParams::new(
+                ::aws_smithy_runtime_api::client::auth::static_resolver::StaticAuthSchemeOptionResolverParams::new(),
+            ),
+        );
+
+        cfg.store_put(::aws_smithy_runtime_api::client::orchestrator::Metadata::new(
+            "UpdateUsageLimits",
+            "codewhispererruntime",
+        ));
+
+        ::std::option::Option::Some(cfg.freeze())
+    }
+
+    fn runtime_components(
+        &self,
+        _: &::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,
+    ) -> ::std::borrow::Cow<'_, ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder> {
+        #[allow(unused_mut)]
+        let mut rcb = ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder::new(
+            "UpdateUsageLimits",
+        )
+        .with_interceptor(
+            ::aws_smithy_runtime::client::stalled_stream_protection::StalledStreamProtectionInterceptor::default(),
+        )
+        .with_interceptor(UpdateUsageLimitsEndpointParamsInterceptor)
+        .with_retry_classifier(
+            ::aws_smithy_runtime::client::retries::classifiers::TransientErrorClassifier::<
+                crate::operation::update_usage_limits::UpdateUsageLimitsError,
+            >::new(),
+        )
+        .with_retry_classifier(
+            ::aws_smithy_runtime::client::retries::classifiers::ModeledAsRetryableClassifier::<
+                crate::operation::update_usage_limits::UpdateUsageLimitsError,
+            >::new(),
+        )
+        .with_retry_classifier(::aws_runtime::retries::classifiers::AwsErrorCodeClassifier::<
+            crate::operation::update_usage_limits::UpdateUsageLimitsError,
+        >::new());
+
+        ::std::borrow::Cow::Owned(rcb)
+    }
+}
+
+#[derive(Debug)]
+struct UpdateUsageLimitsResponseDeserializer;
+impl ::aws_smithy_runtime_api::client::ser_de::DeserializeResponse for UpdateUsageLimitsResponseDeserializer {
+    fn deserialize_nonstreaming(
+        &self,
+        response: &::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+    ) -> ::aws_smithy_runtime_api::client::interceptors::context::OutputOrError {
+        let (success, status) = (response.status().is_success(), response.status().as_u16());
+        let headers = response.headers();
+        let body = response.body().bytes().expect("body loaded");
+        #[allow(unused_mut)]
+        let mut force_error = false;
+        ::tracing::debug!(request_id = ?::aws_types::request_id::RequestId::request_id(response));
+        let parse_result = if !success && status != 200 || force_error {
+            crate::protocol_serde::shape_update_usage_limits::de_update_usage_limits_http_error(status, headers, body)
+        } else {
+            crate::protocol_serde::shape_update_usage_limits::de_update_usage_limits_http_response(
+                status, headers, body,
+            )
+        };
+        crate::protocol_serde::type_erase_result(parse_result)
+    }
+}
+#[derive(Debug)]
+struct UpdateUsageLimitsRequestSerializer;
+impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for UpdateUsageLimitsRequestSerializer {
+    #[allow(
+        unused_mut,
+        clippy::let_and_return,
+        clippy::needless_borrow,
+        clippy::useless_conversion
+    )]
+    fn serialize_input(
+        &self,
+        input: ::aws_smithy_runtime_api::client::interceptors::context::Input,
+        _cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
+    ) -> ::std::result::Result<
+        ::aws_smithy_runtime_api::client::orchestrator::HttpRequest,
+        ::aws_smithy_runtime_api::box_error::BoxError,
+    > {
+        let input = input
+            .downcast::<crate::operation::update_usage_limits::UpdateUsageLimitsInput>()
+            .expect("correct type");
+        let _header_serialization_settings = _cfg
+            .load::<crate::serialization_settings::HeaderSerializationSettings>()
+            .cloned()
+            .unwrap_or_default();
+        let mut request_builder = {
+            fn uri_base(
+                _input: &crate::operation::update_usage_limits::UpdateUsageLimitsInput,
+                output: &mut ::std::string::String,
+            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
+                use ::std::fmt::Write as _;
+                ::std::write!(output, "/").expect("formatting should succeed");
+                ::std::result::Result::Ok(())
+            }
+            #[allow(clippy::unnecessary_wraps)]
+            fn update_http_builder(
+                input: &crate::operation::update_usage_limits::UpdateUsageLimitsInput,
+                builder: ::http::request::Builder,
+            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError>
+            {
+                let mut uri = ::std::string::String::new();
+                uri_base(input, &mut uri)?;
+                ::std::result::Result::Ok(builder.method("POST").uri(uri))
+            }
+            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
+            builder = _header_serialization_settings.set_default_header(
+                builder,
+                ::http::header::CONTENT_TYPE,
+                "application/x-amz-json-1.0",
+            );
+            builder = _header_serialization_settings.set_default_header(
+                builder,
+                ::http::header::HeaderName::from_static("x-amz-target"),
+                "AmazonCodeWhispererService.UpdateUsageLimits",
+            );
+            builder
+        };
+        let body = ::aws_smithy_types::body::SdkBody::from(
+            crate::protocol_serde::shape_update_usage_limits::ser_update_usage_limits_input(&input)?,
+        );
+        if let Some(content_length) = body.content_length() {
+            let content_length = content_length.to_string();
+            request_builder = _header_serialization_settings.set_default_header(
+                request_builder,
+                ::http::header::CONTENT_LENGTH,
+                &content_length,
+            );
+        }
+        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
+    }
+}
+#[derive(Debug)]
+struct UpdateUsageLimitsEndpointParamsInterceptor;
+
+impl ::aws_smithy_runtime_api::client::interceptors::Intercept for UpdateUsageLimitsEndpointParamsInterceptor {
+    fn name(&self) -> &'static str {
+        "UpdateUsageLimitsEndpointParamsInterceptor"
+    }
+
+    fn read_before_execution(
+        &self,
+        context: &::aws_smithy_runtime_api::client::interceptors::context::BeforeSerializationInterceptorContextRef<
+            '_,
+            ::aws_smithy_runtime_api::client::interceptors::context::Input,
+            ::aws_smithy_runtime_api::client::interceptors::context::Output,
+            ::aws_smithy_runtime_api::client::interceptors::context::Error,
+        >,
+        cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
+    ) -> ::std::result::Result<(), ::aws_smithy_runtime_api::box_error::BoxError> {
+        let _input = context
+            .input()
+            .downcast_ref::<UpdateUsageLimitsInput>()
+            .ok_or("failed to downcast to UpdateUsageLimitsInput")?;
+
+        let params = crate::config::endpoint::Params::builder().build().map_err(|err| {
+            ::aws_smithy_runtime_api::client::interceptors::error::ContextAttachedError::new(
+                "endpoint params could not be built",
+                err,
+            )
+        })?;
+        cfg.interceptor_state()
+            .store_put(::aws_smithy_runtime_api::client::endpoint::EndpointResolverParams::new(
+                params,
+            ));
+        ::std::result::Result::Ok(())
+    }
+}
+
+// The get_* functions below are generated from JMESPath expressions in the
+// operationContextParams trait. They target the operation's input shape.
+
+/// Error type for the `UpdateUsageLimitsError` operation.
+#[non_exhaustive]
+#[derive(::std::fmt::Debug)]
+pub enum UpdateUsageLimitsError {
+    /// This exception is thrown when the input fails to satisfy the constraints specified by the
+    /// service.
+    ValidationError(crate::types::error::ValidationError),
+    /// This exception is thrown when the user does not have sufficient access to perform this
+    /// action.
+    AccessDeniedError(crate::types::error::AccessDeniedError),
+    /// This exception is thrown when request was denied due to request throttling.
+    ThrottlingError(crate::types::error::ThrottlingError),
+    /// This exception is thrown when an unexpected error occurred during the processing of a
+    /// request.
+    InternalServerError(crate::types::error::InternalServerError),
+    /// Exception thrown when the number of usage limit update requests exceeds the monthly quota
+    /// (default 3 requests per month)
+    UpdateUsageLimitQuotaExceededError(crate::types::error::UpdateUsageLimitQuotaExceededError),
+    /// An unexpected error occurred (e.g., invalid JSON returned by the service or an unknown error
+    /// code).
+    #[deprecated(
+        note = "Matching `Unhandled` directly is not forwards compatible. Instead, match using a \
+    variable wildcard pattern and check `.code()`:
+     \
+    &nbsp;&nbsp;&nbsp;`err if err.code() == Some(\"SpecificExceptionCode\") => { /* handle the error */ }`
+     \
+    See [`ProvideErrorMetadata`](#impl-ProvideErrorMetadata-for-UpdateUsageLimitsError) for what information is available for the error."
+    )]
+    Unhandled(crate::error::sealed_unhandled::Unhandled),
+}
+impl UpdateUsageLimitsError {
+    /// Creates the `UpdateUsageLimitsError::Unhandled` variant from any error type.
+    pub fn unhandled(
+        err: impl ::std::convert::Into<
+            ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
+        >,
+    ) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source: err.into(),
+            meta: ::std::default::Default::default(),
+        })
+    }
+
+    /// Creates the `UpdateUsageLimitsError::Unhandled` variant from an
+    /// [`ErrorMetadata`](::aws_smithy_types::error::ErrorMetadata).
+    pub fn generic(err: ::aws_smithy_types::error::ErrorMetadata) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source: err.clone().into(),
+            meta: err,
+        })
+    }
+
+    /// Returns error metadata, which includes the error code, message,
+    /// request ID, and potentially additional information.
+    pub fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
+        match self {
+            Self::ValidationError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::AccessDeniedError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::ThrottlingError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::InternalServerError(e) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e),
+            Self::UpdateUsageLimitQuotaExceededError(e) => {
+                ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(e)
+            },
+            Self::Unhandled(e) => &e.meta,
+        }
+    }
+
+    /// Returns `true` if the error kind is `UpdateUsageLimitsError::ValidationError`.
+    pub fn is_validation_error(&self) -> bool {
+        matches!(self, Self::ValidationError(_))
+    }
+
+    /// Returns `true` if the error kind is `UpdateUsageLimitsError::AccessDeniedError`.
+    pub fn is_access_denied_error(&self) -> bool {
+        matches!(self, Self::AccessDeniedError(_))
+    }
+
+    /// Returns `true` if the error kind is `UpdateUsageLimitsError::ThrottlingError`.
+    pub fn is_throttling_error(&self) -> bool {
+        matches!(self, Self::ThrottlingError(_))
+    }
+
+    /// Returns `true` if the error kind is `UpdateUsageLimitsError::InternalServerError`.
+    pub fn is_internal_server_error(&self) -> bool {
+        matches!(self, Self::InternalServerError(_))
+    }
+
+    /// Returns `true` if the error kind is
+    /// `UpdateUsageLimitsError::UpdateUsageLimitQuotaExceededError`.
+    pub fn is_update_usage_limit_quota_exceeded_error(&self) -> bool {
+        matches!(self, Self::UpdateUsageLimitQuotaExceededError(_))
+    }
+}
+impl ::std::error::Error for UpdateUsageLimitsError {
+    fn source(&self) -> ::std::option::Option<&(dyn ::std::error::Error + 'static)> {
+        match self {
+            Self::ValidationError(_inner) => ::std::option::Option::Some(_inner),
+            Self::AccessDeniedError(_inner) => ::std::option::Option::Some(_inner),
+            Self::ThrottlingError(_inner) => ::std::option::Option::Some(_inner),
+            Self::InternalServerError(_inner) => ::std::option::Option::Some(_inner),
+            Self::UpdateUsageLimitQuotaExceededError(_inner) => ::std::option::Option::Some(_inner),
+            Self::Unhandled(_inner) => ::std::option::Option::Some(&*_inner.source),
+        }
+    }
+}
+impl ::std::fmt::Display for UpdateUsageLimitsError {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        match self {
+            Self::ValidationError(_inner) => _inner.fmt(f),
+            Self::AccessDeniedError(_inner) => _inner.fmt(f),
+            Self::ThrottlingError(_inner) => _inner.fmt(f),
+            Self::InternalServerError(_inner) => _inner.fmt(f),
+            Self::UpdateUsageLimitQuotaExceededError(_inner) => _inner.fmt(f),
+            Self::Unhandled(_inner) => {
+                if let ::std::option::Option::Some(code) =
+                    ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
+                {
+                    write!(f, "unhandled error ({code})")
+                } else {
+                    f.write_str("unhandled error")
+                }
+            },
+        }
+    }
+}
+impl ::aws_smithy_types::retry::ProvideErrorKind for UpdateUsageLimitsError {
+    fn code(&self) -> ::std::option::Option<&str> {
+        ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
+    }
+
+    fn retryable_error_kind(&self) -> ::std::option::Option<::aws_smithy_types::retry::ErrorKind> {
+        match self {
+            Self::ThrottlingError(inner) => ::std::option::Option::Some(inner.retryable_error_kind()),
+            Self::InternalServerError(inner) => ::std::option::Option::Some(inner.retryable_error_kind()),
+            _ => ::std::option::Option::None,
+        }
+    }
+}
+impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for UpdateUsageLimitsError {
+    fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
+        match self {
+            Self::ValidationError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::AccessDeniedError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::ThrottlingError(_inner) => ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner),
+            Self::InternalServerError(_inner) => {
+                ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner)
+            },
+            Self::UpdateUsageLimitQuotaExceededError(_inner) => {
+                ::aws_smithy_types::error::metadata::ProvideErrorMetadata::meta(_inner)
+            },
+            Self::Unhandled(_inner) => &_inner.meta,
+        }
+    }
+}
+impl ::aws_smithy_runtime_api::client::result::CreateUnhandledError for UpdateUsageLimitsError {
+    fn create_unhandled_error(
+        source: ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
+        meta: ::std::option::Option<::aws_smithy_types::error::ErrorMetadata>,
+    ) -> Self {
+        Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
+            source,
+            meta: meta.unwrap_or_default(),
+        })
+    }
+}
+impl ::aws_types::request_id::RequestId for crate::operation::update_usage_limits::UpdateUsageLimitsError {
+    fn request_id(&self) -> Option<&str> {
+        self.meta().request_id()
+    }
+}
+
+pub use crate::operation::update_usage_limits::_update_usage_limits_input::UpdateUsageLimitsInput;
+pub use crate::operation::update_usage_limits::_update_usage_limits_output::UpdateUsageLimitsOutput;
+
+mod _update_usage_limits_input;
+
+mod _update_usage_limits_output;
+
+/// Builders
+pub mod builders;
diff --git a/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/_update_usage_limits_input.rs b/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/_update_usage_limits_input.rs
new file mode 100644
index 0000000000..62ec9b216a
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/_update_usage_limits_input.rs
@@ -0,0 +1,167 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
+pub struct UpdateUsageLimitsInput {
+    #[allow(missing_docs)] // documentation missing in model
+    pub account_id: ::std::option::Option<::std::string::String>,
+    #[allow(missing_docs)] // documentation missing in model
+    pub accountless_user_id: ::std::option::Option<::std::string::String>,
+    #[allow(missing_docs)] // documentation missing in model
+    pub feature_type: ::std::option::Option<crate::types::UsageLimitType>,
+    #[allow(missing_docs)] // documentation missing in model
+    pub requested_limit: ::std::option::Option<i64>,
+    #[allow(missing_docs)] // documentation missing in model
+    pub justification: ::std::option::Option<::std::string::String>,
+}
+impl UpdateUsageLimitsInput {
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn account_id(&self) -> ::std::option::Option<&str> {
+        self.account_id.as_deref()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn accountless_user_id(&self) -> ::std::option::Option<&str> {
+        self.accountless_user_id.as_deref()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn feature_type(&self) -> ::std::option::Option<&crate::types::UsageLimitType> {
+        self.feature_type.as_ref()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn requested_limit(&self) -> ::std::option::Option<i64> {
+        self.requested_limit
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn justification(&self) -> ::std::option::Option<&str> {
+        self.justification.as_deref()
+    }
+}
+impl UpdateUsageLimitsInput {
+    /// Creates a new builder-style object to manufacture
+    /// [`UpdateUsageLimitsInput`](crate::operation::update_usage_limits::UpdateUsageLimitsInput).
+    pub fn builder() -> crate::operation::update_usage_limits::builders::UpdateUsageLimitsInputBuilder {
+        crate::operation::update_usage_limits::builders::UpdateUsageLimitsInputBuilder::default()
+    }
+}
+
+/// A builder for
+/// [`UpdateUsageLimitsInput`](crate::operation::update_usage_limits::UpdateUsageLimitsInput).
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct UpdateUsageLimitsInputBuilder {
+    pub(crate) account_id: ::std::option::Option<::std::string::String>,
+    pub(crate) accountless_user_id: ::std::option::Option<::std::string::String>,
+    pub(crate) feature_type: ::std::option::Option<crate::types::UsageLimitType>,
+    pub(crate) requested_limit: ::std::option::Option<i64>,
+    pub(crate) justification: ::std::option::Option<::std::string::String>,
+}
+impl UpdateUsageLimitsInputBuilder {
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn account_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.account_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_account_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.account_id = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_account_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.account_id
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn accountless_user_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.accountless_user_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_accountless_user_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.accountless_user_id = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_accountless_user_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.accountless_user_id
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn feature_type(mut self, input: crate::types::UsageLimitType) -> Self {
+        self.feature_type = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_feature_type(mut self, input: ::std::option::Option<crate::types::UsageLimitType>) -> Self {
+        self.feature_type = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_feature_type(&self) -> &::std::option::Option<crate::types::UsageLimitType> {
+        &self.feature_type
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn requested_limit(mut self, input: i64) -> Self {
+        self.requested_limit = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_requested_limit(mut self, input: ::std::option::Option<i64>) -> Self {
+        self.requested_limit = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_requested_limit(&self) -> &::std::option::Option<i64> {
+        &self.requested_limit
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn justification(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.justification = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_justification(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.justification = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_justification(&self) -> &::std::option::Option<::std::string::String> {
+        &self.justification
+    }
+
+    /// Consumes the builder and constructs a
+    /// [`UpdateUsageLimitsInput`](crate::operation::update_usage_limits::UpdateUsageLimitsInput).
+    pub fn build(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::update_usage_limits::UpdateUsageLimitsInput,
+        ::aws_smithy_types::error::operation::BuildError,
+    > {
+        ::std::result::Result::Ok(crate::operation::update_usage_limits::UpdateUsageLimitsInput {
+            account_id: self.account_id,
+            accountless_user_id: self.accountless_user_id,
+            feature_type: self.feature_type,
+            requested_limit: self.requested_limit,
+            justification: self.justification,
+        })
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/_update_usage_limits_output.rs b/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/_update_usage_limits_output.rs
new file mode 100644
index 0000000000..ab2d91b464
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/_update_usage_limits_output.rs
@@ -0,0 +1,138 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
+pub struct UpdateUsageLimitsOutput {
+    #[allow(missing_docs)] // documentation missing in model
+    pub status: crate::types::UsageLimitUpdateRequestStatus,
+    #[allow(missing_docs)] // documentation missing in model
+    pub approved_limit: ::std::option::Option<i64>,
+    #[allow(missing_docs)] // documentation missing in model
+    pub remaining_requests_this_month: ::std::option::Option<i32>,
+    _request_id: Option<String>,
+}
+impl UpdateUsageLimitsOutput {
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn status(&self) -> &crate::types::UsageLimitUpdateRequestStatus {
+        &self.status
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn approved_limit(&self) -> ::std::option::Option<i64> {
+        self.approved_limit
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn remaining_requests_this_month(&self) -> ::std::option::Option<i32> {
+        self.remaining_requests_this_month
+    }
+}
+impl ::aws_types::request_id::RequestId for UpdateUsageLimitsOutput {
+    fn request_id(&self) -> Option<&str> {
+        self._request_id.as_deref()
+    }
+}
+impl UpdateUsageLimitsOutput {
+    /// Creates a new builder-style object to manufacture
+    /// [`UpdateUsageLimitsOutput`](crate::operation::update_usage_limits::UpdateUsageLimitsOutput).
+    pub fn builder() -> crate::operation::update_usage_limits::builders::UpdateUsageLimitsOutputBuilder {
+        crate::operation::update_usage_limits::builders::UpdateUsageLimitsOutputBuilder::default()
+    }
+}
+
+/// A builder for
+/// [`UpdateUsageLimitsOutput`](crate::operation::update_usage_limits::UpdateUsageLimitsOutput).
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct UpdateUsageLimitsOutputBuilder {
+    pub(crate) status: ::std::option::Option<crate::types::UsageLimitUpdateRequestStatus>,
+    pub(crate) approved_limit: ::std::option::Option<i64>,
+    pub(crate) remaining_requests_this_month: ::std::option::Option<i32>,
+    _request_id: Option<String>,
+}
+impl UpdateUsageLimitsOutputBuilder {
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn status(mut self, input: crate::types::UsageLimitUpdateRequestStatus) -> Self {
+        self.status = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_status(mut self, input: ::std::option::Option<crate::types::UsageLimitUpdateRequestStatus>) -> Self {
+        self.status = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_status(&self) -> &::std::option::Option<crate::types::UsageLimitUpdateRequestStatus> {
+        &self.status
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn approved_limit(mut self, input: i64) -> Self {
+        self.approved_limit = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_approved_limit(mut self, input: ::std::option::Option<i64>) -> Self {
+        self.approved_limit = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_approved_limit(&self) -> &::std::option::Option<i64> {
+        &self.approved_limit
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn remaining_requests_this_month(mut self, input: i32) -> Self {
+        self.remaining_requests_this_month = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_remaining_requests_this_month(mut self, input: ::std::option::Option<i32>) -> Self {
+        self.remaining_requests_this_month = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_remaining_requests_this_month(&self) -> &::std::option::Option<i32> {
+        &self.remaining_requests_this_month
+    }
+
+    pub(crate) fn _request_id(mut self, request_id: impl Into<String>) -> Self {
+        self._request_id = Some(request_id.into());
+        self
+    }
+
+    pub(crate) fn _set_request_id(&mut self, request_id: Option<String>) -> &mut Self {
+        self._request_id = request_id;
+        self
+    }
+
+    /// Consumes the builder and constructs a
+    /// [`UpdateUsageLimitsOutput`](crate::operation::update_usage_limits::UpdateUsageLimitsOutput).
+    /// This method will fail if any of the following fields are not set:
+    /// - [`status`](crate::operation::update_usage_limits::builders::UpdateUsageLimitsOutputBuilder::status)
+    pub fn build(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+        ::aws_smithy_types::error::operation::BuildError,
+    > {
+        ::std::result::Result::Ok(crate::operation::update_usage_limits::UpdateUsageLimitsOutput {
+            status: self.status.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "status",
+                    "status was not specified but it is required when building UpdateUsageLimitsOutput",
+                )
+            })?,
+            approved_limit: self.approved_limit,
+            remaining_requests_this_month: self.remaining_requests_this_month,
+            _request_id: self._request_id,
+        })
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/builders.rs b/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/builders.rs
new file mode 100644
index 0000000000..47c9cb7166
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/operation/update_usage_limits/builders.rs
@@ -0,0 +1,205 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub use crate::operation::update_usage_limits::_update_usage_limits_input::UpdateUsageLimitsInputBuilder;
+pub use crate::operation::update_usage_limits::_update_usage_limits_output::UpdateUsageLimitsOutputBuilder;
+
+impl crate::operation::update_usage_limits::builders::UpdateUsageLimitsInputBuilder {
+    /// Sends a request with this input using the given client.
+    pub async fn send_with(
+        self,
+        client: &crate::Client,
+    ) -> ::std::result::Result<
+        crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::update_usage_limits::UpdateUsageLimitsError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let mut fluent_builder = client.update_usage_limits();
+        fluent_builder.inner = self;
+        fluent_builder.send().await
+    }
+}
+/// Fluent builder constructing a request to `UpdateUsageLimits`.
+///
+/// API to update usage limits for enterprise customers
+#[derive(::std::clone::Clone, ::std::fmt::Debug)]
+pub struct UpdateUsageLimitsFluentBuilder {
+    handle: ::std::sync::Arc<crate::client::Handle>,
+    inner: crate::operation::update_usage_limits::builders::UpdateUsageLimitsInputBuilder,
+    config_override: ::std::option::Option<crate::config::Builder>,
+}
+impl
+    crate::client::customize::internal::CustomizableSend<
+        crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+        crate::operation::update_usage_limits::UpdateUsageLimitsError,
+    > for UpdateUsageLimitsFluentBuilder
+{
+    fn send(
+        self,
+        config_override: crate::config::Builder,
+    ) -> crate::client::customize::internal::BoxFuture<
+        crate::client::customize::internal::SendResult<
+            crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+            crate::operation::update_usage_limits::UpdateUsageLimitsError,
+        >,
+    > {
+        ::std::boxed::Box::pin(async move { self.config_override(config_override).send().await })
+    }
+}
+impl UpdateUsageLimitsFluentBuilder {
+    /// Creates a new `UpdateUsageLimitsFluentBuilder`.
+    pub(crate) fn new(handle: ::std::sync::Arc<crate::client::Handle>) -> Self {
+        Self {
+            handle,
+            inner: ::std::default::Default::default(),
+            config_override: ::std::option::Option::None,
+        }
+    }
+
+    /// Access the UpdateUsageLimits as a reference.
+    pub fn as_input(&self) -> &crate::operation::update_usage_limits::builders::UpdateUsageLimitsInputBuilder {
+        &self.inner
+    }
+
+    /// Sends the request and returns the response.
+    ///
+    /// If an error occurs, an `SdkError` will be returned with additional details that
+    /// can be matched against.
+    ///
+    /// By default, any retryable failures will be retried twice. Retry behavior
+    /// is configurable with the [RetryConfig](aws_smithy_types::retry::RetryConfig), which can be
+    /// set when configuring the client.
+    pub async fn send(
+        self,
+    ) -> ::std::result::Result<
+        crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+        ::aws_smithy_runtime_api::client::result::SdkError<
+            crate::operation::update_usage_limits::UpdateUsageLimitsError,
+            ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
+        >,
+    > {
+        let input = self
+            .inner
+            .build()
+            .map_err(::aws_smithy_runtime_api::client::result::SdkError::construction_failure)?;
+        let runtime_plugins = crate::operation::update_usage_limits::UpdateUsageLimits::operation_runtime_plugins(
+            self.handle.runtime_plugins.clone(),
+            &self.handle.conf,
+            self.config_override,
+        );
+        crate::operation::update_usage_limits::UpdateUsageLimits::orchestrate(&runtime_plugins, input).await
+    }
+
+    /// Consumes this builder, creating a customizable operation that can be modified before being
+    /// sent.
+    pub fn customize(
+        self,
+    ) -> crate::client::customize::CustomizableOperation<
+        crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+        crate::operation::update_usage_limits::UpdateUsageLimitsError,
+        Self,
+    > {
+        crate::client::customize::CustomizableOperation::new(self)
+    }
+
+    pub(crate) fn config_override(
+        mut self,
+        config_override: impl ::std::convert::Into<crate::config::Builder>,
+    ) -> Self {
+        self.set_config_override(::std::option::Option::Some(config_override.into()));
+        self
+    }
+
+    pub(crate) fn set_config_override(
+        &mut self,
+        config_override: ::std::option::Option<crate::config::Builder>,
+    ) -> &mut Self {
+        self.config_override = config_override;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn account_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.account_id(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_account_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_account_id(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_account_id(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_account_id()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn accountless_user_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.accountless_user_id(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_accountless_user_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_accountless_user_id(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_accountless_user_id(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_accountless_user_id()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn feature_type(mut self, input: crate::types::UsageLimitType) -> Self {
+        self.inner = self.inner.feature_type(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_feature_type(mut self, input: ::std::option::Option<crate::types::UsageLimitType>) -> Self {
+        self.inner = self.inner.set_feature_type(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_feature_type(&self) -> &::std::option::Option<crate::types::UsageLimitType> {
+        self.inner.get_feature_type()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn requested_limit(mut self, input: i64) -> Self {
+        self.inner = self.inner.requested_limit(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_requested_limit(mut self, input: ::std::option::Option<i64>) -> Self {
+        self.inner = self.inner.set_requested_limit(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_requested_limit(&self) -> &::std::option::Option<i64> {
+        self.inner.get_requested_limit()
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn justification(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.justification(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_justification(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_justification(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_justification(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_justification()
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde.rs b/crates/amzn-codewhisperer-client/src/protocol_serde.rs
index 636c2ddec4..242a9c318e 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde.rs
@@ -30,6 +30,8 @@ pub fn parse_http_error_metadata(
 
 pub(crate) mod shape_create_artifact_upload_url;
 
+pub(crate) mod shape_create_subscription_token;
+
 pub(crate) mod shape_create_task_assist_conversation;
 
 pub(crate) mod shape_create_upload_url;
@@ -58,6 +60,8 @@ pub(crate) mod shape_get_transformation;
 
 pub(crate) mod shape_get_transformation_plan;
 
+pub(crate) mod shape_get_usage_limits;
+
 pub(crate) mod shape_list_available_customizations;
 
 pub(crate) mod shape_list_available_profiles;
@@ -90,6 +94,8 @@ pub(crate) mod shape_start_transformation;
 
 pub(crate) mod shape_stop_transformation;
 
+pub(crate) mod shape_update_usage_limits;
+
 pub(crate) fn or_empty_doc(data: &[u8]) -> &[u8] {
     if data.is_empty() { b"{}" } else { data }
 }
@@ -100,6 +106,8 @@ pub(crate) mod shape_conflict_exception;
 
 pub(crate) mod shape_create_artifact_upload_url_input;
 
+pub(crate) mod shape_create_subscription_token_input;
+
 pub(crate) mod shape_create_task_assist_conversation_input;
 
 pub(crate) mod shape_create_upload_url_input;
@@ -128,6 +136,8 @@ pub(crate) mod shape_get_transformation_input;
 
 pub(crate) mod shape_get_transformation_plan_input;
 
+pub(crate) mod shape_get_usage_limits_input;
+
 pub(crate) mod shape_internal_server_exception;
 
 pub(crate) mod shape_list_available_customizations_input;
@@ -168,6 +178,10 @@ pub(crate) mod shape_stop_transformation_input;
 
 pub(crate) mod shape_throttling_exception;
 
+pub(crate) mod shape_update_usage_limit_quota_exceeded_exception;
+
+pub(crate) mod shape_update_usage_limits_input;
+
 pub(crate) mod shape_validation_exception;
 
 pub(crate) mod shape_code_generation_status;
@@ -224,6 +238,8 @@ pub(crate) mod shape_transformation_spec;
 
 pub(crate) mod shape_upload_context;
 
+pub(crate) mod shape_usage_limits;
+
 pub(crate) mod shape_user_context;
 
 pub(crate) mod shape_workspace_list;
@@ -318,6 +334,8 @@ pub(crate) mod shape_transformation_steps;
 
 pub(crate) mod shape_transformation_upload_context;
 
+pub(crate) mod shape_usage_limit_list;
+
 pub(crate) mod shape_user_modification_event;
 
 pub(crate) mod shape_user_trigger_decision_event;
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_chat_add_message_event.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_chat_add_message_event.rs
index 8e975642d5..277752c058 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_chat_add_message_event.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_chat_add_message_event.rs
@@ -75,5 +75,8 @@ pub fn ser_chat_add_message_event(
     if let Some(var_15) = &input.has_project_level_context {
         object.key("hasProjectLevelContext").boolean(*var_15);
     }
+    if let Some(var_16) = &input.result {
+        object.key("result").string(var_16.as_str());
+    }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_code_coverage_event.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_code_coverage_event.rs
index 79b0dae06f..7585592779 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_code_coverage_event.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_code_coverage_event.rs
@@ -62,5 +62,11 @@ pub fn ser_code_coverage_event(
             ::aws_smithy_types::Number::NegInt((input.user_written_code_line_count).into()),
         );
     }
+    if input.added_character_count != 0 {
+        object.key("addedCharacterCount").number(
+            #[allow(clippy::useless_conversion)]
+            ::aws_smithy_types::Number::NegInt((input.added_character_count).into()),
+        );
+    }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_create_subscription_token.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_create_subscription_token.rs
new file mode 100644
index 0000000000..07ff020aad
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_create_subscription_token.rs
@@ -0,0 +1,221 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(clippy::unnecessary_wraps)]
+pub fn de_create_subscription_token_http_error(
+    _response_status: u16,
+    _response_headers: &::aws_smithy_runtime_api::http::Headers,
+    _response_body: &[u8],
+) -> std::result::Result<
+    crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+    crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+> {
+    #[allow(unused_mut)]
+    let mut generic_builder =
+        crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
+            .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?;
+    generic_builder = ::aws_types::request_id::apply_request_id(generic_builder, _response_headers);
+    let generic = generic_builder.build();
+    let error_code = match generic.code() {
+        Some(code) => code,
+        None => {
+            return Err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled(generic));
+        },
+    };
+
+    let _error_message = generic.message().map(|msg| msg.to_owned());
+    Err(match error_code {
+        "ValidationException" => {
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::ValidationError({
+                #[allow(unused_mut)]
+                let mut tmp = {
+                    #[allow(unused_mut)]
+                    let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
+                    output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(
+                        _response_body,
+                        output,
+                    )
+                    .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?;
+                    let output = output.meta(generic);
+                    crate::serde_util::validation_exception_correct_errors(output)
+                        .build()
+                        .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?
+                };
+                tmp
+            })
+        },
+        "AccessDeniedException" => {
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::AccessDeniedError({
+                #[allow(unused_mut)]
+                let mut tmp = {
+                    #[allow(unused_mut)]
+                    let mut output = crate::types::error::builders::AccessDeniedErrorBuilder::default();
+                    output = crate::protocol_serde::shape_access_denied_exception::de_access_denied_exception_json_err(
+                        _response_body,
+                        output,
+                    )
+                    .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?;
+                    let output = output.meta(generic);
+                    crate::serde_util::access_denied_exception_correct_errors(output)
+                        .build()
+                        .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?
+                };
+                tmp
+            })
+        },
+        "InternalServerException" => {
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::InternalServerError({
+                #[allow(unused_mut)]
+                let mut tmp = {
+                    #[allow(unused_mut)]
+                    let mut output = crate::types::error::builders::InternalServerErrorBuilder::default();
+                    output =
+                        crate::protocol_serde::shape_internal_server_exception::de_internal_server_exception_json_err(
+                            _response_body,
+                            output,
+                        )
+                        .map_err(
+                            crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled,
+                        )?;
+                    let output = output.meta(generic);
+                    crate::serde_util::internal_server_exception_correct_errors(output)
+                        .build()
+                        .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?
+                };
+                tmp
+            })
+        },
+        "ThrottlingException" => {
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::ThrottlingError({
+                #[allow(unused_mut)]
+                let mut tmp = {
+                    #[allow(unused_mut)]
+                    let mut output = crate::types::error::builders::ThrottlingErrorBuilder::default();
+                    output = crate::protocol_serde::shape_throttling_exception::de_throttling_exception_json_err(
+                        _response_body,
+                        output,
+                    )
+                    .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?;
+                    let output = output.meta(generic);
+                    crate::serde_util::throttling_exception_correct_errors(output)
+                        .build()
+                        .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?
+                };
+                tmp
+            })
+        },
+        "ConflictException" => {
+            crate::operation::create_subscription_token::CreateSubscriptionTokenError::ConflictError({
+                #[allow(unused_mut)]
+                let mut tmp = {
+                    #[allow(unused_mut)]
+                    let mut output = crate::types::error::builders::ConflictErrorBuilder::default();
+                    output = crate::protocol_serde::shape_conflict_exception::de_conflict_exception_json_err(
+                        _response_body,
+                        output,
+                    )
+                    .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?;
+                    let output = output.meta(generic);
+                    crate::serde_util::conflict_exception_correct_errors(output)
+                        .build()
+                        .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?
+                };
+                tmp
+            })
+        },
+        _ => crate::operation::create_subscription_token::CreateSubscriptionTokenError::generic(generic),
+    })
+}
+
+#[allow(clippy::unnecessary_wraps)]
+pub fn de_create_subscription_token_http_response(
+    _response_status: u16,
+    _response_headers: &::aws_smithy_runtime_api::http::Headers,
+    _response_body: &[u8],
+) -> std::result::Result<
+    crate::operation::create_subscription_token::CreateSubscriptionTokenOutput,
+    crate::operation::create_subscription_token::CreateSubscriptionTokenError,
+> {
+    Ok({
+        #[allow(unused_mut)]
+        let mut output =
+            crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder::default();
+        output = crate::protocol_serde::shape_create_subscription_token::de_create_subscription_token(
+            _response_body,
+            output,
+        )
+        .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?;
+        output._set_request_id(::aws_types::request_id::RequestId::request_id(_response_headers).map(str::to_string));
+        crate::serde_util::create_subscription_token_output_output_correct_errors(output)
+            .build()
+            .map_err(crate::operation::create_subscription_token::CreateSubscriptionTokenError::unhandled)?
+    })
+}
+
+pub fn ser_create_subscription_token_input(
+    input: &crate::operation::create_subscription_token::CreateSubscriptionTokenInput,
+) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError>
+{
+    let mut out = String::new();
+    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
+    crate::protocol_serde::shape_create_subscription_token_input::ser_create_subscription_token_input_input(
+        &mut object,
+        input,
+    )?;
+    object.finish();
+    Ok(::aws_smithy_types::body::SdkBody::from(out))
+}
+
+pub(crate) fn de_create_subscription_token(
+    value: &[u8],
+    mut builder: crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder,
+) -> ::std::result::Result<
+    crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder,
+    ::aws_smithy_json::deserialize::error::DeserializeError,
+> {
+    let mut tokens_owned =
+        ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
+    let tokens = &mut tokens_owned;
+    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
+    loop {
+        match tokens.next().transpose()? {
+            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
+            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
+                "encodedVerificationUrl" => {
+                    builder = builder.set_encoded_verification_url(
+                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
+                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
+                            .transpose()?,
+                    );
+                },
+                "token" => {
+                    builder = builder.set_token(
+                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
+                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
+                            .transpose()?,
+                    );
+                },
+                "status" => {
+                    builder = builder.set_status(
+                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
+                            .map(|s| {
+                                s.to_unescaped()
+                                    .map(|u| crate::types::SubscriptionStatus::from(u.as_ref()))
+                            })
+                            .transpose()?,
+                    );
+                },
+                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
+            },
+            other => {
+                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+                    format!("expected object key or end object, found: {:?}", other),
+                ));
+            },
+        }
+    }
+    if tokens.next().is_some() {
+        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+            "found more JSON tokens after completing parsing",
+        ));
+    }
+    Ok(builder)
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_create_subscription_token_input.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_create_subscription_token_input.rs
new file mode 100644
index 0000000000..9405a71f0c
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_create_subscription_token_input.rs
@@ -0,0 +1,13 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub fn ser_create_subscription_token_input_input(
+    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
+    input: &crate::operation::create_subscription_token::CreateSubscriptionTokenInput,
+) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
+    if let Some(var_1) = &input.account_id {
+        object.key("accountId").string(var_1.as_str());
+    }
+    if let Some(var_2) = &input.client_token {
+        object.key("clientToken").string(var_2.as_str());
+    }
+    Ok(())
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_file_context.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_file_context.rs
index 0c003716d9..a23639986d 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_file_context.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_file_context.rs
@@ -12,14 +12,17 @@ pub fn ser_file_context(
     {
         object.key("filename").string(input.filename.as_str());
     }
+    if let Some(var_1) = &input.file_uri {
+        object.key("fileUri").string(var_1.as_str());
+    }
     {
         #[allow(unused_mut)]
-        let mut object_1 = object.key("programmingLanguage").start_object();
+        let mut object_2 = object.key("programmingLanguage").start_object();
         crate::protocol_serde::shape_programming_language::ser_programming_language(
-            &mut object_1,
+            &mut object_2,
             &input.programming_language,
         )?;
-        object_1.finish();
+        object_2.finish();
     }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_generate_completions.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_generate_completions.rs
index bfce3d2f87..d2a1682051 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_generate_completions.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_generate_completions.rs
@@ -158,6 +158,13 @@ pub(crate) fn de_generate_completions(
                             .transpose()?,
                     );
                 },
+                "modelId" => {
+                    builder = builder.set_model_id(
+                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
+                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
+                            .transpose()?,
+                    );
+                },
                 _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
             },
             other => {
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_generate_completions_input.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_generate_completions_input.rs
index e1090c5032..50fadacb94 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_generate_completions_input.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_generate_completions_input.rs
@@ -72,5 +72,8 @@ pub fn ser_generate_completions_input_input(
     if let Some(var_21) = &input.workspace_id {
         object.key("workspaceId").string(var_21.as_str());
     }
+    if let Some(var_22) = &input.model_id {
+        object.key("modelId").string(var_22.as_str());
+    }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_get_usage_limits.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_get_usage_limits.rs
new file mode 100644
index 0000000000..4577ae7829
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_get_usage_limits.rs
@@ -0,0 +1,172 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(clippy::unnecessary_wraps)]
+pub fn de_get_usage_limits_http_error(
+    _response_status: u16,
+    _response_headers: &::aws_smithy_runtime_api::http::Headers,
+    _response_body: &[u8],
+) -> std::result::Result<
+    crate::operation::get_usage_limits::GetUsageLimitsOutput,
+    crate::operation::get_usage_limits::GetUsageLimitsError,
+> {
+    #[allow(unused_mut)]
+    let mut generic_builder =
+        crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
+            .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?;
+    generic_builder = ::aws_types::request_id::apply_request_id(generic_builder, _response_headers);
+    let generic = generic_builder.build();
+    let error_code = match generic.code() {
+        Some(code) => code,
+        None => {
+            return Err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled(
+                generic,
+            ));
+        },
+    };
+
+    let _error_message = generic.message().map(|msg| msg.to_owned());
+    Err(match error_code {
+        "ValidationException" => crate::operation::get_usage_limits::GetUsageLimitsError::ValidationError({
+            #[allow(unused_mut)]
+            let mut tmp = {
+                #[allow(unused_mut)]
+                let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
+                output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(
+                    _response_body,
+                    output,
+                )
+                .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?;
+                let output = output.meta(generic);
+                crate::serde_util::validation_exception_correct_errors(output)
+                    .build()
+                    .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?
+            };
+            tmp
+        }),
+        "AccessDeniedException" => crate::operation::get_usage_limits::GetUsageLimitsError::AccessDeniedError({
+            #[allow(unused_mut)]
+            let mut tmp = {
+                #[allow(unused_mut)]
+                let mut output = crate::types::error::builders::AccessDeniedErrorBuilder::default();
+                output = crate::protocol_serde::shape_access_denied_exception::de_access_denied_exception_json_err(
+                    _response_body,
+                    output,
+                )
+                .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?;
+                let output = output.meta(generic);
+                crate::serde_util::access_denied_exception_correct_errors(output)
+                    .build()
+                    .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?
+            };
+            tmp
+        }),
+        "ThrottlingException" => crate::operation::get_usage_limits::GetUsageLimitsError::ThrottlingError({
+            #[allow(unused_mut)]
+            let mut tmp = {
+                #[allow(unused_mut)]
+                let mut output = crate::types::error::builders::ThrottlingErrorBuilder::default();
+                output = crate::protocol_serde::shape_throttling_exception::de_throttling_exception_json_err(
+                    _response_body,
+                    output,
+                )
+                .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?;
+                let output = output.meta(generic);
+                crate::serde_util::throttling_exception_correct_errors(output)
+                    .build()
+                    .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?
+            };
+            tmp
+        }),
+        "InternalServerException" => crate::operation::get_usage_limits::GetUsageLimitsError::InternalServerError({
+            #[allow(unused_mut)]
+            let mut tmp = {
+                #[allow(unused_mut)]
+                let mut output = crate::types::error::builders::InternalServerErrorBuilder::default();
+                output = crate::protocol_serde::shape_internal_server_exception::de_internal_server_exception_json_err(
+                    _response_body,
+                    output,
+                )
+                .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?;
+                let output = output.meta(generic);
+                crate::serde_util::internal_server_exception_correct_errors(output)
+                    .build()
+                    .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?
+            };
+            tmp
+        }),
+        _ => crate::operation::get_usage_limits::GetUsageLimitsError::generic(generic),
+    })
+}
+
+#[allow(clippy::unnecessary_wraps)]
+pub fn de_get_usage_limits_http_response(
+    _response_status: u16,
+    _response_headers: &::aws_smithy_runtime_api::http::Headers,
+    _response_body: &[u8],
+) -> std::result::Result<
+    crate::operation::get_usage_limits::GetUsageLimitsOutput,
+    crate::operation::get_usage_limits::GetUsageLimitsError,
+> {
+    Ok({
+        #[allow(unused_mut)]
+        let mut output = crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder::default();
+        output = crate::protocol_serde::shape_get_usage_limits::de_get_usage_limits(_response_body, output)
+            .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?;
+        output._set_request_id(::aws_types::request_id::RequestId::request_id(_response_headers).map(str::to_string));
+        crate::serde_util::get_usage_limits_output_output_correct_errors(output)
+            .build()
+            .map_err(crate::operation::get_usage_limits::GetUsageLimitsError::unhandled)?
+    })
+}
+
+pub fn ser_get_usage_limits_input(
+    input: &crate::operation::get_usage_limits::GetUsageLimitsInput,
+) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError>
+{
+    let mut out = String::new();
+    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
+    crate::protocol_serde::shape_get_usage_limits_input::ser_get_usage_limits_input_input(&mut object, input)?;
+    object.finish();
+    Ok(::aws_smithy_types::body::SdkBody::from(out))
+}
+
+pub(crate) fn de_get_usage_limits(
+    value: &[u8],
+    mut builder: crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder,
+) -> ::std::result::Result<
+    crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder,
+    ::aws_smithy_json::deserialize::error::DeserializeError,
+> {
+    let mut tokens_owned =
+        ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
+    let tokens = &mut tokens_owned;
+    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
+    loop {
+        match tokens.next().transpose()? {
+            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
+            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
+                "limits" => {
+                    builder = builder.set_limits(crate::protocol_serde::shape_usage_limits::de_usage_limits(tokens)?);
+                },
+                "daysUntilReset" => {
+                    builder = builder.set_days_until_reset(
+                        ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
+                            .map(i32::try_from)
+                            .transpose()?,
+                    );
+                },
+                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
+            },
+            other => {
+                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+                    format!("expected object key or end object, found: {:?}", other),
+                ));
+            },
+        }
+    }
+    if tokens.next().is_some() {
+        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+            "found more JSON tokens after completing parsing",
+        ));
+    }
+    Ok(builder)
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_get_usage_limits_input.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_get_usage_limits_input.rs
new file mode 100644
index 0000000000..5bfad8ca08
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_get_usage_limits_input.rs
@@ -0,0 +1,10 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub fn ser_get_usage_limits_input_input(
+    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
+    input: &crate::operation::get_usage_limits::GetUsageLimitsInput,
+) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
+    if let Some(var_1) = &input.profile_arn {
+        object.key("profileArn").string(var_1.as_str());
+    }
+    Ok(())
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_push_telemetry_event_input.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_push_telemetry_event_input.rs
index 56ffade93a..bb229db296 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_push_telemetry_event_input.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_push_telemetry_event_input.rs
@@ -6,16 +6,11 @@ pub fn ser_push_telemetry_event_input_input(
     if let Some(var_1) = &input.client_token {
         object.key("clientToken").string(var_1.as_str());
     }
-    if let Some(var_2) = &input.timestamp {
-        object
-            .key("timestamp")
-            .date_time(var_2, ::aws_smithy_types::date_time::Format::EpochSeconds)?;
+    if let Some(var_2) = &input.event_type {
+        object.key("eventType").string(var_2.as_str());
     }
-    if let Some(var_3) = &input.event_id {
-        object.key("eventId").string(var_3.as_str());
-    }
-    if let Some(var_4) = &input.event {
-        object.key("event").document(var_4);
+    if let Some(var_3) = &input.event {
+        object.key("event").document(var_3);
     }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_send_telemetry_event_input.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_send_telemetry_event_input.rs
index 8fd5a6a63a..dfa0de4ab6 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_send_telemetry_event_input.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_send_telemetry_event_input.rs
@@ -24,5 +24,8 @@ pub fn ser_send_telemetry_event_input_input(
     if let Some(var_7) = &input.profile_arn {
         object.key("profileArn").string(var_7.as_str());
     }
+    if let Some(var_8) = &input.model_id {
+        object.key("modelId").string(var_8.as_str());
+    }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limit_quota_exceeded_exception.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limit_quota_exceeded_exception.rs
new file mode 100644
index 0000000000..8eb78f94e8
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limit_quota_exceeded_exception.rs
@@ -0,0 +1,39 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub(crate) fn de_update_usage_limit_quota_exceeded_exception_json_err(
+    value: &[u8],
+    mut builder: crate::types::error::builders::UpdateUsageLimitQuotaExceededErrorBuilder,
+) -> ::std::result::Result<
+    crate::types::error::builders::UpdateUsageLimitQuotaExceededErrorBuilder,
+    ::aws_smithy_json::deserialize::error::DeserializeError,
+> {
+    let mut tokens_owned =
+        ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
+    let tokens = &mut tokens_owned;
+    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
+    loop {
+        match tokens.next().transpose()? {
+            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
+            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
+                "message" => {
+                    builder = builder.set_message(
+                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
+                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
+                            .transpose()?,
+                    );
+                },
+                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
+            },
+            other => {
+                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+                    format!("expected object key or end object, found: {:?}", other),
+                ));
+            },
+        }
+    }
+    if tokens.next().is_some() {
+        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+            "found more JSON tokens after completing parsing",
+        ));
+    }
+    Ok(builder)
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limits.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limits.rs
new file mode 100644
index 0000000000..3109f380c2
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limits.rs
@@ -0,0 +1,201 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(clippy::unnecessary_wraps)]
+pub fn de_update_usage_limits_http_error(
+    _response_status: u16,
+    _response_headers: &::aws_smithy_runtime_api::http::Headers,
+    _response_body: &[u8],
+) -> std::result::Result<
+    crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+    crate::operation::update_usage_limits::UpdateUsageLimitsError,
+> {
+    #[allow(unused_mut)]
+    let mut generic_builder =
+        crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
+            .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?;
+    generic_builder = ::aws_types::request_id::apply_request_id(generic_builder, _response_headers);
+    let generic = generic_builder.build();
+    let error_code = match generic.code() {
+        Some(code) => code,
+        None => return Err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled(generic)),
+    };
+
+    let _error_message = generic.message().map(|msg| msg.to_owned());
+    Err(match error_code {
+        "ValidationException" => crate::operation::update_usage_limits::UpdateUsageLimitsError::ValidationError({
+            #[allow(unused_mut)]
+            let mut tmp = {
+                #[allow(unused_mut)]
+                let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
+                output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(
+                    _response_body,
+                    output,
+                )
+                .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?;
+                let output = output.meta(generic);
+                crate::serde_util::validation_exception_correct_errors(output)
+                    .build()
+                    .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?
+            };
+            tmp
+        }),
+        "AccessDeniedException" => crate::operation::update_usage_limits::UpdateUsageLimitsError::AccessDeniedError({
+            #[allow(unused_mut)]
+            let mut tmp = {
+                #[allow(unused_mut)]
+                let mut output = crate::types::error::builders::AccessDeniedErrorBuilder::default();
+                output = crate::protocol_serde::shape_access_denied_exception::de_access_denied_exception_json_err(
+                    _response_body,
+                    output,
+                )
+                .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?;
+                let output = output.meta(generic);
+                crate::serde_util::access_denied_exception_correct_errors(output)
+                    .build()
+                    .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?
+            };
+            tmp
+        }),
+        "ThrottlingException" => crate::operation::update_usage_limits::UpdateUsageLimitsError::ThrottlingError({
+            #[allow(unused_mut)]
+            let mut tmp = {
+                #[allow(unused_mut)]
+                let mut output = crate::types::error::builders::ThrottlingErrorBuilder::default();
+                output = crate::protocol_serde::shape_throttling_exception::de_throttling_exception_json_err(
+                    _response_body,
+                    output,
+                )
+                .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?;
+                let output = output.meta(generic);
+                crate::serde_util::throttling_exception_correct_errors(output)
+                    .build()
+                    .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?
+            };
+            tmp
+        }),
+        "InternalServerException" => {
+            crate::operation::update_usage_limits::UpdateUsageLimitsError::InternalServerError({
+                #[allow(unused_mut)]
+                let mut tmp = {
+                    #[allow(unused_mut)]
+                    let mut output = crate::types::error::builders::InternalServerErrorBuilder::default();
+                    output =
+                        crate::protocol_serde::shape_internal_server_exception::de_internal_server_exception_json_err(
+                            _response_body,
+                            output,
+                        )
+                        .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?;
+                    let output = output.meta(generic);
+                    crate::serde_util::internal_server_exception_correct_errors(output)
+                        .build()
+                        .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?
+                };
+                tmp
+            })
+        },
+        "UpdateUsageLimitQuotaExceededException" => {
+            crate::operation::update_usage_limits::UpdateUsageLimitsError::UpdateUsageLimitQuotaExceededError({
+                #[allow(unused_mut)]
+                let mut tmp = {
+                    #[allow(unused_mut)]
+                    let mut output =
+                        crate::types::error::builders::UpdateUsageLimitQuotaExceededErrorBuilder::default();
+                    output = crate::protocol_serde::shape_update_usage_limit_quota_exceeded_exception::de_update_usage_limit_quota_exceeded_exception_json_err(_response_body, output).map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?;
+                    let output = output.meta(generic);
+                    crate::serde_util::update_usage_limit_quota_exceeded_exception_correct_errors(output)
+                        .build()
+                        .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?
+                };
+                tmp
+            })
+        },
+        _ => crate::operation::update_usage_limits::UpdateUsageLimitsError::generic(generic),
+    })
+}
+
+#[allow(clippy::unnecessary_wraps)]
+pub fn de_update_usage_limits_http_response(
+    _response_status: u16,
+    _response_headers: &::aws_smithy_runtime_api::http::Headers,
+    _response_body: &[u8],
+) -> std::result::Result<
+    crate::operation::update_usage_limits::UpdateUsageLimitsOutput,
+    crate::operation::update_usage_limits::UpdateUsageLimitsError,
+> {
+    Ok({
+        #[allow(unused_mut)]
+        let mut output = crate::operation::update_usage_limits::builders::UpdateUsageLimitsOutputBuilder::default();
+        output = crate::protocol_serde::shape_update_usage_limits::de_update_usage_limits(_response_body, output)
+            .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?;
+        output._set_request_id(::aws_types::request_id::RequestId::request_id(_response_headers).map(str::to_string));
+        crate::serde_util::update_usage_limits_output_output_correct_errors(output)
+            .build()
+            .map_err(crate::operation::update_usage_limits::UpdateUsageLimitsError::unhandled)?
+    })
+}
+
+pub fn ser_update_usage_limits_input(
+    input: &crate::operation::update_usage_limits::UpdateUsageLimitsInput,
+) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError>
+{
+    let mut out = String::new();
+    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
+    crate::protocol_serde::shape_update_usage_limits_input::ser_update_usage_limits_input_input(&mut object, input)?;
+    object.finish();
+    Ok(::aws_smithy_types::body::SdkBody::from(out))
+}
+
+pub(crate) fn de_update_usage_limits(
+    value: &[u8],
+    mut builder: crate::operation::update_usage_limits::builders::UpdateUsageLimitsOutputBuilder,
+) -> ::std::result::Result<
+    crate::operation::update_usage_limits::builders::UpdateUsageLimitsOutputBuilder,
+    ::aws_smithy_json::deserialize::error::DeserializeError,
+> {
+    let mut tokens_owned =
+        ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
+    let tokens = &mut tokens_owned;
+    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
+    loop {
+        match tokens.next().transpose()? {
+            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
+            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
+                "status" => {
+                    builder = builder.set_status(
+                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
+                            .map(|s| {
+                                s.to_unescaped()
+                                    .map(|u| crate::types::UsageLimitUpdateRequestStatus::from(u.as_ref()))
+                            })
+                            .transpose()?,
+                    );
+                },
+                "approvedLimit" => {
+                    builder = builder.set_approved_limit(
+                        ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
+                            .map(i64::try_from)
+                            .transpose()?,
+                    );
+                },
+                "remainingRequestsThisMonth" => {
+                    builder = builder.set_remaining_requests_this_month(
+                        ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
+                            .map(i32::try_from)
+                            .transpose()?,
+                    );
+                },
+                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
+            },
+            other => {
+                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+                    format!("expected object key or end object, found: {:?}", other),
+                ));
+            },
+        }
+    }
+    if tokens.next().is_some() {
+        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+            "found more JSON tokens after completing parsing",
+        ));
+    }
+    Ok(builder)
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limits_input.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limits_input.rs
new file mode 100644
index 0000000000..90bcaf0cf8
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_update_usage_limits_input.rs
@@ -0,0 +1,25 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub fn ser_update_usage_limits_input_input(
+    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
+    input: &crate::operation::update_usage_limits::UpdateUsageLimitsInput,
+) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
+    if let Some(var_1) = &input.account_id {
+        object.key("accountId").string(var_1.as_str());
+    }
+    if let Some(var_2) = &input.accountless_user_id {
+        object.key("accountlessUserId").string(var_2.as_str());
+    }
+    if let Some(var_3) = &input.feature_type {
+        object.key("featureType").string(var_3.as_str());
+    }
+    if let Some(var_4) = &input.requested_limit {
+        object.key("requestedLimit").number(
+            #[allow(clippy::useless_conversion)]
+            ::aws_smithy_types::Number::NegInt((*var_4).into()),
+        );
+    }
+    if let Some(var_5) = &input.justification {
+        object.key("justification").string(var_5.as_str());
+    }
+    Ok(())
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_usage_limit_list.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_usage_limit_list.rs
new file mode 100644
index 0000000000..b56a446188
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_usage_limit_list.rs
@@ -0,0 +1,69 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub(crate) fn de_usage_limit_list<'a, I>(
+    tokens: &mut ::std::iter::Peekable<I>,
+) -> ::std::result::Result<Option<crate::types::UsageLimitList>, ::aws_smithy_json::deserialize::error::DeserializeError>
+where
+    I: Iterator<
+        Item = Result<
+            ::aws_smithy_json::deserialize::Token<'a>,
+            ::aws_smithy_json::deserialize::error::DeserializeError,
+        >,
+    >,
+{
+    match tokens.next().transpose()? {
+        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
+        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
+            #[allow(unused_mut)]
+            let mut builder = crate::types::builders::UsageLimitListBuilder::default();
+            loop {
+                match tokens.next().transpose()? {
+                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
+                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key
+                        .to_unescaped()?
+                        .as_ref()
+                    {
+                        "type" => {
+                            builder = builder.set_type(
+                                ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
+                                    .map(|s| s.to_unescaped().map(|u| crate::types::UsageLimitType::from(u.as_ref())))
+                                    .transpose()?,
+                            );
+                        },
+                        "value" => {
+                            builder = builder.set_value(
+                                ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
+                                    .map(i64::try_from)
+                                    .transpose()?,
+                            );
+                        },
+                        "percentUsed" => {
+                            builder = builder.set_percent_used(
+                                ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
+                                    .map(|v| v.to_f64_lossy()),
+                            );
+                        },
+                        _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
+                    },
+                    other => {
+                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+                            format!("expected object key or end object, found: {:?}", other),
+                        ));
+                    },
+                }
+            }
+            Ok(Some(
+                crate::serde_util::usage_limit_list_correct_errors(builder)
+                    .build()
+                    .map_err(|err| {
+                        ::aws_smithy_json::deserialize::error::DeserializeError::custom_source(
+                            "Response was invalid",
+                            err,
+                        )
+                    })?,
+            ))
+        },
+        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+            "expected start object or null",
+        )),
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_usage_limits.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_usage_limits.rs
new file mode 100644
index 0000000000..2b2ced49ad
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_usage_limits.rs
@@ -0,0 +1,40 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+pub(crate) fn de_usage_limits<'a, I>(
+    tokens: &mut ::std::iter::Peekable<I>,
+) -> ::std::result::Result<
+    Option<::std::vec::Vec<crate::types::UsageLimitList>>,
+    ::aws_smithy_json::deserialize::error::DeserializeError,
+>
+where
+    I: Iterator<
+        Item = Result<
+            ::aws_smithy_json::deserialize::Token<'a>,
+            ::aws_smithy_json::deserialize::error::DeserializeError,
+        >,
+    >,
+{
+    match tokens.next().transpose()? {
+        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
+        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
+            let mut items = Vec::new();
+            loop {
+                match tokens.peek() {
+                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
+                        tokens.next().transpose().unwrap();
+                        break;
+                    },
+                    _ => {
+                        let value = crate::protocol_serde::shape_usage_limit_list::de_usage_limit_list(tokens)?;
+                        if let Some(value) = value {
+                            items.push(value);
+                        }
+                    },
+                }
+            }
+            Ok(Some(items))
+        },
+        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
+            "expected start array or null",
+        )),
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_input_message.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_input_message.rs
index 716eb41329..2c43086677 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_input_message.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_input_message.rs
@@ -30,5 +30,8 @@ pub fn ser_user_input_message(
         }
         array_6.finish();
     }
+    if let Some(var_9) = &input.model_id {
+        object.key("modelId").string(var_9.as_str());
+    }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_modification_event.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_modification_event.rs
index 996c048212..413bfcd735 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_modification_event.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_modification_event.rs
@@ -44,5 +44,17 @@ pub fn ser_user_modification_event(
             ::aws_smithy_types::Number::NegInt((input.unmodified_accepted_character_count).into()),
         );
     }
+    if input.added_character_count != 0 {
+        object.key("addedCharacterCount").number(
+            #[allow(clippy::useless_conversion)]
+            ::aws_smithy_types::Number::NegInt((input.added_character_count).into()),
+        );
+    }
+    if input.unmodified_added_character_count != 0 {
+        object.key("unmodifiedAddedCharacterCount").number(
+            #[allow(clippy::useless_conversion)]
+            ::aws_smithy_types::Number::NegInt((input.unmodified_added_character_count).into()),
+        );
+    }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_trigger_decision_event.rs b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_trigger_decision_event.rs
index c178cd70fb..c542cb49d3 100644
--- a/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_trigger_decision_event.rs
+++ b/crates/amzn-codewhisperer-client/src/protocol_serde/shape_user_trigger_decision_event.rs
@@ -98,5 +98,23 @@ pub fn ser_user_trigger_decision_event(
         }
         array_10.finish();
     }
+    if input.added_character_count != 0 {
+        object.key("addedCharacterCount").number(
+            #[allow(clippy::useless_conversion)]
+            ::aws_smithy_types::Number::NegInt((input.added_character_count).into()),
+        );
+    }
+    if input.deleted_character_count != 0 {
+        object.key("deletedCharacterCount").number(
+            #[allow(clippy::useless_conversion)]
+            ::aws_smithy_types::Number::NegInt((input.deleted_character_count).into()),
+        );
+    }
+    if input.streak_length != 0 {
+        object.key("streakLength").number(
+            #[allow(clippy::useless_conversion)]
+            ::aws_smithy_types::Number::NegInt((input.streak_length).into()),
+        );
+    }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-client/src/serde_util.rs b/crates/amzn-codewhisperer-client/src/serde_util.rs
index ba8d542366..0b0e986067 100644
--- a/crates/amzn-codewhisperer-client/src/serde_util.rs
+++ b/crates/amzn-codewhisperer-client/src/serde_util.rs
@@ -47,6 +47,30 @@ pub(crate) fn create_artifact_upload_url_output_output_correct_errors(
     builder
 }
 
+pub(crate) fn conflict_exception_correct_errors(
+    mut builder: crate::types::error::builders::ConflictErrorBuilder,
+) -> crate::types::error::builders::ConflictErrorBuilder {
+    if builder.message.is_none() {
+        builder.message = Some(Default::default())
+    }
+    builder
+}
+
+pub(crate) fn create_subscription_token_output_output_correct_errors(
+    mut builder: crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder,
+) -> crate::operation::create_subscription_token::builders::CreateSubscriptionTokenOutputBuilder {
+    if builder.encoded_verification_url.is_none() {
+        builder.encoded_verification_url = Some(Default::default())
+    }
+    if builder.token.is_none() {
+        builder.token = Some(Default::default())
+    }
+    if builder.status.is_none() {
+        builder.status = "no value was set".parse::<crate::types::SubscriptionStatus>().ok()
+    }
+    builder
+}
+
 pub(crate) fn service_quota_exceeded_exception_correct_errors(
     mut builder: crate::types::error::builders::ServiceQuotaExceededErrorBuilder,
 ) -> crate::types::error::builders::ServiceQuotaExceededErrorBuilder {
@@ -74,15 +98,6 @@ pub(crate) fn resource_not_found_exception_correct_errors(
     builder
 }
 
-pub(crate) fn conflict_exception_correct_errors(
-    mut builder: crate::types::error::builders::ConflictErrorBuilder,
-) -> crate::types::error::builders::ConflictErrorBuilder {
-    if builder.message.is_none() {
-        builder.message = Some(Default::default())
-    }
-    builder
-}
-
 pub(crate) fn create_upload_url_output_output_correct_errors(
     mut builder: crate::operation::create_upload_url::builders::CreateUploadUrlOutputBuilder,
 ) -> crate::operation::create_upload_url::builders::CreateUploadUrlOutputBuilder {
@@ -182,6 +197,18 @@ pub(crate) fn get_transformation_plan_output_output_correct_errors(
     builder
 }
 
+pub(crate) fn get_usage_limits_output_output_correct_errors(
+    mut builder: crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder,
+) -> crate::operation::get_usage_limits::builders::GetUsageLimitsOutputBuilder {
+    if builder.limits.is_none() {
+        builder.limits = Some(Default::default())
+    }
+    if builder.days_until_reset.is_none() {
+        builder.days_until_reset = Some(Default::default())
+    }
+    builder
+}
+
 pub(crate) fn list_available_customizations_output_output_correct_errors(
     mut builder: crate::operation::list_available_customizations::builders::ListAvailableCustomizationsOutputBuilder,
 ) -> crate::operation::list_available_customizations::builders::ListAvailableCustomizationsOutputBuilder {
@@ -299,6 +326,26 @@ pub(crate) fn stop_transformation_output_output_correct_errors(
     builder
 }
 
+pub(crate) fn update_usage_limit_quota_exceeded_exception_correct_errors(
+    mut builder: crate::types::error::builders::UpdateUsageLimitQuotaExceededErrorBuilder,
+) -> crate::types::error::builders::UpdateUsageLimitQuotaExceededErrorBuilder {
+    if builder.message.is_none() {
+        builder.message = Some(Default::default())
+    }
+    builder
+}
+
+pub(crate) fn update_usage_limits_output_output_correct_errors(
+    mut builder: crate::operation::update_usage_limits::builders::UpdateUsageLimitsOutputBuilder,
+) -> crate::operation::update_usage_limits::builders::UpdateUsageLimitsOutputBuilder {
+    if builder.status.is_none() {
+        builder.status = "no value was set"
+            .parse::<crate::types::UsageLimitUpdateRequestStatus>()
+            .ok()
+    }
+    builder
+}
+
 pub(crate) fn memory_entry_correct_errors(
     mut builder: crate::types::builders::MemoryEntryBuilder,
 ) -> crate::types::builders::MemoryEntryBuilder {
@@ -455,6 +502,18 @@ pub(crate) fn profile_correct_errors(
     builder
 }
 
+pub(crate) fn usage_limit_list_correct_errors(
+    mut builder: crate::types::builders::UsageLimitListBuilder,
+) -> crate::types::builders::UsageLimitListBuilder {
+    if builder.r#type.is_none() {
+        builder.r#type = "no value was set".parse::<crate::types::UsageLimitType>().ok()
+    }
+    if builder.value.is_none() {
+        builder.value = Some(Default::default())
+    }
+    builder
+}
+
 pub(crate) fn edit_correct_errors(
     mut builder: crate::types::builders::EditBuilder,
 ) -> crate::types::builders::EditBuilder {
diff --git a/crates/amzn-codewhisperer-client/src/types.rs b/crates/amzn-codewhisperer-client/src/types.rs
index 4627b4ad1c..ecb237d805 100644
--- a/crates/amzn-codewhisperer-client/src/types.rs
+++ b/crates/amzn-codewhisperer-client/src/types.rs
@@ -1,6 +1,7 @@
 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub use crate::types::_access_denied_exception_reason::AccessDeniedExceptionReason;
 pub use crate::types::_additional_content_entry::AdditionalContentEntry;
+pub use crate::types::_agentic_chat_event_status::AgenticChatEventStatus;
 pub use crate::types::_app_studio_state::AppStudioState;
 pub use crate::types::_application_properties::ApplicationProperties;
 pub use crate::types::_artifact_type::ArtifactType;
@@ -118,6 +119,7 @@ pub use crate::types::_shell_history_entry::ShellHistoryEntry;
 pub use crate::types::_shell_state::ShellState;
 pub use crate::types::_span::Span;
 pub use crate::types::_sso_identity_details::SsoIdentityDetails;
+pub use crate::types::_subscription_status::SubscriptionStatus;
 pub use crate::types::_suggested_fix::SuggestedFix;
 pub use crate::types::_suggestion_state::SuggestionState;
 pub use crate::types::_supplemental_context::SupplementalContext;
@@ -173,6 +175,9 @@ pub use crate::types::_transformation_upload_context::TransformationUploadContex
 pub use crate::types::_transformation_user_action_status::TransformationUserActionStatus;
 pub use crate::types::_upload_context::UploadContext;
 pub use crate::types::_upload_intent::UploadIntent;
+pub use crate::types::_usage_limit_list::UsageLimitList;
+pub use crate::types::_usage_limit_type::UsageLimitType;
+pub use crate::types::_usage_limit_update_request_status::UsageLimitUpdateRequestStatus;
 pub use crate::types::_user_context::UserContext;
 pub use crate::types::_user_input_message::UserInputMessage;
 pub use crate::types::_user_input_message_context::UserInputMessageContext;
@@ -191,6 +196,8 @@ mod _access_denied_exception_reason;
 
 mod _additional_content_entry;
 
+mod _agentic_chat_event_status;
+
 mod _app_studio_state;
 
 mod _application_properties;
@@ -425,6 +432,8 @@ mod _span;
 
 mod _sso_identity_details;
 
+mod _subscription_status;
+
 mod _suggested_fix;
 
 mod _suggestion_state;
@@ -535,6 +544,12 @@ mod _upload_context;
 
 mod _upload_intent;
 
+mod _usage_limit_list;
+
+mod _usage_limit_type;
+
+mod _usage_limit_update_request_status;
+
 mod _user_context;
 
 mod _user_input_message;
diff --git a/crates/amzn-codewhisperer-client/src/types/_agentic_chat_event_status.rs b/crates/amzn-codewhisperer-client/src/types/_agentic_chat_event_status.rs
new file mode 100644
index 0000000000..3efa4ef363
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/types/_agentic_chat_event_status.rs
@@ -0,0 +1,124 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+
+/// When writing a match expression against `AgenticChatEventStatus`, it is important to ensure
+/// your code is forward-compatible. That is, if a match arm handles a case for a
+/// feature that is supported by the service but has not been represented as an enum
+/// variant in a current version of SDK, your code should continue to work when you
+/// upgrade SDK to a future version in which the enum does include a variant for that
+/// feature.
+///
+/// Here is an example of how you can make a match expression forward-compatible:
+///
+/// ```text
+/// # let agenticchateventstatus = unimplemented!();
+/// match agenticchateventstatus {
+///     AgenticChatEventStatus::Cancelled => { /* ... */ },
+///     AgenticChatEventStatus::Failed => { /* ... */ },
+///     AgenticChatEventStatus::Succeeded => { /* ... */ },
+///     other @ _ if other.as_str() == "NewFeature" => { /* handles a case for `NewFeature` */ },
+///     _ => { /* ... */ },
+/// }
+/// ```
+/// The above code demonstrates that when `agenticchateventstatus` represents
+/// `NewFeature`, the execution path will lead to the second last match arm,
+/// even though the enum does not contain a variant `AgenticChatEventStatus::NewFeature`
+/// in the current version of SDK. The reason is that the variable `other`,
+/// created by the `@` operator, is bound to
+/// `AgenticChatEventStatus::Unknown(UnknownVariantValue("NewFeature".to_owned()))`
+/// and calling `as_str` on it yields `"NewFeature"`.
+/// This match expression is forward-compatible when executed with a newer
+/// version of SDK where the variant `AgenticChatEventStatus::NewFeature` is defined.
+/// Specifically, when `agenticchateventstatus` represents `NewFeature`,
+/// the execution path will hit the second last match arm as before by virtue of
+/// calling `as_str` on `AgenticChatEventStatus::NewFeature` also yielding `"NewFeature"`.
+///
+/// Explicitly matching on the `Unknown` variant should
+/// be avoided for two reasons:
+/// - The inner data `UnknownVariantValue` is opaque, and no further information can be extracted.
+/// - It might inadvertently shadow other intended match arms.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(
+    ::std::clone::Clone,
+    ::std::cmp::Eq,
+    ::std::cmp::Ord,
+    ::std::cmp::PartialEq,
+    ::std::cmp::PartialOrd,
+    ::std::fmt::Debug,
+    ::std::hash::Hash,
+)]
+pub enum AgenticChatEventStatus {
+    #[allow(missing_docs)] // documentation missing in model
+    Cancelled,
+    #[allow(missing_docs)] // documentation missing in model
+    Failed,
+    #[allow(missing_docs)] // documentation missing in model
+    Succeeded,
+    /// `Unknown` contains new variants that have been added since this code was generated.
+    #[deprecated(
+        note = "Don't directly match on `Unknown`. See the docs on this enum for the correct way to handle unknown variants."
+    )]
+    Unknown(crate::primitives::sealed_enum_unknown::UnknownVariantValue),
+}
+impl ::std::convert::From<&str> for AgenticChatEventStatus {
+    fn from(s: &str) -> Self {
+        match s {
+            "CANCELLED" => AgenticChatEventStatus::Cancelled,
+            "FAILED" => AgenticChatEventStatus::Failed,
+            "SUCCEEDED" => AgenticChatEventStatus::Succeeded,
+            other => AgenticChatEventStatus::Unknown(crate::primitives::sealed_enum_unknown::UnknownVariantValue(
+                other.to_owned(),
+            )),
+        }
+    }
+}
+impl ::std::str::FromStr for AgenticChatEventStatus {
+    type Err = ::std::convert::Infallible;
+
+    fn from_str(s: &str) -> ::std::result::Result<Self, <Self as ::std::str::FromStr>::Err> {
+        ::std::result::Result::Ok(AgenticChatEventStatus::from(s))
+    }
+}
+impl AgenticChatEventStatus {
+    /// Returns the `&str` value of the enum member.
+    pub fn as_str(&self) -> &str {
+        match self {
+            AgenticChatEventStatus::Cancelled => "CANCELLED",
+            AgenticChatEventStatus::Failed => "FAILED",
+            AgenticChatEventStatus::Succeeded => "SUCCEEDED",
+            AgenticChatEventStatus::Unknown(value) => value.as_str(),
+        }
+    }
+
+    /// Returns all the `&str` representations of the enum members.
+    pub const fn values() -> &'static [&'static str] {
+        &["CANCELLED", "FAILED", "SUCCEEDED"]
+    }
+}
+impl ::std::convert::AsRef<str> for AgenticChatEventStatus {
+    fn as_ref(&self) -> &str {
+        self.as_str()
+    }
+}
+impl AgenticChatEventStatus {
+    /// Parses the enum value while disallowing unknown variants.
+    ///
+    /// Unknown variants will result in an error.
+    pub fn try_parse(value: &str) -> ::std::result::Result<Self, crate::error::UnknownVariantError> {
+        match Self::from(value) {
+            #[allow(deprecated)]
+            Self::Unknown(_) => ::std::result::Result::Err(crate::error::UnknownVariantError::new(value)),
+            known => Ok(known),
+        }
+    }
+}
+impl ::std::fmt::Display for AgenticChatEventStatus {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        match self {
+            AgenticChatEventStatus::Cancelled => write!(f, "CANCELLED"),
+            AgenticChatEventStatus::Failed => write!(f, "FAILED"),
+            AgenticChatEventStatus::Succeeded => write!(f, "SUCCEEDED"),
+            AgenticChatEventStatus::Unknown(value) => write!(f, "{}", value),
+        }
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/types/_chat_add_message_event.rs b/crates/amzn-codewhisperer-client/src/types/_chat_add_message_event.rs
index 8c1de4c404..1a9c6328b7 100644
--- a/crates/amzn-codewhisperer-client/src/types/_chat_add_message_event.rs
+++ b/crates/amzn-codewhisperer-client/src/types/_chat_add_message_event.rs
@@ -31,6 +31,8 @@ pub struct ChatAddMessageEvent {
     pub number_of_code_blocks: ::std::option::Option<i32>,
     #[allow(missing_docs)] // documentation missing in model
     pub has_project_level_context: ::std::option::Option<bool>,
+    #[allow(missing_docs)] // documentation missing in model
+    pub result: ::std::option::Option<crate::types::AgenticChatEventStatus>,
 }
 impl ChatAddMessageEvent {
     /// ID which represents a multi-turn conversation
@@ -106,6 +108,11 @@ impl ChatAddMessageEvent {
     pub fn has_project_level_context(&self) -> ::std::option::Option<bool> {
         self.has_project_level_context
     }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn result(&self) -> ::std::option::Option<&crate::types::AgenticChatEventStatus> {
+        self.result.as_ref()
+    }
 }
 impl ChatAddMessageEvent {
     /// Creates a new builder-style object to manufacture
@@ -133,6 +140,7 @@ pub struct ChatAddMessageEventBuilder {
     pub(crate) response_length: ::std::option::Option<i32>,
     pub(crate) number_of_code_blocks: ::std::option::Option<i32>,
     pub(crate) has_project_level_context: ::std::option::Option<bool>,
+    pub(crate) result: ::std::option::Option<crate::types::AgenticChatEventStatus>,
 }
 impl ChatAddMessageEventBuilder {
     /// ID which represents a multi-turn conversation
@@ -380,6 +388,23 @@ impl ChatAddMessageEventBuilder {
         &self.has_project_level_context
     }
 
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn result(mut self, input: crate::types::AgenticChatEventStatus) -> Self {
+        self.result = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_result(mut self, input: ::std::option::Option<crate::types::AgenticChatEventStatus>) -> Self {
+        self.result = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_result(&self) -> &::std::option::Option<crate::types::AgenticChatEventStatus> {
+        &self.result
+    }
+
     /// Consumes the builder and constructs a
     /// [`ChatAddMessageEvent`](crate::types::ChatAddMessageEvent). This method will fail if any
     /// of the following fields are not set:
@@ -414,6 +439,7 @@ impl ChatAddMessageEventBuilder {
             response_length: self.response_length,
             number_of_code_blocks: self.number_of_code_blocks,
             has_project_level_context: self.has_project_level_context,
+            result: self.result,
         })
     }
 }
diff --git a/crates/amzn-codewhisperer-client/src/types/_code_coverage_event.rs b/crates/amzn-codewhisperer-client/src/types/_code_coverage_event.rs
index 5631be3c85..6070986435 100644
--- a/crates/amzn-codewhisperer-client/src/types/_code_coverage_event.rs
+++ b/crates/amzn-codewhisperer-client/src/types/_code_coverage_event.rs
@@ -23,6 +23,8 @@ pub struct CodeCoverageEvent {
     pub user_written_code_character_count: i32,
     #[allow(missing_docs)] // documentation missing in model
     pub user_written_code_line_count: i32,
+    #[allow(missing_docs)] // documentation missing in model
+    pub added_character_count: i32,
 }
 impl CodeCoverageEvent {
     #[allow(missing_docs)] // documentation missing in model
@@ -74,6 +76,11 @@ impl CodeCoverageEvent {
     pub fn user_written_code_line_count(&self) -> i32 {
         self.user_written_code_line_count
     }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn added_character_count(&self) -> i32 {
+        self.added_character_count
+    }
 }
 impl CodeCoverageEvent {
     /// Creates a new builder-style object to manufacture
@@ -97,6 +104,7 @@ pub struct CodeCoverageEventBuilder {
     pub(crate) total_new_code_line_count: ::std::option::Option<i32>,
     pub(crate) user_written_code_character_count: ::std::option::Option<i32>,
     pub(crate) user_written_code_line_count: ::std::option::Option<i32>,
+    pub(crate) added_character_count: ::std::option::Option<i32>,
 }
 impl CodeCoverageEventBuilder {
     #[allow(missing_docs)] // documentation missing in model
@@ -273,6 +281,23 @@ impl CodeCoverageEventBuilder {
         &self.user_written_code_line_count
     }
 
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn added_character_count(mut self, input: i32) -> Self {
+        self.added_character_count = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_added_character_count(mut self, input: ::std::option::Option<i32>) -> Self {
+        self.added_character_count = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_added_character_count(&self) -> &::std::option::Option<i32> {
+        &self.added_character_count
+    }
+
     /// Consumes the builder and constructs a
     /// [`CodeCoverageEvent`](crate::types::CodeCoverageEvent). This method will fail if any of
     /// the following fields are not set:
@@ -302,6 +327,7 @@ impl CodeCoverageEventBuilder {
             total_new_code_line_count: self.total_new_code_line_count.unwrap_or_default(),
             user_written_code_character_count: self.user_written_code_character_count.unwrap_or_default(),
             user_written_code_line_count: self.user_written_code_line_count.unwrap_or_default(),
+            added_character_count: self.added_character_count.unwrap_or_default(),
         })
     }
 }
diff --git a/crates/amzn-codewhisperer-client/src/types/_file_context.rs b/crates/amzn-codewhisperer-client/src/types/_file_context.rs
index 201823112b..58d682d8df 100644
--- a/crates/amzn-codewhisperer-client/src/types/_file_context.rs
+++ b/crates/amzn-codewhisperer-client/src/types/_file_context.rs
@@ -9,6 +9,8 @@ pub struct FileContext {
     pub right_file_content: ::std::string::String,
     #[allow(missing_docs)] // documentation missing in model
     pub filename: ::std::string::String,
+    #[allow(missing_docs)] // documentation missing in model
+    pub file_uri: ::std::option::Option<::std::string::String>,
     /// Programming Languages supported by CodeWhisperer
     pub programming_language: crate::types::ProgrammingLanguage,
 }
@@ -31,6 +33,11 @@ impl FileContext {
         self.filename.deref()
     }
 
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn file_uri(&self) -> ::std::option::Option<&str> {
+        self.file_uri.as_deref()
+    }
+
     /// Programming Languages supported by CodeWhisperer
     pub fn programming_language(&self) -> &crate::types::ProgrammingLanguage {
         &self.programming_language
@@ -42,6 +49,7 @@ impl ::std::fmt::Debug for FileContext {
         formatter.field("left_file_content", &"*** Sensitive Data Redacted ***");
         formatter.field("right_file_content", &"*** Sensitive Data Redacted ***");
         formatter.field("filename", &"*** Sensitive Data Redacted ***");
+        formatter.field("file_uri", &"*** Sensitive Data Redacted ***");
         formatter.field("programming_language", &self.programming_language);
         formatter.finish()
     }
@@ -61,6 +69,7 @@ pub struct FileContextBuilder {
     pub(crate) left_file_content: ::std::option::Option<::std::string::String>,
     pub(crate) right_file_content: ::std::option::Option<::std::string::String>,
     pub(crate) filename: ::std::option::Option<::std::string::String>,
+    pub(crate) file_uri: ::std::option::Option<::std::string::String>,
     pub(crate) programming_language: ::std::option::Option<crate::types::ProgrammingLanguage>,
 }
 impl FileContextBuilder {
@@ -118,6 +127,23 @@ impl FileContextBuilder {
         &self.filename
     }
 
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn file_uri(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.file_uri = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_file_uri(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.file_uri = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_file_uri(&self) -> &::std::option::Option<::std::string::String> {
+        &self.file_uri
+    }
+
     /// Programming Languages supported by CodeWhisperer
     /// This field is required.
     pub fn programming_language(mut self, input: crate::types::ProgrammingLanguage) -> Self {
@@ -164,6 +190,7 @@ impl FileContextBuilder {
                     "filename was not specified but it is required when building FileContext",
                 )
             })?,
+            file_uri: self.file_uri,
             programming_language: self.programming_language.ok_or_else(|| {
                 ::aws_smithy_types::error::operation::BuildError::missing_field(
                     "programming_language",
@@ -179,6 +206,7 @@ impl ::std::fmt::Debug for FileContextBuilder {
         formatter.field("left_file_content", &"*** Sensitive Data Redacted ***");
         formatter.field("right_file_content", &"*** Sensitive Data Redacted ***");
         formatter.field("filename", &"*** Sensitive Data Redacted ***");
+        formatter.field("file_uri", &"*** Sensitive Data Redacted ***");
         formatter.field("programming_language", &self.programming_language);
         formatter.finish()
     }
diff --git a/crates/amzn-codewhisperer-client/src/types/_subscription_status.rs b/crates/amzn-codewhisperer-client/src/types/_subscription_status.rs
new file mode 100644
index 0000000000..d30080d047
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/types/_subscription_status.rs
@@ -0,0 +1,118 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+
+/// When writing a match expression against `SubscriptionStatus`, it is important to ensure
+/// your code is forward-compatible. That is, if a match arm handles a case for a
+/// feature that is supported by the service but has not been represented as an enum
+/// variant in a current version of SDK, your code should continue to work when you
+/// upgrade SDK to a future version in which the enum does include a variant for that
+/// feature.
+///
+/// Here is an example of how you can make a match expression forward-compatible:
+///
+/// ```text
+/// # let subscriptionstatus = unimplemented!();
+/// match subscriptionstatus {
+///     SubscriptionStatus::Active => { /* ... */ },
+///     SubscriptionStatus::Inactive => { /* ... */ },
+///     other @ _ if other.as_str() == "NewFeature" => { /* handles a case for `NewFeature` */ },
+///     _ => { /* ... */ },
+/// }
+/// ```
+/// The above code demonstrates that when `subscriptionstatus` represents
+/// `NewFeature`, the execution path will lead to the second last match arm,
+/// even though the enum does not contain a variant `SubscriptionStatus::NewFeature`
+/// in the current version of SDK. The reason is that the variable `other`,
+/// created by the `@` operator, is bound to
+/// `SubscriptionStatus::Unknown(UnknownVariantValue("NewFeature".to_owned()))`
+/// and calling `as_str` on it yields `"NewFeature"`.
+/// This match expression is forward-compatible when executed with a newer
+/// version of SDK where the variant `SubscriptionStatus::NewFeature` is defined.
+/// Specifically, when `subscriptionstatus` represents `NewFeature`,
+/// the execution path will hit the second last match arm as before by virtue of
+/// calling `as_str` on `SubscriptionStatus::NewFeature` also yielding `"NewFeature"`.
+///
+/// Explicitly matching on the `Unknown` variant should
+/// be avoided for two reasons:
+/// - The inner data `UnknownVariantValue` is opaque, and no further information can be extracted.
+/// - It might inadvertently shadow other intended match arms.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(
+    ::std::clone::Clone,
+    ::std::cmp::Eq,
+    ::std::cmp::Ord,
+    ::std::cmp::PartialEq,
+    ::std::cmp::PartialOrd,
+    ::std::fmt::Debug,
+    ::std::hash::Hash,
+)]
+pub enum SubscriptionStatus {
+    #[allow(missing_docs)] // documentation missing in model
+    Active,
+    #[allow(missing_docs)] // documentation missing in model
+    Inactive,
+    /// `Unknown` contains new variants that have been added since this code was generated.
+    #[deprecated(
+        note = "Don't directly match on `Unknown`. See the docs on this enum for the correct way to handle unknown variants."
+    )]
+    Unknown(crate::primitives::sealed_enum_unknown::UnknownVariantValue),
+}
+impl ::std::convert::From<&str> for SubscriptionStatus {
+    fn from(s: &str) -> Self {
+        match s {
+            "ACTIVE" => SubscriptionStatus::Active,
+            "INACTIVE" => SubscriptionStatus::Inactive,
+            other => SubscriptionStatus::Unknown(crate::primitives::sealed_enum_unknown::UnknownVariantValue(
+                other.to_owned(),
+            )),
+        }
+    }
+}
+impl ::std::str::FromStr for SubscriptionStatus {
+    type Err = ::std::convert::Infallible;
+
+    fn from_str(s: &str) -> ::std::result::Result<Self, <Self as ::std::str::FromStr>::Err> {
+        ::std::result::Result::Ok(SubscriptionStatus::from(s))
+    }
+}
+impl SubscriptionStatus {
+    /// Returns the `&str` value of the enum member.
+    pub fn as_str(&self) -> &str {
+        match self {
+            SubscriptionStatus::Active => "ACTIVE",
+            SubscriptionStatus::Inactive => "INACTIVE",
+            SubscriptionStatus::Unknown(value) => value.as_str(),
+        }
+    }
+
+    /// Returns all the `&str` representations of the enum members.
+    pub const fn values() -> &'static [&'static str] {
+        &["ACTIVE", "INACTIVE"]
+    }
+}
+impl ::std::convert::AsRef<str> for SubscriptionStatus {
+    fn as_ref(&self) -> &str {
+        self.as_str()
+    }
+}
+impl SubscriptionStatus {
+    /// Parses the enum value while disallowing unknown variants.
+    ///
+    /// Unknown variants will result in an error.
+    pub fn try_parse(value: &str) -> ::std::result::Result<Self, crate::error::UnknownVariantError> {
+        match Self::from(value) {
+            #[allow(deprecated)]
+            Self::Unknown(_) => ::std::result::Result::Err(crate::error::UnknownVariantError::new(value)),
+            known => Ok(known),
+        }
+    }
+}
+impl ::std::fmt::Display for SubscriptionStatus {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        match self {
+            SubscriptionStatus::Active => write!(f, "ACTIVE"),
+            SubscriptionStatus::Inactive => write!(f, "INACTIVE"),
+            SubscriptionStatus::Unknown(value) => write!(f, "{}", value),
+        }
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/types/_usage_limit_list.rs b/crates/amzn-codewhisperer-client/src/types/_usage_limit_list.rs
new file mode 100644
index 0000000000..c85d56518c
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/types/_usage_limit_list.rs
@@ -0,0 +1,122 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
+pub struct UsageLimitList {
+    #[allow(missing_docs)] // documentation missing in model
+    pub r#type: crate::types::UsageLimitType,
+    #[allow(missing_docs)] // documentation missing in model
+    pub value: i64,
+    #[allow(missing_docs)] // documentation missing in model
+    pub percent_used: ::std::option::Option<f64>,
+}
+impl UsageLimitList {
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn r#type(&self) -> &crate::types::UsageLimitType {
+        &self.r#type
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn value(&self) -> i64 {
+        self.value
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn percent_used(&self) -> ::std::option::Option<f64> {
+        self.percent_used
+    }
+}
+impl UsageLimitList {
+    /// Creates a new builder-style object to manufacture
+    /// [`UsageLimitList`](crate::types::UsageLimitList).
+    pub fn builder() -> crate::types::builders::UsageLimitListBuilder {
+        crate::types::builders::UsageLimitListBuilder::default()
+    }
+}
+
+/// A builder for [`UsageLimitList`](crate::types::UsageLimitList).
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct UsageLimitListBuilder {
+    pub(crate) r#type: ::std::option::Option<crate::types::UsageLimitType>,
+    pub(crate) value: ::std::option::Option<i64>,
+    pub(crate) percent_used: ::std::option::Option<f64>,
+}
+impl UsageLimitListBuilder {
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn r#type(mut self, input: crate::types::UsageLimitType) -> Self {
+        self.r#type = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_type(mut self, input: ::std::option::Option<crate::types::UsageLimitType>) -> Self {
+        self.r#type = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_type(&self) -> &::std::option::Option<crate::types::UsageLimitType> {
+        &self.r#type
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn value(mut self, input: i64) -> Self {
+        self.value = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_value(mut self, input: ::std::option::Option<i64>) -> Self {
+        self.value = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_value(&self) -> &::std::option::Option<i64> {
+        &self.value
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn percent_used(mut self, input: f64) -> Self {
+        self.percent_used = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_percent_used(mut self, input: ::std::option::Option<f64>) -> Self {
+        self.percent_used = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_percent_used(&self) -> &::std::option::Option<f64> {
+        &self.percent_used
+    }
+
+    /// Consumes the builder and constructs a [`UsageLimitList`](crate::types::UsageLimitList).
+    /// This method will fail if any of the following fields are not set:
+    /// - [`r#type`](crate::types::builders::UsageLimitListBuilder::type)
+    /// - [`value`](crate::types::builders::UsageLimitListBuilder::value)
+    pub fn build(
+        self,
+    ) -> ::std::result::Result<crate::types::UsageLimitList, ::aws_smithy_types::error::operation::BuildError> {
+        ::std::result::Result::Ok(crate::types::UsageLimitList {
+            r#type: self.r#type.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "r#type",
+                    "r#type was not specified but it is required when building UsageLimitList",
+                )
+            })?,
+            value: self.value.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "value",
+                    "value was not specified but it is required when building UsageLimitList",
+                )
+            })?,
+            percent_used: self.percent_used,
+        })
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/types/_usage_limit_type.rs b/crates/amzn-codewhisperer-client/src/types/_usage_limit_type.rs
new file mode 100644
index 0000000000..ac3b3fd2b1
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/types/_usage_limit_type.rs
@@ -0,0 +1,163 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+
+/// When writing a match expression against `UsageLimitType`, it is important to ensure
+/// your code is forward-compatible. That is, if a match arm handles a case for a
+/// feature that is supported by the service but has not been represented as an enum
+/// variant in a current version of SDK, your code should continue to work when you
+/// upgrade SDK to a future version in which the enum does include a variant for that
+/// feature.
+///
+/// Here is an example of how you can make a match expression forward-compatible:
+///
+/// ```text
+/// # let usagelimittype = unimplemented!();
+/// match usagelimittype {
+///     UsageLimitType::AiEditor => { /* ... */ },
+///     UsageLimitType::Chat => { /* ... */ },
+///     UsageLimitType::CodeScan => { /* ... */ },
+///     UsageLimitType::GumbyTransform => { /* ... */ },
+///     UsageLimitType::ProactiveCodeScan => { /* ... */ },
+///     UsageLimitType::Qsda => { /* ... */ },
+///     UsageLimitType::Recommendations => { /* ... */ },
+///     UsageLimitType::WeaverbirdConversation => { /* ... */ },
+///     other @ _ if other.as_str() == "NewFeature" => { /* handles a case for `NewFeature` */ },
+///     _ => { /* ... */ },
+/// }
+/// ```
+/// The above code demonstrates that when `usagelimittype` represents
+/// `NewFeature`, the execution path will lead to the second last match arm,
+/// even though the enum does not contain a variant `UsageLimitType::NewFeature`
+/// in the current version of SDK. The reason is that the variable `other`,
+/// created by the `@` operator, is bound to
+/// `UsageLimitType::Unknown(UnknownVariantValue("NewFeature".to_owned()))`
+/// and calling `as_str` on it yields `"NewFeature"`.
+/// This match expression is forward-compatible when executed with a newer
+/// version of SDK where the variant `UsageLimitType::NewFeature` is defined.
+/// Specifically, when `usagelimittype` represents `NewFeature`,
+/// the execution path will hit the second last match arm as before by virtue of
+/// calling `as_str` on `UsageLimitType::NewFeature` also yielding `"NewFeature"`.
+///
+/// Explicitly matching on the `Unknown` variant should
+/// be avoided for two reasons:
+/// - The inner data `UnknownVariantValue` is opaque, and no further information can be extracted.
+/// - It might inadvertently shadow other intended match arms.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(
+    ::std::clone::Clone,
+    ::std::cmp::Eq,
+    ::std::cmp::Ord,
+    ::std::cmp::PartialEq,
+    ::std::cmp::PartialOrd,
+    ::std::fmt::Debug,
+    ::std::hash::Hash,
+)]
+pub enum UsageLimitType {
+    /// AI editor service usage metric
+    AiEditor,
+    /// Chat service usage metric
+    Chat,
+    /// Code scanning service usage metric
+    CodeScan,
+    /// Code transformation service usage metric
+    GumbyTransform,
+    /// Proactive code scanning service usage metric
+    ProactiveCodeScan,
+    /// QSDA usage metric
+    Qsda,
+    /// Inline recommendations service usage metric
+    Recommendations,
+    /// Weaverbird conversation service usage metric
+    WeaverbirdConversation,
+    /// `Unknown` contains new variants that have been added since this code was generated.
+    #[deprecated(
+        note = "Don't directly match on `Unknown`. See the docs on this enum for the correct way to handle unknown variants."
+    )]
+    Unknown(crate::primitives::sealed_enum_unknown::UnknownVariantValue),
+}
+impl ::std::convert::From<&str> for UsageLimitType {
+    fn from(s: &str) -> Self {
+        match s {
+            "AI_EDITOR" => UsageLimitType::AiEditor,
+            "CHAT" => UsageLimitType::Chat,
+            "CODE_SCAN" => UsageLimitType::CodeScan,
+            "GUMBY_TRANSFORM" => UsageLimitType::GumbyTransform,
+            "PROACTIVE_CODE_SCAN" => UsageLimitType::ProactiveCodeScan,
+            "QSDA" => UsageLimitType::Qsda,
+            "RECOMMENDATIONS" => UsageLimitType::Recommendations,
+            "WEAVERBIRD_CONVERSATION" => UsageLimitType::WeaverbirdConversation,
+            other => UsageLimitType::Unknown(crate::primitives::sealed_enum_unknown::UnknownVariantValue(
+                other.to_owned(),
+            )),
+        }
+    }
+}
+impl ::std::str::FromStr for UsageLimitType {
+    type Err = ::std::convert::Infallible;
+
+    fn from_str(s: &str) -> ::std::result::Result<Self, <Self as ::std::str::FromStr>::Err> {
+        ::std::result::Result::Ok(UsageLimitType::from(s))
+    }
+}
+impl UsageLimitType {
+    /// Returns the `&str` value of the enum member.
+    pub fn as_str(&self) -> &str {
+        match self {
+            UsageLimitType::AiEditor => "AI_EDITOR",
+            UsageLimitType::Chat => "CHAT",
+            UsageLimitType::CodeScan => "CODE_SCAN",
+            UsageLimitType::GumbyTransform => "GUMBY_TRANSFORM",
+            UsageLimitType::ProactiveCodeScan => "PROACTIVE_CODE_SCAN",
+            UsageLimitType::Qsda => "QSDA",
+            UsageLimitType::Recommendations => "RECOMMENDATIONS",
+            UsageLimitType::WeaverbirdConversation => "WEAVERBIRD_CONVERSATION",
+            UsageLimitType::Unknown(value) => value.as_str(),
+        }
+    }
+
+    /// Returns all the `&str` representations of the enum members.
+    pub const fn values() -> &'static [&'static str] {
+        &[
+            "AI_EDITOR",
+            "CHAT",
+            "CODE_SCAN",
+            "GUMBY_TRANSFORM",
+            "PROACTIVE_CODE_SCAN",
+            "QSDA",
+            "RECOMMENDATIONS",
+            "WEAVERBIRD_CONVERSATION",
+        ]
+    }
+}
+impl ::std::convert::AsRef<str> for UsageLimitType {
+    fn as_ref(&self) -> &str {
+        self.as_str()
+    }
+}
+impl UsageLimitType {
+    /// Parses the enum value while disallowing unknown variants.
+    ///
+    /// Unknown variants will result in an error.
+    pub fn try_parse(value: &str) -> ::std::result::Result<Self, crate::error::UnknownVariantError> {
+        match Self::from(value) {
+            #[allow(deprecated)]
+            Self::Unknown(_) => ::std::result::Result::Err(crate::error::UnknownVariantError::new(value)),
+            known => Ok(known),
+        }
+    }
+}
+impl ::std::fmt::Display for UsageLimitType {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        match self {
+            UsageLimitType::AiEditor => write!(f, "AI_EDITOR"),
+            UsageLimitType::Chat => write!(f, "CHAT"),
+            UsageLimitType::CodeScan => write!(f, "CODE_SCAN"),
+            UsageLimitType::GumbyTransform => write!(f, "GUMBY_TRANSFORM"),
+            UsageLimitType::ProactiveCodeScan => write!(f, "PROACTIVE_CODE_SCAN"),
+            UsageLimitType::Qsda => write!(f, "QSDA"),
+            UsageLimitType::Recommendations => write!(f, "RECOMMENDATIONS"),
+            UsageLimitType::WeaverbirdConversation => write!(f, "WEAVERBIRD_CONVERSATION"),
+            UsageLimitType::Unknown(value) => write!(f, "{}", value),
+        }
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/types/_usage_limit_update_request_status.rs b/crates/amzn-codewhisperer-client/src/types/_usage_limit_update_request_status.rs
new file mode 100644
index 0000000000..bf717fdfab
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/types/_usage_limit_update_request_status.rs
@@ -0,0 +1,124 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+
+/// When writing a match expression against `UsageLimitUpdateRequestStatus`, it is important to
+/// ensure your code is forward-compatible. That is, if a match arm handles a case for a
+/// feature that is supported by the service but has not been represented as an enum
+/// variant in a current version of SDK, your code should continue to work when you
+/// upgrade SDK to a future version in which the enum does include a variant for that
+/// feature.
+///
+/// Here is an example of how you can make a match expression forward-compatible:
+///
+/// ```text
+/// # let usagelimitupdaterequeststatus = unimplemented!();
+/// match usagelimitupdaterequeststatus {
+///     UsageLimitUpdateRequestStatus::Approved => { /* ... */ },
+///     UsageLimitUpdateRequestStatus::PendingReview => { /* ... */ },
+///     UsageLimitUpdateRequestStatus::Rejected => { /* ... */ },
+///     other @ _ if other.as_str() == "NewFeature" => { /* handles a case for `NewFeature` */ },
+///     _ => { /* ... */ },
+/// }
+/// ```
+/// The above code demonstrates that when `usagelimitupdaterequeststatus` represents
+/// `NewFeature`, the execution path will lead to the second last match arm,
+/// even though the enum does not contain a variant `UsageLimitUpdateRequestStatus::NewFeature`
+/// in the current version of SDK. The reason is that the variable `other`,
+/// created by the `@` operator, is bound to
+/// `UsageLimitUpdateRequestStatus::Unknown(UnknownVariantValue("NewFeature".to_owned()))`
+/// and calling `as_str` on it yields `"NewFeature"`.
+/// This match expression is forward-compatible when executed with a newer
+/// version of SDK where the variant `UsageLimitUpdateRequestStatus::NewFeature` is defined.
+/// Specifically, when `usagelimitupdaterequeststatus` represents `NewFeature`,
+/// the execution path will hit the second last match arm as before by virtue of
+/// calling `as_str` on `UsageLimitUpdateRequestStatus::NewFeature` also yielding `"NewFeature"`.
+///
+/// Explicitly matching on the `Unknown` variant should
+/// be avoided for two reasons:
+/// - The inner data `UnknownVariantValue` is opaque, and no further information can be extracted.
+/// - It might inadvertently shadow other intended match arms.
+#[allow(missing_docs)] // documentation missing in model
+#[non_exhaustive]
+#[derive(
+    ::std::clone::Clone,
+    ::std::cmp::Eq,
+    ::std::cmp::Ord,
+    ::std::cmp::PartialEq,
+    ::std::cmp::PartialOrd,
+    ::std::fmt::Debug,
+    ::std::hash::Hash,
+)]
+pub enum UsageLimitUpdateRequestStatus {
+    /// The limit update request was approved
+    Approved,
+    /// The limit update request is pending review
+    PendingReview,
+    /// The limit update request was rejected
+    Rejected,
+    /// `Unknown` contains new variants that have been added since this code was generated.
+    #[deprecated(
+        note = "Don't directly match on `Unknown`. See the docs on this enum for the correct way to handle unknown variants."
+    )]
+    Unknown(crate::primitives::sealed_enum_unknown::UnknownVariantValue),
+}
+impl ::std::convert::From<&str> for UsageLimitUpdateRequestStatus {
+    fn from(s: &str) -> Self {
+        match s {
+            "APPROVED" => UsageLimitUpdateRequestStatus::Approved,
+            "PENDING_REVIEW" => UsageLimitUpdateRequestStatus::PendingReview,
+            "REJECTED" => UsageLimitUpdateRequestStatus::Rejected,
+            other => UsageLimitUpdateRequestStatus::Unknown(
+                crate::primitives::sealed_enum_unknown::UnknownVariantValue(other.to_owned()),
+            ),
+        }
+    }
+}
+impl ::std::str::FromStr for UsageLimitUpdateRequestStatus {
+    type Err = ::std::convert::Infallible;
+
+    fn from_str(s: &str) -> ::std::result::Result<Self, <Self as ::std::str::FromStr>::Err> {
+        ::std::result::Result::Ok(UsageLimitUpdateRequestStatus::from(s))
+    }
+}
+impl UsageLimitUpdateRequestStatus {
+    /// Returns the `&str` value of the enum member.
+    pub fn as_str(&self) -> &str {
+        match self {
+            UsageLimitUpdateRequestStatus::Approved => "APPROVED",
+            UsageLimitUpdateRequestStatus::PendingReview => "PENDING_REVIEW",
+            UsageLimitUpdateRequestStatus::Rejected => "REJECTED",
+            UsageLimitUpdateRequestStatus::Unknown(value) => value.as_str(),
+        }
+    }
+
+    /// Returns all the `&str` representations of the enum members.
+    pub const fn values() -> &'static [&'static str] {
+        &["APPROVED", "PENDING_REVIEW", "REJECTED"]
+    }
+}
+impl ::std::convert::AsRef<str> for UsageLimitUpdateRequestStatus {
+    fn as_ref(&self) -> &str {
+        self.as_str()
+    }
+}
+impl UsageLimitUpdateRequestStatus {
+    /// Parses the enum value while disallowing unknown variants.
+    ///
+    /// Unknown variants will result in an error.
+    pub fn try_parse(value: &str) -> ::std::result::Result<Self, crate::error::UnknownVariantError> {
+        match Self::from(value) {
+            #[allow(deprecated)]
+            Self::Unknown(_) => ::std::result::Result::Err(crate::error::UnknownVariantError::new(value)),
+            known => Ok(known),
+        }
+    }
+}
+impl ::std::fmt::Display for UsageLimitUpdateRequestStatus {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        match self {
+            UsageLimitUpdateRequestStatus::Approved => write!(f, "APPROVED"),
+            UsageLimitUpdateRequestStatus::PendingReview => write!(f, "PENDING_REVIEW"),
+            UsageLimitUpdateRequestStatus::Rejected => write!(f, "REJECTED"),
+            UsageLimitUpdateRequestStatus::Unknown(value) => write!(f, "{}", value),
+        }
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/types/_user_input_message.rs b/crates/amzn-codewhisperer-client/src/types/_user_input_message.rs
index 1d8e987387..725358a632 100644
--- a/crates/amzn-codewhisperer-client/src/types/_user_input_message.rs
+++ b/crates/amzn-codewhisperer-client/src/types/_user_input_message.rs
@@ -14,6 +14,8 @@ pub struct UserInputMessage {
     pub origin: ::std::option::Option<crate::types::Origin>,
     /// Images associated with the Chat Message.
     pub images: ::std::option::Option<::std::vec::Vec<crate::types::ImageBlock>>,
+    /// Unique identifier for the model used in this conversation
+    pub model_id: ::std::option::Option<::std::string::String>,
 }
 impl UserInputMessage {
     /// The content of the chat message.
@@ -44,6 +46,11 @@ impl UserInputMessage {
     pub fn images(&self) -> &[crate::types::ImageBlock] {
         self.images.as_deref().unwrap_or_default()
     }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn model_id(&self) -> ::std::option::Option<&str> {
+        self.model_id.as_deref()
+    }
 }
 impl ::std::fmt::Debug for UserInputMessage {
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
@@ -53,6 +60,7 @@ impl ::std::fmt::Debug for UserInputMessage {
         formatter.field("user_intent", &self.user_intent);
         formatter.field("origin", &self.origin);
         formatter.field("images", &self.images);
+        formatter.field("model_id", &self.model_id);
         formatter.finish()
     }
 }
@@ -73,6 +81,7 @@ pub struct UserInputMessageBuilder {
     pub(crate) user_intent: ::std::option::Option<crate::types::UserIntent>,
     pub(crate) origin: ::std::option::Option<crate::types::Origin>,
     pub(crate) images: ::std::option::Option<::std::vec::Vec<crate::types::ImageBlock>>,
+    pub(crate) model_id: ::std::option::Option<::std::string::String>,
 }
 impl UserInputMessageBuilder {
     /// The content of the chat message.
@@ -170,6 +179,23 @@ impl UserInputMessageBuilder {
         &self.images
     }
 
+    /// Unique identifier for the model used in this conversation
+    pub fn model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.model_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn set_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.model_id = input;
+        self
+    }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn get_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.model_id
+    }
+
     /// Consumes the builder and constructs a [`UserInputMessage`](crate::types::UserInputMessage).
     /// This method will fail if any of the following fields are not set:
     /// - [`content`](crate::types::builders::UserInputMessageBuilder::content)
@@ -187,6 +213,7 @@ impl UserInputMessageBuilder {
             user_intent: self.user_intent,
             origin: self.origin,
             images: self.images,
+            model_id: self.model_id,
         })
     }
 }
@@ -198,6 +225,7 @@ impl ::std::fmt::Debug for UserInputMessageBuilder {
         formatter.field("user_intent", &self.user_intent);
         formatter.field("origin", &self.origin);
         formatter.field("images", &self.images);
+        formatter.field("model_id", &self.model_id);
         formatter.finish()
     }
 }
diff --git a/crates/amzn-codewhisperer-client/src/types/_user_modification_event.rs b/crates/amzn-codewhisperer-client/src/types/_user_modification_event.rs
index b02c2fb53c..0359261f64 100644
--- a/crates/amzn-codewhisperer-client/src/types/_user_modification_event.rs
+++ b/crates/amzn-codewhisperer-client/src/types/_user_modification_event.rs
@@ -19,6 +19,10 @@ pub struct UserModificationEvent {
     pub accepted_character_count: i32,
     #[allow(missing_docs)] // documentation missing in model
     pub unmodified_accepted_character_count: i32,
+    #[allow(missing_docs)] // documentation missing in model
+    pub added_character_count: i32,
+    #[allow(missing_docs)] // documentation missing in model
+    pub unmodified_added_character_count: i32,
 }
 impl UserModificationEvent {
     #[allow(missing_docs)] // documentation missing in model
@@ -62,6 +66,16 @@ impl UserModificationEvent {
     pub fn unmodified_accepted_character_count(&self) -> i32 {
         self.unmodified_accepted_character_count
     }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn added_character_count(&self) -> i32 {
+        self.added_character_count
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn unmodified_added_character_count(&self) -> i32 {
+        self.unmodified_added_character_count
+    }
 }
 impl UserModificationEvent {
     /// Creates a new builder-style object to manufacture
@@ -83,6 +97,8 @@ pub struct UserModificationEventBuilder {
     pub(crate) timestamp: ::std::option::Option<::aws_smithy_types::DateTime>,
     pub(crate) accepted_character_count: ::std::option::Option<i32>,
     pub(crate) unmodified_accepted_character_count: ::std::option::Option<i32>,
+    pub(crate) added_character_count: ::std::option::Option<i32>,
+    pub(crate) unmodified_added_character_count: ::std::option::Option<i32>,
 }
 impl UserModificationEventBuilder {
     #[allow(missing_docs)] // documentation missing in model
@@ -228,6 +244,40 @@ impl UserModificationEventBuilder {
         &self.unmodified_accepted_character_count
     }
 
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn added_character_count(mut self, input: i32) -> Self {
+        self.added_character_count = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_added_character_count(mut self, input: ::std::option::Option<i32>) -> Self {
+        self.added_character_count = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_added_character_count(&self) -> &::std::option::Option<i32> {
+        &self.added_character_count
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn unmodified_added_character_count(mut self, input: i32) -> Self {
+        self.unmodified_added_character_count = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_unmodified_added_character_count(mut self, input: ::std::option::Option<i32>) -> Self {
+        self.unmodified_added_character_count = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_unmodified_added_character_count(&self) -> &::std::option::Option<i32> {
+        &self.unmodified_added_character_count
+    }
+
     /// Consumes the builder and constructs a
     /// [`UserModificationEvent`](crate::types::UserModificationEvent). This method will fail if
     /// any of the following fields are not set:
@@ -274,6 +324,8 @@ impl UserModificationEventBuilder {
             })?,
             accepted_character_count: self.accepted_character_count.unwrap_or_default(),
             unmodified_accepted_character_count: self.unmodified_accepted_character_count.unwrap_or_default(),
+            added_character_count: self.added_character_count.unwrap_or_default(),
+            unmodified_added_character_count: self.unmodified_added_character_count.unwrap_or_default(),
         })
     }
 }
diff --git a/crates/amzn-codewhisperer-client/src/types/_user_trigger_decision_event.rs b/crates/amzn-codewhisperer-client/src/types/_user_trigger_decision_event.rs
index d8dd7de8cf..4187e38a46 100644
--- a/crates/amzn-codewhisperer-client/src/types/_user_trigger_decision_event.rs
+++ b/crates/amzn-codewhisperer-client/src/types/_user_trigger_decision_event.rs
@@ -35,6 +35,12 @@ pub struct UserTriggerDecisionEvent {
     pub added_ide_diagnostics: ::std::option::Option<::std::vec::Vec<crate::types::IdeDiagnostic>>,
     /// List of IDE Diagnostics
     pub removed_ide_diagnostics: ::std::option::Option<::std::vec::Vec<crate::types::IdeDiagnostic>>,
+    #[allow(missing_docs)] // documentation missing in model
+    pub added_character_count: i32,
+    #[allow(missing_docs)] // documentation missing in model
+    pub deleted_character_count: i32,
+    #[allow(missing_docs)] // documentation missing in model
+    pub streak_length: i32,
 }
 impl UserTriggerDecisionEvent {
     #[allow(missing_docs)] // documentation missing in model
@@ -124,6 +130,21 @@ impl UserTriggerDecisionEvent {
     pub fn removed_ide_diagnostics(&self) -> &[crate::types::IdeDiagnostic] {
         self.removed_ide_diagnostics.as_deref().unwrap_or_default()
     }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn added_character_count(&self) -> i32 {
+        self.added_character_count
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn deleted_character_count(&self) -> i32 {
+        self.deleted_character_count
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn streak_length(&self) -> i32 {
+        self.streak_length
+    }
 }
 impl UserTriggerDecisionEvent {
     /// Creates a new builder-style object to manufacture
@@ -153,6 +174,9 @@ pub struct UserTriggerDecisionEventBuilder {
     pub(crate) accepted_character_count: ::std::option::Option<i32>,
     pub(crate) added_ide_diagnostics: ::std::option::Option<::std::vec::Vec<crate::types::IdeDiagnostic>>,
     pub(crate) removed_ide_diagnostics: ::std::option::Option<::std::vec::Vec<crate::types::IdeDiagnostic>>,
+    pub(crate) added_character_count: ::std::option::Option<i32>,
+    pub(crate) deleted_character_count: ::std::option::Option<i32>,
+    pub(crate) streak_length: ::std::option::Option<i32>,
 }
 impl UserTriggerDecisionEventBuilder {
     #[allow(missing_docs)] // documentation missing in model
@@ -454,6 +478,57 @@ impl UserTriggerDecisionEventBuilder {
         &self.removed_ide_diagnostics
     }
 
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn added_character_count(mut self, input: i32) -> Self {
+        self.added_character_count = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_added_character_count(mut self, input: ::std::option::Option<i32>) -> Self {
+        self.added_character_count = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_added_character_count(&self) -> &::std::option::Option<i32> {
+        &self.added_character_count
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn deleted_character_count(mut self, input: i32) -> Self {
+        self.deleted_character_count = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_deleted_character_count(mut self, input: ::std::option::Option<i32>) -> Self {
+        self.deleted_character_count = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_deleted_character_count(&self) -> &::std::option::Option<i32> {
+        &self.deleted_character_count
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn streak_length(mut self, input: i32) -> Self {
+        self.streak_length = ::std::option::Option::Some(input);
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_streak_length(mut self, input: ::std::option::Option<i32>) -> Self {
+        self.streak_length = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_streak_length(&self) -> &::std::option::Option<i32> {
+        &self.streak_length
+    }
+
     /// Consumes the builder and constructs a
     /// [`UserTriggerDecisionEvent`](crate::types::UserTriggerDecisionEvent). This method will
     /// fail if any of the following fields are not set:
@@ -520,6 +595,9 @@ impl UserTriggerDecisionEventBuilder {
             accepted_character_count: self.accepted_character_count.unwrap_or_default(),
             added_ide_diagnostics: self.added_ide_diagnostics,
             removed_ide_diagnostics: self.removed_ide_diagnostics,
+            added_character_count: self.added_character_count.unwrap_or_default(),
+            deleted_character_count: self.deleted_character_count.unwrap_or_default(),
+            streak_length: self.streak_length.unwrap_or_default(),
         })
     }
 }
diff --git a/crates/amzn-codewhisperer-client/src/types/builders.rs b/crates/amzn-codewhisperer-client/src/types/builders.rs
index cf3088c1d7..dfa16576cb 100644
--- a/crates/amzn-codewhisperer-client/src/types/builders.rs
+++ b/crates/amzn-codewhisperer-client/src/types/builders.rs
@@ -97,6 +97,7 @@ pub use crate::types::_transformation_source_code_artifact_descriptor::Transform
 pub use crate::types::_transformation_spec::TransformationSpecBuilder;
 pub use crate::types::_transformation_step::TransformationStepBuilder;
 pub use crate::types::_transformation_upload_context::TransformationUploadContextBuilder;
+pub use crate::types::_usage_limit_list::UsageLimitListBuilder;
 pub use crate::types::_user_context::UserContextBuilder;
 pub use crate::types::_user_input_message::UserInputMessageBuilder;
 pub use crate::types::_user_input_message_context::UserInputMessageContextBuilder;
diff --git a/crates/amzn-codewhisperer-client/src/types/error.rs b/crates/amzn-codewhisperer-client/src/types/error.rs
index f8c1d99f79..701fedb284 100644
--- a/crates/amzn-codewhisperer-client/src/types/error.rs
+++ b/crates/amzn-codewhisperer-client/src/types/error.rs
@@ -5,6 +5,7 @@ pub use crate::types::error::_internal_server_exception::InternalServerError;
 pub use crate::types::error::_resource_not_found_exception::ResourceNotFoundError;
 pub use crate::types::error::_service_quota_exceeded_exception::ServiceQuotaExceededError;
 pub use crate::types::error::_throttling_exception::ThrottlingError;
+pub use crate::types::error::_update_usage_limit_quota_exceeded_exception::UpdateUsageLimitQuotaExceededError;
 pub use crate::types::error::_validation_exception::ValidationError;
 
 mod _access_denied_exception;
@@ -19,6 +20,8 @@ mod _service_quota_exceeded_exception;
 
 mod _throttling_exception;
 
+mod _update_usage_limit_quota_exceeded_exception;
+
 mod _validation_exception;
 
 /// Builders
diff --git a/crates/amzn-codewhisperer-client/src/types/error/_update_usage_limit_quota_exceeded_exception.rs b/crates/amzn-codewhisperer-client/src/types/error/_update_usage_limit_quota_exceeded_exception.rs
new file mode 100644
index 0000000000..426b0a8f8d
--- /dev/null
+++ b/crates/amzn-codewhisperer-client/src/types/error/_update_usage_limit_quota_exceeded_exception.rs
@@ -0,0 +1,109 @@
+// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
+
+/// Exception thrown when the number of usage limit update requests exceeds the monthly quota
+/// (default 3 requests per month)
+#[non_exhaustive]
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
+pub struct UpdateUsageLimitQuotaExceededError {
+    #[allow(missing_docs)] // documentation missing in model
+    pub message: ::std::string::String,
+    pub(crate) meta: ::aws_smithy_types::error::ErrorMetadata,
+}
+impl UpdateUsageLimitQuotaExceededError {
+    /// Returns the error message.
+    pub fn message(&self) -> &str {
+        &self.message
+    }
+}
+impl ::std::fmt::Display for UpdateUsageLimitQuotaExceededError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        ::std::write!(
+            f,
+            "UpdateUsageLimitQuotaExceededError [UpdateUsageLimitQuotaExceededException]"
+        )?;
+        {
+            ::std::write!(f, ": {}", &self.message)?;
+        }
+        Ok(())
+    }
+}
+impl ::std::error::Error for UpdateUsageLimitQuotaExceededError {}
+impl ::aws_types::request_id::RequestId for crate::types::error::UpdateUsageLimitQuotaExceededError {
+    fn request_id(&self) -> Option<&str> {
+        use ::aws_smithy_types::error::metadata::ProvideErrorMetadata;
+        self.meta().request_id()
+    }
+}
+impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for UpdateUsageLimitQuotaExceededError {
+    fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
+        &self.meta
+    }
+}
+impl UpdateUsageLimitQuotaExceededError {
+    /// Creates a new builder-style object to manufacture
+    /// [`UpdateUsageLimitQuotaExceededError`](crate::types::error::UpdateUsageLimitQuotaExceededError).
+    pub fn builder() -> crate::types::error::builders::UpdateUsageLimitQuotaExceededErrorBuilder {
+        crate::types::error::builders::UpdateUsageLimitQuotaExceededErrorBuilder::default()
+    }
+}
+
+/// A builder for
+/// [`UpdateUsageLimitQuotaExceededError`](crate::types::error::UpdateUsageLimitQuotaExceededError).
+#[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
+#[non_exhaustive]
+pub struct UpdateUsageLimitQuotaExceededErrorBuilder {
+    pub(crate) message: ::std::option::Option<::std::string::String>,
+    meta: std::option::Option<::aws_smithy_types::error::ErrorMetadata>,
+}
+impl UpdateUsageLimitQuotaExceededErrorBuilder {
+    #[allow(missing_docs)] // documentation missing in model
+    /// This field is required.
+    pub fn message(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.message = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_message(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.message = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_message(&self) -> &::std::option::Option<::std::string::String> {
+        &self.message
+    }
+
+    /// Sets error metadata
+    pub fn meta(mut self, meta: ::aws_smithy_types::error::ErrorMetadata) -> Self {
+        self.meta = Some(meta);
+        self
+    }
+
+    /// Sets error metadata
+    pub fn set_meta(&mut self, meta: std::option::Option<::aws_smithy_types::error::ErrorMetadata>) -> &mut Self {
+        self.meta = meta;
+        self
+    }
+
+    /// Consumes the builder and constructs a
+    /// [`UpdateUsageLimitQuotaExceededError`](crate::types::error::UpdateUsageLimitQuotaExceededError).
+    /// This method will fail if any of the following fields are not set:
+    /// - [`message`](crate::types::error::builders::UpdateUsageLimitQuotaExceededErrorBuilder::message)
+    pub fn build(
+        self,
+    ) -> ::std::result::Result<
+        crate::types::error::UpdateUsageLimitQuotaExceededError,
+        ::aws_smithy_types::error::operation::BuildError,
+    > {
+        ::std::result::Result::Ok(crate::types::error::UpdateUsageLimitQuotaExceededError {
+            message: self.message.ok_or_else(|| {
+                ::aws_smithy_types::error::operation::BuildError::missing_field(
+                    "message",
+                    "message was not specified but it is required when building UpdateUsageLimitQuotaExceededError",
+                )
+            })?,
+            meta: self.meta.unwrap_or_default(),
+        })
+    }
+}
diff --git a/crates/amzn-codewhisperer-client/src/types/error/builders.rs b/crates/amzn-codewhisperer-client/src/types/error/builders.rs
index adeb2f224d..2f75bc5c72 100644
--- a/crates/amzn-codewhisperer-client/src/types/error/builders.rs
+++ b/crates/amzn-codewhisperer-client/src/types/error/builders.rs
@@ -5,4 +5,5 @@ pub use crate::types::error::_internal_server_exception::InternalServerErrorBuil
 pub use crate::types::error::_resource_not_found_exception::ResourceNotFoundErrorBuilder;
 pub use crate::types::error::_service_quota_exceeded_exception::ServiceQuotaExceededErrorBuilder;
 pub use crate::types::error::_throttling_exception::ThrottlingErrorBuilder;
+pub use crate::types::error::_update_usage_limit_quota_exceeded_exception::UpdateUsageLimitQuotaExceededErrorBuilder;
 pub use crate::types::error::_validation_exception::ValidationErrorBuilder;
diff --git a/crates/amzn-codewhisperer-streaming-client/Cargo.toml b/crates/amzn-codewhisperer-streaming-client/Cargo.toml
index c250679b94..b078e16abd 100644
--- a/crates/amzn-codewhisperer-streaming-client/Cargo.toml
+++ b/crates/amzn-codewhisperer-streaming-client/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "amzn-codewhisperer-streaming-client"
-version = "0.1.8200"
+version = "0.1.8702"
 authors = ["Grant Gurvis <grangurv@amazon.com>"]
 build = false
 exclude = [
@@ -67,11 +67,11 @@ version = "1.2.4"
 version = "0.60.6"
 
 [dependencies.aws-smithy-http]
-version = "0.60.12"
+version = "0.62.1"
 features = ["event-stream"]
 
 [dependencies.aws-smithy-json]
-version = "0.61.2"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.7.8"
diff --git a/crates/amzn-codewhisperer-streaming-client/src/config.rs b/crates/amzn-codewhisperer-streaming-client/src/config.rs
index 9c0faddffa..6fced58031 100644
--- a/crates/amzn-codewhisperer-streaming-client/src/config.rs
+++ b/crates/amzn-codewhisperer-streaming-client/src/config.rs
@@ -591,6 +591,7 @@ impl Builder {
     /// # Examples
     ///
     /// Disabling identity caching:
+    ///
     /// ```no_run
     /// use amzn_codewhisperer_streaming_client::config::IdentityCache;
     ///
@@ -602,6 +603,7 @@ impl Builder {
     /// ```
     ///
     /// Customizing lazy caching:
+    ///
     /// ```no_run
     /// use std::time::Duration;
     ///
@@ -638,6 +640,7 @@ impl Builder {
     /// # Examples
     ///
     /// Disabling identity caching:
+    ///
     /// ```no_run
     /// use amzn_codewhisperer_streaming_client::config::IdentityCache;
     ///
@@ -649,6 +652,7 @@ impl Builder {
     /// ```
     ///
     /// Customizing lazy caching:
+    ///
     /// ```no_run
     /// use std::time::Duration;
     ///
diff --git a/crates/amzn-codewhisperer-streaming-client/src/protocol_serde/shape_user_input_message.rs b/crates/amzn-codewhisperer-streaming-client/src/protocol_serde/shape_user_input_message.rs
index 716eb41329..2c43086677 100644
--- a/crates/amzn-codewhisperer-streaming-client/src/protocol_serde/shape_user_input_message.rs
+++ b/crates/amzn-codewhisperer-streaming-client/src/protocol_serde/shape_user_input_message.rs
@@ -30,5 +30,8 @@ pub fn ser_user_input_message(
         }
         array_6.finish();
     }
+    if let Some(var_9) = &input.model_id {
+        object.key("modelId").string(var_9.as_str());
+    }
     Ok(())
 }
diff --git a/crates/amzn-codewhisperer-streaming-client/src/types/_user_input_message.rs b/crates/amzn-codewhisperer-streaming-client/src/types/_user_input_message.rs
index 1d8e987387..725358a632 100644
--- a/crates/amzn-codewhisperer-streaming-client/src/types/_user_input_message.rs
+++ b/crates/amzn-codewhisperer-streaming-client/src/types/_user_input_message.rs
@@ -14,6 +14,8 @@ pub struct UserInputMessage {
     pub origin: ::std::option::Option<crate::types::Origin>,
     /// Images associated with the Chat Message.
     pub images: ::std::option::Option<::std::vec::Vec<crate::types::ImageBlock>>,
+    /// Unique identifier for the model used in this conversation
+    pub model_id: ::std::option::Option<::std::string::String>,
 }
 impl UserInputMessage {
     /// The content of the chat message.
@@ -44,6 +46,11 @@ impl UserInputMessage {
     pub fn images(&self) -> &[crate::types::ImageBlock] {
         self.images.as_deref().unwrap_or_default()
     }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn model_id(&self) -> ::std::option::Option<&str> {
+        self.model_id.as_deref()
+    }
 }
 impl ::std::fmt::Debug for UserInputMessage {
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
@@ -53,6 +60,7 @@ impl ::std::fmt::Debug for UserInputMessage {
         formatter.field("user_intent", &self.user_intent);
         formatter.field("origin", &self.origin);
         formatter.field("images", &self.images);
+        formatter.field("model_id", &self.model_id);
         formatter.finish()
     }
 }
@@ -73,6 +81,7 @@ pub struct UserInputMessageBuilder {
     pub(crate) user_intent: ::std::option::Option<crate::types::UserIntent>,
     pub(crate) origin: ::std::option::Option<crate::types::Origin>,
     pub(crate) images: ::std::option::Option<::std::vec::Vec<crate::types::ImageBlock>>,
+    pub(crate) model_id: ::std::option::Option<::std::string::String>,
 }
 impl UserInputMessageBuilder {
     /// The content of the chat message.
@@ -170,6 +179,23 @@ impl UserInputMessageBuilder {
         &self.images
     }
 
+    /// Unique identifier for the model used in this conversation
+    pub fn model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.model_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn set_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.model_id = input;
+        self
+    }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn get_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.model_id
+    }
+
     /// Consumes the builder and constructs a [`UserInputMessage`](crate::types::UserInputMessage).
     /// This method will fail if any of the following fields are not set:
     /// - [`content`](crate::types::builders::UserInputMessageBuilder::content)
@@ -187,6 +213,7 @@ impl UserInputMessageBuilder {
             user_intent: self.user_intent,
             origin: self.origin,
             images: self.images,
+            model_id: self.model_id,
         })
     }
 }
@@ -198,6 +225,7 @@ impl ::std::fmt::Debug for UserInputMessageBuilder {
         formatter.field("user_intent", &self.user_intent);
         formatter.field("origin", &self.origin);
         formatter.field("images", &self.images);
+        formatter.field("model_id", &self.model_id);
         formatter.finish()
     }
 }
diff --git a/crates/amzn-consolas-client/Cargo.toml b/crates/amzn-consolas-client/Cargo.toml
index 709cf0c709..f504fd9799 100644
--- a/crates/amzn-consolas-client/Cargo.toml
+++ b/crates/amzn-consolas-client/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "amzn-consolas-client"
-version = "0.1.8200"
+version = "0.1.8702"
 authors = ["Grant Gurvis <grangurv@amazon.com>"]
 build = false
 exclude = [
@@ -67,10 +67,10 @@ version = "1.5.5"
 version = "1.2.4"
 
 [dependencies.aws-smithy-http]
-version = "0.60.12"
+version = "0.62.1"
 
 [dependencies.aws-smithy-json]
-version = "0.61.2"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.7.8"
diff --git a/crates/amzn-consolas-client/src/config.rs b/crates/amzn-consolas-client/src/config.rs
index d9d6dbdeb8..f77b52fb62 100644
--- a/crates/amzn-consolas-client/src/config.rs
+++ b/crates/amzn-consolas-client/src/config.rs
@@ -614,6 +614,7 @@ impl Builder {
     /// # Examples
     ///
     /// Disabling identity caching:
+    ///
     /// ```no_run
     /// use amzn_consolas_client::config::IdentityCache;
     ///
@@ -625,6 +626,7 @@ impl Builder {
     /// ```
     ///
     /// Customizing lazy caching:
+    ///
     /// ```no_run
     /// use std::time::Duration;
     ///
@@ -661,6 +663,7 @@ impl Builder {
     /// # Examples
     ///
     /// Disabling identity caching:
+    ///
     /// ```no_run
     /// use amzn_consolas_client::config::IdentityCache;
     ///
@@ -672,6 +675,7 @@ impl Builder {
     /// ```
     ///
     /// Customizing lazy caching:
+    ///
     /// ```no_run
     /// use std::time::Duration;
     ///
@@ -1157,7 +1161,7 @@ impl Builder {
     ///
     /// Customizing behavior major version:
     ///
-    ///  ```no_run
+    /// ```no_run
     /// use amzn_consolas_client::config::BehaviorVersion;
     ///
     /// let config = amzn_consolas_client::Config::builder()
@@ -1182,7 +1186,7 @@ impl Builder {
     ///
     /// Set the behavior major version to `latest`. This is equivalent to enabling the
     /// `behavior-version-latest` cargo feature.
-    //
+    ///
     /// ```no_run
     /// use amzn_consolas_client::config::BehaviorVersion;
     ///
@@ -1195,7 +1199,7 @@ impl Builder {
     ///
     /// Customizing behavior major version:
     ///
-    ///  ```no_run
+    /// ```no_run
     /// use amzn_consolas_client::config::BehaviorVersion;
     ///
     /// let config = amzn_consolas_client::Config::builder()
diff --git a/crates/amzn-consolas-client/src/protocol_serde/shape_file_context.rs b/crates/amzn-consolas-client/src/protocol_serde/shape_file_context.rs
index 0c003716d9..a23639986d 100644
--- a/crates/amzn-consolas-client/src/protocol_serde/shape_file_context.rs
+++ b/crates/amzn-consolas-client/src/protocol_serde/shape_file_context.rs
@@ -12,14 +12,17 @@ pub fn ser_file_context(
     {
         object.key("filename").string(input.filename.as_str());
     }
+    if let Some(var_1) = &input.file_uri {
+        object.key("fileUri").string(var_1.as_str());
+    }
     {
         #[allow(unused_mut)]
-        let mut object_1 = object.key("programmingLanguage").start_object();
+        let mut object_2 = object.key("programmingLanguage").start_object();
         crate::protocol_serde::shape_programming_language::ser_programming_language(
-            &mut object_1,
+            &mut object_2,
             &input.programming_language,
         )?;
-        object_1.finish();
+        object_2.finish();
     }
     Ok(())
 }
diff --git a/crates/amzn-consolas-client/src/types/_file_context.rs b/crates/amzn-consolas-client/src/types/_file_context.rs
index 201823112b..58d682d8df 100644
--- a/crates/amzn-consolas-client/src/types/_file_context.rs
+++ b/crates/amzn-consolas-client/src/types/_file_context.rs
@@ -9,6 +9,8 @@ pub struct FileContext {
     pub right_file_content: ::std::string::String,
     #[allow(missing_docs)] // documentation missing in model
     pub filename: ::std::string::String,
+    #[allow(missing_docs)] // documentation missing in model
+    pub file_uri: ::std::option::Option<::std::string::String>,
     /// Programming Languages supported by CodeWhisperer
     pub programming_language: crate::types::ProgrammingLanguage,
 }
@@ -31,6 +33,11 @@ impl FileContext {
         self.filename.deref()
     }
 
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn file_uri(&self) -> ::std::option::Option<&str> {
+        self.file_uri.as_deref()
+    }
+
     /// Programming Languages supported by CodeWhisperer
     pub fn programming_language(&self) -> &crate::types::ProgrammingLanguage {
         &self.programming_language
@@ -42,6 +49,7 @@ impl ::std::fmt::Debug for FileContext {
         formatter.field("left_file_content", &"*** Sensitive Data Redacted ***");
         formatter.field("right_file_content", &"*** Sensitive Data Redacted ***");
         formatter.field("filename", &"*** Sensitive Data Redacted ***");
+        formatter.field("file_uri", &"*** Sensitive Data Redacted ***");
         formatter.field("programming_language", &self.programming_language);
         formatter.finish()
     }
@@ -61,6 +69,7 @@ pub struct FileContextBuilder {
     pub(crate) left_file_content: ::std::option::Option<::std::string::String>,
     pub(crate) right_file_content: ::std::option::Option<::std::string::String>,
     pub(crate) filename: ::std::option::Option<::std::string::String>,
+    pub(crate) file_uri: ::std::option::Option<::std::string::String>,
     pub(crate) programming_language: ::std::option::Option<crate::types::ProgrammingLanguage>,
 }
 impl FileContextBuilder {
@@ -118,6 +127,23 @@ impl FileContextBuilder {
         &self.filename
     }
 
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn file_uri(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.file_uri = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn set_file_uri(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.file_uri = input;
+        self
+    }
+
+    #[allow(missing_docs)] // documentation missing in model
+    pub fn get_file_uri(&self) -> &::std::option::Option<::std::string::String> {
+        &self.file_uri
+    }
+
     /// Programming Languages supported by CodeWhisperer
     /// This field is required.
     pub fn programming_language(mut self, input: crate::types::ProgrammingLanguage) -> Self {
@@ -164,6 +190,7 @@ impl FileContextBuilder {
                     "filename was not specified but it is required when building FileContext",
                 )
             })?,
+            file_uri: self.file_uri,
             programming_language: self.programming_language.ok_or_else(|| {
                 ::aws_smithy_types::error::operation::BuildError::missing_field(
                     "programming_language",
@@ -179,6 +206,7 @@ impl ::std::fmt::Debug for FileContextBuilder {
         formatter.field("left_file_content", &"*** Sensitive Data Redacted ***");
         formatter.field("right_file_content", &"*** Sensitive Data Redacted ***");
         formatter.field("filename", &"*** Sensitive Data Redacted ***");
+        formatter.field("file_uri", &"*** Sensitive Data Redacted ***");
         formatter.field("programming_language", &self.programming_language);
         formatter.finish()
     }
diff --git a/crates/amzn-qdeveloper-streaming-client/Cargo.toml b/crates/amzn-qdeveloper-streaming-client/Cargo.toml
index fdb0ade48e..29e4d5e25c 100644
--- a/crates/amzn-qdeveloper-streaming-client/Cargo.toml
+++ b/crates/amzn-qdeveloper-streaming-client/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "amzn-qdeveloper-streaming-client"
-version = "0.1.8200"
+version = "0.1.8702"
 authors = ["Grant Gurvis <grangurv@amazon.com>"]
 build = false
 exclude = [
@@ -70,11 +70,11 @@ version = "1.2.4"
 version = "0.60.6"
 
 [dependencies.aws-smithy-http]
-version = "0.60.12"
+version = "0.62.1"
 features = ["event-stream"]
 
 [dependencies.aws-smithy-json]
-version = "0.61.2"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.7.8"
diff --git a/crates/amzn-qdeveloper-streaming-client/src/protocol_serde/shape_user_input_message.rs b/crates/amzn-qdeveloper-streaming-client/src/protocol_serde/shape_user_input_message.rs
index 716eb41329..2c43086677 100644
--- a/crates/amzn-qdeveloper-streaming-client/src/protocol_serde/shape_user_input_message.rs
+++ b/crates/amzn-qdeveloper-streaming-client/src/protocol_serde/shape_user_input_message.rs
@@ -30,5 +30,8 @@ pub fn ser_user_input_message(
         }
         array_6.finish();
     }
+    if let Some(var_9) = &input.model_id {
+        object.key("modelId").string(var_9.as_str());
+    }
     Ok(())
 }
diff --git a/crates/amzn-qdeveloper-streaming-client/src/types/_user_input_message.rs b/crates/amzn-qdeveloper-streaming-client/src/types/_user_input_message.rs
index 1d8e987387..725358a632 100644
--- a/crates/amzn-qdeveloper-streaming-client/src/types/_user_input_message.rs
+++ b/crates/amzn-qdeveloper-streaming-client/src/types/_user_input_message.rs
@@ -14,6 +14,8 @@ pub struct UserInputMessage {
     pub origin: ::std::option::Option<crate::types::Origin>,
     /// Images associated with the Chat Message.
     pub images: ::std::option::Option<::std::vec::Vec<crate::types::ImageBlock>>,
+    /// Unique identifier for the model used in this conversation
+    pub model_id: ::std::option::Option<::std::string::String>,
 }
 impl UserInputMessage {
     /// The content of the chat message.
@@ -44,6 +46,11 @@ impl UserInputMessage {
     pub fn images(&self) -> &[crate::types::ImageBlock] {
         self.images.as_deref().unwrap_or_default()
     }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn model_id(&self) -> ::std::option::Option<&str> {
+        self.model_id.as_deref()
+    }
 }
 impl ::std::fmt::Debug for UserInputMessage {
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
@@ -53,6 +60,7 @@ impl ::std::fmt::Debug for UserInputMessage {
         formatter.field("user_intent", &self.user_intent);
         formatter.field("origin", &self.origin);
         formatter.field("images", &self.images);
+        formatter.field("model_id", &self.model_id);
         formatter.finish()
     }
 }
@@ -73,6 +81,7 @@ pub struct UserInputMessageBuilder {
     pub(crate) user_intent: ::std::option::Option<crate::types::UserIntent>,
     pub(crate) origin: ::std::option::Option<crate::types::Origin>,
     pub(crate) images: ::std::option::Option<::std::vec::Vec<crate::types::ImageBlock>>,
+    pub(crate) model_id: ::std::option::Option<::std::string::String>,
 }
 impl UserInputMessageBuilder {
     /// The content of the chat message.
@@ -170,6 +179,23 @@ impl UserInputMessageBuilder {
         &self.images
     }
 
+    /// Unique identifier for the model used in this conversation
+    pub fn model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.model_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn set_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.model_id = input;
+        self
+    }
+
+    /// Unique identifier for the model used in this conversation
+    pub fn get_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.model_id
+    }
+
     /// Consumes the builder and constructs a [`UserInputMessage`](crate::types::UserInputMessage).
     /// This method will fail if any of the following fields are not set:
     /// - [`content`](crate::types::builders::UserInputMessageBuilder::content)
@@ -187,6 +213,7 @@ impl UserInputMessageBuilder {
             user_intent: self.user_intent,
             origin: self.origin,
             images: self.images,
+            model_id: self.model_id,
         })
     }
 }
@@ -198,6 +225,7 @@ impl ::std::fmt::Debug for UserInputMessageBuilder {
         formatter.field("user_intent", &self.user_intent);
         formatter.field("origin", &self.origin);
         formatter.field("images", &self.images);
+        formatter.field("model_id", &self.model_id);
         formatter.finish()
     }
 }
diff --git a/crates/amzn-toolkit-telemetry-client/Cargo.toml b/crates/amzn-toolkit-telemetry-client/Cargo.toml
index 5ac7b22007..0e546aab79 100644
--- a/crates/amzn-toolkit-telemetry-client/Cargo.toml
+++ b/crates/amzn-toolkit-telemetry-client/Cargo.toml
@@ -38,10 +38,10 @@ version = "1.1.3"
 version = "1.1.3"
 
 [dependencies.aws-smithy-http]
-version = "0.60.3"
+version = "0.62.1"
 
 [dependencies.aws-smithy-json]
-version = "0.60.3"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.1.3"
diff --git a/crates/chat-cli/Cargo.toml b/crates/chat-cli/Cargo.toml
index 2b7ae4d42b..1e7bb1757e 100644
--- a/crates/chat-cli/Cargo.toml
+++ b/crates/chat-cli/Cargo.toml
@@ -178,13 +178,16 @@ security-framework = "3.2.0"
 [target.'cfg(windows)'.dependencies]
 windows = { version = "0.61.1", features = [
     "Foundation",
+    "Win32_System_ProcessStatus",
+    "Win32_System_Kernel",
     "Win32_System_Threading",
+    "Wdk_System_Threading",
 ] }
 winreg = "0.55.0"
 
 [dev-dependencies]
 assert_cmd = "2.0"
-criterion = "0.5.1"
+criterion = "0.6.0"
 mockito = "1.7.0"
 paste = "1.0.11"
 predicates = "3.0"
diff --git a/crates/chat-cli/src/auth/builder_id.rs b/crates/chat-cli/src/auth/builder_id.rs
index e12d87dc77..c45d7fb289 100644
--- a/crates/chat-cli/src/auth/builder_id.rs
+++ b/crates/chat-cli/src/auth/builder_id.rs
@@ -45,9 +45,11 @@ use time::OffsetDateTime;
 use tracing::{
     debug,
     error,
+    trace,
     warn,
 };
 
+use crate::api_client::clients::shared::stalled_stream_protection_config;
 use crate::auth::AuthError;
 use crate::auth::consts::*;
 use crate::auth::scope::is_scopes;
@@ -85,6 +87,7 @@ pub fn client(region: Region) -> Client {
             .region(region)
             .retry_config(RetryConfig::standard().with_max_attempts(3))
             .sleep_impl(SharedAsyncSleep::new(TokioSleep::new()))
+            .stalled_stream_protection(stalled_stream_protection_config())
             .app_name(app_name())
             .build(),
     )
@@ -123,6 +126,7 @@ impl DeviceRegistration {
 
     /// Loads the OIDC registered client from the secret store, deleting it if it is expired.
     async fn load_from_secret_store(database: &Database, region: &Region) -> Result<Option<Self>, AuthError> {
+        trace!(?region, "loading device registration from secret store");
         let device_registration = database.get_secret(Self::SECRET_KEY).await?;
 
         if let Some(device_registration) = device_registration {
@@ -130,9 +134,18 @@ impl DeviceRegistration {
             let device_registration: Self = serde_json::from_str(&device_registration.0)?;
 
             if let Some(client_secret_expires_at) = device_registration.client_secret_expires_at {
-                if !is_expired(&client_secret_expires_at) && device_registration.region == region.as_ref() {
+                let is_expired = is_expired(&client_secret_expires_at);
+                let registration_region_is_valid = device_registration.region == region.as_ref();
+                trace!(
+                    ?is_expired,
+                    ?registration_region_is_valid,
+                    "checking if device registration is valid"
+                );
+                if !is_expired && registration_region_is_valid {
                     return Ok(Some(device_registration));
                 }
+            } else {
+                warn!("no expiration time found for the client secret");
             }
         }
 
@@ -291,19 +304,25 @@ impl BuilderIdToken {
                 match token {
                     Some(token) => {
                         let region = token.region.clone().map_or(OIDC_BUILDER_ID_REGION, Region::new);
-
                         let client = client(region.clone());
-                        // if token is expired try to refresh
+
                         if token.is_expired() {
+                            trace!("token is expired, refreshing");
                             token.refresh_token(&client, database, &region).await
                         } else {
                             Ok(Some(token))
                         }
                     },
-                    None => Ok(None),
+                    None => {
+                        debug!("secret stored in the database was empty");
+                        Ok(None)
+                    },
                 }
             },
-            Ok(None) => Ok(None),
+            Ok(None) => {
+                debug!("no secret found in the database");
+                Ok(None)
+            },
             Err(err) => {
                 error!(%err, "Error getting builder id token from keychain");
                 Err(err)?
diff --git a/crates/chat-cli/src/cli/chat/command.rs b/crates/chat-cli/src/cli/chat/command.rs
index f2a4262b60..5252e63aa1 100644
--- a/crates/chat-cli/src/cli/chat/command.rs
+++ b/crates/chat-cli/src/cli/chat/command.rs
@@ -58,6 +58,7 @@ pub enum Command {
         path: String,
         force: bool,
     },
+    Mcp,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -837,6 +838,7 @@ impl Command {
                     }
                     Self::Save { path, force }
                 },
+                "mcp" => Self::Mcp,
                 unknown_command => {
                     let looks_like_path = {
                         let after_slash_command_str = parts[1..].join(" ");
diff --git a/crates/chat-cli/src/cli/chat/conversation_state.rs b/crates/chat-cli/src/cli/chat/conversation_state.rs
index 6238114adb..b6b9c8414d 100644
--- a/crates/chat-cli/src/cli/chat/conversation_state.rs
+++ b/crates/chat-cli/src/cli/chat/conversation_state.rs
@@ -1049,12 +1049,13 @@ mod tests {
     #[tokio::test]
     async fn test_conversation_state_history_handling_truncation() {
         let mut database = Database::new().await.unwrap();
+        let mut output = SharedWriter::null();
 
         let mut tool_manager = ToolManager::default();
         let mut conversation_state = ConversationState::new(
             Context::new(),
             "fake_conv_id",
-            tool_manager.load_tools(&database).await.unwrap(),
+            tool_manager.load_tools(&database, &mut output).await.unwrap(),
             None,
             None,
             tool_manager,
@@ -1076,10 +1077,11 @@ mod tests {
     #[tokio::test]
     async fn test_conversation_state_history_handling_with_tool_results() {
         let mut database = Database::new().await.unwrap();
+        let mut output = SharedWriter::null();
 
         // Build a long conversation history of tool use results.
         let mut tool_manager = ToolManager::default();
-        let tool_config = tool_manager.load_tools(&database).await.unwrap();
+        let tool_config = tool_manager.load_tools(&database, &mut output).await.unwrap();
         let mut conversation_state = ConversationState::new(
             Context::new(),
             "fake_conv_id",
@@ -1150,6 +1152,7 @@ mod tests {
     #[tokio::test]
     async fn test_conversation_state_with_context_files() {
         let mut database = Database::new().await.unwrap();
+        let mut output = SharedWriter::null();
 
         let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
         ctx.fs().write(AMAZONQ_FILENAME, "test context").await.unwrap();
@@ -1158,7 +1161,7 @@ mod tests {
         let mut conversation_state = ConversationState::new(
             ctx,
             "fake_conv_id",
-            tool_manager.load_tools(&database).await.unwrap(),
+            tool_manager.load_tools(&database, &mut output).await.unwrap(),
             None,
             None,
             tool_manager,
@@ -1199,6 +1202,7 @@ mod tests {
         // tracing_subscriber::fmt::try_init().ok();
 
         let mut database = Database::new().await.unwrap();
+        let mut output = SharedWriter::null();
 
         let mut tool_manager = ToolManager::default();
         let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
@@ -1227,7 +1231,7 @@ mod tests {
         let mut conversation_state = ConversationState::new(
             ctx,
             "fake_conv_id",
-            tool_manager.load_tools(&database).await.unwrap(),
+            tool_manager.load_tools(&database, &mut output).await.unwrap(),
             None,
             Some(SharedWriter::stdout()),
             tool_manager,
diff --git a/crates/chat-cli/src/cli/chat/mod.rs b/crates/chat-cli/src/cli/chat/mod.rs
index 9645732e02..b4bcb8af74 100644
--- a/crates/chat-cli/src/cli/chat/mod.rs
+++ b/crates/chat-cli/src/cli/chat/mod.rs
@@ -107,6 +107,7 @@ use token_counter::{
 use tokio::signal::ctrl_c;
 use tool_manager::{
     GetPromptError,
+    LoadingRecord,
     McpServerConfig,
     PromptBundle,
     ToolManager,
@@ -117,6 +118,7 @@ use tools::{
     OutputKind,
     QueuedTool,
     Tool,
+    ToolOrigin,
     ToolPermissions,
     ToolSpec,
 };
@@ -203,7 +205,7 @@ const WELCOME_TEXT: &str = color_print::cstr! {"<cyan!>
 const SMALL_SCREEN_WELCOME_TEXT: &str = color_print::cstr! {"<em>Welcome to <cyan!>Amazon Q</cyan!>!</em>"};
 const RESUME_TEXT: &str = color_print::cstr! {"<em>Picking up where we left off...</em>"};
 
-const ROTATING_TIPS: [&str; 12] = [
+const ROTATING_TIPS: [&str; 13] = [
     color_print::cstr! {"You can resume the last conversation from your current directory by launching with <green!>q chat --resume</green!>"},
     color_print::cstr! {"Get notified whenever Q CLI finishes responding. Just run <green!>q settings chat.enableNotifications true</green!>"},
     color_print::cstr! {"You can use <green!>/editor</green!> to edit your prompt with a vim-like experience"},
@@ -216,6 +218,7 @@ const ROTATING_TIPS: [&str; 12] = [
     color_print::cstr! {"If you want to file an issue to the Q CLI team, just tell me, or run <green!>q issue</green!>"},
     color_print::cstr! {"You can enable custom tools with <green!>MCP servers</green!>. Learn more with /help"},
     color_print::cstr! {"You can specify wait time (in ms) for mcp server loading with <green!>q settings mcp.initTimeout {timeout in int}</green!>. Servers that takes longer than the specified time will continue to load in the background. Use /tools to see pending servers."},
+    color_print::cstr! {"You can see the server load status as well as any warnings or errors associated with <green!>/mcp</green!>"},
 ];
 
 const GREETING_BREAK_POINT: usize = 80;
@@ -245,6 +248,7 @@ const HELP_TEXT: &str = color_print::cstr! {"
   <em>untrust</em>     <black!>Revert a tool or tools to per-request confirmation</black!>
   <em>trustall</em>    <black!>Trust all tools (equivalent to deprecated /acceptall)</black!>
   <em>reset</em>       <black!>Reset all tools to default permission levels</black!>
+<em>/mcp</em>          <black!>See mcp server loaded</black!>
 <em>/profile</em>      <black!>Manage profiles</black!>
   <em>help</em>        <black!>Show profile help</black!>
   <em>list</em>        <black!>List profiles</black!>
@@ -275,6 +279,7 @@ const HELP_TEXT: &str = color_print::cstr! {"
 <em>Ctrl(^) + j</em>           <black!>Insert new-line to provide multi-line prompt. Alternatively, [Alt(⌥) + Enter(⏎)]</black!>
 <em>Ctrl(^) + s</em>           <black!>Fuzzy search commands and context files. Use Tab to select multiple items.</black!>
                       <black!>Change the keybind to ctrl+x with: q settings chat.skimCommandKey x (where x is any key)</black!>
+<em>chat.editMode</em>         <black!>Set editing mode (vim or emacs) using: q settings chat.editMode vi/emacs</black!>
 
 "};
 
@@ -411,7 +416,7 @@ pub async fn chat(
         .interactive(interactive)
         .build(telemetry, tool_manager_output)
         .await?;
-    let tool_config = tool_manager.load_tools(database).await?;
+    let tool_config = tool_manager.load_tools(database, &mut output).await?;
     let mut tool_permissions = ToolPermissions::new(tool_config.len());
     if accept_all || trust_all_tools {
         tool_permissions.trust_all = true;
@@ -2399,24 +2404,43 @@ impl ChatContext {
                             style::Print("▔".repeat(terminal_width)),
                         )?;
 
-                        self.conversation_state.tools.iter().for_each(|(origin, tools)| {
-                            let to_display = tools
+                        let mut origin_tools: Vec<_> = self.conversation_state.tools.iter().collect();
+
+                        // Built in tools always appear first.
+                        origin_tools.sort_by(|(origin_a, _), (origin_b, _)| match (origin_a, origin_b) {
+                            (ToolOrigin::Native, _) => std::cmp::Ordering::Less,
+                            (_, ToolOrigin::Native) => std::cmp::Ordering::Greater,
+                            (ToolOrigin::McpServer(name_a), ToolOrigin::McpServer(name_b)) => name_a.cmp(name_b),
+                        });
+
+                        for (origin, tools) in origin_tools.iter() {
+                            let mut sorted_tools: Vec<_> = tools
                                 .iter()
                                 .filter(|FigTool::ToolSpecification(spec)| spec.name != DUMMY_TOOL_NAME)
-                                .fold(String::new(), |mut acc, FigTool::ToolSpecification(spec)| {
-                                    let width = longest - spec.name.len() + 4;
-                                    acc.push_str(
-                                        format!(
-                                            "- {}{:>width$}{}\n",
-                                            spec.name,
-                                            "",
-                                            self.tool_permissions.display_label(&spec.name),
-                                            width = width
-                                        )
-                                        .as_str(),
-                                    );
-                                    acc
-                                });
+                                .collect();
+
+                            sorted_tools.sort_by_key(|t| match t {
+                                FigTool::ToolSpecification(spec) => &spec.name,
+                            });
+
+                            let to_display =
+                                sorted_tools
+                                    .iter()
+                                    .fold(String::new(), |mut acc, FigTool::ToolSpecification(spec)| {
+                                        let width = longest - spec.name.len() + 4;
+                                        acc.push_str(
+                                            format!(
+                                                "- {}{:>width$}{}\n",
+                                                spec.name,
+                                                "",
+                                                self.tool_permissions.display_label(&spec.name),
+                                                width = width
+                                            )
+                                            .as_str(),
+                                        );
+                                        acc
+                                    });
+
                             let _ = queue!(
                                 self.output,
                                 style::SetAttribute(Attribute::Bold),
@@ -2425,7 +2449,7 @@ impl ChatContext {
                                 style::Print(to_display),
                                 style::Print("\n")
                             );
-                        });
+                        }
 
                         let loading = self.conversation_state.tool_manager.pending_clients().await;
                         if !loading.is_empty() {
@@ -2444,7 +2468,7 @@ impl ChatContext {
 
                         queue!(
                             self.output,
-                            style::Print("\nTrusted tools can be run without confirmation\n"),
+                            style::Print("\nTrusted tools will run without confirmation."),
                             style::SetForegroundColor(Color::DarkGrey),
                             style::Print(format!("\n{}\n", "* Default settings")),
                             style::Print("\n💡 Use "),
@@ -2452,7 +2476,7 @@ impl ChatContext {
                             style::Print("/tools help"),
                             style::SetForegroundColor(Color::Reset),
                             style::SetForegroundColor(Color::DarkGrey),
-                            style::Print(" to edit permissions."),
+                            style::Print(" to edit permissions.\n\n"),
                             style::SetForegroundColor(Color::Reset),
                         )?;
                     },
@@ -2594,23 +2618,31 @@ impl ChatContext {
                             style::Print("\n"),
                             style::Print(format!("{}\n", "▔".repeat(terminal_width))),
                         )?;
-                        let prompts_by_server = prompts_wl.iter().fold(
-                            HashMap::<&String, Vec<&PromptBundle>>::new(),
-                            |mut acc, (prompt_name, bundles)| {
-                                if prompt_name.contains(search_word.as_deref().unwrap_or("")) {
-                                    if prompt_name.len() > longest_name.len() {
-                                        longest_name = prompt_name.as_str();
-                                    }
-                                    for bundle in bundles {
-                                        acc.entry(&bundle.server_name)
-                                            .and_modify(|b| b.push(bundle))
-                                            .or_insert(vec![bundle]);
+                        let mut prompts_by_server: Vec<_> = prompts_wl
+                            .iter()
+                            .fold(
+                                HashMap::<&String, Vec<&PromptBundle>>::new(),
+                                |mut acc, (prompt_name, bundles)| {
+                                    if prompt_name.contains(search_word.as_deref().unwrap_or("")) {
+                                        if prompt_name.len() > longest_name.len() {
+                                            longest_name = prompt_name.as_str();
+                                        }
+                                        for bundle in bundles {
+                                            acc.entry(&bundle.server_name)
+                                                .and_modify(|b| b.push(bundle))
+                                                .or_insert(vec![bundle]);
+                                        }
                                     }
-                                }
-                                acc
-                            },
-                        );
-                        for (i, (server_name, bundles)) in prompts_by_server.iter().enumerate() {
+                                    acc
+                                },
+                            )
+                            .into_iter()
+                            .collect();
+                        prompts_by_server.sort_by_key(|(server_name, _)| server_name.as_str());
+
+                        for (i, (server_name, bundles)) in prompts_by_server.iter_mut().enumerate() {
+                            bundles.sort_by_key(|bundle| &bundle.prompt_get.name);
+
                             if i > 0 {
                                 queue!(self.output, style::Print("\n"))?;
                             }
@@ -2920,6 +2952,53 @@ impl ChatContext {
                     skip_printing_tools: true,
                 }
             },
+            Command::Mcp => {
+                let terminal_width = self.terminal_width();
+                let loaded_servers = self.conversation_state.tool_manager.mcp_load_record.lock().await;
+                let still_loading = self
+                    .conversation_state
+                    .tool_manager
+                    .pending_clients()
+                    .await
+                    .into_iter()
+                    .map(|name| format!(" - {name}\n"))
+                    .collect::<Vec<_>>()
+                    .join("");
+                for (server_name, msg) in loaded_servers.iter() {
+                    let msg = msg
+                        .iter()
+                        .map(|record| match record {
+                            LoadingRecord::Err(content)
+                            | LoadingRecord::Warn(content)
+                            | LoadingRecord::Success(content) => content.clone(),
+                        })
+                        .collect::<Vec<_>>()
+                        .join("\n--- tools refreshed ---\n");
+                    queue!(
+                        self.output,
+                        style::Print(server_name),
+                        style::Print("\n"),
+                        style::Print(format!("{}\n", "▔".repeat(terminal_width))),
+                        style::Print(msg),
+                        style::Print("\n")
+                    )?;
+                }
+                if !still_loading.is_empty() {
+                    queue!(
+                        self.output,
+                        style::Print("Still loading:\n"),
+                        style::Print(format!("{}\n", "▔".repeat(terminal_width))),
+                        style::Print(still_loading),
+                        style::Print("\n")
+                    )?;
+                }
+                self.output.flush()?;
+                ChatState::PromptUser {
+                    tool_uses: None,
+                    pending_tool_index: None,
+                    skip_printing_tools: true,
+                }
+            },
         })
     }
 
diff --git a/crates/chat-cli/src/cli/chat/server_messenger.rs b/crates/chat-cli/src/cli/chat/server_messenger.rs
index 3adc665d15..966600fc44 100644
--- a/crates/chat-cli/src/cli/chat/server_messenger.rs
+++ b/crates/chat-cli/src/cli/chat/server_messenger.rs
@@ -14,23 +14,23 @@ use crate::mcp_client::{
 };
 
 #[allow(dead_code)]
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub enum UpdateEventMessage {
     ToolsListResult {
         server_name: String,
-        result: ToolsListResult,
+        result: eyre::Result<ToolsListResult>,
     },
     PromptsListResult {
         server_name: String,
-        result: PromptsListResult,
+        result: eyre::Result<PromptsListResult>,
     },
     ResourcesListResult {
         server_name: String,
-        result: ResourcesListResult,
+        result: eyre::Result<ResourcesListResult>,
     },
     ResourceTemplatesListResult {
         server_name: String,
-        result: ResourceTemplatesListResult,
+        result: eyre::Result<ResourceTemplatesListResult>,
     },
     InitStart {
         server_name: String,
@@ -67,7 +67,7 @@ pub struct ServerMessenger {
 
 #[async_trait::async_trait]
 impl Messenger for ServerMessenger {
-    async fn send_tools_list_result(&self, result: ToolsListResult) -> Result<(), MessengerError> {
+    async fn send_tools_list_result(&self, result: eyre::Result<ToolsListResult>) -> Result<(), MessengerError> {
         Ok(self
             .update_event_sender
             .send(UpdateEventMessage::ToolsListResult {
@@ -78,7 +78,7 @@ impl Messenger for ServerMessenger {
             .map_err(|e| MessengerError::Custom(e.to_string()))?)
     }
 
-    async fn send_prompts_list_result(&self, result: PromptsListResult) -> Result<(), MessengerError> {
+    async fn send_prompts_list_result(&self, result: eyre::Result<PromptsListResult>) -> Result<(), MessengerError> {
         Ok(self
             .update_event_sender
             .send(UpdateEventMessage::PromptsListResult {
@@ -89,7 +89,10 @@ impl Messenger for ServerMessenger {
             .map_err(|e| MessengerError::Custom(e.to_string()))?)
     }
 
-    async fn send_resources_list_result(&self, result: ResourcesListResult) -> Result<(), MessengerError> {
+    async fn send_resources_list_result(
+        &self,
+        result: eyre::Result<ResourcesListResult>,
+    ) -> Result<(), MessengerError> {
         Ok(self
             .update_event_sender
             .send(UpdateEventMessage::ResourcesListResult {
@@ -102,7 +105,7 @@ impl Messenger for ServerMessenger {
 
     async fn send_resource_templates_list_result(
         &self,
-        result: ResourceTemplatesListResult,
+        result: eyre::Result<ResourceTemplatesListResult>,
     ) -> Result<(), MessengerError> {
         Ok(self
             .update_event_sender
diff --git a/crates/chat-cli/src/cli/chat/tool_manager.rs b/crates/chat-cli/src/cli/chat/tool_manager.rs
index 12c92d203c..c38d441c76 100644
--- a/crates/chat-cli/src/cli/chat/tool_manager.rs
+++ b/crates/chat-cli/src/cli/chat/tool_manager.rs
@@ -7,7 +7,10 @@ use std::hash::{
     DefaultHasher,
     Hasher,
 };
-use std::io::Write;
+use std::io::{
+    BufWriter,
+    Write,
+};
 use std::path::{
     Path,
     PathBuf,
@@ -17,11 +20,14 @@ use std::sync::atomic::{
     AtomicBool,
     Ordering,
 };
-use std::sync::mpsc::RecvTimeoutError;
 use std::sync::{
     Arc,
     RwLock as SyncRwLock,
 };
+use std::time::{
+    Duration,
+    Instant,
+};
 
 use convert_case::Casing;
 use crossterm::{
@@ -45,6 +51,7 @@ use thiserror::Error;
 use tokio::signal::ctrl_c;
 use tokio::sync::{
     Mutex,
+    Notify,
     RwLock,
 };
 use tracing::{
@@ -52,6 +59,7 @@ use tracing::{
     warn,
 };
 
+use super::util::shared_writer::SharedWriter;
 use crate::api_client::model::{
     ToolResult,
     ToolResultContentBlock,
@@ -83,6 +91,7 @@ use crate::database::Database;
 use crate::database::settings::Setting;
 use crate::mcp_client::{
     JsonRpcResponse,
+    Messenger,
     PromptGet,
 };
 use crate::platform::Context;
@@ -125,34 +134,38 @@ pub enum GetPromptError {
 /// display thread. These messages control the visual loading indicators shown to
 /// the user during tool initialization.
 enum LoadingMsg {
-    /// Indicates a new tool is being initialized and should be added to the loading
-    /// display. The String parameter is the name of the tool being initialized.
-    Add(String),
     /// Indicates a tool has finished initializing successfully and should be removed from
     /// the loading display. The String parameter is the name of the tool that
     /// completed initialization.
-    Done(String),
+    Done { name: String, time: String },
     /// Represents an error that occurred during tool initialization.
     /// Contains the name of the server that failed to initialize and the error message.
-    Error { name: String, msg: eyre::Report },
+    Error {
+        name: String,
+        msg: eyre::Report,
+        time: String,
+    },
     /// Represents a warning that occurred during tool initialization.
     /// Contains the name of the server that generated the warning and the warning message.
-    Warn { name: String, msg: eyre::Report },
+    Warn {
+        name: String,
+        msg: eyre::Report,
+        time: String,
+    },
     /// Signals that the loading display thread should terminate.
     /// This is sent when all tool initialization is complete or when the application is shutting
     /// down.
-    Terminate,
+    Terminate { still_loading: Vec<String> },
 }
 
-/// Represents the state of a loading indicator for a tool being initialized.
-///
-/// This struct tracks timing information for each tool's loading status display in the terminal.
-///
-/// # Fields
-/// * `init_time` - When initialization for this tool began, used to calculate load time
-struct StatusLine {
-    init_time: std::time::Instant,
-    is_done: bool,
+/// Used to denote the loading outcome associated with a server.
+/// This is mainly used in the non-interactive mode to determine if there is any fatal errors to
+/// surface (since we would only want to surface fatal errors in non-interactive mode).
+#[derive(Clone, Debug)]
+pub enum LoadingRecord {
+    Success(String),
+    Warn(String),
+    Err(String),
 }
 
 // This is to mirror claude's config set up
@@ -283,141 +296,106 @@ impl ToolManagerBuilder {
                 (sanitized_server_name, custom_tool_client)
             })
             .collect::<Vec<(String, _)>>();
+        let mut loading_servers = HashMap::<String, Instant>::new();
+        for (server_name, _) in &pre_initialized {
+            let init_time = std::time::Instant::now();
+            loading_servers.insert(server_name.clone(), init_time);
+        }
+        let total = loading_servers.len();
 
-        // Send up task to update user on server loading status
-        let (tx, rx) = std::sync::mpsc::channel::<LoadingMsg>();
-        // TODO: rather than using it as an "anchor" to determine the progress of server loads, we
-        // should make this task optional (and it is defined as an optional right now. There is
-        // just no code path with it being None). When ran with no-interactive mode, we really do
-        // not have a need to run this task.
-        let loading_display_task = tokio::task::spawn_blocking(move || {
-            let mut loading_servers = HashMap::<String, StatusLine>::new();
-            let mut spinner_logo_idx: usize = 0;
-            let mut complete: usize = 0;
-            let mut failed: usize = 0;
-            loop {
-                match rx.recv_timeout(std::time::Duration::from_millis(50)) {
-                    Ok(recv_result) => match recv_result {
-                        LoadingMsg::Add(name) => {
-                            let init_time = std::time::Instant::now();
-                            let is_done = false;
-                            let status_line = StatusLine { init_time, is_done };
-                            execute!(output, cursor::MoveToColumn(0))?;
-                            if !loading_servers.is_empty() {
-                                // TODO: account for terminal width
-                                execute!(output, cursor::MoveUp(1))?;
-                            }
-                            loading_servers.insert(name.clone(), status_line);
-                            let total = loading_servers.len();
-                            execute!(output, terminal::Clear(terminal::ClearType::CurrentLine))?;
-                            queue_init_message(spinner_logo_idx, complete, failed, total, &mut output)?;
-                            output.flush()?;
-                        },
-                        LoadingMsg::Done(name) => {
-                            if let Some(status_line) = loading_servers.get_mut(&name) {
-                                status_line.is_done = true;
-                                complete += 1;
-                                let time_taken =
-                                    (std::time::Instant::now() - status_line.init_time).as_secs_f64().abs();
-                                let time_taken = format!("{:.2}", time_taken);
-                                execute!(
-                                    output,
-                                    cursor::MoveToColumn(0),
-                                    cursor::MoveUp(1),
-                                    terminal::Clear(terminal::ClearType::CurrentLine),
-                                )?;
-                                queue_success_message(&name, &time_taken, &mut output)?;
-                                let total = loading_servers.len();
-                                queue_init_message(spinner_logo_idx, complete, failed, total, &mut output)?;
-                                output.flush()?;
-                            }
-                            if loading_servers.iter().all(|(_, status)| status.is_done) {
-                                break;
-                            }
-                        },
-                        LoadingMsg::Error { name, msg } => {
-                            if let Some(status_line) = loading_servers.get_mut(&name) {
-                                status_line.is_done = true;
-                                failed += 1;
-                                execute!(
-                                    output,
-                                    cursor::MoveToColumn(0),
-                                    cursor::MoveUp(1),
-                                    terminal::Clear(terminal::ClearType::CurrentLine),
-                                )?;
-                                queue_failure_message(&name, &msg, &mut output)?;
-                                let total = loading_servers.len();
-                                queue_init_message(spinner_logo_idx, complete, failed, total, &mut output)?;
-                            }
-                            if loading_servers.iter().all(|(_, status)| status.is_done) {
-                                break;
-                            }
-                        },
-                        LoadingMsg::Warn { name, msg } => {
-                            if let Some(status_line) = loading_servers.get_mut(&name) {
-                                status_line.is_done = true;
-                                complete += 1;
-                                execute!(
-                                    output,
-                                    cursor::MoveToColumn(0),
-                                    cursor::MoveUp(1),
-                                    terminal::Clear(terminal::ClearType::CurrentLine),
-                                )?;
-                                let msg = eyre::eyre!(msg.to_string());
-                                queue_warn_message(&name, &msg, &mut output)?;
-                                let total = loading_servers.len();
-                                queue_init_message(spinner_logo_idx, complete, failed, total, &mut output)?;
-                                output.flush()?;
-                            }
-                            if loading_servers.iter().all(|(_, status)| status.is_done) {
-                                break;
-                            }
-                        },
-                        LoadingMsg::Terminate => {
-                            if loading_servers.iter().any(|(_, status)| !status.is_done) {
+        // Spawn a task for displaying the mcp loading statuses.
+        // This is only necessary when we are in interactive mode AND there are servers to load.
+        // Otherwise we do not need to be spawning this.
+        let (_loading_display_task, loading_status_sender) = if is_interactive && total > 0 {
+            let (tx, mut rx) = tokio::sync::mpsc::channel::<LoadingMsg>(50);
+            (
+                Some(tokio::task::spawn(async move {
+                    let mut spinner_logo_idx: usize = 0;
+                    let mut complete: usize = 0;
+                    let mut failed: usize = 0;
+                    queue_init_message(spinner_logo_idx, complete, failed, total, &mut output)?;
+                    loop {
+                        match tokio::time::timeout(Duration::from_millis(50), rx.recv()).await {
+                            Ok(Some(recv_result)) => match recv_result {
+                                LoadingMsg::Done { name, time } => {
+                                    complete += 1;
+                                    execute!(
+                                        output,
+                                        cursor::MoveToColumn(0),
+                                        cursor::MoveUp(1),
+                                        terminal::Clear(terminal::ClearType::CurrentLine),
+                                    )?;
+                                    queue_success_message(&name, &time, &mut output)?;
+                                    queue_init_message(spinner_logo_idx, complete, failed, total, &mut output)?;
+                                },
+                                LoadingMsg::Error { name, msg, time } => {
+                                    failed += 1;
+                                    execute!(
+                                        output,
+                                        cursor::MoveToColumn(0),
+                                        cursor::MoveUp(1),
+                                        terminal::Clear(terminal::ClearType::CurrentLine),
+                                    )?;
+                                    queue_failure_message(&name, &msg, time.as_str(), &mut output)?;
+                                    queue_init_message(spinner_logo_idx, complete, failed, total, &mut output)?;
+                                },
+                                LoadingMsg::Warn { name, msg, time } => {
+                                    complete += 1;
+                                    execute!(
+                                        output,
+                                        cursor::MoveToColumn(0),
+                                        cursor::MoveUp(1),
+                                        terminal::Clear(terminal::ClearType::CurrentLine),
+                                    )?;
+                                    let msg = eyre::eyre!(msg.to_string());
+                                    queue_warn_message(&name, &msg, time.as_str(), &mut output)?;
+                                    queue_init_message(spinner_logo_idx, complete, failed, total, &mut output)?;
+                                },
+                                LoadingMsg::Terminate { still_loading } => {
+                                    if !still_loading.is_empty() {
+                                        execute!(
+                                            output,
+                                            cursor::MoveToColumn(0),
+                                            cursor::MoveUp(1),
+                                            terminal::Clear(terminal::ClearType::CurrentLine),
+                                        )?;
+                                        let msg = still_loading.iter().fold(String::new(), |mut acc, server_name| {
+                                            acc.push_str(format!("\n - {server_name}").as_str());
+                                            acc
+                                        });
+                                        let msg = eyre::eyre!(msg);
+                                        queue_incomplete_load_message(complete, total, &msg, &mut output)?;
+                                    }
+                                    execute!(output, style::Print("\n"),)?;
+                                    break;
+                                },
+                            },
+                            Err(_e) => {
+                                spinner_logo_idx = (spinner_logo_idx + 1) % SPINNER_CHARS.len();
                                 execute!(
                                     output,
+                                    cursor::SavePosition,
                                     cursor::MoveToColumn(0),
                                     cursor::MoveUp(1),
-                                    terminal::Clear(terminal::ClearType::CurrentLine),
+                                    style::Print(SPINNER_CHARS[spinner_logo_idx]),
+                                    cursor::RestorePosition
                                 )?;
-                                let msg =
-                                    loading_servers
-                                        .iter()
-                                        .fold(String::new(), |mut acc, (server_name, status)| {
-                                            if !status.is_done {
-                                                acc.push_str(format!("\n - {server_name}").as_str());
-                                            }
-                                            acc
-                                        });
-                                let msg = eyre::eyre!(msg);
-                                let total = loading_servers.len();
-                                queue_incomplete_load_message(complete, total, &msg, &mut output)?;
-                            }
-                            execute!(output, style::Print("\n"),)?;
-                            break;
-                        },
-                    },
-                    Err(RecvTimeoutError::Timeout) => {
-                        spinner_logo_idx = (spinner_logo_idx + 1) % SPINNER_CHARS.len();
-                        execute!(
-                            output,
-                            cursor::SavePosition,
-                            cursor::MoveToColumn(0),
-                            cursor::MoveUp(1),
-                            style::Print(SPINNER_CHARS[spinner_logo_idx]),
-                            cursor::RestorePosition
-                        )?;
-                    },
-                    _ => break,
-                }
-            }
-            Ok::<_, eyre::Report>(())
-        });
+                            },
+                            _ => break,
+                        }
+                        output.flush()?;
+                    }
+                    Ok::<_, eyre::Report>(())
+                })),
+                Some(tx),
+            )
+        } else {
+            (None, None)
+        };
         let mut clients = HashMap::<String, Arc<CustomToolClient>>::new();
-        let mut load_msg_sender = Some(tx.clone());
+        let mut loading_status_sender_clone = loading_status_sender.clone();
         let conv_id_clone = conversation_id.clone();
-        let regex = Arc::new(Regex::new(VALID_TOOL_NAME)?);
+        let regex = Regex::new(VALID_TOOL_NAME)?;
         let new_tool_specs = Arc::new(Mutex::new(HashMap::new()));
         let new_tool_specs_clone = new_tool_specs.clone();
         let has_new_stuff = Arc::new(AtomicBool::new(false));
@@ -426,51 +404,145 @@ impl ToolManagerBuilder {
         let pending_clone = pending.clone();
         let (mut msg_rx, messenger_builder) = ServerMessengerBuilder::new(20);
         let telemetry_clone = telemetry.clone();
+        let notify = Arc::new(Notify::new());
+        let notify_weak = Arc::downgrade(&notify);
+        let load_record = Arc::new(Mutex::new(HashMap::<String, Vec<LoadingRecord>>::new()));
+        let load_record_clone = load_record.clone();
         tokio::spawn(async move {
+            let mut record_temp_buf = Vec::<u8>::new();
+            let mut initialized = HashSet::<String>::new();
             while let Some(msg) = msg_rx.recv().await {
+                record_temp_buf.clear();
                 // For now we will treat every list result as if they contain the
                 // complete set of tools. This is not necessarily true in the future when
                 // request method on the mcp client no longer buffers all the pages from
                 // list calls.
                 match msg {
                     UpdateEventMessage::ToolsListResult { server_name, result } => {
+                        let time_taken = loading_servers
+                            .remove(&server_name)
+                            .map_or("0.0".to_owned(), |init_time| {
+                                let time_taken = (std::time::Instant::now() - init_time).as_secs_f64().abs();
+                                format!("{:.2}", time_taken)
+                            });
                         pending_clone.write().await.remove(&server_name);
-                        let mut specs = result
-                            .tools
-                            .into_iter()
-                            .filter_map(|v| serde_json::from_value::<ToolSpec>(v).ok())
-                            .collect::<Vec<_>>();
-                        let mut sanitized_mapping = HashMap::<String, String>::new();
-                        if let Some(load_msg) = process_tool_specs(
-                            conv_id_clone.as_str(),
-                            &server_name,
-                            load_msg_sender.is_some(),
-                            &mut specs,
-                            &mut sanitized_mapping,
-                            &regex,
-                            &telemetry_clone,
-                        ) {
-                            let mut has_errored = false;
-                            if let Some(sender) = &load_msg_sender {
-                                if let Err(e) = sender.send(load_msg) {
-                                    warn!(
-                                        "Error sending update message to display task: {:?}\nAssume display task has completed",
-                                        e
+                        match result {
+                            Ok(result) => {
+                                let mut specs = result
+                                    .tools
+                                    .into_iter()
+                                    .filter_map(|v| serde_json::from_value::<ToolSpec>(v).ok())
+                                    .collect::<Vec<_>>();
+                                let mut sanitized_mapping = HashMap::<String, String>::new();
+                                let process_result = process_tool_specs(
+                                    conv_id_clone.as_str(),
+                                    &server_name,
+                                    &mut specs,
+                                    &mut sanitized_mapping,
+                                    &regex,
+                                    &telemetry_clone,
+                                );
+                                if let Some(sender) = &loading_status_sender_clone {
+                                    // Anomalies here are not considered fatal, thus we shall give
+                                    // warnings.
+                                    let msg = match process_result {
+                                        Ok(_) => LoadingMsg::Done {
+                                            name: server_name.clone(),
+                                            time: time_taken.clone(),
+                                        },
+                                        Err(ref e) => LoadingMsg::Warn {
+                                            name: server_name.clone(),
+                                            msg: eyre::eyre!(e.to_string()),
+                                            time: time_taken.clone(),
+                                        },
+                                    };
+                                    if let Err(e) = sender.send(msg).await {
+                                        warn!(
+                                            "Error sending update message to display task: {:?}\nAssume display task has completed",
+                                            e
+                                        );
+                                        loading_status_sender_clone.take();
+                                    }
+                                }
+                                new_tool_specs_clone
+                                    .lock()
+                                    .await
+                                    .insert(server_name.clone(), (sanitized_mapping, specs));
+                                has_new_stuff_clone.store(true, Ordering::Release);
+                                // Maintain a record of the server load:
+                                let mut buf_writer = BufWriter::new(&mut record_temp_buf);
+                                if let Err(e) = &process_result {
+                                    let _ = queue_warn_message(
+                                        server_name.as_str(),
+                                        e,
+                                        time_taken.as_str(),
+                                        &mut buf_writer,
+                                    );
+                                } else {
+                                    let _ = queue_success_message(
+                                        server_name.as_str(),
+                                        time_taken.as_str(),
+                                        &mut buf_writer,
                                     );
-                                    has_errored = true;
                                 }
-                            }
-                            if has_errored {
-                                load_msg_sender.take();
-                            }
+                                let _ = buf_writer.flush();
+                                drop(buf_writer);
+                                let record = String::from_utf8_lossy(&record_temp_buf).to_string();
+                                let record = if process_result.is_err() {
+                                    LoadingRecord::Warn(record)
+                                } else {
+                                    LoadingRecord::Success(record)
+                                };
+                                load_record_clone
+                                    .lock()
+                                    .await
+                                    .entry(server_name.clone())
+                                    .and_modify(|load_record| {
+                                        load_record.push(record.clone());
+                                    })
+                                    .or_insert(vec![record]);
+                            },
+                            Err(e) => {
+                                // Log error to chat Log
+                                error!("Error loading server {server_name}: {:?}", e);
+                                // Maintain a record of the server load:
+                                let mut buf_writer = BufWriter::new(&mut record_temp_buf);
+                                let _ = queue_failure_message(server_name.as_str(), &e, &time_taken, &mut buf_writer);
+                                let _ = buf_writer.flush();
+                                drop(buf_writer);
+                                let record = String::from_utf8_lossy(&record_temp_buf).to_string();
+                                let record = LoadingRecord::Err(record);
+                                load_record_clone
+                                    .lock()
+                                    .await
+                                    .entry(server_name.clone())
+                                    .and_modify(|load_record| {
+                                        load_record.push(record.clone());
+                                    })
+                                    .or_insert(vec![record]);
+                                // Errors surfaced at this point (i.e. before [process_tool_specs]
+                                // is called) are fatals and should be considered errors
+                                if let Some(sender) = &loading_status_sender_clone {
+                                    let msg = LoadingMsg::Error {
+                                        name: server_name.clone(),
+                                        msg: e,
+                                        time: time_taken,
+                                    };
+                                    if let Err(e) = sender.send(msg).await {
+                                        warn!(
+                                            "Error sending update message to display task: {:?}\nAssume display task has completed",
+                                            e
+                                        );
+                                        loading_status_sender_clone.take();
+                                    }
+                                }
+                            },
                         }
-                        new_tool_specs_clone
-                            .lock()
-                            .await
-                            .insert(server_name, (sanitized_mapping, specs));
-                        // We only want to set this flag when the display task has ended
-                        if load_msg_sender.is_none() {
-                            has_new_stuff_clone.store(true, Ordering::Release);
+                        if let Some(notify) = notify_weak.upgrade() {
+                            initialized.insert(server_name);
+                            if initialized.len() >= total {
+                                notify.notify_one();
+                            }
                         }
                     },
                     UpdateEventMessage::PromptsListResult {
@@ -487,17 +559,15 @@ impl ToolManagerBuilder {
                     } => {},
                     UpdateEventMessage::InitStart { server_name } => {
                         pending_clone.write().await.insert(server_name.clone());
-                        if let Some(sender) = &load_msg_sender {
-                            let _ = sender.send(LoadingMsg::Add(server_name));
-                        }
+                        loading_servers.insert(server_name, std::time::Instant::now());
                     },
                 }
             }
         });
         for (mut name, init_res) in pre_initialized {
+            let messenger = messenger_builder.build_with_name(name.clone());
             match init_res {
                 Ok(mut client) => {
-                    let messenger = messenger_builder.build_with_name(client.get_server_name().to_owned());
                     client.assign_messenger(Box::new(messenger));
                     let mut client = Arc::new(client);
                     while let Some(collided_client) = clients.insert(name.clone(), client) {
@@ -512,16 +582,10 @@ impl ToolManagerBuilder {
                     telemetry
                         .send_mcp_server_init(conversation_id.clone(), Some(e.to_string()), 0)
                         .ok();
-
-                    let _ = tx.send(LoadingMsg::Error {
-                        name: name.clone(),
-                        msg: e,
-                    });
+                    let _ = messenger.send_tools_list_result(Err(e)).await;
                 },
             }
         }
-        let loading_display_task = Some(loading_display_task);
-        let loading_status_sender = Some(tx);
 
         // Set up task to handle prompt requests
         let sender = self.prompt_list_sender.take();
@@ -616,12 +680,13 @@ impl ToolManagerBuilder {
             conversation_id,
             clients,
             prompts,
-            loading_display_task,
             pending_clients: pending,
+            notify: Some(notify),
             loading_status_sender,
             new_tool_specs,
             has_new_stuff,
             is_interactive,
+            mcp_load_record: load_record,
             ..Default::default()
         })
     }
@@ -685,13 +750,13 @@ pub struct ToolManager {
     /// cases where multiple servers offer prompts with the same name.
     pub prompts: Arc<SyncRwLock<HashMap<String, Vec<PromptBundle>>>>,
 
-    /// Handle to the thread that displays loading status for tool initialization.
-    /// This thread provides visual feedback to users during the tool loading process.
-    loading_display_task: Option<tokio::task::JoinHandle<Result<(), eyre::Report>>>,
+    /// A notifier to understand if the initial loading has completed.
+    /// This is only used for initial loading and is discarded after.
+    notify: Option<Arc<Notify>>,
 
     /// Channel sender for communicating with the loading display thread.
     /// Used to send status updates about tool initialization progress.
-    loading_status_sender: Option<std::sync::mpsc::Sender<LoadingMsg>>,
+    loading_status_sender: Option<tokio::sync::mpsc::Sender<LoadingMsg>>,
 
     /// Mapping from sanitized tool names to original tool names.
     /// This is used to handle tool name transformations that may occur during initialization
@@ -704,6 +769,13 @@ pub struct ToolManager {
     pub schema: HashMap<String, ToolSpec>,
 
     is_interactive: bool,
+
+    /// This serves as a record of the loading of mcp servers.
+    /// The key of which is the server name as they are recognized by the current instance of chat
+    /// (which may be different than how it is written in the config, depending of the presence of
+    /// invalid characters).
+    /// The value is the load message (i.e. load time, warnings, and errors)
+    pub mcp_load_record: Arc<Mutex<HashMap<String, Vec<LoadingRecord>>>>,
 }
 
 impl Clone for ToolManager {
@@ -717,15 +789,20 @@ impl Clone for ToolManager {
             tn_map: self.tn_map.clone(),
             schema: self.schema.clone(),
             is_interactive: self.is_interactive,
+            mcp_load_record: self.mcp_load_record.clone(),
             ..Default::default()
         }
     }
 }
 
 impl ToolManager {
-    pub async fn load_tools(&mut self, database: &Database) -> eyre::Result<HashMap<String, ToolSpec>> {
+    pub async fn load_tools(
+        &mut self,
+        database: &Database,
+        output: &mut SharedWriter,
+    ) -> eyre::Result<HashMap<String, ToolSpec>> {
         let tx = self.loading_status_sender.take();
-        let display_task = self.loading_display_task.take();
+        let notify = self.notify.take();
         self.schema = {
             let mut tool_specs =
                 serde_json::from_str::<HashMap<String, ToolSpec>>(include_str!("tools/tool_index.json"))?;
@@ -750,17 +827,6 @@ impl ToolManager {
         });
         // We need to cast it to erase the type otherwise the compiler will default to static
         // dispatch, which would result in an error of inconsistent match arm return type.
-        let display_fut: Pin<Box<dyn Future<Output = ()>>> = match display_task {
-            Some(display_task) => {
-                let fut = async move {
-                    if let Err(e) = display_task.await {
-                        error!("Error while joining status display task: {:?}", e);
-                    }
-                };
-                Box::pin(fut)
-            },
-            None => Box::pin(future::pending()),
-        };
         let timeout_fut: Pin<Box<dyn Future<Output = ()>>> = if self.clients.is_empty() {
             // If there is no server loaded, we want to resolve immediately
             Box::pin(future::ready(()))
@@ -771,25 +837,67 @@ impl ToolManager {
                 .map_or(5000_u64, |s| s as u64);
             Box::pin(tokio::time::sleep(std::time::Duration::from_millis(init_timeout)))
         } else {
-            Box::pin(future::pending())
+            // if it is non-interactive we will want to use the "mcp.noInteractiveTimeout"
+            let init_timeout = database
+                .settings
+                .get_int(Setting::McpNoInteractiveTimeout)
+                .map_or(30_000_u64, |s| s as u64);
+            Box::pin(tokio::time::sleep(std::time::Duration::from_millis(init_timeout)))
+        };
+        let server_loading_fut: Pin<Box<dyn Future<Output = ()>>> = if let Some(notify) = notify {
+            Box::pin(async move { notify.notified().await })
+        } else {
+            Box::pin(future::ready(()))
         };
         tokio::select! {
-            _ = display_fut => {},
             _ = timeout_fut => {
                 if let Some(tx) = tx {
-                    let _ = tx.send(LoadingMsg::Terminate);
+                    let still_loading = self.pending_clients.read().await.iter().cloned().collect::<Vec<_>>();
+                    let _ = tx.send(LoadingMsg::Terminate { still_loading }).await;
+                }
+                if !self.clients.is_empty() && !self.is_interactive {
+                    let _ = queue!(
+                        output,
+                        style::Print(
+                            "Not all mcp servers loaded. Configure no-interactive timeout with q settings mcp.noInteractiveTimeout"
+                        ),
+                        style::Print("\n------\n")
+                    );
                 }
             },
+            _ = server_loading_fut => {
+                if let Some(tx) = tx {
+                    let still_loading = self.pending_clients.read().await.iter().cloned().collect::<Vec<_>>();
+                    let _ = tx.send(LoadingMsg::Terminate { still_loading }).await;
+                }
+            }
             _ = ctrl_c() => {
                 if self.is_interactive {
                     if let Some(tx) = tx {
-                        let _ = tx.send(LoadingMsg::Terminate);
+                        let still_loading = self.pending_clients.read().await.iter().cloned().collect::<Vec<_>>();
+                        let _ = tx.send(LoadingMsg::Terminate { still_loading }).await;
                     }
                 } else {
                     return Err(eyre::eyre!("User interrupted mcp server loading in non-interactive mode. Ending."));
                 }
             }
         }
+        if !self.is_interactive
+            && self
+                .mcp_load_record
+                .lock()
+                .await
+                .iter()
+                .any(|(_, records)| records.iter().any(|record| matches!(record, LoadingRecord::Err(_))))
+        {
+            queue!(
+                output,
+                style::Print(
+                    "One or more mcp server did not load correctly. See $TMPDIR/qlog/chat.log for more details."
+                ),
+                style::Print("\n------\n")
+            )?;
+        }
         self.update().await;
         Ok(self.schema.clone())
     }
@@ -1099,12 +1207,11 @@ impl ToolManager {
 fn process_tool_specs(
     conversation_id: &str,
     server_name: &str,
-    is_in_display: bool,
     specs: &mut Vec<ToolSpec>,
     tn_map: &mut HashMap<String, String>,
-    regex: &Arc<Regex>,
+    regex: &Regex,
     telemetry: &TelemetryThread,
-) -> Option<LoadingMsg> {
+) -> eyre::Result<()> {
     // Each mcp server might have multiple tools.
     // To avoid naming conflicts we are going to namespace it.
     // This would also help us locate which mcp server to call the tool from.
@@ -1155,8 +1262,8 @@ fn process_tool_specs(
     // considered a "server load". Reasoning being:
     // - Failures here are not related to server load
     // - There is not a whole lot we can do with this data
-    let loading_msg = if !out_of_spec_tool_names.is_empty() {
-        let msg = out_of_spec_tool_names.iter().fold(
+    if !out_of_spec_tool_names.is_empty() {
+        Err(eyre::eyre!(out_of_spec_tool_names.iter().fold(
             String::from(
                 "The following tools are out of spec. They will be excluded from the list of available tools:\n",
             ),
@@ -1174,46 +1281,23 @@ fn process_tool_specs(
                         (tool_name.as_str(), "tool schema contains empty description")
                     },
                 };
-                acc.push_str(format!("  - {} ({})\n", tool_name, msg).as_str());
+                acc.push_str(format!(" - {} ({})\n", tool_name, msg).as_str());
                 acc
             },
-        );
-        error!(
-            "Server {} finished loading with the following error: \n{}",
-            server_name, msg
-        );
-        if is_in_display {
-            Some(LoadingMsg::Warn {
-                name: server_name.to_string(),
-                msg: eyre::eyre!(msg),
-            })
-        } else {
-            None
-        }
+        )))
         // TODO: if no tools are valid, we need to offload the server
         // from the fleet (i.e. kill the server)
     } else if !tn_map.is_empty() {
-        let warn = tn_map.iter().fold(
+        Err(eyre::eyre!(tn_map.iter().fold(
             String::from("The following tool names are changed:\n"),
             |mut acc, (k, v)| {
                 acc.push_str(format!(" - {} -> {}\n", v, k).as_str());
                 acc
             },
-        );
-        if is_in_display {
-            Some(LoadingMsg::Warn {
-                name: server_name.to_string(),
-                msg: eyre::eyre!(warn),
-            })
-        } else {
-            None
-        }
-    } else if is_in_display {
-        Some(LoadingMsg::Done(server_name.to_string()))
+        )))
     } else {
-        None
-    };
-    loading_msg
+        Ok(())
+    }
 }
 
 fn sanitize_name(orig: String, regex: &regex::Regex, hasher: &mut impl Hasher) -> String {
@@ -1253,6 +1337,7 @@ fn queue_success_message(name: &str, time_taken: &str, output: &mut impl Write)
         style::Print(" loaded in "),
         style::SetForegroundColor(style::Color::Yellow),
         style::Print(format!("{time_taken} s\n")),
+        style::ResetColor,
     )?)
 }
 
@@ -1303,7 +1388,12 @@ fn queue_init_message(
     Ok(queue!(output, style::Print("\n"))?)
 }
 
-fn queue_failure_message(name: &str, fail_load_msg: &eyre::Report, output: &mut impl Write) -> eyre::Result<()> {
+fn queue_failure_message(
+    name: &str,
+    fail_load_msg: &eyre::Report,
+    time: &str,
+    output: &mut impl Write,
+) -> eyre::Result<()> {
     use crate::util::CHAT_BINARY_NAME;
     Ok(queue!(
         output,
@@ -1312,17 +1402,21 @@ fn queue_failure_message(name: &str, fail_load_msg: &eyre::Report, output: &mut
         style::SetForegroundColor(style::Color::Blue),
         style::Print(name),
         style::ResetColor,
-        style::Print(" has failed to load:\n- "),
+        style::Print(" has failed to load after"),
+        style::SetForegroundColor(style::Color::Yellow),
+        style::Print(format!(" {time} s")),
+        style::ResetColor,
+        style::Print("\n - "),
         style::Print(fail_load_msg),
         style::Print("\n"),
         style::Print(format!(
-            "- run with Q_LOG_LEVEL=trace and see $TMPDIR/{CHAT_BINARY_NAME} for detail\n"
+            " - run with Q_LOG_LEVEL=trace and see $TMPDIR/{CHAT_BINARY_NAME} for detail\n"
         )),
         style::ResetColor,
     )?)
 }
 
-fn queue_warn_message(name: &str, msg: &eyre::Report, output: &mut impl Write) -> eyre::Result<()> {
+fn queue_warn_message(name: &str, msg: &eyre::Report, time: &str, output: &mut impl Write) -> eyre::Result<()> {
     Ok(queue!(
         output,
         style::SetForegroundColor(style::Color::Yellow),
@@ -1330,7 +1424,11 @@ fn queue_warn_message(name: &str, msg: &eyre::Report, output: &mut impl Write) -
         style::SetForegroundColor(style::Color::Blue),
         style::Print(name),
         style::ResetColor,
-        style::Print(" has the following warning:\n"),
+        style::Print(" has loaded in"),
+        style::SetForegroundColor(style::Color::Yellow),
+        style::Print(format!(" {time} s")),
+        style::ResetColor,
+        style::Print(" with the following warning:\n"),
         style::Print(msg),
         style::ResetColor,
     )?)
diff --git a/crates/chat-cli/src/cli/chat/tools/mod.rs b/crates/chat-cli/src/cli/chat/tools/mod.rs
index 9c941b50c1..6d236ec708 100644
--- a/crates/chat-cli/src/cli/chat/tools/mod.rs
+++ b/crates/chat-cli/src/cli/chat/tools/mod.rs
@@ -178,7 +178,6 @@ impl ToolPermissions {
     }
 
     /// Provide default permission labels for the built-in set of tools.
-    /// Unknown tools are assumed to be "Per-request"
     // This "static" way avoids needing to construct a tool instance.
     fn default_permission_label(&self, tool_name: &str) -> String {
         let label = match tool_name {
diff --git a/crates/chat-cli/src/database/mod.rs b/crates/chat-cli/src/database/mod.rs
index 227e29302e..cc05c43b3b 100644
--- a/crates/chat-cli/src/database/mod.rs
+++ b/crates/chat-cli/src/database/mod.rs
@@ -27,7 +27,10 @@ use serde_json::{
 };
 use settings::Settings;
 use thiserror::Error;
-use tracing::info;
+use tracing::{
+    info,
+    trace,
+};
 use uuid::Uuid;
 
 use crate::cli::ConversationState;
@@ -334,15 +337,18 @@ impl Database {
     }
 
     pub async fn get_secret(&self, key: &str) -> Result<Option<Secret>, DatabaseError> {
+        trace!(key, "getting secret");
         Ok(self.get_entry::<String>(Table::Auth, key)?.map(Into::into))
     }
 
     pub async fn set_secret(&self, key: &str, value: &str) -> Result<(), DatabaseError> {
+        trace!(key, "setting secret");
         self.set_entry(Table::Auth, key, value)?;
         Ok(())
     }
 
     pub async fn delete_secret(&self, key: &str) -> Result<(), DatabaseError> {
+        trace!(key, "deleting secret");
         self.delete_entry(Table::Auth, key)
     }
 
diff --git a/crates/chat-cli/src/database/settings.rs b/crates/chat-cli/src/database/settings.rs
index 1830bc74e1..bac2e06bbf 100644
--- a/crates/chat-cli/src/database/settings.rs
+++ b/crates/chat-cli/src/database/settings.rs
@@ -29,6 +29,7 @@ pub enum Setting {
     ApiCodeWhispererService,
     ApiQService,
     McpInitTimeout,
+    McpNoInteractiveTimeout,
     McpLoadedBefore,
 }
 
@@ -47,6 +48,7 @@ impl AsRef<str> for Setting {
             Self::ApiCodeWhispererService => "api.codewhisperer.service",
             Self::ApiQService => "api.q.service",
             Self::McpInitTimeout => "mcp.initTimeout",
+            Self::McpNoInteractiveTimeout => "mcp.noInteractiveTimeout",
             Self::McpLoadedBefore => "mcp.loadedBefore",
         }
     }
@@ -75,6 +77,7 @@ impl TryFrom<&str> for Setting {
             "api.codewhisperer.service" => Ok(Self::ApiCodeWhispererService),
             "api.q.service" => Ok(Self::ApiQService),
             "mcp.initTimeout" => Ok(Self::McpInitTimeout),
+            "mcp.noInteractiveTimeout" => Ok(Self::McpNoInteractiveTimeout),
             "mcp.loadedBefore" => Ok(Self::McpLoadedBefore),
             _ => Err(DatabaseError::InvalidSetting(value.to_string())),
         }
diff --git a/crates/chat-cli/src/lib.rs b/crates/chat-cli/src/lib.rs
index d8bfa3209c..8c2287bfad 100644
--- a/crates/chat-cli/src/lib.rs
+++ b/crates/chat-cli/src/lib.rs
@@ -2,6 +2,16 @@
 //! This lib.rs is only here for testing purposes.
 //! `test_mcp_server/test_server.rs` is declared as a separate binary and would need a way to
 //! reference types defined inside of this crate, hence the export.
+pub mod api_client;
+pub mod auth;
+pub mod aws_common;
+pub mod cli;
+pub mod database;
+pub mod logging;
 pub mod mcp_client;
+pub mod platform;
+pub mod request;
+pub mod telemetry;
+pub mod util;
 
 pub use mcp_client::*;
diff --git a/crates/chat-cli/src/mcp_client/client.rs b/crates/chat-cli/src/mcp_client/client.rs
index b0d8eefe00..3144ee4158 100644
--- a/crates/chat-cli/src/mcp_client/client.rs
+++ b/crates/chat-cli/src/mcp_client/client.rs
@@ -11,8 +11,6 @@ use std::sync::{
 };
 use std::time::Duration;
 
-use nix::sys::signal::Signal;
-use nix::unistd::Pid;
 use serde::{
     Deserialize,
     Serialize,
@@ -46,6 +44,10 @@ use super::{
     ServerCapabilities,
     ToolsListResult,
 };
+use crate::util::process::{
+    Pid,
+    terminate_process,
+};
 
 pub type ClientInfo = serde_json::Value;
 pub type StdioTransport = JsonRpcStdioTransport;
@@ -165,8 +167,11 @@ impl Client<StdioTransport> {
                 .stdin(Stdio::piped())
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped())
-                .process_group(0)
                 .envs(std::env::vars());
+
+            #[cfg(not(windows))]
+            command.process_group(0);
+
             if let Some(env) = env {
                 for (env_name, env_value) in env {
                     command.env(env_name, env_value);
@@ -174,14 +179,10 @@ impl Client<StdioTransport> {
             }
             command.args(args).spawn()?
         };
+
         let server_process_id = child.id().ok_or(ClientError::MissingProcessId)?;
-        #[allow(clippy::map_err_ignore)]
-        let server_process_id = Pid::from_raw(
-            server_process_id
-                .try_into()
-                .map_err(|_| ClientError::MissingProcessId)?,
-        );
-        let server_process_id = Some(server_process_id);
+        let server_process_id = Some(Pid::from_u32(server_process_id));
+
         let transport = Arc::new(transport::stdio::JsonRpcStdioTransport::client(child)?);
         Ok(Self {
             server_name,
@@ -205,7 +206,7 @@ where
     // This drop trait is here as a fail safe to ensure we don't leave behind any orphans.
     fn drop(&mut self) {
         if let Some(process_id) = self.server_process_id {
-            let _ = nix::sys::signal::kill(process_id, Signal::SIGTERM);
+            let _ = terminate_process(process_id);
         }
     }
 }
@@ -573,28 +574,27 @@ where
 {
     // TODO: decouple pagination logic from request and have page fetching logic here
     // instead
-    let resp = match client.request("tools/list", None).await {
-        Ok(resp) => resp,
-        Err(e) => {
-            tracing::error!("Failed to retrieve tool list from {}: {:?}", client.server_name, e);
-            return;
-        },
-    };
-    if let Some(error) = resp.error {
-        let msg = format!("Failed to retrieve tool list for {}: {:?}", client.server_name, error);
-        tracing::error!("{}", &msg);
-        return;
-    }
-    let Some(result) = resp.result else {
-        tracing::error!("Tool list response from {} is missing result", client.server_name);
-        return;
-    };
-    let tool_list_result = match serde_json::from_value::<ToolsListResult>(result) {
-        Ok(result) => result,
-        Err(e) => {
-            tracing::error!("Failed to deserialize tool result from {}: {:?}", client.server_name, e);
-            return;
-        },
+    let tool_list_result = 'tool_list_result: {
+        let resp = match client.request("tools/list", None).await {
+            Ok(resp) => resp,
+            Err(e) => break 'tool_list_result Err(e.into()),
+        };
+        if let Some(error) = resp.error {
+            let msg = format!("Failed to retrieve tool list for {}: {:?}", client.server_name, error);
+            break 'tool_list_result Err(eyre::eyre!(msg));
+        }
+        let Some(result) = resp.result else {
+            let msg = format!("Tool list response from {} is missing result", client.server_name);
+            break 'tool_list_result Err(eyre::eyre!(msg));
+        };
+        let tool_list_result = match serde_json::from_value::<ToolsListResult>(result) {
+            Ok(result) => result,
+            Err(e) => {
+                let msg = format!("Failed to deserialize tool result from {}: {:?}", client.server_name, e);
+                break 'tool_list_result Err(eyre::eyre!(msg));
+            },
+        };
+        Ok::<ToolsListResult, eyre::Report>(tool_list_result)
     };
     if let Some(messenger) = messenger {
         let _ = messenger
diff --git a/crates/chat-cli/src/mcp_client/messenger.rs b/crates/chat-cli/src/mcp_client/messenger.rs
index efd49617ab..14f79e518a 100644
--- a/crates/chat-cli/src/mcp_client/messenger.rs
+++ b/crates/chat-cli/src/mcp_client/messenger.rs
@@ -16,21 +16,22 @@ use super::{
 pub trait Messenger: std::fmt::Debug + Send + Sync + 'static {
     /// Sends the result of a tools list operation to the consumer
     /// This function is used to deliver information about available tools
-    async fn send_tools_list_result(&self, result: ToolsListResult) -> Result<(), MessengerError>;
+    async fn send_tools_list_result(&self, result: eyre::Result<ToolsListResult>) -> Result<(), MessengerError>;
 
     /// Sends the result of a prompts list operation to the consumer
     /// This function is used to deliver information about available prompts
-    async fn send_prompts_list_result(&self, result: PromptsListResult) -> Result<(), MessengerError>;
+    async fn send_prompts_list_result(&self, result: eyre::Result<PromptsListResult>) -> Result<(), MessengerError>;
 
     /// Sends the result of a resources list operation to the consumer
     /// This function is used to deliver information about available resources
-    async fn send_resources_list_result(&self, result: ResourcesListResult) -> Result<(), MessengerError>;
+    async fn send_resources_list_result(&self, result: eyre::Result<ResourcesListResult>)
+    -> Result<(), MessengerError>;
 
     /// Sends the result of a resource templates list operation to the consumer
     /// This function is used to deliver information about available resource templates
     async fn send_resource_templates_list_result(
         &self,
-        result: ResourceTemplatesListResult,
+        result: eyre::Result<ResourceTemplatesListResult>,
     ) -> Result<(), MessengerError>;
 
     /// Signals to the orchestrator that a server has started initializing
@@ -52,21 +53,24 @@ pub struct NullMessenger;
 
 #[async_trait::async_trait]
 impl Messenger for NullMessenger {
-    async fn send_tools_list_result(&self, _result: ToolsListResult) -> Result<(), MessengerError> {
+    async fn send_tools_list_result(&self, _result: eyre::Result<ToolsListResult>) -> Result<(), MessengerError> {
         Ok(())
     }
 
-    async fn send_prompts_list_result(&self, _result: PromptsListResult) -> Result<(), MessengerError> {
+    async fn send_prompts_list_result(&self, _result: eyre::Result<PromptsListResult>) -> Result<(), MessengerError> {
         Ok(())
     }
 
-    async fn send_resources_list_result(&self, _result: ResourcesListResult) -> Result<(), MessengerError> {
+    async fn send_resources_list_result(
+        &self,
+        _result: eyre::Result<ResourcesListResult>,
+    ) -> Result<(), MessengerError> {
         Ok(())
     }
 
     async fn send_resource_templates_list_result(
         &self,
-        _result: ResourceTemplatesListResult,
+        _result: eyre::Result<ResourceTemplatesListResult>,
     ) -> Result<(), MessengerError> {
         Ok(())
     }
diff --git a/crates/chat-cli/src/util/mod.rs b/crates/chat-cli/src/util/mod.rs
index 185dcee0ea..79fd1610d9 100644
--- a/crates/chat-cli/src/util/mod.rs
+++ b/crates/chat-cli/src/util/mod.rs
@@ -1,11 +1,11 @@
 mod cli_context;
+pub mod consts;
 pub mod directories;
 pub mod open;
+pub mod process;
 pub mod spinner;
 pub mod system_info;
 
-pub mod consts;
-
 use std::fmt::Display;
 use std::io::{
     ErrorKind,
diff --git a/crates/chat-cli/src/util/process/mod.rs b/crates/chat-cli/src/util/process/mod.rs
new file mode 100644
index 0000000000..e0a8414592
--- /dev/null
+++ b/crates/chat-cli/src/util/process/mod.rs
@@ -0,0 +1,11 @@
+pub use sysinfo::Pid;
+
+#[cfg(target_os = "windows")]
+mod windows;
+#[cfg(target_os = "windows")]
+pub use windows::*;
+
+#[cfg(not(windows))]
+mod unix;
+#[cfg(not(windows))]
+pub use unix::*;
diff --git a/crates/chat-cli/src/util/process/unix.rs b/crates/chat-cli/src/util/process/unix.rs
new file mode 100644
index 0000000000..b0ffc60935
--- /dev/null
+++ b/crates/chat-cli/src/util/process/unix.rs
@@ -0,0 +1,64 @@
+use nix::sys::signal::Signal;
+use sysinfo::Pid;
+
+pub fn terminate_process(pid: Pid) -> Result<(), String> {
+    let nix_pid = nix::unistd::Pid::from_raw(pid.as_u32() as i32);
+    nix::sys::signal::kill(nix_pid, Signal::SIGTERM).map_err(|e| format!("Failed to terminate process: {}", e))
+}
+
+#[cfg(test)]
+#[cfg(not(windows))]
+mod tests {
+    use std::process::Command;
+    use std::time::Duration;
+
+    use super::*;
+
+    // Helper to create a long-running process for testing
+    fn spawn_test_process() -> std::process::Child {
+        let mut command = Command::new("sleep");
+        command.arg("30");
+        command.spawn().expect("Failed to spawn test process")
+    }
+
+    #[test]
+    fn test_terminate_process() {
+        // Spawn a test process
+        let mut child = spawn_test_process();
+        let pid = Pid::from_u32(child.id());
+
+        // Terminate the process
+        let result = terminate_process(pid);
+
+        // Verify termination was successful
+        assert!(result.is_ok(), "Process termination failed: {:?}", result.err());
+
+        // Give it a moment to terminate
+        std::thread::sleep(Duration::from_millis(100));
+
+        // Verify the process is actually terminated
+        match child.try_wait() {
+            Ok(Some(_)) => {
+                // Process exited, which is what we expect
+            },
+            Ok(None) => {
+                panic!("Process is still running after termination");
+            },
+            Err(e) => {
+                panic!("Error checking process status: {}", e);
+            },
+        }
+    }
+
+    #[test]
+    fn test_terminate_nonexistent_process() {
+        // Use a likely invalid PID
+        let invalid_pid = Pid::from_u32(u32::MAX - 1);
+
+        // Attempt to terminate a non-existent process
+        let result = terminate_process(invalid_pid);
+
+        // Should return an error
+        assert!(result.is_err(), "Terminating non-existent process should fail");
+    }
+}
diff --git a/crates/chat-cli/src/util/process/windows.rs b/crates/chat-cli/src/util/process/windows.rs
new file mode 100644
index 0000000000..12e0389bd8
--- /dev/null
+++ b/crates/chat-cli/src/util/process/windows.rs
@@ -0,0 +1,120 @@
+use std::ops::Deref;
+
+use sysinfo::Pid;
+use windows::Win32::Foundation::{
+    CloseHandle,
+    HANDLE,
+};
+use windows::Win32::System::Threading::{
+    OpenProcess,
+    PROCESS_TERMINATE,
+    TerminateProcess,
+};
+
+/// Terminate a process on Windows using the Windows API
+pub fn terminate_process(pid: Pid) -> Result<(), String> {
+    unsafe {
+        // Open the process with termination rights
+        let handle = OpenProcess(PROCESS_TERMINATE, false, pid.as_u32())
+            .map_err(|e| format!("Failed to open process: {}", e))?;
+
+        // Create a safe handle that will be closed automatically when dropped
+        let safe_handle = SafeHandle::new(handle).ok_or_else(|| "Invalid process handle".to_string())?;
+
+        // Terminate the process with exit code 1
+        TerminateProcess(*safe_handle, 1).map_err(|e| format!("Failed to terminate process: {}", e))?;
+
+        Ok(())
+    }
+}
+
+struct SafeHandle(HANDLE);
+
+impl SafeHandle {
+    fn new(handle: HANDLE) -> Option<Self> {
+        if !handle.is_invalid() { Some(Self(handle)) } else { None }
+    }
+}
+
+impl Drop for SafeHandle {
+    fn drop(&mut self) {
+        unsafe {
+            let _ = CloseHandle(self.0);
+        }
+    }
+}
+
+impl Deref for SafeHandle {
+    type Target = HANDLE;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::process::Command;
+    use std::time::Duration;
+
+    use super::*;
+
+    // Helper to create a long-running process for testing
+    fn spawn_test_process() -> std::process::Child {
+        let mut command = Command::new("cmd");
+        command.args(["/C", "timeout 30 > nul"]);
+        command.spawn().expect("Failed to spawn test process")
+    }
+
+    #[test]
+    fn test_terminate_process() {
+        // Spawn a test process
+        let mut child = spawn_test_process();
+        let pid = Pid::from_u32(child.id());
+
+        // Terminate the process
+        let result = terminate_process(pid);
+
+        // Verify termination was successful
+        assert!(result.is_ok(), "Process termination failed: {:?}", result.err());
+
+        // Give it a moment to terminate
+        std::thread::sleep(Duration::from_millis(100));
+
+        // Verify the process is actually terminated
+        match child.try_wait() {
+            Ok(Some(_)) => {
+                // Process exited, which is what we expect
+            },
+            Ok(None) => {
+                panic!("Process is still running after termination");
+            },
+            Err(e) => {
+                panic!("Error checking process status: {}", e);
+            },
+        }
+    }
+
+    #[test]
+    fn test_terminate_nonexistent_process() {
+        // Use a likely invalid PID
+        let invalid_pid = Pid::from_u32(u32::MAX - 1);
+
+        // Attempt to terminate a non-existent process
+        let result = terminate_process(invalid_pid);
+
+        // Should return an error
+        assert!(result.is_err(), "Terminating non-existent process should fail");
+    }
+
+    #[test]
+    fn test_safe_handle() {
+        // Test creating a SafeHandle with an invalid handle
+        let invalid_handle = HANDLE(std::ptr::null_mut());
+        let safe_handle = SafeHandle::new(invalid_handle);
+        assert!(safe_handle.is_none(), "SafeHandle should be None for invalid handle");
+
+        // We can't easily test a valid handle without actually opening a process,
+        // which would require additional setup and teardown
+    }
+}
diff --git a/crates/chat-cli/src/util/system_info/linux.rs b/crates/chat-cli/src/util/system_info/linux.rs
index 423f3f8f3c..20d257d556 100644
--- a/crates/chat-cli/src/util/system_info/linux.rs
+++ b/crates/chat-cli/src/util/system_info/linux.rs
@@ -1,13 +1,18 @@
-#[cfg(target_os = "linux")]
 use std::io;
-#[cfg(target_os = "linux")]
 use std::path::Path;
+use std::sync::OnceLock;
 
+use nix::sys::utsname::uname;
 use serde::{
     Deserialize,
     Serialize,
 };
 
+use super::{
+    OSVersion,
+    OsRelease,
+};
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DisplayServer {
     X11,
@@ -22,32 +27,21 @@ pub enum DesktopEnvironment {
     Sway,
 }
 
-#[cfg(target_os = "linux")]
 pub fn get_os_release() -> Option<&'static OsRelease> {
-    use std::sync::OnceLock;
-
     static OS_RELEASE: OnceLock<Option<OsRelease>> = OnceLock::new();
     OS_RELEASE.get_or_init(|| OsRelease::load().ok()).as_ref()
 }
 
-/// Fields from <https://www.man7.org/linux/man-pages/man5/os-release.5.html>
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct OsRelease {
-    pub id: Option<String>,
-
-    pub name: Option<String>,
-    pub pretty_name: Option<String>,
-
-    pub version_id: Option<String>,
-    pub version: Option<String>,
-
-    pub build_id: Option<String>,
+pub fn get_os_version() -> Option<OSVersion> {
+    let kernel_version = uname().ok()?.release().to_string_lossy().into();
+    let os_release = get_os_release().cloned();
 
-    pub variant_id: Option<String>,
-    pub variant: Option<String>,
+    Some(OSVersion::Linux {
+        kernel_version,
+        os_release,
+    })
 }
 
-#[cfg(target_os = "linux")]
 impl OsRelease {
     fn path() -> &'static Path {
         Path::new("/etc/os-release")
@@ -88,7 +82,6 @@ impl OsRelease {
     }
 }
 
-#[cfg(target_os = "linux")]
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/chat-cli/src/util/system_info/mod.rs b/crates/chat-cli/src/util/system_info/mod.rs
index acaf949f4f..2da01517f5 100644
--- a/crates/chat-cli/src/util/system_info/mod.rs
+++ b/crates/chat-cli/src/util/system_info/mod.rs
@@ -1,4 +1,7 @@
+#[cfg(target_os = "linux")]
 pub mod linux;
+#[cfg(target_os = "windows")]
+pub mod windows;
 
 use std::sync::OnceLock;
 
@@ -10,6 +13,24 @@ use serde::{
 
 use crate::platform::Env;
 
+/// Fields for OS release information
+/// Fields from <https://www.man7.org/linux/man-pages/man5/os-release.5.html>
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub struct OsRelease {
+    pub id: Option<String>,
+
+    pub name: Option<String>,
+    pub pretty_name: Option<String>,
+
+    pub version_id: Option<String>,
+    pub version: Option<String>,
+
+    pub build_id: Option<String>,
+
+    pub variant_id: Option<String>,
+    pub variant: Option<String>,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum OSVersion {
@@ -22,7 +43,7 @@ pub enum OSVersion {
     Linux {
         kernel_version: String,
         #[serde(flatten)]
-        os_release: Option<linux::OsRelease>,
+        os_release: Option<OsRelease>,
     },
     Windows {
         name: String,
@@ -63,83 +84,67 @@ impl std::fmt::Display for OSVersion {
 
 pub fn os_version() -> Option<&'static OSVersion> {
     static OS_VERSION: OnceLock<Option<OSVersion>> = OnceLock::new();
-    OS_VERSION.get_or_init(|| {
-        cfg_if! {
-            if #[cfg(target_os = "macos")] {
-                use std::process::Command;
-                use regex::Regex;
-
-                let version_info = Command::new("sw_vers")
-                    .output()
-                    .ok()?;
-
-                let version_info: String = String::from_utf8_lossy(&version_info.stdout).trim().into();
-
-                let version_regex = Regex::new(r"ProductVersion:\s*(\S+)").unwrap();
-                let build_regex = Regex::new(r"BuildVersion:\s*(\S+)").unwrap();
-
-                let version: String = version_regex
-                    .captures(&version_info)
-                    .and_then(|c| c.get(1))
-                    .map(|v| v.as_str().into())?;
-
-                let major = version
-                    .split('.')
-                    .next()?
-                    .parse().ok()?;
-
-                let minor = version
-                    .split('.')
-                    .nth(1)?
-                    .parse().ok()?;
-
-                let patch = version.split('.').nth(2).and_then(|p| p.parse().ok());
-
-                let build = build_regex
-                    .captures(&version_info)
-                    .and_then(|c| c.get(1))?
-                    .as_str()
-                    .into();
-
-                Some(OSVersion::MacOS {
-                    major,
-                    minor,
-                    patch,
-                    build,
-                })
-            } else if #[cfg(target_os = "linux")] {
-                use nix::sys::utsname::uname;
-
-                let kernel_version = uname().ok()?.release().to_string_lossy().into();
-                let os_release = linux::get_os_release().cloned();
-
-                Some(OSVersion::Linux {
-                    kernel_version,
-                    os_release,
-                })
-            } else if #[cfg(target_os = "windows")] {
-                use winreg::enums::HKEY_LOCAL_MACHINE;
-                use winreg::RegKey;
-
-                let rkey = RegKey::predef(HKEY_LOCAL_MACHINE).open_subkey(r"SOFTWARE\Microsoft\Windows NT\CurrentVersion").ok()?;
-                let build: String = rkey.get_value("CurrentBuild").ok()?;
-
-                Some(OSVersion::Windows {
-                    name: rkey.get_value("ProductName").ok()?,
-                    build: build.parse::<u32>().ok()?,
-                })
-            } else if #[cfg(target_os = "freebsd")] {
-                use nix::sys::utsname::uname;
-
-                let version = uname().ok()?.release().to_string_lossy().into();
-
-                Some(OSVersion::FreeBsd {
-                    version,
-                })
-
+    OS_VERSION
+        .get_or_init(|| {
+            cfg_if! {
+                if #[cfg(target_os = "macos")] {
+                    use std::process::Command;
+                    use regex::Regex;
+
+                    let version_info = Command::new("sw_vers")
+                        .output()
+                        .ok()?;
+
+                    let version_info: String = String::from_utf8_lossy(&version_info.stdout).trim().into();
+
+                    let version_regex = Regex::new(r"ProductVersion:\s*(\S+)").unwrap();
+                    let build_regex = Regex::new(r"BuildVersion:\s*(\S+)").unwrap();
+
+                    let version: String = version_regex
+                        .captures(&version_info)
+                        .and_then(|c| c.get(1))
+                        .map(|v| v.as_str().into())?;
+
+                    let major = version
+                        .split('.')
+                        .next()?
+                        .parse().ok()?;
+
+                    let minor = version
+                        .split('.')
+                        .nth(1)?
+                        .parse().ok()?;
+
+                    let patch = version.split('.').nth(2).and_then(|p| p.parse().ok());
+
+                    let build = build_regex
+                        .captures(&version_info)
+                        .and_then(|c| c.get(1))?
+                        .as_str()
+                        .into();
+
+                    Some(OSVersion::MacOS {
+                        major,
+                        minor,
+                        patch,
+                        build,
+                    })
+                } else if #[cfg(target_os = "linux")] {
+                    linux::get_os_version()
+                } else if #[cfg(target_os = "windows")] {
+                    windows::get_os_version()
+                } else if #[cfg(target_os = "freebsd")] {
+                    use nix::sys::utsname::uname;
+
+                    let version = uname().ok()?.release().to_string_lossy().into();
+
+                    Some(OSVersion::FreeBsd {
+                        version,
+                    })
+                }
             }
-        }
-    }).as_ref()
+        })
+        .as_ref()
 }
 
 pub fn in_ssh() -> bool {
diff --git a/crates/chat-cli/src/util/system_info/windows.rs b/crates/chat-cli/src/util/system_info/windows.rs
new file mode 100644
index 0000000000..29fc53ad50
--- /dev/null
+++ b/crates/chat-cli/src/util/system_info/windows.rs
@@ -0,0 +1,97 @@
+use std::io;
+use std::sync::OnceLock;
+
+use serde::{
+    Deserialize,
+    Serialize,
+};
+use winreg::RegKey;
+use winreg::enums::HKEY_LOCAL_MACHINE;
+
+use super::{
+    OSVersion,
+    OsRelease,
+};
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DisplayServer {
+    Win32,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DesktopEnvironment {
+    Windows,
+    WindowsTerminal,
+}
+
+pub fn get_os_release() -> Option<&'static OsRelease> {
+    static OS_RELEASE: OnceLock<Option<OsRelease>> = OnceLock::new();
+    OS_RELEASE.get_or_init(|| OsRelease::load().ok()).as_ref()
+}
+
+pub fn get_os_version() -> Option<OSVersion> {
+    let rkey = RegKey::predef(HKEY_LOCAL_MACHINE)
+        .open_subkey(r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
+        .ok()?;
+
+    let build: String = rkey.get_value("CurrentBuild").ok()?;
+    let name: String = rkey.get_value("ProductName").ok()?;
+
+    Some(OSVersion::Windows {
+        name,
+        build: build.parse::<u32>().ok()?,
+    })
+}
+
+impl OsRelease {
+    fn registry_path() -> &'static str {
+        r"SOFTWARE\Microsoft\Windows NT\CurrentVersion"
+    }
+
+    pub(crate) fn load() -> io::Result<OsRelease> {
+        let reg_key = RegKey::predef(HKEY_LOCAL_MACHINE).open_subkey(Self::registry_path())?;
+
+        let os_release = OsRelease {
+            // Map Windows registry values to OsRelease fields
+            name: reg_key.get_value("ProductName").ok(),
+            pretty_name: reg_key.get_value("ProductName").ok(),
+
+            // Use ReleaseId or DisplayVersion for version_id
+            version_id: reg_key
+                .get_value("ReleaseId")
+                .or_else(|_| reg_key.get_value("DisplayVersion"))
+                .ok(),
+
+            // Use DisplayVersion or ReleaseId for version
+            version: reg_key
+                .get_value("DisplayVersion")
+                .or_else(|_| reg_key.get_value("ReleaseId"))
+                .ok(),
+
+            // Use CurrentBuild for build_id
+            build_id: reg_key.get_value("CurrentBuild").ok(),
+
+            // Use EditionID for variant_id
+            variant: Some("Windows".to_string()),
+            variant_id: reg_key.get_value("EditionID").ok(),
+
+            // Set Windows as the ID
+            id: Some("windows".to_string()),
+        };
+
+        Ok(os_release)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn os_release() {
+        let info = OsRelease::load().unwrap();
+        assert!(info.name.is_some());
+        assert!(info.id.is_some());
+        assert_eq!(info.id, Some("windows".to_string()));
+    }
+}
diff --git a/crates/fig_auth/src/builder_id.rs b/crates/fig_auth/src/builder_id.rs
index 41e6d3f24a..547c9e4f1b 100644
--- a/crates/fig_auth/src/builder_id.rs
+++ b/crates/fig_auth/src/builder_id.rs
@@ -42,6 +42,7 @@ use aws_smithy_runtime_api::client::identity::{
 use aws_smithy_types::error::display::DisplayErrorContext;
 use aws_types::region::Region;
 use aws_types::request_id::RequestId;
+use aws_types::sdk_config::StalledStreamProtectionConfig;
 use fig_aws_common::app_name;
 use fig_telemetry_core::{
     Event,
@@ -101,6 +102,11 @@ pub(crate) fn client(region: Region) -> Client {
         .region(region)
         .retry_config(retry_config)
         .sleep_impl(SharedAsyncSleep::new(TokioSleep::new()))
+        .stalled_stream_protection(
+            StalledStreamProtectionConfig::enabled()
+                .grace_period(std::time::Duration::from_secs(60))
+                .build(),
+        )
         .app_name(app_name())
         .build();
     Client::new(&sdk_config)
diff --git a/crates/fig_auth/src/consts.rs b/crates/fig_auth/src/consts.rs
index a09e42a85a..300246e784 100644
--- a/crates/fig_auth/src/consts.rs
+++ b/crates/fig_auth/src/consts.rs
@@ -2,7 +2,7 @@ use aws_types::region::Region;
 
 pub(crate) const CLIENT_NAME: &str = "Amazon Q Developer for command line";
 
-pub(crate) const OIDC_BUILDER_ID_REGION: Region = Region::from_static("us-east-1");
+pub const OIDC_BUILDER_ID_REGION: Region = Region::from_static("us-east-1");
 
 /// The scopes requested for OIDC
 ///
diff --git a/crates/fig_auth/src/lib.rs b/crates/fig_auth/src/lib.rs
index 09c3951080..5434131012 100644
--- a/crates/fig_auth/src/lib.rs
+++ b/crates/fig_auth/src/lib.rs
@@ -1,5 +1,5 @@
 pub mod builder_id;
-mod consts;
+pub mod consts;
 mod error;
 pub mod pkce;
 mod scope;
diff --git a/crates/fig_desktop/README.md b/crates/fig_desktop/README.md
index 0b16f433e3..e0bf96f071 100644
--- a/crates/fig_desktop/README.md
+++ b/crates/fig_desktop/README.md
@@ -1,6 +1,6 @@
-# Fig Desktop
+# Amazon Q Desktop
 
-This is the main Fig app written in Rust. It should be
+This is the main Amazon Q Desktop written in Rust. It should be
 ready to run and start developing with if you follow the
 instructions in the [root README](../README.md).
 
@@ -10,4 +10,4 @@ instructions in the [root README](../README.md).
 1. Run `cargo run`.
 1. Once the UI opens, right click anywhere to inspect element, go to the console tab, and set `window.location.href`
 to the URL of the dashboard development server.
-
+   - Alternatively, you can use the `DASHBOARD_URL` environment variable instead of manually setting `window.location.href`, e,g. `DASHBOARD_URL=http://localhost:3433 cargo run`.
diff --git a/crates/q_cli/Cargo.toml b/crates/q_cli/Cargo.toml
index 9401547269..8457288a6e 100644
--- a/crates/q_cli/Cargo.toml
+++ b/crates/q_cli/Cargo.toml
@@ -99,7 +99,7 @@ winapi = { version = "0.3", features = ["consoleapi"] }
 
 [dev-dependencies]
 assert_cmd = "2.0"
-criterion = "0.5.1"
+criterion = "0.6.0"
 insta.workspace = true
 paste = "1.0.11"
 predicates = "3.0"
diff --git a/crates/q_cli/src/cli/mod.rs b/crates/q_cli/src/cli/mod.rs
index f26a07baa2..498bfc11f5 100644
--- a/crates/q_cli/src/cli/mod.rs
+++ b/crates/q_cli/src/cli/mod.rs
@@ -46,8 +46,13 @@ use eyre::{
     bail,
 };
 use feed::Feed;
-use fig_auth::builder_id::BuilderIdToken;
+use fig_auth::builder_id::{
+    BuilderIdToken,
+    DeviceRegistration,
+};
+use fig_auth::consts::OIDC_BUILDER_ID_REGION;
 use fig_auth::is_logged_in;
+use fig_auth::pkce::Region;
 use fig_auth::secret_store::SecretStore;
 use fig_ipc::local::open_ui_element;
 use fig_log::{
@@ -71,6 +76,7 @@ use tracing::{
     Level,
     debug,
     error,
+    warn,
 };
 
 use self::integrations::IntegrationsSubcommands;
@@ -380,10 +386,35 @@ impl Cli {
             assert_logged_in().await?;
         }
 
+        // Save credentials from the macOS keychain to sqlite.
+        // On Linux, this essentially just rewrites to the database.
         let secret_store = SecretStore::new().await.ok();
         if let Some(secret_store) = secret_store {
             if let Ok(database) = database().map_err(|err| error!(?err, "failed to open database")) {
                 if let Ok(token) = BuilderIdToken::load(&secret_store, false).await {
+                    // Save the device registration. This is required for token refresh to succeed.
+                    if let Some(token) = token.as_ref() {
+                        let region = token.region.clone().map_or(OIDC_BUILDER_ID_REGION, Region::new);
+                        match DeviceRegistration::load_from_secret_store(&secret_store, &region).await {
+                            Ok(Some(reg)) => match serde_json::to_string(&reg) {
+                                Ok(reg) => {
+                                    database
+                                        .set_auth_value("codewhisperer:odic:device-registration", reg)
+                                        .map_err(|err| error!(?err, "failed to write device registration to auth db"))
+                                        .ok();
+                                },
+                                Err(err) => error!(?err, "failed to serialize the device registration"),
+                            },
+                            Ok(None) => {
+                                warn!(?token, "no device registration found for token");
+                            },
+                            Err(err) => {
+                                error!(?err, "failed to load device registration");
+                            },
+                        }
+                    }
+
+                    // Next, save the token.
                     if let Ok(token) = serde_json::to_string(&token) {
                         database
                             .set_auth_value("codewhisperer:odic:token", token)
diff --git a/crates/semantic_search_client/Cargo.toml b/crates/semantic_search_client/Cargo.toml
new file mode 100644
index 0000000000..f581916dbb
--- /dev/null
+++ b/crates/semantic_search_client/Cargo.toml
@@ -0,0 +1,53 @@
+[package]
+name = "semantic_search_client"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+publish.workspace = true
+version.workspace = true
+license.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+tracing.workspace = true
+thiserror.workspace = true
+uuid.workspace = true
+dirs.workspace = true
+walkdir.workspace = true
+chrono.workspace = true
+indicatif.workspace = true
+rayon.workspace = true
+tempfile.workspace = true
+once_cell.workspace = true
+tokio.workspace = true
+
+# Vector search library
+hnsw_rs = "0.3.1"
+
+# BM25 implementation - works on all platforms including ARM
+bm25 = { version = "2.2.1", features = ["language_detection"] }
+
+# Common dependencies for all platforms
+anyhow = "1.0"
+
+# Candle dependencies - not used on Linux ARM
+[target.'cfg(not(all(target_os = "linux", target_arch = "aarch64")))'.dependencies]
+candle-core = { version = "0.9.1", features = [] }
+candle-nn = "0.9.1"
+candle-transformers = "0.9.1"
+tokenizers = "0.21.1"
+hf-hub = { version = "0.4.2", default-features = false, features = ["rustls-tls", "tokio", "ureq"] }
+
+# Conditionally enable Metal on macOS
+[target.'cfg(all(target_os = "macos", not(all(target_os = "linux", target_arch = "aarch64"))))'.dependencies.candle-core]
+version = "0.9.1"
+features = []
+
+# Conditionally enable CUDA on Linux and Windows
+[target.'cfg(all(any(target_os = "linux", target_os = "windows"), not(all(target_os = "linux", target_arch = "aarch64"))))'.dependencies.candle-core]
+version = "0.9.1"
+features = []
diff --git a/crates/semantic_search_client/README.md b/crates/semantic_search_client/README.md
new file mode 100644
index 0000000000..dfbc5917bf
--- /dev/null
+++ b/crates/semantic_search_client/README.md
@@ -0,0 +1,320 @@
+# Semantic Search Client
+
+Rust library for managing semantic memory contexts with vector embeddings, enabling semantic search capabilities across text and code.
+
+[![Crate](https://img.shields.io/crates/v/semantic_search_client.svg)](https://crates.io/crates/semantic_search_client)
+[![Documentation](https://docs.rs/semantic_search_client/badge.svg)](https://docs.rs/semantic_search_client)
+
+## Features
+
+- **Semantic Memory Management**: Create, store, and search through semantic memory contexts
+- **Vector Embeddings**: Generate high-quality text embeddings for semantic similarity search
+- **Multi-Platform Support**: Works on macOS, Windows, and Linux with optimized backends
+- **Hardware Acceleration**: Uses Metal on macOS and optimized backends on other platforms
+- **File Processing**: Process various file types including text, markdown, JSON, and code
+- **Persistent Storage**: Save contexts to disk for long-term storage and retrieval
+- **Progress Tracking**: Detailed progress reporting for long-running operations
+- **Parallel Processing**: Efficiently process large directories with parallel execution
+- **Memory Efficient**: Stream large files and directories without excessive memory usage
+- **Cross-Platform Compatibility**: Fallback mechanisms for all platforms and architectures
+
+## Installation
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+semantic_search_client = "0.1.0"
+```
+
+## Quick Start
+
+```rust
+use semantic_search_client::{SemanticSearchClient, Result};
+use std::path::Path;
+
+fn main() -> Result<()> {
+    // Create a new memory bank client with default settings
+    let mut client = SemanticSearchClient::new_with_default_dir()?;
+    
+    // Add a context from a directory
+    let context_id = client.add_context_from_path(
+        Path::new("/path/to/project"),
+        "My Project",
+        "Code and documentation for my project",
+        true, // make it persistent
+        None, // no progress callback
+    )?;
+    
+    // Search within the context
+    let results = client.search_context(&context_id, "implement authentication", 5)?;
+    
+    // Print the results
+    for result in results {
+        println!("Score: {}", result.distance);
+        if let Some(text) = result.text() {
+            println!("Text: {}", text);
+        }
+    }
+    
+    Ok(())
+}
+```
+
+## Testing
+
+The library includes comprehensive tests for all components. By default, tests use a mock embedder to avoid downloading models.
+
+### Running Tests with Mock Embedders (Default)
+
+```bash
+cargo test
+```
+
+### Running Tests with Real Embedders
+
+To run tests with real embedders (which will download models), set the `MEMORY_BANK_USE_REAL_EMBEDDERS` environment variable:
+
+```bash
+MEMORY_BANK_USE_REAL_EMBEDDERS=1 cargo test
+```
+
+## Core Concepts
+
+### Memory Contexts
+
+A memory context is a collection of related text or code that has been processed and indexed for semantic search. Contexts can be created from:
+
+- Files
+- Directories
+- Raw text
+
+Contexts can be either:
+
+- **Volatile**: Temporary and lost when the program exits
+- **Persistent**: Saved to disk and can be reloaded later
+
+### Data Points
+
+Each context contains data points, which are individual pieces of text with associated metadata and vector embeddings. Data points are the atomic units of search.
+
+### Embeddings
+
+Text is converted to vector embeddings using different backends based on platform and architecture:
+
+- **macOS/Windows**: Uses ONNX Runtime with FastEmbed by default
+- **Linux (non-ARM)**: Uses Candle for embeddings
+- **Linux (ARM64)**: Uses BM25 keyword-based embeddings as a fallback
+
+## Embedding Backends
+
+The library supports multiple embedding backends with automatic selection based on platform compatibility:
+
+1. **ONNX**: Fastest option, available on macOS and Windows
+2. **Candle**: Good performance, used on Linux (non-ARM)
+3. **BM25**: Fallback option based on keyword matching, used on Linux ARM64
+
+The default selection logic prioritizes performance where possible:
+- macOS/Windows: ONNX is the default
+- Linux (non-ARM): Candle is the default
+- Linux ARM64: BM25 is the default
+- ARM64: BM25 is the default
+
+## Detailed Usage
+
+### Creating a Client
+
+```rust
+// With default directory (~/.memory_bank)
+let client = SemanticSearchClient::new_with_default_dir()?;
+
+// With custom directory
+let client = SemanticSearchClient::new("/path/to/storage")?;
+
+// With specific embedding type
+use semantic_search_client::embedding::EmbeddingType;
+let client = SemanticSearchClient::new_with_embedding_type(EmbeddingType::Candle)?;
+```
+
+### Adding Contexts
+
+```rust
+// From a file
+let file_context_id = client.add_context_from_file(
+    "/path/to/document.md",
+    "Documentation",
+    "Project documentation",
+    true, // persistent
+    None, // no progress callback
+)?;
+
+// From a directory with progress reporting
+let dir_context_id = client.add_context_from_directory(
+    "/path/to/codebase",
+    "Codebase",
+    "Project source code",
+    true, // persistent
+    Some(|status| {
+        match status {
+            ProgressStatus::CountingFiles => println!("Counting files..."),
+            ProgressStatus::StartingIndexing(count) => println!("Starting indexing {} files", count),
+            ProgressStatus::Indexing(current, total) => 
+                println!("Indexing file {}/{}", current, total),
+            ProgressStatus::CreatingSemanticContext => 
+                println!("Creating semantic context..."),
+            ProgressStatus::GeneratingEmbeddings(current, total) => 
+                println!("Generating embeddings {}/{}", current, total),
+            ProgressStatus::BuildingIndex => println!("Building index..."),
+            ProgressStatus::Finalizing => println!("Finalizing..."),
+            ProgressStatus::Complete => println!("Indexing complete!"),
+        }
+    }),
+)?;
+
+// From raw text
+let text_context_id = client.add_context_from_text(
+    "This is some text to remember",
+    "Note",
+    "Important information",
+    false, // volatile
+)?;
+```
+
+### Searching
+
+```rust
+// Search across all contexts
+let all_results = client.search_all("authentication implementation", 5)?;
+for (context_id, results) in all_results {
+    println!("Results from context {}", context_id);
+    for result in results {
+        println!("  Score: {}", result.distance);
+        if let Some(text) = result.text() {
+            println!("  Text: {}", text);
+        }
+    }
+}
+
+// Search in a specific context
+let context_results = client.search_context(
+    &context_id,
+    "authentication implementation",
+    5,
+)?;
+```
+
+### Managing Contexts
+
+```rust
+// Get all contexts
+let contexts = client.get_all_contexts();
+for context in contexts {
+    println!("Context: {} ({})", context.name, context.id);
+    println!("  Description: {}", context.description);
+    println!("  Created: {}", context.created_at);
+    println!("  Items: {}", context.item_count);
+}
+
+// Make a volatile context persistent
+client.make_persistent(
+    &context_id,
+    "Saved Context",
+    "Important information saved for later",
+)?;
+
+// Remove a context
+client.remove_context_by_id(&context_id, true)?; // true to delete persistent storage
+client.remove_context_by_name("My Context", true)?;
+client.remove_context_by_path("/path/to/indexed/directory", true)?;
+```
+
+## Advanced Features
+
+### Custom Embedding Models
+
+The library supports different embedding backends:
+
+```rust
+// Use ONNX (fastest, used on macOS and Windows)
+#[cfg(any(target_os = "macos", target_os = "windows"))]
+let client = SemanticSearchClient::with_embedding_type(
+    "/path/to/storage",
+    EmbeddingType::Onnx,
+)?;
+
+// Use Candle (used on Linux non-ARM)
+#[cfg(all(target_os = "linux", not(target_arch = "aarch64")))]
+let client = SemanticSearchClient::with_embedding_type(
+    "/path/to/storage",
+    EmbeddingType::Candle,
+)?;
+
+// Use BM25 (used on Linux ARM64)
+#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
+let client = SemanticSearchClient::with_embedding_type(
+    "/path/to/storage",
+    EmbeddingType::BM25,
+)?;
+```
+
+### Parallel Processing
+
+For large directories, the library automatically uses parallel processing to speed up indexing:
+
+```rust
+use rayon::prelude::*;
+
+// Configure the global thread pool (optional)
+rayon::ThreadPoolBuilder::new()
+    .num_threads(8)
+    .build_global()
+    .unwrap();
+
+// The client will use the configured thread pool
+let client = SemanticSearchClient::new_with_default_dir()?;
+```
+
+## Performance Considerations
+
+- **Memory Usage**: For very large directories, consider indexing subdirectories separately
+- **Disk Space**: Persistent contexts store both the original text and vector embeddings
+- **Embedding Speed**: The first embedding operation may be slower as models are loaded
+- **Hardware Acceleration**: On macOS, Metal is used for faster embedding generation
+- **Platform Differences**: Performance may vary based on the selected embedding backend
+
+## Platform-Specific Features
+
+- **macOS**: Uses Metal for hardware-accelerated embeddings via ONNX Runtime and Candle
+- **Windows**: Uses optimized CPU execution via ONNX Runtime and Candle
+- **Linux (non-ARM)**: Uses Candle for embeddings
+- **Linux ARM64**: Uses BM25 keyword-based embeddings as a fallback
+
+## Error Handling
+
+The library uses a custom error type `MemoryBankError` that implements the standard `Error` trait:
+
+```rust
+use semantic_search_client::{SemanticSearchClient, MemoryBankError, Result};
+
+fn process() -> Result<()> {
+    let client = SemanticSearchClient::new_with_default_dir()?;
+    
+    // Handle specific error types
+    match client.search_context("invalid-id", "query", 5) {
+        Ok(results) => println!("Found {} results", results.len()),
+        Err(MemoryBankError::ContextNotFound(id)) => 
+            println!("Context not found: {}", id),
+        Err(e) => println!("Error: {}", e),
+    }
+    
+    Ok(())
+}
+```
+
+## Contributing
+
+Contributions are welcome! Please feel free to submit a Pull Request.
+
+## License
+
+This project is licensed under the terms specified in the repository's license file.
diff --git a/crates/semantic_search_client/src/client/embedder_factory.rs b/crates/semantic_search_client/src/client/embedder_factory.rs
new file mode 100644
index 0000000000..e3e6bf5143
--- /dev/null
+++ b/crates/semantic_search_client/src/client/embedder_factory.rs
@@ -0,0 +1,55 @@
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+use crate::embedding::CandleTextEmbedder;
+#[cfg(test)]
+use crate::embedding::MockTextEmbedder;
+use crate::embedding::{
+    BM25TextEmbedder,
+    EmbeddingType,
+    TextEmbedderTrait,
+};
+use crate::error::Result;
+
+/// Creates a text embedder based on the specified embedding type
+///
+/// # Arguments
+///
+/// * `embedding_type` - Type of embedding engine to use
+///
+/// # Returns
+///
+/// A text embedder instance
+#[cfg(any(target_os = "macos", target_os = "windows"))]
+pub fn create_embedder(embedding_type: EmbeddingType) -> Result<Box<dyn TextEmbedderTrait>> {
+    let embedder: Box<dyn TextEmbedderTrait> = match embedding_type {
+        #[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+        EmbeddingType::Candle => Box::new(CandleTextEmbedder::new()?),
+        EmbeddingType::BM25 => Box::new(BM25TextEmbedder::new()?),
+        #[cfg(test)]
+        EmbeddingType::Mock => Box::new(MockTextEmbedder::new(384)),
+    };
+
+    Ok(embedder)
+}
+
+/// Creates a text embedder based on the specified embedding type
+/// (Linux version)
+///
+/// # Arguments
+///
+/// * `embedding_type` - Type of embedding engine to use
+///
+/// # Returns
+///
+/// A text embedder instance
+#[cfg(not(any(target_os = "macos", target_os = "windows")))]
+pub fn create_embedder(embedding_type: EmbeddingType) -> Result<Box<dyn TextEmbedderTrait>> {
+    let embedder: Box<dyn TextEmbedderTrait> = match embedding_type {
+        #[cfg(not(target_arch = "aarch64"))]
+        EmbeddingType::Candle => Box::new(CandleTextEmbedder::new()?),
+        EmbeddingType::BM25 => Box::new(BM25TextEmbedder::new()?),
+        #[cfg(test)]
+        EmbeddingType::Mock => Box::new(MockTextEmbedder::new(384)),
+    };
+
+    Ok(embedder)
+}
diff --git a/crates/semantic_search_client/src/client/implementation.rs b/crates/semantic_search_client/src/client/implementation.rs
new file mode 100644
index 0000000000..13ba61edf7
--- /dev/null
+++ b/crates/semantic_search_client/src/client/implementation.rs
@@ -0,0 +1,1045 @@
+use std::collections::HashMap;
+use std::fs;
+use std::path::{
+    Path,
+    PathBuf,
+};
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use serde_json::Value;
+
+use crate::client::semantic_context::SemanticContext;
+use crate::client::{
+    embedder_factory,
+    utils,
+};
+use crate::config;
+use crate::embedding::{
+    EmbeddingType,
+    TextEmbedderTrait,
+};
+use crate::error::{
+    Result,
+    SemanticSearchError,
+};
+use crate::processing::process_file;
+use crate::types::{
+    ContextId,
+    ContextMap,
+    DataPoint,
+    MemoryContext,
+    ProgressStatus,
+    SearchResults,
+};
+
+/// Semantic search client for managing semantic memory
+///
+/// This client provides functionality for creating, managing, and searching
+/// through semantic memory contexts. It supports both volatile (in-memory)
+/// and persistent (on-disk) contexts.
+///
+/// # Examples
+///
+/// ```
+/// use semantic_search_client::SemanticSearchClient;
+///
+/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
+/// let mut client = SemanticSearchClient::new_with_default_dir()?;
+/// let context_id = client.add_context_from_text(
+///     "This is a test text for semantic memory",
+///     "Test Context",
+///     "A test context",
+///     false,
+/// )?;
+/// # Ok(())
+/// # }
+/// ```
+pub struct SemanticSearchClient {
+    /// Base directory for storing persistent contexts
+    base_dir: PathBuf,
+    /// Short-term (volatile) memory contexts
+    volatile_contexts: ContextMap,
+    /// Long-term (persistent) memory contexts
+    persistent_contexts: HashMap<ContextId, MemoryContext>,
+    /// Text embedder for generating embeddings
+    #[cfg(any(target_os = "macos", target_os = "windows"))]
+    embedder: Box<dyn TextEmbedderTrait>,
+    /// Text embedder for generating embeddings (Linux only)
+    #[cfg(not(any(target_os = "macos", target_os = "windows")))]
+    embedder: Box<dyn TextEmbedderTrait>,
+}
+impl SemanticSearchClient {
+    /// Create a new semantic search client
+    ///
+    /// # Arguments
+    ///
+    /// * `base_dir` - Base directory for storing persistent contexts
+    ///
+    /// # Returns
+    ///
+    /// A new SemanticSearchClient instance
+    pub fn new(base_dir: impl AsRef<Path>) -> Result<Self> {
+        Self::with_embedding_type(base_dir, EmbeddingType::default())
+    }
+
+    /// Create a new semantic search client with a specific embedding type
+    ///
+    /// # Arguments
+    ///
+    /// * `base_dir` - Base directory for storing persistent contexts
+    /// * `embedding_type` - Type of embedding engine to use
+    ///
+    /// # Returns
+    ///
+    /// A new SemanticSearchClient instance
+    pub fn with_embedding_type(base_dir: impl AsRef<Path>, embedding_type: EmbeddingType) -> Result<Self> {
+        let base_dir = base_dir.as_ref().to_path_buf();
+        fs::create_dir_all(&base_dir)?;
+
+        // Create models directory
+        crate::config::ensure_models_dir(&base_dir)?;
+
+        // Initialize the configuration
+        if let Err(e) = config::init_config(&base_dir) {
+            tracing::error!("Failed to initialize semantic search configuration: {}", e);
+            // Continue with default config if initialization fails
+        }
+
+        let embedder = embedder_factory::create_embedder(embedding_type)?;
+
+        // Load metadata for persistent contexts
+        let contexts_file = base_dir.join("contexts.json");
+        let persistent_contexts = utils::load_json_from_file(&contexts_file)?;
+
+        // Create the client instance first
+        let mut client = Self {
+            base_dir,
+            volatile_contexts: HashMap::new(),
+            persistent_contexts,
+            embedder,
+        };
+
+        // Now load all persistent contexts
+        let context_ids: Vec<String> = client.persistent_contexts.keys().cloned().collect();
+        for id in context_ids {
+            if let Err(e) = client.load_persistent_context(&id) {
+                tracing::error!("Failed to load persistent context {}: {}", id, e);
+            }
+        }
+
+        Ok(client)
+    }
+
+    /// Get the default base directory for memory bank
+    ///
+    /// # Returns
+    ///
+    /// The default base directory path
+    pub fn get_default_base_dir() -> PathBuf {
+        crate::config::get_default_base_dir()
+    }
+
+    /// Get the models directory path
+    ///
+    /// # Arguments
+    ///
+    /// * `base_dir` - Base directory for memory bank
+    ///
+    /// # Returns
+    ///
+    /// The models directory path
+    pub fn get_models_dir(base_dir: &Path) -> PathBuf {
+        crate::config::get_models_dir(base_dir)
+    }
+
+    /// Create a new semantic search client with the default base directory
+    ///
+    /// # Returns
+    ///
+    /// A new SemanticSearchClient instance
+    pub fn new_with_default_dir() -> Result<Self> {
+        let base_dir = Self::get_default_base_dir();
+        Self::new(base_dir)
+    }
+
+    /// Create a new semantic search client with the default base directory and specific embedding
+    /// type
+    ///
+    /// # Arguments
+    ///
+    /// * `embedding_type` - Type of embedding engine to use
+    ///
+    /// # Returns
+    ///
+    /// A new SemanticSearchClient instance
+    pub fn new_with_embedding_type(embedding_type: EmbeddingType) -> Result<Self> {
+        let base_dir = Self::get_default_base_dir();
+        Self::with_embedding_type(base_dir, embedding_type)
+    }
+
+    /// Get the current semantic search configuration
+    ///
+    /// # Returns
+    ///
+    /// A reference to the current configuration
+    pub fn get_config(&self) -> &'static config::SemanticSearchConfig {
+        config::get_config()
+    }
+
+    /// Update the semantic search configuration
+    ///
+    /// # Arguments
+    ///
+    /// * `new_config` - The new configuration to use
+    ///
+    /// # Returns
+    ///
+    /// Result indicating success or failure
+    pub fn update_config(&self, new_config: config::SemanticSearchConfig) -> std::io::Result<()> {
+        config::update_config(&self.base_dir, new_config)
+    }
+
+    /// Validate inputs
+    fn validate_input(name: &str) -> Result<()> {
+        if name.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Context name cannot be empty".to_string(),
+            ));
+        }
+        Ok(())
+    }
+
+    /// Add a context from a path (file or directory)
+    ///
+    /// # Arguments
+    ///
+    /// * `path` - Path to a file or directory
+    /// * `name` - Name for the context
+    /// * `description` - Description of the context
+    /// * `persistent` - Whether to make this context persistent
+    /// * `progress_callback` - Optional callback for progress updates
+    ///
+    /// # Returns
+    ///
+    /// The ID of the created context
+    pub fn add_context_from_path<F>(
+        &mut self,
+        path: impl AsRef<Path>,
+        name: &str,
+        description: &str,
+        persistent: bool,
+        progress_callback: Option<F>,
+    ) -> Result<String>
+    where
+        F: Fn(ProgressStatus) + Send + 'static,
+    {
+        let path = path.as_ref();
+
+        // Validate inputs
+        Self::validate_input(name)?;
+
+        if !path.exists() {
+            return Err(SemanticSearchError::InvalidPath(format!(
+                "Path does not exist: {}",
+                path.display()
+            )));
+        }
+
+        if path.is_dir() {
+            // Handle directory
+            self.add_context_from_directory(path, name, description, persistent, progress_callback)
+        } else if path.is_file() {
+            // Handle file
+            self.add_context_from_file(path, name, description, persistent, progress_callback)
+        } else {
+            Err(SemanticSearchError::InvalidPath(format!(
+                "Path is not a file or directory: {}",
+                path.display()
+            )))
+        }
+    }
+
+    /// Add a context from a file
+    ///
+    /// # Arguments
+    ///
+    /// * `file_path` - Path to the file
+    /// * `name` - Name for the context
+    /// * `description` - Description of the context
+    /// * `persistent` - Whether to make this context persistent
+    /// * `progress_callback` - Optional callback for progress updates
+    ///
+    /// # Returns
+    ///
+    /// The ID of the created context
+    fn add_context_from_file<F>(
+        &mut self,
+        file_path: impl AsRef<Path>,
+        name: &str,
+        description: &str,
+        persistent: bool,
+        progress_callback: Option<F>,
+    ) -> Result<String>
+    where
+        F: Fn(ProgressStatus) + Send + 'static,
+    {
+        let file_path = file_path.as_ref();
+
+        // Notify progress: Starting
+        if let Some(ref callback) = progress_callback {
+            callback(ProgressStatus::CountingFiles);
+        }
+
+        // Generate a unique ID for this context
+        let id = utils::generate_context_id();
+
+        // Create the context directory
+        let context_dir = self.create_context_directory(&id, persistent)?;
+
+        // Notify progress: Starting indexing
+        if let Some(ref callback) = progress_callback {
+            callback(ProgressStatus::StartingIndexing(1));
+        }
+
+        // Process the file
+        let items = process_file(file_path)?;
+
+        // Notify progress: Indexing
+        if let Some(ref callback) = progress_callback {
+            callback(ProgressStatus::Indexing(1, 1));
+        }
+
+        // Create a semantic context from the items
+        let semantic_context = self.create_semantic_context(&context_dir, &items, &progress_callback)?;
+
+        // Notify progress: Finalizing
+        if let Some(ref callback) = progress_callback {
+            callback(ProgressStatus::Finalizing);
+        }
+
+        // Save and store the context
+        self.save_and_store_context(
+            &id,
+            name,
+            description,
+            persistent,
+            Some(file_path.to_string_lossy().to_string()),
+            semantic_context,
+        )?;
+
+        // Notify progress: Complete
+        if let Some(ref callback) = progress_callback {
+            callback(ProgressStatus::Complete);
+        }
+
+        Ok(id)
+    }
+
+    /// Add a context from a directory
+    ///
+    /// # Arguments
+    ///
+    /// * `dir_path` - Path to the directory
+    /// * `name` - Name for the context
+    /// * `description` - Description of the context
+    /// * `persistent` - Whether to make this context persistent
+    /// * `progress_callback` - Optional callback for progress updates
+    ///
+    /// # Returns
+    ///
+    /// The ID of the created context
+    pub fn add_context_from_directory<F>(
+        &mut self,
+        dir_path: impl AsRef<Path>,
+        name: &str,
+        description: &str,
+        persistent: bool,
+        progress_callback: Option<F>,
+    ) -> Result<ContextId>
+    where
+        F: Fn(ProgressStatus) + Send + 'static,
+    {
+        let dir_path = dir_path.as_ref();
+
+        // Generate a unique ID for this context
+        let id = utils::generate_context_id();
+
+        // Create context directory
+        let context_dir = self.create_context_directory(&id, persistent)?;
+
+        // Count files and notify progress
+        let file_count = Self::count_files_in_directory(dir_path, &progress_callback)?;
+
+        // Process files
+        let items = Self::process_directory_files(dir_path, file_count, &progress_callback)?;
+
+        // Create and populate semantic context
+        let semantic_context = self.create_semantic_context(&context_dir, &items, &progress_callback)?;
+
+        // Save and store context
+        self.save_and_store_context(
+            &id,
+            name,
+            description,
+            persistent,
+            Some(dir_path.to_string_lossy().to_string()),
+            semantic_context,
+        )?;
+
+        Ok(id)
+    }
+
+    /// Create a context directory
+    fn create_context_directory(&self, id: &str, persistent: bool) -> Result<PathBuf> {
+        utils::create_context_directory(&self.base_dir, id, persistent)
+    }
+
+    /// Count files in a directory
+    fn count_files_in_directory<F>(dir_path: &Path, progress_callback: &Option<F>) -> Result<usize>
+    where
+        F: Fn(ProgressStatus) + Send + 'static,
+    {
+        utils::count_files_in_directory(dir_path, progress_callback)
+    }
+
+    /// Process files in a directory
+    fn process_directory_files<F>(
+        dir_path: &Path,
+        file_count: usize,
+        progress_callback: &Option<F>,
+    ) -> Result<Vec<Value>>
+    where
+        F: Fn(ProgressStatus) + Send + 'static,
+    {
+        // Notify progress: Starting indexing
+        if let Some(ref callback) = progress_callback {
+            callback(ProgressStatus::StartingIndexing(file_count));
+        }
+
+        // Process all files in the directory with progress updates
+        let mut processed_files = 0;
+        let mut items = Vec::new();
+
+        for entry in walkdir::WalkDir::new(dir_path)
+            .follow_links(true)
+            .into_iter()
+            .filter_map(|e| e.ok())
+            .filter(|e| e.file_type().is_file())
+        {
+            let path = entry.path();
+
+            // Skip hidden files
+            if path
+                .file_name()
+                .and_then(|n| n.to_str())
+                .is_some_and(|s| s.starts_with('.'))
+            {
+                continue;
+            }
+
+            // Process the file
+            match process_file(path) {
+                Ok(mut file_items) => items.append(&mut file_items),
+                Err(_) => continue, // Skip files that fail to process
+            }
+
+            processed_files += 1;
+
+            // Update progress
+            if let Some(ref callback) = progress_callback {
+                callback(ProgressStatus::Indexing(processed_files, file_count));
+            }
+        }
+
+        Ok(items)
+    }
+
+    /// Create a semantic context from items
+    fn create_semantic_context<F>(
+        &self,
+        context_dir: &Path,
+        items: &[Value],
+        progress_callback: &Option<F>,
+    ) -> Result<SemanticContext>
+    where
+        F: Fn(ProgressStatus) + Send + 'static,
+    {
+        // Notify progress: Creating semantic context
+        if let Some(ref callback) = progress_callback {
+            callback(ProgressStatus::CreatingSemanticContext);
+        }
+
+        // Create a new semantic context
+        let mut semantic_context = SemanticContext::new(context_dir.join("data.json"))?;
+
+        // Process items to data points
+        let data_points = self.process_items_to_data_points(items, progress_callback)?;
+
+        // Notify progress: Building index
+        if let Some(ref callback) = progress_callback {
+            callback(ProgressStatus::BuildingIndex);
+        }
+
+        // Add the data points to the context
+        semantic_context.add_data_points(data_points)?;
+
+        Ok(semantic_context)
+    }
+
+    fn process_items_to_data_points<F>(&self, items: &[Value], progress_callback: &Option<F>) -> Result<Vec<DataPoint>>
+    where
+        F: Fn(ProgressStatus) + Send + 'static,
+    {
+        let mut data_points = Vec::new();
+        let total_items = items.len();
+
+        // Process items with progress updates for embedding generation
+        for (i, item) in items.iter().enumerate() {
+            // Update progress for embedding generation
+            if let Some(ref callback) = progress_callback {
+                if i % 10 == 0 {
+                    callback(ProgressStatus::GeneratingEmbeddings(i, total_items));
+                }
+            }
+
+            // Create a data point from the item
+            let data_point = self.create_data_point_from_item(item, i)?;
+            data_points.push(data_point);
+        }
+
+        Ok(data_points)
+    }
+
+    /// Save and store context
+    fn save_and_store_context(
+        &mut self,
+        id: &str,
+        name: &str,
+        description: &str,
+        persistent: bool,
+        source_path: Option<String>,
+        semantic_context: SemanticContext,
+    ) -> Result<()> {
+        // Notify progress: Finalizing (90% progress point)
+        let item_count = semantic_context.get_data_points().len();
+
+        // Save to disk if persistent
+        if persistent {
+            semantic_context.save()?;
+        }
+
+        // Create the context metadata
+        let context = MemoryContext::new(id.to_string(), name, description, persistent, source_path, item_count);
+
+        // Store the context
+        if persistent {
+            self.persistent_contexts.insert(id.to_string(), context);
+            self.save_contexts_metadata()?;
+        }
+
+        // Store the semantic context
+        self.volatile_contexts
+            .insert(id.to_string(), Arc::new(Mutex::new(semantic_context)));
+
+        Ok(())
+    }
+
+    /// Create a data point from text
+    ///
+    /// # Arguments
+    ///
+    /// * `text` - The text to create a data point from
+    /// * `id` - The ID for the data point
+    ///
+    /// # Returns
+    ///
+    /// A new DataPoint
+    fn create_data_point_from_text(&self, text: &str, id: usize) -> Result<DataPoint> {
+        // Generate an embedding for the text
+        let vector = self.embedder.embed(text)?;
+
+        // Create a data point
+        let mut payload = HashMap::new();
+        payload.insert("text".to_string(), Value::String(text.to_string()));
+
+        Ok(DataPoint { id, payload, vector })
+    }
+
+    /// Create a data point from a JSON item
+    ///
+    /// # Arguments
+    ///
+    /// * `item` - The JSON item to create a data point from
+    /// * `id` - The ID for the data point
+    ///
+    /// # Returns
+    ///
+    /// A new DataPoint
+    fn create_data_point_from_item(&self, item: &Value, id: usize) -> Result<DataPoint> {
+        // Extract the text from the item
+        let text = item.get("text").and_then(|v| v.as_str()).unwrap_or("");
+
+        // Generate an embedding for the text
+        let vector = self.embedder.embed(text)?;
+
+        // Convert Value to HashMap
+        let payload: HashMap<String, Value> = if let Value::Object(map) = item {
+            map.clone().into_iter().collect()
+        } else {
+            let mut map = HashMap::new();
+            map.insert("text".to_string(), item.clone());
+            map
+        };
+
+        Ok(DataPoint { id, payload, vector })
+    }
+
+    /// Add a context from text
+    ///
+    /// # Arguments
+    ///
+    /// * `text` - The text to add
+    /// * `context_name` - Name for the context
+    /// * `context_description` - Description of the context
+    /// * `is_persistent` - Whether to make this context persistent
+    ///
+    /// # Returns
+    ///
+    /// The ID of the created context
+    pub fn add_context_from_text(
+        &mut self,
+        text: &str,
+        context_name: &str,
+        context_description: &str,
+        is_persistent: bool,
+    ) -> Result<String> {
+        // Validate inputs
+        if text.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Text content cannot be empty".to_string(),
+            ));
+        }
+
+        if context_name.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Context name cannot be empty".to_string(),
+            ));
+        }
+
+        // Generate a unique ID for this context
+        let context_id = utils::generate_context_id();
+
+        // Create the context directory
+        let context_dir = self.create_context_directory(&context_id, is_persistent)?;
+
+        // Create a new semantic context
+        let mut semantic_context = SemanticContext::new(context_dir.join("data.json"))?;
+
+        // Create a data point from the text
+        let data_point = self.create_data_point_from_text(text, 0)?;
+
+        // Add the data point to the context
+        semantic_context.add_data_points(vec![data_point])?;
+
+        // Save to disk if persistent
+        if is_persistent {
+            semantic_context.save()?;
+        }
+
+        // Save and store the context
+        self.save_and_store_context(
+            &context_id,
+            context_name,
+            context_description,
+            is_persistent,
+            None,
+            semantic_context,
+        )?;
+
+        Ok(context_id)
+    }
+
+    /// Get all contexts
+    ///
+    /// # Returns
+    ///
+    /// A vector of all contexts (both volatile and persistent)
+    pub fn get_all_contexts(&self) -> Vec<MemoryContext> {
+        let mut contexts = Vec::new();
+
+        // Add persistent contexts
+        for context in self.persistent_contexts.values() {
+            contexts.push(context.clone());
+        }
+
+        // Add volatile contexts that aren't already in persistent contexts
+        for id in self.volatile_contexts.keys() {
+            if !self.persistent_contexts.contains_key(id) {
+                // Create a temporary context object for volatile contexts
+                let context = MemoryContext::new(
+                    id.clone(),
+                    "Volatile Context",
+                    "Temporary memory context",
+                    false,
+                    None,
+                    0,
+                );
+                contexts.push(context);
+            }
+        }
+
+        contexts
+    }
+
+    /// Search across all contexts
+    ///
+    /// # Arguments
+    ///
+    /// * `query_text` - Search query
+    /// * `result_limit` - Maximum number of results to return per context (if None, uses
+    ///   default_results from config)
+    ///
+    /// # Returns
+    ///
+    /// A vector of (context_id, results) pairs
+    pub fn search_all(&self, query_text: &str, result_limit: Option<usize>) -> Result<Vec<(ContextId, SearchResults)>> {
+        // Validate inputs
+        if query_text.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Query text cannot be empty".to_string(),
+            ));
+        }
+
+        // Use the configured default_results if limit is None
+        let effective_limit = result_limit.unwrap_or_else(|| config::get_config().default_results);
+
+        // Generate an embedding for the query
+        let query_vector = self.embedder.embed(query_text)?;
+
+        let mut all_results = Vec::new();
+
+        // Search in all volatile contexts
+        for (context_id, context) in &self.volatile_contexts {
+            let context_guard = context.lock().map_err(|e| {
+                SemanticSearchError::OperationFailed(format!("Failed to acquire lock on context: {}", e))
+            })?;
+
+            match context_guard.search(&query_vector, effective_limit) {
+                Ok(results) => {
+                    if !results.is_empty() {
+                        all_results.push((context_id.clone(), results));
+                    }
+                },
+                Err(e) => {
+                    tracing::warn!("Failed to search context {}: {}", context_id, e);
+                    continue; // Skip contexts that fail to search
+                },
+            }
+        }
+
+        // Sort contexts by best match
+        all_results.sort_by(|(_, a), (_, b)| {
+            if a.is_empty() {
+                return std::cmp::Ordering::Greater;
+            }
+            if b.is_empty() {
+                return std::cmp::Ordering::Less;
+            }
+            a[0].distance
+                .partial_cmp(&b[0].distance)
+                .unwrap_or(std::cmp::Ordering::Equal)
+        });
+
+        Ok(all_results)
+    }
+
+    /// Search in a specific context
+    ///
+    /// # Arguments
+    ///
+    /// * `context_id` - ID of the context to search in
+    /// * `query_text` - Search query
+    /// * `result_limit` - Maximum number of results to return (if None, uses default_results from
+    ///   config)
+    ///
+    /// # Returns
+    ///
+    /// A vector of search results
+    pub fn search_context(
+        &self,
+        context_id: &str,
+        query_text: &str,
+        result_limit: Option<usize>,
+    ) -> Result<SearchResults> {
+        // Validate inputs
+        if context_id.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Context ID cannot be empty".to_string(),
+            ));
+        }
+
+        if query_text.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Query text cannot be empty".to_string(),
+            ));
+        }
+
+        // Use the configured default_results if limit is None
+        let effective_limit = result_limit.unwrap_or_else(|| config::get_config().default_results);
+
+        // Generate an embedding for the query
+        let query_vector = self.embedder.embed(query_text)?;
+
+        let context = self
+            .volatile_contexts
+            .get(context_id)
+            .ok_or_else(|| SemanticSearchError::ContextNotFound(context_id.to_string()))?;
+
+        let context_guard = context
+            .lock()
+            .map_err(|e| SemanticSearchError::OperationFailed(format!("Failed to acquire lock on context: {}", e)))?;
+
+        context_guard.search(&query_vector, effective_limit)
+    }
+
+    /// Get all contexts
+    ///
+    /// # Returns
+    ///
+    /// A vector of memory contexts
+    pub fn get_contexts(&self) -> Vec<MemoryContext> {
+        self.persistent_contexts.values().cloned().collect()
+    }
+
+    /// Make a context persistent
+    ///
+    /// # Arguments
+    ///
+    /// * `context_id` - ID of the context to make persistent
+    /// * `context_name` - Name for the persistent context
+    /// * `context_description` - Description of the persistent context
+    ///
+    /// # Returns
+    ///
+    /// Result indicating success or failure
+    pub fn make_persistent(&mut self, context_id: &str, context_name: &str, context_description: &str) -> Result<()> {
+        // Validate inputs
+        if context_id.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Context ID cannot be empty".to_string(),
+            ));
+        }
+
+        if context_name.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Context name cannot be empty".to_string(),
+            ));
+        }
+
+        // Check if the context exists
+        let context = self
+            .volatile_contexts
+            .get(context_id)
+            .ok_or_else(|| SemanticSearchError::ContextNotFound(context_id.to_string()))?;
+
+        // Create the persistent context directory
+        let persistent_dir = self.base_dir.join(context_id);
+        fs::create_dir_all(&persistent_dir)?;
+
+        // Get the context data
+        let context_guard = context
+            .lock()
+            .map_err(|e| SemanticSearchError::OperationFailed(format!("Failed to acquire lock on context: {}", e)))?;
+
+        // Save the data to the persistent directory
+        let data_path = persistent_dir.join("data.json");
+        utils::save_json_to_file(&data_path, context_guard.get_data_points())?;
+
+        // Create the context metadata
+        let context_meta = MemoryContext::new(
+            context_id.to_string(),
+            context_name,
+            context_description,
+            true,
+            None,
+            context_guard.get_data_points().len(),
+        );
+
+        // Store the context metadata
+        self.persistent_contexts.insert(context_id.to_string(), context_meta);
+        self.save_contexts_metadata()?;
+
+        Ok(())
+    }
+
+    /// Remove a context by ID
+    ///
+    /// # Arguments
+    ///
+    /// * `context_id` - ID of the context to remove
+    /// * `delete_persistent_storage` - Whether to delete persistent storage for this context
+    ///
+    /// # Returns
+    ///
+    /// Result indicating success or failure
+    pub fn remove_context_by_id(&mut self, context_id: &str, delete_persistent_storage: bool) -> Result<()> {
+        // Validate inputs
+        if context_id.is_empty() {
+            return Err(SemanticSearchError::InvalidArgument(
+                "Context ID cannot be empty".to_string(),
+            ));
+        }
+
+        // Check if the context exists before attempting removal
+        let context_exists =
+            self.volatile_contexts.contains_key(context_id) || self.persistent_contexts.contains_key(context_id);
+
+        if !context_exists {
+            return Err(SemanticSearchError::ContextNotFound(context_id.to_string()));
+        }
+
+        // Remove from volatile contexts
+        self.volatile_contexts.remove(context_id);
+
+        // Remove from persistent contexts if needed
+        if delete_persistent_storage {
+            if self.persistent_contexts.remove(context_id).is_some() {
+                self.save_contexts_metadata()?;
+            }
+
+            // Delete the persistent directory
+            let persistent_dir = self.base_dir.join(context_id);
+            if persistent_dir.exists() {
+                fs::remove_dir_all(persistent_dir)?;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Remove a context by name
+    ///
+    /// # Arguments
+    ///
+    /// * `name` - Name of the context to remove
+    /// * `delete_persistent` - Whether to delete persistent storage for this context
+    ///
+    /// # Returns
+    ///
+    /// Result indicating success or failure
+    pub fn remove_context_by_name(&mut self, name: &str, delete_persistent: bool) -> Result<()> {
+        // Find the context ID by name
+        let context_id = self
+            .persistent_contexts
+            .iter()
+            .find(|(_, ctx)| ctx.name == name)
+            .map(|(id, _)| id.clone());
+
+        if let Some(id) = context_id {
+            self.remove_context_by_id(&id, delete_persistent)
+        } else {
+            Err(SemanticSearchError::ContextNotFound(format!(
+                "No context found with name: {}",
+                name
+            )))
+        }
+    }
+
+    /// Remove a context by path
+    ///
+    /// # Arguments
+    ///
+    /// * `path` - Path associated with the context to remove
+    /// * `delete_persistent` - Whether to delete persistent storage for this context
+    ///
+    /// # Returns
+    ///
+    /// Result indicating success or failure
+    pub fn remove_context_by_path(&mut self, path: &str, delete_persistent: bool) -> Result<()> {
+        // Find the context ID by path
+        let context_id = self
+            .persistent_contexts
+            .iter()
+            .find(|(_, ctx)| ctx.source_path.as_ref().is_some_and(|p| p == path))
+            .map(|(id, _)| id.clone());
+
+        if let Some(id) = context_id {
+            self.remove_context_by_id(&id, delete_persistent)
+        } else {
+            Err(SemanticSearchError::ContextNotFound(format!(
+                "No context found with path: {}",
+                path
+            )))
+        }
+    }
+
+    /// Remove a context (legacy method for backward compatibility)
+    ///
+    /// # Arguments
+    ///
+    /// * `context_id_or_name` - ID or name of the context to remove
+    /// * `delete_persistent` - Whether to delete persistent storage for this context
+    ///
+    /// # Returns
+    ///
+    /// Result indicating success or failure
+    pub fn remove_context(&mut self, context_id_or_name: &str, delete_persistent: bool) -> Result<()> {
+        // Try to remove by ID first
+        if self.persistent_contexts.contains_key(context_id_or_name)
+            || self.volatile_contexts.contains_key(context_id_or_name)
+        {
+            return self.remove_context_by_id(context_id_or_name, delete_persistent);
+        }
+
+        // If not found by ID, try by name
+        self.remove_context_by_name(context_id_or_name, delete_persistent)
+    }
+
+    /// Load a persistent context
+    ///
+    /// # Arguments
+    ///
+    /// * `context_id` - ID of the context to load
+    ///
+    /// # Returns
+    ///
+    /// Result indicating success or failure
+    pub fn load_persistent_context(&mut self, context_id: &str) -> Result<()> {
+        // Check if the context exists in persistent contexts
+        if !self.persistent_contexts.contains_key(context_id) {
+            return Err(SemanticSearchError::ContextNotFound(context_id.to_string()));
+        }
+
+        // Check if the context is already loaded
+        if self.volatile_contexts.contains_key(context_id) {
+            return Ok(());
+        }
+
+        // Create the context directory path
+        let context_dir = self.base_dir.join(context_id);
+        if !context_dir.exists() {
+            return Err(SemanticSearchError::InvalidPath(format!(
+                "Context directory does not exist: {}",
+                context_dir.display()
+            )));
+        }
+
+        // Create a new semantic context
+        let semantic_context = SemanticContext::new(context_dir.join("data.json"))?;
+
+        // Store the semantic context
+        self.volatile_contexts
+            .insert(context_id.to_string(), Arc::new(Mutex::new(semantic_context)));
+
+        Ok(())
+    }
+
+    /// Save contexts metadata to disk
+    fn save_contexts_metadata(&self) -> Result<()> {
+        let contexts_file = self.base_dir.join("contexts.json");
+        utils::save_json_to_file(&contexts_file, &self.persistent_contexts)
+    }
+}
diff --git a/crates/semantic_search_client/src/client/mod.rs b/crates/semantic_search_client/src/client/mod.rs
new file mode 100644
index 0000000000..c7b224e86e
--- /dev/null
+++ b/crates/semantic_search_client/src/client/mod.rs
@@ -0,0 +1,11 @@
+/// Factory for creating embedders
+pub mod embedder_factory;
+/// Client implementation for semantic search operations
+mod implementation;
+/// Semantic context implementation for search operations
+pub mod semantic_context;
+/// Utility functions for semantic search operations
+pub mod utils;
+
+pub use implementation::SemanticSearchClient;
+pub use semantic_context::SemanticContext;
diff --git a/crates/semantic_search_client/src/client/semantic_context.rs b/crates/semantic_search_client/src/client/semantic_context.rs
new file mode 100644
index 0000000000..a8c3717c9a
--- /dev/null
+++ b/crates/semantic_search_client/src/client/semantic_context.rs
@@ -0,0 +1,150 @@
+use std::fs::{
+    self,
+    File,
+};
+use std::io::{
+    BufReader,
+    BufWriter,
+};
+use std::path::PathBuf;
+
+use crate::error::Result;
+use crate::index::VectorIndex;
+use crate::types::{
+    DataPoint,
+    SearchResult,
+};
+
+/// A semantic context containing data points and a vector index
+pub struct SemanticContext {
+    /// The data points stored in the index
+    pub(crate) data_points: Vec<DataPoint>,
+    /// The vector index for fast approximate nearest neighbor search
+    index: Option<VectorIndex>,
+    /// Path to save/load the data points
+    data_path: PathBuf,
+}
+
+impl SemanticContext {
+    /// Create a new semantic context
+    pub fn new(data_path: PathBuf) -> Result<Self> {
+        // Create the directory if it doesn't exist
+        if let Some(parent) = data_path.parent() {
+            fs::create_dir_all(parent)?;
+        }
+
+        // Create a new instance
+        let mut context = Self {
+            data_points: Vec::new(),
+            index: None,
+            data_path: data_path.clone(),
+        };
+
+        // Load data points if the file exists
+        if data_path.exists() {
+            let file = File::open(&data_path)?;
+            let reader = BufReader::new(file);
+            context.data_points = serde_json::from_reader(reader)?;
+        }
+
+        // If we have data points, rebuild the index
+        if !context.data_points.is_empty() {
+            context.rebuild_index()?;
+        }
+
+        Ok(context)
+    }
+
+    /// Save data points to disk
+    pub fn save(&self) -> Result<()> {
+        // Save the data points as JSON
+        let file = File::create(&self.data_path)?;
+        let writer = BufWriter::new(file);
+        serde_json::to_writer(writer, &self.data_points)?;
+
+        Ok(())
+    }
+
+    /// Rebuild the index from the current data points
+    pub fn rebuild_index(&mut self) -> Result<()> {
+        // Create a new index with the current data points
+        let index = VectorIndex::new(self.data_points.len().max(100));
+
+        // Add all data points to the index
+        for (i, point) in self.data_points.iter().enumerate() {
+            index.insert(&point.vector, i);
+        }
+
+        // Set the new index
+        self.index = Some(index);
+
+        Ok(())
+    }
+
+    /// Add data points to the context
+    pub fn add_data_points(&mut self, data_points: Vec<DataPoint>) -> Result<usize> {
+        // Store the count before extending the data points
+        let count = data_points.len();
+
+        if count == 0 {
+            return Ok(0);
+        }
+
+        // Add the new points to our data store
+        let start_idx = self.data_points.len();
+        self.data_points.extend(data_points);
+        let end_idx = self.data_points.len();
+
+        // Update the index
+        self.update_index_by_range(start_idx, end_idx)?;
+
+        Ok(count)
+    }
+
+    /// Update the index with data points in a specific range
+    pub fn update_index_by_range(&mut self, start_idx: usize, end_idx: usize) -> Result<()> {
+        // If we don't have an index yet, or if the index is small and we're adding many points,
+        // it might be more efficient to rebuild from scratch
+        if self.index.is_none() || (self.data_points.len() < 1000 && (end_idx - start_idx) > self.data_points.len() / 2)
+        {
+            return self.rebuild_index();
+        }
+
+        // Get the existing index
+        let index = self.index.as_ref().unwrap();
+
+        // Add only the points in the specified range to the index
+        for i in start_idx..end_idx {
+            index.insert(&self.data_points[i].vector, i);
+        }
+
+        Ok(())
+    }
+
+    /// Search for similar items to the given vector
+    pub fn search(&self, query_vector: &[f32], limit: usize) -> Result<Vec<SearchResult>> {
+        let index = match &self.index {
+            Some(idx) => idx,
+            None => return Ok(Vec::new()), // Return empty results if no index
+        };
+
+        // Search for the nearest neighbors
+        let results = index.search(query_vector, limit, 100);
+
+        // Convert the results to our SearchResult type
+        let search_results = results
+            .into_iter()
+            .map(|(id, distance)| {
+                let point = self.data_points[id].clone();
+                SearchResult::new(point, distance)
+            })
+            .collect();
+
+        Ok(search_results)
+    }
+
+    /// Get the data points for serialization
+    pub fn get_data_points(&self) -> &Vec<DataPoint> {
+        &self.data_points
+    }
+}
diff --git a/crates/semantic_search_client/src/client/utils.rs b/crates/semantic_search_client/src/client/utils.rs
new file mode 100644
index 0000000000..ee13e4a7fe
--- /dev/null
+++ b/crates/semantic_search_client/src/client/utils.rs
@@ -0,0 +1,123 @@
+use std::fs;
+use std::path::{
+    Path,
+    PathBuf,
+};
+
+use uuid::Uuid;
+
+use crate::error::Result;
+use crate::types::ProgressStatus;
+
+/// Create a context directory based on persistence setting
+///
+/// # Arguments
+///
+/// * `base_dir` - Base directory for persistent contexts
+/// * `id` - Context ID
+/// * `persistent` - Whether this is a persistent context
+///
+/// # Returns
+///
+/// The path to the created directory
+pub fn create_context_directory(base_dir: &Path, id: &str, persistent: bool) -> Result<PathBuf> {
+    let context_dir = if persistent {
+        let context_dir = base_dir.join(id);
+        fs::create_dir_all(&context_dir)?;
+        context_dir
+    } else {
+        // For volatile contexts, use a temporary directory
+        let temp_dir = std::env::temp_dir().join("memory_bank").join(id);
+        fs::create_dir_all(&temp_dir)?;
+        temp_dir
+    };
+
+    Ok(context_dir)
+}
+
+/// Generate a unique context ID
+///
+/// # Returns
+///
+/// A new UUID as a string
+pub fn generate_context_id() -> String {
+    Uuid::new_v4().to_string()
+}
+
+/// Count files in a directory with progress updates
+///
+/// # Arguments
+///
+/// * `dir_path` - Path to the directory
+/// * `progress_callback` - Optional callback for progress updates
+///
+/// # Returns
+///
+/// The number of files found
+pub fn count_files_in_directory<F>(dir_path: &Path, progress_callback: &Option<F>) -> Result<usize>
+where
+    F: Fn(ProgressStatus) + Send + 'static,
+{
+    // Notify progress: Getting file count
+    if let Some(ref callback) = progress_callback {
+        callback(ProgressStatus::CountingFiles);
+    }
+
+    // Count files first to provide progress information
+    let mut file_count = 0;
+    for entry in walkdir::WalkDir::new(dir_path)
+        .follow_links(true)
+        .into_iter()
+        .filter_map(|e| e.ok())
+        .filter(|e| e.file_type().is_file())
+    {
+        let path = entry.path();
+
+        // Skip hidden files
+        if path
+            .file_name()
+            .and_then(|n| n.to_str())
+            .is_some_and(|s| s.starts_with('.'))
+        {
+            continue;
+        }
+
+        file_count += 1;
+    }
+
+    Ok(file_count)
+}
+
+/// Save JSON data to a file
+///
+/// # Arguments
+///
+/// * `path` - Path to save the file
+/// * `data` - Data to save
+///
+/// # Returns
+///
+/// Result indicating success or failure
+pub fn save_json_to_file<T: serde::Serialize>(path: &Path, data: &T) -> Result<()> {
+    let json = serde_json::to_string_pretty(data)?;
+    fs::write(path, json)?;
+    Ok(())
+}
+
+/// Load JSON data from a file
+///
+/// # Arguments
+///
+/// * `path` - Path to the file
+///
+/// # Returns
+///
+/// The loaded data or default if the file doesn't exist
+pub fn load_json_from_file<T: serde::de::DeserializeOwned + Default>(path: &Path) -> Result<T> {
+    if path.exists() {
+        let json_str = fs::read_to_string(path)?;
+        Ok(serde_json::from_str(&json_str).unwrap_or_default())
+    } else {
+        Ok(T::default())
+    }
+}
diff --git a/crates/semantic_search_client/src/config.rs b/crates/semantic_search_client/src/config.rs
new file mode 100644
index 0000000000..f61c65788d
--- /dev/null
+++ b/crates/semantic_search_client/src/config.rs
@@ -0,0 +1,332 @@
+//! Configuration management for the semantic search client.
+//!
+//! This module provides a centralized configuration system for semantic search settings.
+//! It supports loading configuration from a JSON file and provides default values.
+//! It also manages model paths and directory structure.
+
+use std::fs;
+use std::path::{
+    Path,
+    PathBuf,
+};
+
+use once_cell::sync::OnceCell;
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+/// Main configuration structure for the semantic search client.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SemanticSearchConfig {
+    /// Chunk size for text splitting
+    pub chunk_size: usize,
+
+    /// Chunk overlap for text splitting
+    pub chunk_overlap: usize,
+
+    /// Default number of results to return from searches
+    pub default_results: usize,
+
+    /// Model name for embeddings
+    pub model_name: String,
+
+    /// Timeout in milliseconds for embedding operations
+    pub timeout: u64,
+
+    /// Base directory for storing persistent contexts
+    pub base_dir: PathBuf,
+}
+
+impl Default for SemanticSearchConfig {
+    fn default() -> Self {
+        Self {
+            chunk_size: 512,
+            chunk_overlap: 128,
+            default_results: 5,
+            model_name: "all-MiniLM-L6-v2".to_string(),
+            timeout: 30000, // 30 seconds
+            base_dir: get_default_base_dir(),
+        }
+    }
+}
+
+// Global configuration instance using OnceCell for thread-safe initialization
+static CONFIG: OnceCell<SemanticSearchConfig> = OnceCell::new();
+
+/// Get the default base directory for semantic search
+///
+/// # Returns
+///
+/// The default base directory path
+pub fn get_default_base_dir() -> PathBuf {
+    dirs::home_dir()
+        .unwrap_or_else(|| PathBuf::from("."))
+        .join(".semantic_search")
+}
+
+/// Get the models directory path
+///
+/// # Arguments
+///
+/// * `base_dir` - Base directory for semantic search
+///
+/// # Returns
+///
+/// The models directory path
+pub fn get_models_dir(base_dir: &Path) -> PathBuf {
+    base_dir.join("models")
+}
+
+/// Get the model directory for a specific model
+///
+/// # Arguments
+///
+/// * `base_dir` - Base directory for semantic search
+/// * `model_name` - Name of the model
+///
+/// # Returns
+///
+/// The model directory path
+pub fn get_model_dir(base_dir: &Path, model_name: &str) -> PathBuf {
+    get_models_dir(base_dir).join(model_name)
+}
+
+/// Get the model file path for a specific model
+///
+/// # Arguments
+///
+/// * `base_dir` - Base directory for semantic search
+/// * `model_name` - Name of the model
+/// * `file_name` - Name of the file
+///
+/// # Returns
+///
+/// The model file path
+pub fn get_model_file_path(base_dir: &Path, model_name: &str, file_name: &str) -> PathBuf {
+    get_model_dir(base_dir, model_name).join(file_name)
+}
+
+/// Ensure the models directory exists
+///
+/// # Arguments
+///
+/// * `base_dir` - Base directory for semantic search
+///
+/// # Returns
+///
+/// Result indicating success or failure
+pub fn ensure_models_dir(base_dir: &Path) -> std::io::Result<()> {
+    let models_dir = get_models_dir(base_dir);
+    std::fs::create_dir_all(models_dir)
+}
+
+/// Initializes the global configuration.
+///
+/// # Arguments
+///
+/// * `base_dir` - Base directory where the configuration file should be stored
+///
+/// # Returns
+///
+/// A Result indicating success or failure
+pub fn init_config(base_dir: &Path) -> std::io::Result<()> {
+    let config_path = base_dir.join("semantic_search_config.json");
+    let config = load_or_create_config(&config_path)?;
+
+    // Set the configuration if it hasn't been set already
+    // This is thread-safe and will only succeed once
+    if CONFIG.set(config).is_err() {
+        // Configuration was already initialized, which is fine
+    }
+
+    Ok(())
+}
+
+/// Gets a reference to the global configuration.
+///
+/// # Returns
+///
+/// A reference to the global configuration
+///
+/// # Panics
+///
+/// Panics if the configuration has not been initialized
+pub fn get_config() -> &'static SemanticSearchConfig {
+    CONFIG.get().expect("Semantic search configuration not initialized")
+}
+
+/// Loads the configuration from a file or creates a new one with default values.
+///
+/// # Arguments
+///
+/// * `config_path` - Path to the configuration file
+///
+/// # Returns
+///
+/// A Result containing the loaded or created configuration
+fn load_or_create_config(config_path: &Path) -> std::io::Result<SemanticSearchConfig> {
+    if config_path.exists() {
+        // Load existing config
+        let content = fs::read_to_string(config_path)?;
+        match serde_json::from_str(&content) {
+            Ok(config) => Ok(config),
+            Err(_) => {
+                // If parsing fails, create a new default config
+                let config = SemanticSearchConfig::default();
+                save_config(&config, config_path)?;
+                Ok(config)
+            },
+        }
+    } else {
+        // Create new config with default values
+        let config = SemanticSearchConfig::default();
+
+        // Ensure parent directory exists
+        if let Some(parent) = config_path.parent() {
+            fs::create_dir_all(parent)?;
+        }
+
+        save_config(&config, config_path)?;
+        Ok(config)
+    }
+}
+
+/// Saves the configuration to a file.
+///
+/// # Arguments
+///
+/// * `config` - The configuration to save
+/// * `config_path` - Path to the configuration file
+///
+/// # Returns
+///
+/// A Result indicating success or failure
+fn save_config(config: &SemanticSearchConfig, config_path: &Path) -> std::io::Result<()> {
+    let content = serde_json::to_string_pretty(config)?;
+    fs::write(config_path, content)
+}
+
+/// Updates the configuration with new values and saves it to disk.
+///
+/// # Arguments
+///
+/// * `base_dir` - Base directory where the configuration file is stored
+/// * `new_config` - The new configuration values
+///
+/// # Returns
+///
+/// A Result indicating success or failure
+pub fn update_config(base_dir: &Path, new_config: SemanticSearchConfig) -> std::io::Result<()> {
+    let config_path = base_dir.join("semantic_search_config.json");
+
+    // Save the new config to disk
+    save_config(&new_config, &config_path)?;
+
+    // Update the global config
+    // This will only work if the config hasn't been initialized yet
+    // Otherwise, we need to restart the application to apply changes
+    let _ = CONFIG.set(new_config);
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use std::fs;
+
+    use tempfile::tempdir;
+
+    use super::*;
+
+    #[test]
+    fn test_default_config() {
+        let config = SemanticSearchConfig::default();
+        assert_eq!(config.chunk_size, 512);
+        assert_eq!(config.chunk_overlap, 128);
+        assert_eq!(config.default_results, 5);
+        assert_eq!(config.model_name, "all-MiniLM-L6-v2");
+    }
+
+    #[test]
+    fn test_load_or_create_config() {
+        let temp_dir = tempdir().unwrap();
+        let config_path = temp_dir.path().join("semantic_search_config.json");
+
+        // Test creating a new config
+        let config = load_or_create_config(&config_path).unwrap();
+        assert_eq!(config.chunk_size, 512);
+        assert!(config_path.exists());
+
+        // Test loading an existing config
+        let mut modified_config = config.clone();
+        modified_config.chunk_size = 1024;
+        save_config(&modified_config, &config_path).unwrap();
+
+        let loaded_config = load_or_create_config(&config_path).unwrap();
+        assert_eq!(loaded_config.chunk_size, 1024);
+    }
+
+    #[test]
+    fn test_update_config() {
+        let temp_dir = tempdir().unwrap();
+
+        // Initialize with default config
+        init_config(temp_dir.path()).unwrap();
+
+        // Create a new config with different values
+        let new_config = SemanticSearchConfig {
+            chunk_size: 1024,
+            chunk_overlap: 256,
+            default_results: 10,
+            model_name: "different-model".to_string(),
+            timeout: 30000,
+            base_dir: temp_dir.path().to_path_buf(),
+        };
+
+        // Update the config
+        update_config(temp_dir.path(), new_config).unwrap();
+
+        // Check that the file was updated
+        let config_path = temp_dir.path().join("semantic_search_config.json");
+        let content = fs::read_to_string(config_path).unwrap();
+        let loaded_config: SemanticSearchConfig = serde_json::from_str(&content).unwrap();
+
+        assert_eq!(loaded_config.chunk_size, 1024);
+        assert_eq!(loaded_config.chunk_overlap, 256);
+        assert_eq!(loaded_config.default_results, 10);
+        assert_eq!(loaded_config.model_name, "different-model");
+    }
+
+    #[test]
+    fn test_directory_structure() {
+        let temp_dir = tempdir().unwrap();
+        let base_dir = temp_dir.path();
+
+        // Test models directory path
+        let models_dir = get_models_dir(base_dir);
+        assert_eq!(models_dir, base_dir.join("models"));
+
+        // Test model directory path
+        let model_dir = get_model_dir(base_dir, "test-model");
+        assert_eq!(model_dir, base_dir.join("models").join("test-model"));
+
+        // Test model file path
+        let model_file = get_model_file_path(base_dir, "test-model", "model.bin");
+        assert_eq!(model_file, base_dir.join("models").join("test-model").join("model.bin"));
+    }
+
+    #[test]
+    fn test_ensure_models_dir() {
+        let temp_dir = tempdir().unwrap();
+        let base_dir = temp_dir.path();
+
+        // Ensure models directory exists
+        ensure_models_dir(base_dir).unwrap();
+
+        // Check that directory was created
+        let models_dir = get_models_dir(base_dir);
+        assert!(models_dir.exists());
+        assert!(models_dir.is_dir());
+    }
+}
diff --git a/crates/semantic_search_client/src/embedding/benchmark_test.rs b/crates/semantic_search_client/src/embedding/benchmark_test.rs
new file mode 100644
index 0000000000..46e928c9ba
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/benchmark_test.rs
@@ -0,0 +1,100 @@
+//! Standardized benchmark tests for embedding models
+//!
+//! This module provides standardized benchmark tests for comparing
+//! different embedding model implementations.
+
+use std::env;
+
+use crate::embedding::{
+    BM25TextEmbedder,
+    run_standard_benchmark,
+};
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+use crate::embedding::{
+    CandleTextEmbedder,
+    ModelType,
+};
+
+/// Helper function to check if real embedder tests should be skipped
+fn should_skip_real_embedder_tests() -> bool {
+    // Skip if real embedders are not explicitly requested
+    if env::var("MEMORY_BANK_USE_REAL_EMBEDDERS").is_err() {
+        println!("Skipping test: MEMORY_BANK_USE_REAL_EMBEDDERS not set");
+        return true;
+    }
+
+    // Skip in CI environments
+    if env::var("CI").is_ok() {
+        println!("Skipping test: Running in CI environment");
+        return true;
+    }
+
+    false
+}
+
+/// Run benchmark for a Candle model
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+fn benchmark_candle_model(model_type: ModelType) {
+    match CandleTextEmbedder::with_model_type(model_type) {
+        Ok(embedder) => {
+            println!("Benchmarking Candle model: {:?}", model_type);
+            let results = run_standard_benchmark(&embedder);
+            println!(
+                "Model: {}, Embedding dim: {}, Single time: {:?}, Batch time: {:?}, Avg per text: {:?}",
+                results.model_name,
+                results.embedding_dim,
+                results.single_time,
+                results.batch_time,
+                results.avg_time_per_text()
+            );
+        },
+        Err(e) => {
+            println!("Failed to load Candle model {:?}: {}", model_type, e);
+        },
+    }
+}
+
+/// Run benchmark for BM25 model
+fn benchmark_bm25_model() {
+    match BM25TextEmbedder::new() {
+        Ok(embedder) => {
+            println!("Benchmarking BM25 model");
+            let results = run_standard_benchmark(&embedder);
+            println!(
+                "Model: {}, Embedding dim: {}, Single time: {:?}, Batch time: {:?}, Avg per text: {:?}",
+                results.model_name,
+                results.embedding_dim,
+                results.single_time,
+                results.batch_time,
+                results.avg_time_per_text()
+            );
+        },
+        Err(e) => {
+            println!("Failed to load BM25 model: {}", e);
+        },
+    }
+}
+
+/// Standardized benchmark test for all embedding models
+#[test]
+fn test_standard_benchmark() {
+    if should_skip_real_embedder_tests() {
+        return;
+    }
+
+    println!("Running standardized benchmark tests for embedding models");
+    println!("--------------------------------------------------------");
+
+    // Benchmark BM25 model (available on all platforms)
+    benchmark_bm25_model();
+
+    // Benchmark Candle models (not available on Linux ARM)
+    #[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+    {
+        benchmark_candle_model(ModelType::MiniLML6V2);
+        benchmark_candle_model(ModelType::MiniLML12V2);
+    }
+
+    println!("--------------------------------------------------------");
+    println!("Benchmark tests completed");
+}
diff --git a/crates/semantic_search_client/src/embedding/benchmark_utils.rs b/crates/semantic_search_client/src/embedding/benchmark_utils.rs
new file mode 100644
index 0000000000..e2d392e11e
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/benchmark_utils.rs
@@ -0,0 +1,131 @@
+//! Benchmark utilities for embedding models
+//!
+//! This module provides standardized utilities for benchmarking embedding models
+//! to ensure fair and consistent comparisons between different implementations.
+
+use std::time::{
+    Duration,
+    Instant,
+};
+
+use tracing::info;
+
+/// Standard test data for benchmarking embedding models
+pub fn create_standard_test_data() -> Vec<String> {
+    vec![
+        "This is a short sentence.".to_string(),
+        "Another simple example.".to_string(),
+        "The quick brown fox jumps over the lazy dog.".to_string(),
+        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.".to_string(),
+        "Machine learning models can process and analyze text data to extract meaningful information and generate embeddings that represent semantic relationships between words and phrases.".to_string(),
+    ]
+}
+
+/// Benchmark results for embedding operations
+#[derive(Debug, Clone)]
+pub struct BenchmarkResults {
+    /// Model name or identifier
+    pub model_name: String,
+    /// Embedding dimension
+    pub embedding_dim: usize,
+    /// Time for single embedding
+    pub single_time: Duration,
+    /// Time for batch embedding
+    pub batch_time: Duration,
+    /// Number of texts in the batch
+    pub batch_size: usize,
+}
+
+impl BenchmarkResults {
+    /// Create a new benchmark results instance
+    pub fn new(
+        model_name: String,
+        embedding_dim: usize,
+        single_time: Duration,
+        batch_time: Duration,
+        batch_size: usize,
+    ) -> Self {
+        Self {
+            model_name,
+            embedding_dim,
+            single_time,
+            batch_time,
+            batch_size,
+        }
+    }
+
+    /// Get the average time per text in the batch
+    pub fn avg_time_per_text(&self) -> Duration {
+        if self.batch_size == 0 {
+            return Duration::from_secs(0);
+        }
+        Duration::from_nanos((self.batch_time.as_nanos() / self.batch_size as u128) as u64)
+    }
+
+    /// Log the benchmark results
+    pub fn log(&self) {
+        info!(
+            "Model: {}, Embedding dim: {}, Single time: {:?}, Batch time: {:?}, Avg per text: {:?}",
+            self.model_name,
+            self.embedding_dim,
+            self.single_time,
+            self.batch_time,
+            self.avg_time_per_text()
+        );
+    }
+}
+
+/// Trait for benchmarkable embedding models
+pub trait BenchmarkableEmbedder {
+    /// Get the model name
+    fn model_name(&self) -> String;
+
+    /// Get the embedding dimension
+    fn embedding_dim(&self) -> usize;
+
+    /// Embed a single text
+    fn embed_single(&self, text: &str) -> Vec<f32>;
+
+    /// Embed a batch of texts
+    fn embed_batch(&self, texts: &[String]) -> Vec<Vec<f32>>;
+}
+
+/// Run a standardized benchmark on an embedder
+///
+/// # Arguments
+///
+/// * `embedder` - The embedder to benchmark
+/// * `texts` - The texts to use for benchmarking
+///
+/// # Returns
+///
+/// The benchmark results
+pub fn run_standard_benchmark<E: BenchmarkableEmbedder>(embedder: &E) -> BenchmarkResults {
+    let texts = create_standard_test_data();
+
+    // Warm-up run
+    let _ = embedder.embed_batch(&texts);
+
+    // Measure single embedding performance
+    let start = Instant::now();
+    let single_result = embedder.embed_single(&texts[0]);
+    let single_duration = start.elapsed();
+
+    // Measure batch embedding performance
+    let start = Instant::now();
+    let batch_result = embedder.embed_batch(&texts);
+    let batch_duration = start.elapsed();
+
+    // Verify results
+    assert_eq!(single_result.len(), embedder.embedding_dim());
+    assert_eq!(batch_result.len(), texts.len());
+    assert_eq!(batch_result[0].len(), embedder.embedding_dim());
+
+    BenchmarkResults::new(
+        embedder.model_name(),
+        embedder.embedding_dim(),
+        single_duration,
+        batch_duration,
+        texts.len(),
+    )
+}
diff --git a/crates/semantic_search_client/src/embedding/bm25.rs b/crates/semantic_search_client/src/embedding/bm25.rs
new file mode 100644
index 0000000000..e11b484d70
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/bm25.rs
@@ -0,0 +1,212 @@
+use std::sync::Arc;
+
+use bm25::{
+    Embedder,
+    EmbedderBuilder,
+    Embedding,
+};
+use tracing::{
+    debug,
+    info,
+};
+
+use crate::embedding::benchmark_utils::BenchmarkableEmbedder;
+use crate::error::Result;
+
+/// BM25 Text Embedder implementation
+///
+/// This is a fallback implementation for platforms where neither Candle nor ONNX
+/// are fully supported. It uses the BM25 algorithm to create term frequency vectors
+/// that can be used for text search.
+///
+/// Note: BM25 is a keyword-based approach and doesn't support true semantic search.
+/// It works by matching keywords rather than understanding semantic meaning, so
+/// it will only find matches when there's lexical overlap between query and documents.
+pub struct BM25TextEmbedder {
+    /// BM25 embedder from the bm25 crate
+    embedder: Arc<Embedder>,
+    /// Vector dimension (fixed size for compatibility with other embedders)
+    dimension: usize,
+}
+
+impl BM25TextEmbedder {
+    /// Create a new BM25 text embedder
+    pub fn new() -> Result<Self> {
+        info!("Initializing BM25TextEmbedder with language detection");
+
+        // Initialize with a small sample corpus to build the embedder
+        // We can use an empty corpus and rely on the fallback avgdl
+        // Using LanguageMode::Detect for automatic language detection
+        let embedder = EmbedderBuilder::with_fit_to_corpus(bm25::LanguageMode::Detect, &[]).build();
+
+        debug!(
+            "BM25TextEmbedder initialized successfully with avgdl: {}",
+            embedder.avgdl()
+        );
+
+        Ok(Self {
+            embedder: Arc::new(embedder),
+            dimension: 384, // Match dimension of other embedders for compatibility
+        })
+    }
+
+    /// Convert a BM25 sparse embedding to a dense vector of fixed dimension
+    fn sparse_to_dense(&self, embedding: Embedding) -> Vec<f32> {
+        // Create a zero vector of the target dimension
+        let mut dense = vec![0.0; self.dimension];
+
+        // Fill in values from the sparse embedding
+        for token in embedding.0 {
+            // Use the token index modulo dimension to map to a position in our dense vector
+            let idx = (token.index as usize) % self.dimension;
+            dense[idx] += token.value;
+        }
+
+        // Normalize the vector
+        let norm: f32 = dense.iter().map(|&x| x * x).sum::<f32>().sqrt();
+        if norm > 0.0 {
+            for val in dense.iter_mut() {
+                *val /= norm;
+            }
+        }
+
+        dense
+    }
+
+    /// Embed a text using BM25 algorithm
+    pub fn embed(&self, text: &str) -> Result<Vec<f32>> {
+        // Generate BM25 embedding
+        let embedding = self.embedder.embed(text);
+
+        // Convert to dense vector
+        let dense = self.sparse_to_dense(embedding);
+
+        Ok(dense)
+    }
+
+    /// Embed multiple texts using BM25 algorithm
+    pub fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>> {
+        let mut results = Vec::with_capacity(texts.len());
+
+        for text in texts {
+            results.push(self.embed(text)?);
+        }
+
+        Ok(results)
+    }
+}
+
+// Implement BenchmarkableEmbedder for BM25TextEmbedder
+impl BenchmarkableEmbedder for BM25TextEmbedder {
+    fn model_name(&self) -> String {
+        "BM25".to_string()
+    }
+
+    fn embedding_dim(&self) -> usize {
+        self.dimension
+    }
+
+    fn embed_single(&self, text: &str) -> Vec<f32> {
+        self.embed(text).unwrap_or_else(|_| vec![0.0; self.dimension])
+    }
+
+    fn embed_batch(&self, texts: &[String]) -> Vec<Vec<f32>> {
+        self.embed_batch(texts)
+            .unwrap_or_else(|_| vec![vec![0.0; self.dimension]; texts.len()])
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_bm25_embed_single() {
+        let embedder = BM25TextEmbedder::new().unwrap();
+        let text = "This is a test sentence";
+        let embedding = embedder.embed(text).unwrap();
+
+        // Check that the embedding has the expected dimension
+        assert_eq!(embedding.len(), embedder.dimension);
+
+        // Check that the embedding is normalized
+        let norm: f32 = embedding.iter().map(|&x| x * x).sum::<f32>().sqrt();
+        assert!((norm - 1.0).abs() < 1e-5 || norm == 0.0);
+    }
+
+    #[test]
+    fn test_bm25_embed_batch() {
+        let embedder = BM25TextEmbedder::new().unwrap();
+        let texts = vec![
+            "First test sentence".to_string(),
+            "Second test sentence".to_string(),
+            "Third test sentence".to_string(),
+        ];
+        let embeddings = embedder.embed_batch(&texts).unwrap();
+
+        // Check that we got the right number of embeddings
+        assert_eq!(embeddings.len(), texts.len());
+
+        // Check that each embedding has the expected dimension
+        for embedding in &embeddings {
+            assert_eq!(embedding.len(), embedder.dimension);
+        }
+    }
+
+    #[test]
+    fn test_bm25_keyword_matching() {
+        let embedder = BM25TextEmbedder::new().unwrap();
+
+        // Create embeddings for two texts
+        let text1 = "information retrieval and search engines";
+        let text2 = "machine learning algorithms";
+
+        let embedding1 = embedder.embed(text1).unwrap();
+        let embedding2 = embedder.embed(text2).unwrap();
+
+        // Create a query embedding
+        let query = "information search";
+        let query_embedding = embedder.embed(query).unwrap();
+
+        // Calculate cosine similarity
+        fn cosine_similarity(a: &[f32], b: &[f32]) -> f32 {
+            let dot_product: f32 = a.iter().zip(b.iter()).map(|(x, y)| x * y).sum();
+            dot_product
+        }
+
+        let sim1 = cosine_similarity(&query_embedding, &embedding1);
+        let sim2 = cosine_similarity(&query_embedding, &embedding2);
+
+        // The query should be more similar to text1 than text2
+        assert!(sim1 > sim2);
+    }
+
+    #[test]
+    fn test_bm25_multilingual() {
+        let embedder = BM25TextEmbedder::new().unwrap();
+
+        // Test with different languages
+        let english = "The quick brown fox jumps over the lazy dog";
+        let spanish = "El zorro marrón rápido salta sobre el perro perezoso";
+        let french = "Le rapide renard brun saute par-dessus le chien paresseux";
+
+        // All should produce valid embeddings
+        let english_embedding = embedder.embed(english).unwrap();
+        let spanish_embedding = embedder.embed(spanish).unwrap();
+        let french_embedding = embedder.embed(french).unwrap();
+
+        // Check dimensions
+        assert_eq!(english_embedding.len(), embedder.dimension);
+        assert_eq!(spanish_embedding.len(), embedder.dimension);
+        assert_eq!(french_embedding.len(), embedder.dimension);
+
+        // Check normalization
+        let norm_en: f32 = english_embedding.iter().map(|&x| x * x).sum::<f32>().sqrt();
+        let norm_es: f32 = spanish_embedding.iter().map(|&x| x * x).sum::<f32>().sqrt();
+        let norm_fr: f32 = french_embedding.iter().map(|&x| x * x).sum::<f32>().sqrt();
+
+        assert!((norm_en - 1.0).abs() < 1e-5 || norm_en == 0.0);
+        assert!((norm_es - 1.0).abs() < 1e-5 || norm_es == 0.0);
+        assert!((norm_fr - 1.0).abs() < 1e-5 || norm_fr == 0.0);
+    }
+}
diff --git a/crates/semantic_search_client/src/embedding/candle.rs b/crates/semantic_search_client/src/embedding/candle.rs
new file mode 100644
index 0000000000..a5af728ad0
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/candle.rs
@@ -0,0 +1,802 @@
+use std::path::Path;
+use std::thread::available_parallelism;
+
+use anyhow::Result as AnyhowResult;
+use candle_core::{
+    Device,
+    Tensor,
+};
+use candle_nn::VarBuilder;
+use candle_transformers::models::bert::{
+    BertModel,
+    DTYPE,
+};
+use rayon::prelude::*;
+use tokenizers::Tokenizer;
+use tracing::{
+    debug,
+    error,
+    info,
+};
+
+use crate::embedding::candle_models::{
+    ModelConfig,
+    ModelType,
+};
+use crate::error::{
+    Result,
+    SemanticSearchError,
+};
+
+/// Text embedding generator using Candle for embedding models
+pub struct CandleTextEmbedder {
+    /// The BERT model
+    model: BertModel,
+    /// The tokenizer
+    tokenizer: Tokenizer,
+    /// The device to run on
+    device: Device,
+    /// Model configuration
+    config: ModelConfig,
+}
+
+impl CandleTextEmbedder {
+    /// Create a new TextEmbedder with the default model (all-MiniLM-L6-v2)
+    ///
+    /// # Returns
+    ///
+    /// A new TextEmbedder instance
+    pub fn new() -> Result<Self> {
+        Self::with_model_type(ModelType::default())
+    }
+
+    /// Create a new TextEmbedder with a specific model type
+    ///
+    /// # Arguments
+    ///
+    /// * `model_type` - The type of model to use
+    ///
+    /// # Returns
+    ///
+    /// A new TextEmbedder instance
+    pub fn with_model_type(model_type: ModelType) -> Result<Self> {
+        let model_config = model_type.get_config();
+        let (model_path, tokenizer_path) = model_config.get_local_paths();
+
+        // Create model directory if it doesn't exist
+        ensure_model_directory_exists(&model_path)?;
+
+        // Download files if they don't exist
+        ensure_model_files(&model_path, &tokenizer_path, &model_config)?;
+
+        Self::with_model_config(&model_path, &tokenizer_path, model_config)
+    }
+
+    /// Create a new TextEmbedder with specific model paths and configuration
+    ///
+    /// # Arguments
+    ///
+    /// * `model_path` - Path to the model file (.safetensors)
+    /// * `tokenizer_path` - Path to the tokenizer file (.json)
+    /// * `config` - Model configuration
+    ///
+    /// # Returns
+    ///
+    /// A new TextEmbedder instance
+    pub fn with_model_config(model_path: &Path, tokenizer_path: &Path, config: ModelConfig) -> Result<Self> {
+        info!("Initializing text embedder with model: {:?}", model_path);
+
+        // Initialize thread pool
+        let threads = initialize_thread_pool()?;
+        info!("Using {} threads for text embedding", threads);
+
+        // Load tokenizer
+        let tokenizer = load_tokenizer(tokenizer_path)?;
+
+        // Get the best available device (Metal, CUDA, or CPU)
+        let device = get_best_available_device();
+
+        // Load model
+        let model = load_model(model_path, &config, &device)?;
+
+        debug!("Text embedder initialized successfully");
+
+        Ok(Self {
+            model,
+            tokenizer,
+            device,
+            config,
+        })
+    }
+
+    /// Create a new TextEmbedder with specific model paths
+    ///
+    /// # Arguments
+    ///
+    /// * `model_path` - Path to the model file (.safetensors)
+    /// * `tokenizer_path` - Path to the tokenizer file (.json)
+    ///
+    /// # Returns
+    ///
+    /// A new TextEmbedder instance
+    pub fn with_model_paths(model_path: &Path, tokenizer_path: &Path) -> Result<Self> {
+        // Use default model configuration
+        let config = ModelType::default().get_config();
+        Self::with_model_config(model_path, tokenizer_path, config)
+    }
+
+    /// Generate an embedding for a text
+    ///
+    /// # Arguments
+    ///
+    /// * `text` - The text to embed
+    ///
+    /// # Returns
+    ///
+    /// A vector of floats representing the text embedding
+    pub fn embed(&self, text: &str) -> Result<Vec<f32>> {
+        let texts = vec![text.to_string()];
+        match self.embed_batch(&texts) {
+            Ok(embeddings) => Ok(embeddings.into_iter().next().unwrap()),
+            Err(e) => {
+                error!("Failed to embed text: {}", e);
+                Err(e)
+            },
+        }
+    }
+
+    /// Generate embeddings for multiple texts
+    ///
+    /// # Arguments
+    ///
+    /// * `texts` - The texts to embed
+    ///
+    /// # Returns
+    ///
+    /// A vector of embeddings
+    pub fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>> {
+        // Configure tokenizer with padding
+        let tokenizer = prepare_tokenizer(&self.tokenizer)?;
+
+        // Process in batches for better memory efficiency
+        let batch_size = self.config.batch_size;
+
+        // Use parallel iterator to process batches in parallel
+        let all_embeddings: Vec<Vec<f32>> = texts
+            .par_chunks(batch_size)
+            .flat_map(|batch| self.process_batch(batch, &tokenizer))
+            .collect();
+
+        // Check if we have the correct number of embeddings
+        if all_embeddings.len() != texts.len() {
+            return Err(SemanticSearchError::EmbeddingError(
+                "Failed to generate embeddings for all texts".to_string(),
+            ));
+        }
+
+        Ok(all_embeddings)
+    }
+
+    /// Process a batch of texts to generate embeddings
+    fn process_batch(&self, batch: &[String], tokenizer: &Tokenizer) -> Vec<Vec<f32>> {
+        // Tokenize batch
+        let tokens = match tokenizer.encode_batch(batch.to_vec(), true) {
+            Ok(t) => t,
+            Err(e) => {
+                error!("Failed to tokenize texts: {}", e);
+                return Vec::new();
+            },
+        };
+
+        // Convert tokens to tensors
+        let (token_ids, attention_mask) = match create_tensors_from_tokens(&tokens, &self.device) {
+            Ok(tensors) => tensors,
+            Err(_) => return Vec::new(),
+        };
+
+        // Create token type ids
+        let token_type_ids = match token_ids.zeros_like() {
+            Ok(t) => t,
+            Err(e) => {
+                error!("Failed to create zeros tensor for token_type_ids: {}", e);
+                return Vec::new();
+            },
+        };
+
+        // Run model inference and process results
+        self.run_inference_and_process(&token_ids, &token_type_ids, &attention_mask)
+            .unwrap_or_else(|_| Vec::new())
+    }
+
+    /// Run model inference and process the results
+    fn run_inference_and_process(
+        &self,
+        token_ids: &Tensor,
+        token_type_ids: &Tensor,
+        attention_mask: &Tensor,
+    ) -> Result<Vec<Vec<f32>>> {
+        // Run model inference
+        let embeddings = match self.model.forward(token_ids, token_type_ids, Some(attention_mask)) {
+            Ok(e) => e,
+            Err(e) => {
+                error!("Model inference failed: {}", e);
+                return Err(SemanticSearchError::EmbeddingError(format!(
+                    "Model inference failed: {}",
+                    e
+                )));
+            },
+        };
+
+        // Apply mean pooling
+        let mean_embeddings = match embeddings.mean(1) {
+            Ok(m) => m,
+            Err(e) => {
+                error!("Failed to compute mean embeddings: {}", e);
+                return Err(SemanticSearchError::EmbeddingError(format!(
+                    "Failed to compute mean embeddings: {}",
+                    e
+                )));
+            },
+        };
+
+        // Normalize if configured
+        let final_embeddings = if self.config.normalize_embeddings {
+            normalize_l2(&mean_embeddings)?
+        } else {
+            mean_embeddings
+        };
+
+        // Convert to Vec<Vec<f32>>
+        match final_embeddings.to_vec2::<f32>() {
+            Ok(v) => Ok(v),
+            Err(e) => {
+                error!("Failed to convert embeddings to vector: {}", e);
+                Err(SemanticSearchError::EmbeddingError(format!(
+                    "Failed to convert embeddings to vector: {}",
+                    e
+                )))
+            },
+        }
+    }
+}
+
+/// Ensure model directory exists
+fn ensure_model_directory_exists(model_path: &Path) -> Result<()> {
+    let model_dir = model_path.parent().unwrap_or_else(|| Path::new("."));
+    if let Err(err) = std::fs::create_dir_all(model_dir) {
+        error!("Failed to create model directory: {}", err);
+        return Err(SemanticSearchError::IoError(err));
+    }
+    Ok(())
+}
+
+/// Ensure model files exist, downloading them if necessary
+fn ensure_model_files(model_path: &Path, tokenizer_path: &Path, config: &ModelConfig) -> Result<()> {
+    // Check if files already exist
+    if model_path.exists() && tokenizer_path.exists() {
+        return Ok(());
+    }
+
+    // Create parent directories if they don't exist
+    if let Some(parent) = model_path.parent() {
+        if let Err(e) = std::fs::create_dir_all(parent) {
+            return Err(SemanticSearchError::IoError(e));
+        }
+    }
+    if let Some(parent) = tokenizer_path.parent() {
+        if let Err(e) = std::fs::create_dir_all(parent) {
+            return Err(SemanticSearchError::IoError(e));
+        }
+    }
+
+    info!("Downloading model files for {}...", config.name);
+
+    // Download files using Hugging Face Hub API
+    download_model_files(model_path, tokenizer_path, config).map_err(|e| {
+        error!("Failed to download model files: {}", e);
+        SemanticSearchError::EmbeddingError(e.to_string())
+    })
+}
+
+/// Download model files from Hugging Face Hub
+fn download_model_files(model_path: &Path, tokenizer_path: &Path, config: &ModelConfig) -> AnyhowResult<()> {
+    // Use Hugging Face Hub API to download files
+    let api = hf_hub::api::sync::Api::new()?;
+    let repo = api.repo(hf_hub::Repo::with_revision(
+        config.repo_path.clone(),
+        hf_hub::RepoType::Model,
+        "main".to_string(),
+    ));
+
+    // Download model file if it doesn't exist
+    if !model_path.exists() {
+        let model_file = repo.get(&config.model_file)?;
+        std::fs::copy(model_file, model_path)?;
+    }
+
+    // Download tokenizer file if it doesn't exist
+    if !tokenizer_path.exists() {
+        let tokenizer_file = repo.get(&config.tokenizer_file)?;
+        std::fs::copy(tokenizer_file, tokenizer_path)?;
+    }
+
+    Ok(())
+}
+
+/// Initialize thread pool for parallel processing
+fn initialize_thread_pool() -> Result<usize> {
+    // Automatically detect available parallelism
+    let threads = match available_parallelism() {
+        Ok(n) => n.get(),
+        Err(e) => {
+            error!("Failed to detect available parallelism: {}", e);
+            // Default to 4 threads if detection fails
+            4
+        },
+    };
+
+    // Initialize the global Rayon thread pool once
+    if let Err(e) = rayon::ThreadPoolBuilder::new().num_threads(threads).build_global() {
+        // This is fine - it means the pool is already initialized
+        debug!("Rayon thread pool already initialized or failed: {}", e);
+    }
+
+    Ok(threads)
+}
+
+/// Load tokenizer from file
+fn load_tokenizer(tokenizer_path: &Path) -> Result<Tokenizer> {
+    match Tokenizer::from_file(tokenizer_path) {
+        Ok(t) => Ok(t),
+        Err(e) => {
+            error!("Failed to load tokenizer from {:?}: {}", tokenizer_path, e);
+            Err(SemanticSearchError::EmbeddingError(format!(
+                "Failed to load tokenizer: {}",
+                e
+            )))
+        },
+    }
+}
+
+/// Get the best available device for inference
+fn get_best_available_device() -> Device {
+    // Always use CPU for embedding to avoid hardware acceleration issues
+    info!("Using CPU for text embedding (hardware acceleration disabled)");
+    Device::Cpu
+}
+
+/// Load model from file
+fn load_model(model_path: &Path, config: &ModelConfig, device: &Device) -> Result<BertModel> {
+    // Load model weights
+    let vb = unsafe {
+        match VarBuilder::from_mmaped_safetensors(&[model_path], DTYPE, device) {
+            Ok(v) => v,
+            Err(e) => {
+                error!("Failed to load model weights from {:?}: {}", model_path, e);
+                return Err(SemanticSearchError::EmbeddingError(format!(
+                    "Failed to load model weights: {}",
+                    e
+                )));
+            },
+        }
+    };
+
+    // Create BERT model
+    match BertModel::load(vb, &config.config) {
+        Ok(m) => Ok(m),
+        Err(e) => {
+            error!("Failed to create BERT model: {}", e);
+            Err(SemanticSearchError::EmbeddingError(format!(
+                "Failed to create BERT model: {}",
+                e
+            )))
+        },
+    }
+}
+
+/// Prepare tokenizer with padding configuration
+fn prepare_tokenizer(tokenizer: &Tokenizer) -> Result<Tokenizer> {
+    let mut tokenizer = tokenizer.clone();
+    if let Some(pp) = tokenizer.get_padding_mut() {
+        pp.strategy = tokenizers::PaddingStrategy::BatchLongest;
+    } else {
+        let pp = tokenizers::PaddingParams {
+            strategy: tokenizers::PaddingStrategy::BatchLongest,
+            ..Default::default()
+        };
+        tokenizer.with_padding(Some(pp));
+    }
+    Ok(tokenizer)
+}
+
+/// Create tensors from tokenized inputs
+fn create_tensors_from_tokens(tokens: &[tokenizers::Encoding], device: &Device) -> Result<(Tensor, Tensor)> {
+    // Pre-allocate vectors with exact capacity
+    let mut token_ids = Vec::with_capacity(tokens.len());
+    let mut attention_mask = Vec::with_capacity(tokens.len());
+
+    // Convert tokens to tensors
+    for tokens in tokens {
+        let ids = tokens.get_ids().to_vec();
+        let mask = tokens.get_attention_mask().to_vec();
+
+        let ids_tensor = match Tensor::new(ids.as_slice(), device) {
+            Ok(t) => t,
+            Err(e) => {
+                error!("Failed to create token_ids tensor: {}", e);
+                return Err(SemanticSearchError::EmbeddingError(format!(
+                    "Failed to create token_ids tensor: {}",
+                    e
+                )));
+            },
+        };
+
+        let mask_tensor = match Tensor::new(mask.as_slice(), device) {
+            Ok(t) => t,
+            Err(e) => {
+                error!("Failed to create attention_mask tensor: {}", e);
+                return Err(SemanticSearchError::EmbeddingError(format!(
+                    "Failed to create attention_mask tensor: {}",
+                    e
+                )));
+            },
+        };
+
+        token_ids.push(ids_tensor);
+        attention_mask.push(mask_tensor);
+    }
+
+    // Stack tensors into batches
+    let token_ids = match Tensor::stack(&token_ids, 0) {
+        Ok(t) => t,
+        Err(e) => {
+            error!("Failed to stack token_ids tensors: {}", e);
+            return Err(SemanticSearchError::EmbeddingError(format!(
+                "Failed to stack token_ids tensors: {}",
+                e
+            )));
+        },
+    };
+
+    let attention_mask = match Tensor::stack(&attention_mask, 0) {
+        Ok(t) => t,
+        Err(e) => {
+            error!("Failed to stack attention_mask tensors: {}", e);
+            return Err(SemanticSearchError::EmbeddingError(format!(
+                "Failed to stack attention_mask tensors: {}",
+                e
+            )));
+        },
+    };
+
+    Ok((token_ids, attention_mask))
+}
+
+/// Normalize embedding to unit length (L2 norm)
+fn normalize_l2(v: &Tensor) -> Result<Tensor> {
+    // Calculate squared values
+    let squared = match v.sqr() {
+        Ok(s) => s,
+        Err(e) => {
+            error!("Failed to square tensor for L2 normalization: {}", e);
+            return Err(SemanticSearchError::EmbeddingError(format!(
+                "Failed to square tensor: {}",
+                e
+            )));
+        },
+    };
+
+    // Sum along last dimension and keep dimensions
+    let sum_squared = match squared.sum_keepdim(1) {
+        Ok(s) => s,
+        Err(e) => {
+            error!("Failed to sum squared values: {}", e);
+            return Err(SemanticSearchError::EmbeddingError(format!(
+                "Failed to sum tensor: {}",
+                e
+            )));
+        },
+    };
+
+    // Calculate square root for L2 norm
+    let norm = match sum_squared.sqrt() {
+        Ok(n) => n,
+        Err(e) => {
+            error!("Failed to compute square root for normalization: {}", e);
+            return Err(SemanticSearchError::EmbeddingError(format!(
+                "Failed to compute square root: {}",
+                e
+            )));
+        },
+    };
+
+    // Divide by norm
+    match v.broadcast_div(&norm) {
+        Ok(n) => Ok(n),
+        Err(e) => {
+            error!("Failed to normalize by division: {}", e);
+            Err(SemanticSearchError::EmbeddingError(format!(
+                "Failed to normalize: {}",
+                e
+            )))
+        },
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{
+        env,
+        fs,
+    };
+
+    use tempfile::tempdir;
+
+    use super::*;
+
+    // Helper function to create a test embedder with mock files
+    fn create_test_embedder() -> Result<CandleTextEmbedder> {
+        // Use a temporary directory for test files
+        let temp_dir = tempdir().expect("Failed to create temp directory");
+        let _model_path = temp_dir.path().join("model.safetensors");
+        let _tokenizer_path = temp_dir.path().join("tokenizer.json");
+
+        // Mock the ensure_model_files function to avoid actual downloads
+        // This is a simplified test that checks error handling paths
+
+        // Return a mock error to test error handling
+        Err(crate::error::SemanticSearchError::EmbeddingError(
+            "Test error".to_string(),
+        ))
+    }
+
+    /// Helper function to check if real embedder tests should be skipped
+    fn should_skip_real_embedder_tests() -> bool {
+        // Skip if real embedders are not explicitly requested
+        if env::var("MEMORY_BANK_USE_REAL_EMBEDDERS").is_err() {
+            return true;
+        }
+
+        // Skip in CI environments
+        if env::var("CI").is_ok() {
+            return true;
+        }
+
+        false
+    }
+
+    /// Helper function to create test data for performance tests
+    fn create_test_data() -> Vec<String> {
+        vec![
+            "This is a short sentence.".to_string(),
+            "Another simple example.".to_string(),
+            "The quick brown fox jumps over the lazy dog.".to_string(),
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.".to_string(),
+            "Machine learning models can process and analyze text data to extract meaningful information and generate embeddings that represent semantic relationships between words and phrases.".to_string(),
+        ]
+    }
+
+    #[test]
+    fn test_embed_single() {
+        if should_skip_real_embedder_tests() {
+            return;
+        }
+
+        // Use real embedder for testing
+        match CandleTextEmbedder::new() {
+            Ok(embedder) => {
+                let embedding = embedder.embed("This is a test sentence.").unwrap();
+
+                // MiniLM-L6-v2 produces 384-dimensional embeddings
+                assert_eq!(embedding.len(), 384);
+
+                // Check that the embedding is normalized (L2 norm ≈ 1.0)
+                let norm: f32 = embedding.iter().map(|x| x * x).sum::<f32>().sqrt();
+                assert!((norm - 1.0).abs() < 1e-5);
+            },
+            Err(e) => {
+                // If model loading fails, skip the test
+                println!("Skipping test: Failed to load real embedder: {}", e);
+            },
+        }
+    }
+
+    #[test]
+    fn test_embed_batch() {
+        if should_skip_real_embedder_tests() {
+            return;
+        }
+
+        // Use real embedder for testing
+        match CandleTextEmbedder::new() {
+            Ok(embedder) => {
+                let texts = vec![
+                    "The cat sits outside".to_string(),
+                    "A man is playing guitar".to_string(),
+                ];
+                let embeddings = embedder.embed_batch(&texts).unwrap();
+
+                assert_eq!(embeddings.len(), 2);
+                assert_eq!(embeddings[0].len(), 384);
+                assert_eq!(embeddings[1].len(), 384);
+
+                // Check that embeddings are different
+                let mut different = false;
+                for i in 0..384 {
+                    if (embeddings[0][i] - embeddings[1][i]).abs() > 1e-5 {
+                        different = true;
+                        break;
+                    }
+                }
+                assert!(different);
+            },
+            Err(e) => {
+                // If model loading fails, skip the test
+                println!("Skipping test: Failed to load real embedder: {}", e);
+            },
+        }
+    }
+
+    #[test]
+    fn test_model_types() {
+        // Test that we can create embedders with different model types
+        // This is just a compilation test, we don't actually load the models
+
+        // These should compile without errors
+        let _model_type1 = ModelType::MiniLML6V2;
+        let _model_type2 = ModelType::MiniLML12V2;
+
+        // Test that default is MiniLML6V2
+        assert_eq!(ModelType::default(), ModelType::MiniLML6V2);
+    }
+
+    #[test]
+    fn test_error_handling() {
+        // Test error handling with invalid paths
+        let invalid_path = Path::new("/nonexistent/path");
+        let result = CandleTextEmbedder::with_model_paths(invalid_path, invalid_path);
+        assert!(result.is_err());
+
+        // Test error handling with mock embedder
+        let result = create_test_embedder();
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_ensure_model_files() {
+        // Create temporary directory for test
+        let temp_dir = tempdir().expect("Failed to create temp directory");
+        let model_path = temp_dir.path().join("model.safetensors");
+        let tokenizer_path = temp_dir.path().join("tokenizer.json");
+
+        // Create empty files to simulate existing files
+        fs::write(&model_path, "mock data").expect("Failed to write mock model file");
+        fs::write(&tokenizer_path, "mock data").expect("Failed to write mock tokenizer file");
+
+        // Test that ensure_model_files returns Ok when files exist
+        let config = ModelType::default().get_config();
+        let result = ensure_model_files(&model_path, &tokenizer_path, &config);
+        assert!(result.is_ok());
+    }
+
+    /// Performance test for different model types
+    #[test]
+    fn test_model_performance() {
+        if should_skip_real_embedder_tests() {
+            return;
+        }
+
+        // Test data
+        let texts = create_test_data();
+
+        // Test each model type
+        let model_types = [ModelType::MiniLML6V2, ModelType::MiniLML12V2];
+
+        for model_type in model_types {
+            run_performance_test(model_type, &texts);
+        }
+    }
+
+    /// Run performance test for a specific model type
+    fn run_performance_test(model_type: ModelType, texts: &[String]) {
+        match CandleTextEmbedder::with_model_type(model_type) {
+            Ok(embedder) => {
+                println!("Testing performance of {:?}", model_type);
+
+                // Warm-up run
+                let _ = embedder.embed_batch(texts);
+
+                // Measure single embedding performance
+                let start = std::time::Instant::now();
+                let single_result = embedder.embed(&texts[0]);
+                let single_duration = start.elapsed();
+
+                // Measure batch embedding performance
+                let start = std::time::Instant::now();
+                let batch_result = embedder.embed_batch(texts);
+                let batch_duration = start.elapsed();
+
+                // Check results are valid
+                assert!(single_result.is_ok());
+                assert!(batch_result.is_ok());
+
+                // Get embedding dimensions
+                let embedding_dim = single_result.unwrap().len();
+
+                println!(
+                    "Model: {:?}, Embedding dim: {}, Single time: {:?}, Batch time: {:?}, Avg per text: {:?}",
+                    model_type,
+                    embedding_dim,
+                    single_duration,
+                    batch_duration,
+                    batch_duration.div_f32(texts.len() as f32)
+                );
+            },
+            Err(e) => {
+                println!("Failed to load model {:?}: {}", model_type, e);
+            },
+        }
+    }
+
+    /// Test loading all models to ensure they work
+    #[test]
+    fn test_load_all_models() {
+        if should_skip_real_embedder_tests() {
+            return;
+        }
+
+        let model_types = [ModelType::MiniLML6V2, ModelType::MiniLML12V2];
+
+        for model_type in model_types {
+            test_model_loading(model_type);
+        }
+    }
+
+    /// Test loading a specific model
+    fn test_model_loading(model_type: ModelType) {
+        match CandleTextEmbedder::with_model_type(model_type) {
+            Ok(embedder) => {
+                // Test a simple embedding to verify the model works
+                let result = embedder.embed("Test sentence for model verification.");
+                assert!(result.is_ok(), "Model {:?} failed to generate embedding", model_type);
+
+                // Verify embedding dimensions
+                let embedding = result.unwrap();
+                let expected_dim = match model_type {
+                    ModelType::MiniLML6V2 => 384,
+                    ModelType::MiniLML12V2 => 384,
+                };
+
+                assert_eq!(
+                    embedding.len(),
+                    expected_dim,
+                    "Model {:?} produced embedding with incorrect dimensions",
+                    model_type
+                );
+
+                println!("Successfully loaded and tested model {:?}", model_type);
+            },
+            Err(e) => {
+                println!("Failed to load model {:?}: {}", model_type, e);
+                // Don't fail the test if a model can't be loaded, just report it
+            },
+        }
+    }
+}
+impl crate::embedding::BenchmarkableEmbedder for CandleTextEmbedder {
+    fn model_name(&self) -> String {
+        format!("Candle-{}", self.config.name)
+    }
+
+    fn embedding_dim(&self) -> usize {
+        self.config.config.hidden_size
+    }
+
+    fn embed_single(&self, text: &str) -> Vec<f32> {
+        self.embed(text).unwrap()
+    }
+
+    fn embed_batch(&self, texts: &[String]) -> Vec<Vec<f32>> {
+        self.embed_batch(texts).unwrap()
+    }
+}
diff --git a/crates/semantic_search_client/src/embedding/candle_models.rs b/crates/semantic_search_client/src/embedding/candle_models.rs
new file mode 100644
index 0000000000..de050dd65a
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/candle_models.rs
@@ -0,0 +1,122 @@
+use std::path::PathBuf;
+
+use candle_transformers::models::bert::Config as BertConfig;
+
+/// Type of model to use for text embedding
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ModelType {
+    /// MiniLM-L6-v2 model (384 dimensions)
+    MiniLML6V2,
+    /// MiniLM-L12-v2 model (384 dimensions)
+    MiniLML12V2,
+}
+
+impl Default for ModelType {
+    fn default() -> Self {
+        Self::MiniLML6V2
+    }
+}
+
+/// Configuration for a model
+#[derive(Debug, Clone)]
+pub struct ModelConfig {
+    /// Name of the model
+    pub name: String,
+    /// Path to the model repository
+    pub repo_path: String,
+    /// Name of the model file
+    pub model_file: String,
+    /// Name of the tokenizer file
+    pub tokenizer_file: String,
+    /// BERT configuration
+    pub config: BertConfig,
+    /// Whether to normalize embeddings
+    pub normalize_embeddings: bool,
+    /// Batch size for processing
+    pub batch_size: usize,
+}
+
+impl ModelType {
+    /// Get the configuration for this model type
+    pub fn get_config(&self) -> ModelConfig {
+        match self {
+            Self::MiniLML6V2 => ModelConfig {
+                name: "all-MiniLM-L6-v2".to_string(),
+                repo_path: "sentence-transformers/all-MiniLM-L6-v2".to_string(),
+                model_file: "model.safetensors".to_string(),
+                tokenizer_file: "tokenizer.json".to_string(),
+                config: BertConfig {
+                    vocab_size: 30522,
+                    hidden_size: 384,
+                    num_hidden_layers: 6,
+                    num_attention_heads: 12,
+                    intermediate_size: 1536,
+                    hidden_act: candle_transformers::models::bert::HiddenAct::Gelu,
+                    hidden_dropout_prob: 0.0,
+                    max_position_embeddings: 512,
+                    type_vocab_size: 2,
+                    initializer_range: 0.02,
+                    layer_norm_eps: 1e-12,
+                    pad_token_id: 0,
+                    position_embedding_type: candle_transformers::models::bert::PositionEmbeddingType::Absolute,
+                    use_cache: true,
+                    classifier_dropout: None,
+                    model_type: Some("bert".to_string()),
+                },
+                normalize_embeddings: true,
+                batch_size: 32,
+            },
+            Self::MiniLML12V2 => ModelConfig {
+                name: "all-MiniLM-L12-v2".to_string(),
+                repo_path: "sentence-transformers/all-MiniLM-L12-v2".to_string(),
+                model_file: "model.safetensors".to_string(),
+                tokenizer_file: "tokenizer.json".to_string(),
+                config: BertConfig {
+                    vocab_size: 30522,
+                    hidden_size: 384,
+                    num_hidden_layers: 12,
+                    num_attention_heads: 12,
+                    intermediate_size: 1536,
+                    hidden_act: candle_transformers::models::bert::HiddenAct::Gelu,
+                    hidden_dropout_prob: 0.0,
+                    max_position_embeddings: 512,
+                    type_vocab_size: 2,
+                    initializer_range: 0.02,
+                    layer_norm_eps: 1e-12,
+                    pad_token_id: 0,
+                    position_embedding_type: candle_transformers::models::bert::PositionEmbeddingType::Absolute,
+                    use_cache: true,
+                    classifier_dropout: None,
+                    model_type: Some("bert".to_string()),
+                },
+                normalize_embeddings: true,
+                batch_size: 32,
+            },
+        }
+    }
+
+    /// Get the local paths for model files
+    pub fn get_local_paths(&self) -> (PathBuf, PathBuf) {
+        // Get the base directory and models directory
+        let base_dir = crate::config::get_default_base_dir();
+        let model_dir = crate::config::get_model_dir(&base_dir, &self.get_config().name);
+
+        // Return paths for model and tokenizer files
+        (
+            model_dir.join(&self.get_config().model_file),
+            model_dir.join(&self.get_config().tokenizer_file),
+        )
+    }
+}
+
+impl ModelConfig {
+    /// Get the local paths for model files
+    pub fn get_local_paths(&self) -> (PathBuf, PathBuf) {
+        // Get the base directory and model directory
+        let base_dir = crate::config::get_default_base_dir();
+        let model_dir = crate::config::get_model_dir(&base_dir, &self.name);
+
+        // Return paths for model and tokenizer files
+        (model_dir.join(&self.model_file), model_dir.join(&self.tokenizer_file))
+    }
+}
diff --git a/crates/semantic_search_client/src/embedding/mock.rs b/crates/semantic_search_client/src/embedding/mock.rs
new file mode 100644
index 0000000000..e3303d30cc
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/mock.rs
@@ -0,0 +1,113 @@
+use crate::error::Result;
+
+/// Mock text embedder for testing
+pub struct MockTextEmbedder {
+    /// Fixed embedding dimension
+    dimension: usize,
+}
+
+impl MockTextEmbedder {
+    /// Create a new MockTextEmbedder
+    pub fn new(dimension: usize) -> Self {
+        Self { dimension }
+    }
+
+    /// Generate a deterministic embedding for a text
+    ///
+    /// # Arguments
+    ///
+    /// * `text` - The text to embed
+    ///
+    /// # Returns
+    ///
+    /// A vector of floats representing the text embedding
+    pub fn embed(&self, text: &str) -> Result<Vec<f32>> {
+        // Generate a deterministic embedding based on the text
+        // This avoids downloading any models while providing consistent results
+        let mut embedding = Vec::with_capacity(self.dimension);
+
+        // Use a simple hash of the text to seed the embedding values
+        let hash = text.chars().fold(0u32, |acc, c| acc.wrapping_add(c as u32));
+
+        for i in 0..self.dimension {
+            // Generate a deterministic but varied value for each dimension
+            let value = ((hash.wrapping_add(i as u32)).wrapping_mul(16807) % 65536) as f32 / 65536.0;
+            embedding.push(value);
+        }
+
+        // Normalize the embedding to unit length
+        let norm: f32 = embedding.iter().map(|x| x * x).sum::<f32>().sqrt();
+        for value in &mut embedding {
+            *value /= norm;
+        }
+
+        Ok(embedding)
+    }
+
+    /// Generate embeddings for multiple texts
+    ///
+    /// # Arguments
+    ///
+    /// * `texts` - The texts to embed
+    ///
+    /// # Returns
+    ///
+    /// A vector of embeddings
+    pub fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>> {
+        let mut results = Vec::with_capacity(texts.len());
+        for text in texts {
+            results.push(self.embed(text)?);
+        }
+        Ok(results)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_mock_embed_single() {
+        let embedder = MockTextEmbedder::new(384);
+        let embedding = embedder.embed("This is a test sentence.").unwrap();
+
+        // Check dimension
+        assert_eq!(embedding.len(), 384);
+
+        // Check that the embedding is normalized (L2 norm ≈ 1.0)
+        let norm: f32 = embedding.iter().map(|x| x * x).sum::<f32>().sqrt();
+        assert!((norm - 1.0).abs() < 1e-5);
+    }
+
+    #[test]
+    fn test_mock_embed_batch() {
+        let embedder = MockTextEmbedder::new(384);
+        let texts = vec![
+            "The cat sits outside".to_string(),
+            "A man is playing guitar".to_string(),
+        ];
+        let embeddings = embedder.embed_batch(&texts).unwrap();
+
+        assert_eq!(embeddings.len(), 2);
+        assert_eq!(embeddings[0].len(), 384);
+        assert_eq!(embeddings[1].len(), 384);
+
+        // Check that embeddings are different
+        let mut different = false;
+        for i in 0..384 {
+            if (embeddings[0][i] - embeddings[1][i]).abs() > 1e-5 {
+                different = true;
+                break;
+            }
+        }
+        assert!(different);
+
+        // Check determinism - same input should give same output
+        let embedding1 = embedder.embed("The cat sits outside").unwrap();
+        let embedding2 = embedder.embed("The cat sits outside").unwrap();
+
+        for i in 0..384 {
+            assert_eq!(embedding1[i], embedding2[i]);
+        }
+    }
+}
diff --git a/crates/semantic_search_client/src/embedding/mod.rs b/crates/semantic_search_client/src/embedding/mod.rs
new file mode 100644
index 0000000000..f70b24787d
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/mod.rs
@@ -0,0 +1,30 @@
+#[cfg(test)]
+mod benchmark_test;
+mod benchmark_utils;
+mod bm25;
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+mod candle;
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+mod candle_models;
+/// Mock embedder for testing
+#[cfg(test)]
+pub mod mock;
+mod trait_def;
+
+pub use benchmark_utils::{
+    BenchmarkResults,
+    BenchmarkableEmbedder,
+    create_standard_test_data,
+    run_standard_benchmark,
+};
+pub use bm25::BM25TextEmbedder;
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+pub use candle::CandleTextEmbedder;
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+pub use candle_models::ModelType;
+#[cfg(test)]
+pub use mock::MockTextEmbedder;
+pub use trait_def::{
+    EmbeddingType,
+    TextEmbedderTrait,
+};
diff --git a/crates/semantic_search_client/src/embedding/onnx.rs b/crates/semantic_search_client/src/embedding/onnx.rs
new file mode 100644
index 0000000000..4cdde06ef0
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/onnx.rs
@@ -0,0 +1,369 @@
+//! Text embedding functionality using fastembed
+//!
+//! This module provides functionality for generating text embeddings
+//! using the fastembed library, which is available on macOS and Windows platforms.
+
+use fastembed::{
+    InitOptions,
+    TextEmbedding,
+};
+use tracing::{
+    debug,
+    error,
+    info,
+};
+
+use crate::embedding::onnx_models::OnnxModelType;
+use crate::error::{
+    Result,
+    SemanticSearchError,
+};
+
+/// Text embedder using fastembed
+pub struct TextEmbedder {
+    /// The embedding model
+    model: TextEmbedding,
+    /// The model type
+    model_type: OnnxModelType,
+}
+
+impl TextEmbedder {
+    /// Create a new TextEmbedder with the default model (all-MiniLM-L6-v2-Q)
+    ///
+    /// # Returns
+    ///
+    /// A new TextEmbedder instance
+    pub fn new() -> Result<Self> {
+        Self::with_model_type(OnnxModelType::default())
+    }
+
+    /// Create a new TextEmbedder with a specific model type
+    ///
+    /// # Arguments
+    ///
+    /// * `model_type` - The model type to use
+    ///
+    /// # Returns
+    ///
+    /// A new TextEmbedder instance
+    pub fn with_model_type(model_type: OnnxModelType) -> Result<Self> {
+        info!("Initializing text embedder with fastembed model: {:?}", model_type);
+
+        // Prepare the models directory
+        let models_dir = prepare_models_directory()?;
+
+        // Initialize the embedding model
+        let model = initialize_model(model_type, &models_dir)?;
+
+        debug!(
+            "Fastembed text embedder initialized successfully with model: {:?}",
+            model_type
+        );
+
+        Ok(Self { model, model_type })
+    }
+
+    /// Get the model type
+    pub fn model_type(&self) -> OnnxModelType {
+        self.model_type
+    }
+
+    /// Generate an embedding for a text
+    ///
+    /// # Arguments
+    ///
+    /// * `text` - The text to embed
+    ///
+    /// # Returns
+    ///
+    /// A vector of floats representing the text embedding
+    pub fn embed(&self, text: &str) -> Result<Vec<f32>> {
+        let texts = vec![text];
+        match self.model.embed(texts, None) {
+            Ok(embeddings) => Ok(embeddings.into_iter().next().unwrap()),
+            Err(e) => {
+                error!("Failed to embed text: {}", e);
+                Err(SemanticSearchError::FastembedError(e.to_string()))
+            },
+        }
+    }
+
+    /// Generate embeddings for multiple texts
+    ///
+    /// # Arguments
+    ///
+    /// * `texts` - The texts to embed
+    ///
+    /// # Returns
+    ///
+    /// A vector of embeddings
+    pub fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>> {
+        let documents: Vec<&str> = texts.iter().map(|s| s.as_str()).collect();
+        match self.model.embed(documents, None) {
+            Ok(embeddings) => Ok(embeddings),
+            Err(e) => {
+                error!("Failed to embed batch of texts: {}", e);
+                Err(SemanticSearchError::FastembedError(e.to_string()))
+            },
+        }
+    }
+}
+
+/// Prepare the models directory
+///
+/// # Returns
+///
+/// The models directory path
+fn prepare_models_directory() -> Result<std::path::PathBuf> {
+    // Get the models directory from the base directory
+    let base_dir = crate::config::get_default_base_dir();
+    let models_dir = crate::config::get_models_dir(&base_dir);
+
+    // Ensure the models directory exists
+    std::fs::create_dir_all(&models_dir)?;
+
+    Ok(models_dir)
+}
+
+/// Initialize the embedding model
+///
+/// # Arguments
+///
+/// * `model_type` - The model type to use
+/// * `models_dir` - The models directory path
+///
+/// # Returns
+///
+/// The initialized embedding model
+fn initialize_model(model_type: OnnxModelType, models_dir: &std::path::Path) -> Result<TextEmbedding> {
+    match TextEmbedding::try_new(
+        InitOptions::new(model_type.get_fastembed_model())
+            .with_cache_dir(models_dir.to_path_buf())
+            .with_show_download_progress(true),
+    ) {
+        Ok(model) => Ok(model),
+        Err(e) => {
+            error!("Failed to initialize fastembed model: {}", e);
+            Err(SemanticSearchError::FastembedError(e.to_string()))
+        },
+    }
+}
+impl crate::embedding::BenchmarkableEmbedder for TextEmbedder {
+    fn model_name(&self) -> String {
+        format!("ONNX-{}", self.model_type().get_model_name())
+    }
+
+    fn embedding_dim(&self) -> usize {
+        self.model_type().get_embedding_dim()
+    }
+
+    fn embed_single(&self, text: &str) -> Vec<f32> {
+        self.embed(text).unwrap()
+    }
+
+    fn embed_batch(&self, texts: &[String]) -> Vec<Vec<f32>> {
+        self.embed_batch(texts).unwrap()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::env;
+    use std::time::Instant;
+
+    use super::*;
+
+    /// Helper function to check if real embedder tests should be skipped
+    fn should_skip_real_embedder_tests() -> bool {
+        // Skip if real embedders are not explicitly requested
+        if env::var("MEMORY_BANK_USE_REAL_EMBEDDERS").is_err() {
+            println!("Skipping test: MEMORY_BANK_USE_REAL_EMBEDDERS not set");
+            return true;
+        }
+
+        false
+    }
+
+    /// Helper function to create test data for performance tests
+    fn create_test_data() -> Vec<String> {
+        vec![
+            "This is a short sentence.".to_string(),
+            "Another simple example.".to_string(),
+            "The quick brown fox jumps over the lazy dog.".to_string(),
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.".to_string(),
+            "Machine learning models can process and analyze text data to extract meaningful information and generate embeddings that represent semantic relationships between words and phrases.".to_string(),
+        ]
+    }
+
+    #[test]
+    fn test_embed_single() {
+        if should_skip_real_embedder_tests() {
+            return;
+        }
+
+        // Use real embedder for testing
+        match TextEmbedder::new() {
+            Ok(embedder) => {
+                let embedding = embedder.embed("This is a test sentence.").unwrap();
+
+                // MiniLM-L6-v2-Q produces 384-dimensional embeddings
+                assert_eq!(embedding.len(), embedder.model_type().get_embedding_dim());
+            },
+            Err(e) => {
+                // If model loading fails, skip the test
+                println!("Skipping test: Failed to load real embedder: {}", e);
+            },
+        }
+    }
+
+    #[test]
+    fn test_embed_batch() {
+        if should_skip_real_embedder_tests() {
+            return;
+        }
+
+        // Use real embedder for testing
+        match TextEmbedder::new() {
+            Ok(embedder) => {
+                let texts = vec![
+                    "The cat sits outside".to_string(),
+                    "A man is playing guitar".to_string(),
+                ];
+                let embeddings = embedder.embed_batch(&texts).unwrap();
+                let dim = embedder.model_type().get_embedding_dim();
+
+                assert_eq!(embeddings.len(), 2);
+                assert_eq!(embeddings[0].len(), dim);
+                assert_eq!(embeddings[1].len(), dim);
+
+                // Check that embeddings are different
+                let mut different = false;
+                for i in 0..dim {
+                    if (embeddings[0][i] - embeddings[1][i]).abs() > 1e-5 {
+                        different = true;
+                        break;
+                    }
+                }
+                assert!(different);
+            },
+            Err(e) => {
+                // If model loading fails, skip the test
+                println!("Skipping test: Failed to load real embedder: {}", e);
+            },
+        }
+    }
+
+    /// Performance test for different model types
+    /// This test is only run when MEMORY_BANK_USE_REAL_EMBEDDERS is set
+    #[test]
+    fn test_model_performance() {
+        // Skip this test in CI environments where model files might not be available
+        if env::var("CI").is_ok() {
+            return;
+        }
+
+        // Skip if real embedders are not explicitly requested
+        if env::var("MEMORY_BANK_USE_REAL_EMBEDDERS").is_err() {
+            return;
+        }
+
+        // Test data
+        let texts = create_test_data();
+
+        // Test each model type
+        let model_types = [OnnxModelType::MiniLML6V2Q, OnnxModelType::MiniLML12V2Q];
+
+        for model_type in model_types {
+            run_performance_test(model_type, &texts);
+        }
+    }
+
+    /// Run performance test for a specific model type
+    fn run_performance_test(model_type: OnnxModelType, texts: &[String]) {
+        match TextEmbedder::with_model_type(model_type) {
+            Ok(embedder) => {
+                println!("Testing performance of {:?}", model_type);
+
+                // Warm-up run
+                let _ = embedder.embed_batch(texts);
+
+                // Measure single embedding performance
+                let start = Instant::now();
+                let single_result = embedder.embed(&texts[0]);
+                let single_duration = start.elapsed();
+
+                // Measure batch embedding performance
+                let start = Instant::now();
+                let batch_result = embedder.embed_batch(texts);
+                let batch_duration = start.elapsed();
+
+                // Check results are valid
+                assert!(single_result.is_ok());
+                assert!(batch_result.is_ok());
+
+                // Get embedding dimensions
+                let embedding_dim = single_result.unwrap().len();
+
+                println!(
+                    "Model: {:?}, Embedding dim: {}, Single time: {:?}, Batch time: {:?}, Avg per text: {:?}",
+                    model_type,
+                    embedding_dim,
+                    single_duration,
+                    batch_duration,
+                    batch_duration.div_f32(texts.len() as f32)
+                );
+            },
+            Err(e) => {
+                println!("Failed to load model {:?}: {}", model_type, e);
+            },
+        }
+    }
+
+    /// Test loading all models to ensure they work
+    #[test]
+    fn test_load_all_models() {
+        // Skip this test in CI environments where model files might not be available
+        if env::var("CI").is_ok() {
+            return;
+        }
+
+        // Skip if real embedders are not explicitly requested
+        if env::var("MEMORY_BANK_USE_REAL_EMBEDDERS").is_err() {
+            return;
+        }
+
+        let model_types = [OnnxModelType::MiniLML6V2Q, OnnxModelType::MiniLML12V2Q];
+
+        for model_type in model_types {
+            test_model_loading(model_type);
+        }
+    }
+
+    /// Test loading a specific model
+    fn test_model_loading(model_type: OnnxModelType) {
+        match TextEmbedder::with_model_type(model_type) {
+            Ok(embedder) => {
+                // Test a simple embedding to verify the model works
+                let result = embedder.embed("Test sentence for model verification.");
+                assert!(result.is_ok(), "Model {:?} failed to generate embedding", model_type);
+
+                // Verify embedding dimensions
+                let embedding = result.unwrap();
+                let expected_dim = model_type.get_embedding_dim();
+
+                assert_eq!(
+                    embedding.len(),
+                    expected_dim,
+                    "Model {:?} produced embedding with incorrect dimensions",
+                    model_type
+                );
+
+                println!("Successfully loaded and tested model {:?}", model_type);
+            },
+            Err(e) => {
+                println!("Failed to load model {:?}: {}", model_type, e);
+                // Don't fail the test if a model can't be loaded, just report it
+            },
+        }
+    }
+}
diff --git a/crates/semantic_search_client/src/embedding/onnx_models.rs b/crates/semantic_search_client/src/embedding/onnx_models.rs
new file mode 100644
index 0000000000..90ceaaf103
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/onnx_models.rs
@@ -0,0 +1,51 @@
+use std::path::PathBuf;
+
+use fastembed::EmbeddingModel;
+
+/// Type of ONNX model to use for text embedding
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum OnnxModelType {
+    /// MiniLM-L6-v2-Q model (384 dimensions, quantized)
+    MiniLML6V2Q,
+    /// MiniLM-L12-v2-Q model (384 dimensions, quantized)
+    MiniLML12V2Q,
+}
+
+impl Default for OnnxModelType {
+    fn default() -> Self {
+        Self::MiniLML6V2Q
+    }
+}
+
+impl OnnxModelType {
+    /// Get the fastembed model for this model type
+    pub fn get_fastembed_model(&self) -> EmbeddingModel {
+        match self {
+            Self::MiniLML6V2Q => EmbeddingModel::AllMiniLML6V2Q,
+            Self::MiniLML12V2Q => EmbeddingModel::AllMiniLML12V2Q,
+        }
+    }
+
+    /// Get the embedding dimension for this model type
+    pub fn get_embedding_dim(&self) -> usize {
+        match self {
+            Self::MiniLML6V2Q => 384,
+            Self::MiniLML12V2Q => 384,
+        }
+    }
+
+    /// Get the model name
+    pub fn get_model_name(&self) -> &'static str {
+        match self {
+            Self::MiniLML6V2Q => "all-MiniLM-L6-v2-Q",
+            Self::MiniLML12V2Q => "all-MiniLM-L12-v2-Q",
+        }
+    }
+
+    /// Get the local paths for model files
+    pub fn get_local_paths(&self) -> PathBuf {
+        // Get the base directory and model directory
+        let base_dir = crate::config::get_default_base_dir();
+        crate::config::get_model_dir(&base_dir, self.get_model_name())
+    }
+}
diff --git a/crates/semantic_search_client/src/embedding/tf.rs b/crates/semantic_search_client/src/embedding/tf.rs
new file mode 100644
index 0000000000..18a6ff57e5
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/tf.rs
@@ -0,0 +1,168 @@
+use std::collections::HashMap;
+use std::hash::{Hash, Hasher};
+use std::collections::hash_map::DefaultHasher;
+
+use tracing::{
+    debug,
+    info,
+};
+
+use crate::embedding::benchmark_utils::BenchmarkableEmbedder;
+use crate::error::Result;
+
+/// TF (Term Frequency) Text Embedder implementation
+///
+/// This is a simplified fallback implementation for platforms where neither Candle nor ONNX
+/// are fully supported. It uses a hash-based approach to create term frequency vectors
+/// that can be used for text search.
+///
+/// Note: This is a keyword-based approach and doesn't support true semantic search.
+/// It works by matching keywords rather than understanding semantic meaning, so
+/// it will only find matches when there's lexical overlap between query and documents.
+pub struct TFTextEmbedder {
+    /// Vector dimension
+    dimension: usize,
+}
+
+impl TFTextEmbedder {
+    /// Create a new TF text embedder
+    pub fn new() -> Result<Self> {
+        info!("Initializing TF Text Embedder");
+
+        let embedder = Self {
+            dimension: 384, // Match dimension of other embedders for compatibility
+        };
+
+        debug!("TF Text Embedder initialized successfully");
+        Ok(embedder)
+    }
+
+    /// Tokenize text into terms
+    fn tokenize(text: &str) -> Vec<String> {
+        // Simple tokenization by splitting on whitespace and punctuation
+        text.to_lowercase()
+            .split(|c: char| c.is_whitespace() || c.is_ascii_punctuation())
+            .filter(|s| !s.is_empty())
+            .map(|s| s.to_string())
+            .collect()
+    }
+    
+    /// Hash a string to an index within the dimension range
+    fn hash_to_index(token: &str, dimension: usize) -> usize {
+        let mut hasher = DefaultHasher::new();
+        token.hash(&mut hasher);
+        (hasher.finish() as usize) % dimension
+    }
+
+    /// Create a term frequency vector from tokens
+    fn create_term_frequency_vector(&self, tokens: &[String]) -> Vec<f32> {
+        let mut vector = vec![0.0; self.dimension];
+        
+        // Count term frequencies using hash-based indexing
+        for token in tokens {
+            let idx = Self::hash_to_index(token, self.dimension);
+            vector[idx] += 1.0;
+        }
+        
+        // Normalize the vector
+        let norm: f32 = vector.iter().map(|&x| x * x).sum::<f32>().sqrt();
+        if norm > 0.0 {
+            for val in vector.iter_mut() {
+                *val /= norm;
+            }
+        }
+        
+        vector
+    }
+
+    /// Embed a text using simplified hash-based approach
+    pub fn embed(&self, text: &str) -> Result<Vec<f32>> {
+        let tokens = Self::tokenize(text);
+        let vector = self.create_term_frequency_vector(&tokens);
+        Ok(vector)
+    }
+
+    /// Embed multiple texts
+    pub fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>> {
+        let mut results = Vec::with_capacity(texts.len());
+
+        for text in texts {
+            results.push(self.embed(text)?);
+        }
+
+        Ok(results)
+    }
+}
+
+// Implement BenchmarkableEmbedder for TFTextEmbedder
+impl BenchmarkableEmbedder for TFTextEmbedder {
+    fn model_name(&self) -> String {
+        "TF".to_string()
+    }
+
+    fn embedding_dim(&self) -> usize {
+        self.dimension
+    }
+
+    fn embed_single(&self, text: &str) -> Vec<f32> {
+        self.embed(text).unwrap_or_else(|_| vec![0.0; self.dimension])
+    }
+
+    fn embed_batch(&self, texts: &[String]) -> Vec<Vec<f32>> {
+        self.embed_batch(texts)
+            .unwrap_or_else(|_| vec![vec![0.0; self.dimension]; texts.len()])
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_tf_embed_single() {
+        let embedder = TFTextEmbedder::new().unwrap();
+        let text = "This is a test sentence";
+        let embedding = embedder.embed(text).unwrap();
+
+        // Check that the embedding has the expected dimension
+        assert_eq!(embedding.len(), embedder.dimension);
+
+        // Check that the embedding is normalized
+        let norm: f32 = embedding.iter().map(|&x| x * x).sum::<f32>().sqrt();
+        assert!((norm - 1.0).abs() < 1e-5 || norm == 0.0);
+    }
+
+    #[test]
+    fn test_tf_embed_batch() {
+        let embedder = TFTextEmbedder::new().unwrap();
+        let texts = vec![
+            "First test sentence".to_string(),
+            "Second test sentence".to_string(),
+            "Third test sentence".to_string(),
+        ];
+        let embeddings = embedder.embed_batch(&texts).unwrap();
+
+        // Check that we got the right number of embeddings
+        assert_eq!(embeddings.len(), texts.len());
+
+        // Check that each embedding has the expected dimension
+        for embedding in &embeddings {
+            assert_eq!(embedding.len(), embedder.dimension);
+        }
+    }
+
+    #[test]
+    fn test_tf_tokenization() {
+        // Test basic tokenization
+        let tokens = TFTextEmbedder::tokenize("Hello, world! This is a test.");
+        assert_eq!(tokens, vec!["hello", "world", "this", "is", "a", "test"]);
+
+        // Test case insensitivity
+        let tokens = TFTextEmbedder::tokenize("HELLO world");
+        assert_eq!(tokens, vec!["hello", "world"]);
+
+        // Test handling of multiple spaces and punctuation
+        let tokens = TFTextEmbedder::tokenize("  multiple   spaces, and! punctuation...");
+        assert_eq!(tokens, vec!["multiple", "spaces", "and", "punctuation"]);
+    }
+}
diff --git a/crates/semantic_search_client/src/embedding/trait_def.rs b/crates/semantic_search_client/src/embedding/trait_def.rs
new file mode 100644
index 0000000000..1be80b6752
--- /dev/null
+++ b/crates/semantic_search_client/src/embedding/trait_def.rs
@@ -0,0 +1,74 @@
+use crate::error::Result;
+
+/// Embedding engine type to use
+#[derive(Debug, Clone, Copy)]
+pub enum EmbeddingType {
+    /// Use Candle embedding engine (not available on Linux ARM)
+    #[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+    Candle,
+    /// Use BM25 embedding engine (available on all platforms)
+    BM25,
+    /// Use Mock embedding engine (only available in tests)
+    #[cfg(test)]
+    Mock,
+}
+
+// Default implementation based on platform capabilities
+// All platforms except Linux ARM: Use Candle
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+#[allow(clippy::derivable_impls)]
+impl Default for EmbeddingType {
+    fn default() -> Self {
+        EmbeddingType::Candle
+    }
+}
+
+// Linux ARM: Use BM25
+#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
+#[allow(clippy::derivable_impls)]
+impl Default for EmbeddingType {
+    fn default() -> Self {
+        EmbeddingType::BM25
+    }
+}
+
+/// Common trait for text embedders
+pub trait TextEmbedderTrait: Send + Sync {
+    /// Generate an embedding for a text
+    fn embed(&self, text: &str) -> Result<Vec<f32>>;
+
+    /// Generate embeddings for multiple texts
+    fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>>;
+}
+
+#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
+impl TextEmbedderTrait for super::CandleTextEmbedder {
+    fn embed(&self, text: &str) -> Result<Vec<f32>> {
+        self.embed(text)
+    }
+
+    fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>> {
+        self.embed_batch(texts)
+    }
+}
+
+impl TextEmbedderTrait for super::BM25TextEmbedder {
+    fn embed(&self, text: &str) -> Result<Vec<f32>> {
+        self.embed(text)
+    }
+
+    fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>> {
+        self.embed_batch(texts)
+    }
+}
+
+#[cfg(test)]
+impl TextEmbedderTrait for super::MockTextEmbedder {
+    fn embed(&self, text: &str) -> Result<Vec<f32>> {
+        self.embed(text)
+    }
+
+    fn embed_batch(&self, texts: &[String]) -> Result<Vec<Vec<f32>>> {
+        self.embed_batch(texts)
+    }
+}
diff --git a/crates/semantic_search_client/src/error.rs b/crates/semantic_search_client/src/error.rs
new file mode 100644
index 0000000000..e320c3fea3
--- /dev/null
+++ b/crates/semantic_search_client/src/error.rs
@@ -0,0 +1,57 @@
+use std::{
+    fmt,
+    io,
+};
+
+/// Result type for semantic search operations
+pub type Result<T> = std::result::Result<T, SemanticSearchError>;
+
+/// Error types for semantic search operations
+#[derive(Debug)]
+pub enum SemanticSearchError {
+    /// I/O error
+    IoError(io::Error),
+    /// JSON serialization/deserialization error
+    SerdeError(serde_json::Error),
+    /// JSON serialization/deserialization error (string variant)
+    SerializationError(String),
+    /// Invalid path
+    InvalidPath(String),
+    /// Context not found
+    ContextNotFound(String),
+    /// Operation failed
+    OperationFailed(String),
+    /// Invalid argument
+    InvalidArgument(String),
+    /// Embedding error
+    EmbeddingError(String),
+}
+
+impl fmt::Display for SemanticSearchError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SemanticSearchError::IoError(e) => write!(f, "I/O error: {}", e),
+            SemanticSearchError::SerdeError(e) => write!(f, "Serialization error: {}", e),
+            SemanticSearchError::SerializationError(msg) => write!(f, "Serialization error: {}", msg),
+            SemanticSearchError::InvalidPath(path) => write!(f, "Invalid path: {}", path),
+            SemanticSearchError::ContextNotFound(id) => write!(f, "Context not found: {}", id),
+            SemanticSearchError::OperationFailed(msg) => write!(f, "Operation failed: {}", msg),
+            SemanticSearchError::InvalidArgument(msg) => write!(f, "Invalid argument: {}", msg),
+            SemanticSearchError::EmbeddingError(msg) => write!(f, "Embedding error: {}", msg),
+        }
+    }
+}
+
+impl std::error::Error for SemanticSearchError {}
+
+impl From<io::Error> for SemanticSearchError {
+    fn from(error: io::Error) -> Self {
+        SemanticSearchError::IoError(error)
+    }
+}
+
+impl From<serde_json::Error> for SemanticSearchError {
+    fn from(error: serde_json::Error) -> Self {
+        SemanticSearchError::SerdeError(error)
+    }
+}
diff --git a/crates/semantic_search_client/src/index/mod.rs b/crates/semantic_search_client/src/index/mod.rs
new file mode 100644
index 0000000000..0d734c33db
--- /dev/null
+++ b/crates/semantic_search_client/src/index/mod.rs
@@ -0,0 +1,3 @@
+mod vector_index;
+
+pub use vector_index::VectorIndex;
diff --git a/crates/semantic_search_client/src/index/vector_index.rs b/crates/semantic_search_client/src/index/vector_index.rs
new file mode 100644
index 0000000000..3a849ec6d4
--- /dev/null
+++ b/crates/semantic_search_client/src/index/vector_index.rs
@@ -0,0 +1,92 @@
+use hnsw_rs::hnsw::Hnsw;
+use hnsw_rs::prelude::DistCosine;
+use tracing::{
+    debug,
+    info,
+};
+
+/// Vector index for fast approximate nearest neighbor search
+pub struct VectorIndex {
+    /// The HNSW index
+    index: Hnsw<'static, f32, DistCosine>,
+    /// Counter to track the number of elements
+    count: std::sync::atomic::AtomicUsize,
+}
+
+impl VectorIndex {
+    /// Create a new empty vector index
+    ///
+    /// # Arguments
+    ///
+    /// * `max_elements` - Maximum number of elements the index can hold
+    ///
+    /// # Returns
+    ///
+    /// A new VectorIndex instance
+    pub fn new(max_elements: usize) -> Self {
+        info!("Creating new vector index with max_elements: {}", max_elements);
+
+        let index = Hnsw::new(
+            16,                    // Max number of connections per layer
+            max_elements.max(100), // Maximum elements
+            16,                    // Max layer
+            100,                   // ef_construction (size of the dynamic candidate list)
+            DistCosine {},
+        );
+
+        debug!("Vector index created successfully");
+        Self {
+            index,
+            count: std::sync::atomic::AtomicUsize::new(0),
+        }
+    }
+
+    /// Insert a vector into the index
+    ///
+    /// # Arguments
+    ///
+    /// * `vector` - The vector to insert
+    /// * `id` - The ID associated with the vector
+    pub fn insert(&self, vector: &[f32], id: usize) {
+        self.index.insert((vector, id));
+        self.count.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+    }
+
+    /// Search for nearest neighbors
+    ///
+    /// # Arguments
+    ///
+    /// * `query` - The query vector
+    /// * `limit` - Maximum number of results to return
+    /// * `ef_search` - Size of the dynamic candidate list for search
+    ///
+    /// # Returns
+    ///
+    /// A vector of (id, distance) pairs
+    pub fn search(&self, query: &[f32], limit: usize, ef_search: usize) -> Vec<(usize, f32)> {
+        let results = self.index.search(query, limit, ef_search);
+
+        results
+            .into_iter()
+            .map(|neighbor| (neighbor.d_id, neighbor.distance))
+            .collect()
+    }
+
+    /// Get the number of elements in the index
+    ///
+    /// # Returns
+    ///
+    /// The number of elements in the index
+    pub fn len(&self) -> usize {
+        self.count.load(std::sync::atomic::Ordering::SeqCst)
+    }
+
+    /// Check if the index is empty
+    ///
+    /// # Returns
+    ///
+    /// `true` if the index is empty, `false` otherwise
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+}
diff --git a/crates/semantic_search_client/src/lib.rs b/crates/semantic_search_client/src/lib.rs
new file mode 100644
index 0000000000..6c6205263e
--- /dev/null
+++ b/crates/semantic_search_client/src/lib.rs
@@ -0,0 +1,37 @@
+//! Semantic Search Client - A library for managing semantic memory contexts
+//!
+//! This crate provides functionality for creating, managing, and searching
+//! semantic memory contexts. It uses vector embeddings to enable semantic search
+//! across text and code.
+
+#![warn(missing_docs)]
+
+/// Client implementation for semantic search operations
+pub mod client;
+/// Configuration management for semantic search
+pub mod config;
+/// Error types for semantic search operations
+pub mod error;
+/// Vector index implementation
+pub mod index;
+/// File processing utilities
+pub mod processing;
+/// Data types for semantic search operations
+pub mod types;
+
+/// Text embedding functionality
+pub mod embedding;
+
+pub use client::SemanticSearchClient;
+pub use config::SemanticSearchConfig;
+pub use error::{
+    Result,
+    SemanticSearchError,
+};
+pub use types::{
+    DataPoint,
+    FileType,
+    MemoryContext,
+    ProgressStatus,
+    SearchResult,
+};
diff --git a/crates/semantic_search_client/src/processing/file_processor.rs b/crates/semantic_search_client/src/processing/file_processor.rs
new file mode 100644
index 0000000000..dfa053dd96
--- /dev/null
+++ b/crates/semantic_search_client/src/processing/file_processor.rs
@@ -0,0 +1,179 @@
+use std::fs;
+use std::path::Path;
+
+use serde_json::Value;
+
+use crate::error::{
+    Result,
+    SemanticSearchError,
+};
+use crate::processing::text_chunker::chunk_text;
+use crate::types::FileType;
+
+/// Determine the file type based on extension
+pub fn get_file_type(path: &Path) -> FileType {
+    match path.extension().and_then(|ext| ext.to_str()) {
+        Some("txt") => FileType::Text,
+        Some("md" | "markdown") => FileType::Markdown,
+        Some("json") => FileType::Json,
+        // Code file extensions
+        Some("rs") => FileType::Code,
+        Some("py") => FileType::Code,
+        Some("js" | "jsx" | "ts" | "tsx") => FileType::Code,
+        Some("java") => FileType::Code,
+        Some("c" | "cpp" | "h" | "hpp") => FileType::Code,
+        Some("go") => FileType::Code,
+        Some("rb") => FileType::Code,
+        Some("php") => FileType::Code,
+        Some("swift") => FileType::Code,
+        Some("kt" | "kts") => FileType::Code,
+        Some("cs") => FileType::Code,
+        Some("sh" | "bash" | "zsh") => FileType::Code,
+        Some("html" | "htm" | "xml") => FileType::Code,
+        Some("css" | "scss" | "sass" | "less") => FileType::Code,
+        Some("sql") => FileType::Code,
+        Some("yaml" | "yml") => FileType::Code,
+        Some("toml") => FileType::Code,
+        // Default to unknown
+        _ => FileType::Unknown,
+    }
+}
+
+/// Process a file and extract its content
+///
+/// # Arguments
+///
+/// * `path` - Path to the file
+///
+/// # Returns
+///
+/// A vector of JSON objects representing the file content
+pub fn process_file(path: &Path) -> Result<Vec<Value>> {
+    if !path.exists() {
+        return Err(SemanticSearchError::InvalidPath(format!(
+            "File does not exist: {}",
+            path.display()
+        )));
+    }
+
+    let file_type = get_file_type(path);
+    let content = fs::read_to_string(path).map_err(|e| {
+        SemanticSearchError::IoError(std::io::Error::new(
+            e.kind(),
+            format!("Failed to read file {}: {}", path.display(), e),
+        ))
+    })?;
+
+    match file_type {
+        FileType::Text | FileType::Markdown | FileType::Code => {
+            // For text-based files, chunk the content and create multiple data points
+            // Use the configured chunk size and overlap
+            let chunks = chunk_text(&content, None, None);
+            let path_str = path.to_string_lossy().to_string();
+            let file_type_str = format!("{:?}", file_type);
+
+            let mut results = Vec::new();
+
+            for (i, chunk) in chunks.iter().enumerate() {
+                let mut metadata = serde_json::Map::new();
+                metadata.insert("text".to_string(), Value::String(chunk.clone()));
+                metadata.insert("path".to_string(), Value::String(path_str.clone()));
+                metadata.insert("file_type".to_string(), Value::String(file_type_str.clone()));
+                metadata.insert("chunk_index".to_string(), Value::Number((i as u64).into()));
+                metadata.insert("total_chunks".to_string(), Value::Number((chunks.len() as u64).into()));
+
+                // For code files, add additional metadata
+                if file_type == FileType::Code {
+                    metadata.insert(
+                        "language".to_string(),
+                        Value::String(
+                            path.extension()
+                                .and_then(|ext| ext.to_str())
+                                .unwrap_or("unknown")
+                                .to_string(),
+                        ),
+                    );
+                }
+
+                results.push(Value::Object(metadata));
+            }
+
+            // If no chunks were created (empty file), create at least one entry
+            if results.is_empty() {
+                let mut metadata = serde_json::Map::new();
+                metadata.insert("text".to_string(), Value::String(String::new()));
+                metadata.insert("path".to_string(), Value::String(path_str));
+                metadata.insert("file_type".to_string(), Value::String(file_type_str));
+                metadata.insert("chunk_index".to_string(), Value::Number(0.into()));
+                metadata.insert("total_chunks".to_string(), Value::Number(1.into()));
+
+                results.push(Value::Object(metadata));
+            }
+
+            Ok(results)
+        },
+        FileType::Json => {
+            // For JSON files, parse the content
+            let json: Value =
+                serde_json::from_str(&content).map_err(|e| SemanticSearchError::SerializationError(e.to_string()))?;
+
+            match json {
+                Value::Array(items) => {
+                    // If it's an array, return each item
+                    Ok(items)
+                },
+                _ => {
+                    // Otherwise, return the whole object
+                    Ok(vec![json])
+                },
+            }
+        },
+        FileType::Unknown => {
+            // For unknown file types, just store the path
+            let mut metadata = serde_json::Map::new();
+            metadata.insert("path".to_string(), Value::String(path.to_string_lossy().to_string()));
+            metadata.insert("file_type".to_string(), Value::String("Unknown".to_string()));
+
+            Ok(vec![Value::Object(metadata)])
+        },
+    }
+}
+
+/// Process a directory and extract content from all files
+///
+/// # Arguments
+///
+/// * `dir_path` - Path to the directory
+///
+/// # Returns
+///
+/// A vector of JSON objects representing the content of all files
+pub fn process_directory(dir_path: &Path) -> Result<Vec<Value>> {
+    let mut results = Vec::new();
+
+    for entry in walkdir::WalkDir::new(dir_path)
+        .follow_links(true)
+        .into_iter()
+        .filter_map(|e| e.ok())
+        .filter(|e| e.file_type().is_file())
+    {
+        let path = entry.path();
+
+        // Skip hidden files
+        if path
+            .file_name()
+            .and_then(|n| n.to_str())
+            .is_some_and(|s| s.starts_with('.'))
+        {
+            continue;
+        }
+
+        // Process the file
+        match process_file(path) {
+            Ok(mut items) => results.append(&mut items),
+            Err(_) => continue, // Skip files that fail to process
+        }
+    }
+
+    Ok(results)
+}
diff --git a/crates/semantic_search_client/src/processing/mod.rs b/crates/semantic_search_client/src/processing/mod.rs
new file mode 100644
index 0000000000..393f82700e
--- /dev/null
+++ b/crates/semantic_search_client/src/processing/mod.rs
@@ -0,0 +1,11 @@
+/// File processing utilities for handling different file types and extracting content
+pub mod file_processor;
+/// Text chunking utilities for breaking down text into manageable pieces for embedding
+pub mod text_chunker;
+
+pub use file_processor::{
+    get_file_type,
+    process_directory,
+    process_file,
+};
+pub use text_chunker::chunk_text;
diff --git a/crates/semantic_search_client/src/processing/text_chunker.rs b/crates/semantic_search_client/src/processing/text_chunker.rs
new file mode 100644
index 0000000000..0b3a84b6d1
--- /dev/null
+++ b/crates/semantic_search_client/src/processing/text_chunker.rs
@@ -0,0 +1,118 @@
+use crate::config;
+
+/// Chunk text into smaller pieces with overlap
+///
+/// # Arguments
+///
+/// * `text` - The text to chunk
+/// * `chunk_size` - Optional chunk size (if None, uses config value)
+/// * `overlap` - Optional overlap size (if None, uses config value)
+///
+/// # Returns
+///
+/// A vector of string chunks
+pub fn chunk_text(text: &str, chunk_size: Option<usize>, overlap: Option<usize>) -> Vec<String> {
+    // Get configuration values or use provided values
+    let config = config::get_config();
+    let chunk_size = chunk_size.unwrap_or(config.chunk_size);
+    let overlap = overlap.unwrap_or(config.chunk_overlap);
+
+    let mut chunks = Vec::new();
+    let words: Vec<&str> = text.split_whitespace().collect();
+
+    if words.is_empty() {
+        return chunks;
+    }
+
+    let mut i = 0;
+    while i < words.len() {
+        let end = (i + chunk_size).min(words.len());
+        let chunk = words[i..end].join(" ");
+        chunks.push(chunk);
+
+        // Move forward by chunk_size - overlap
+        i += chunk_size - overlap;
+        if i >= words.len() || i == 0 {
+            break;
+        }
+    }
+
+    chunks
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Once;
+
+    use super::*;
+
+    static INIT: Once = Once::new();
+
+    fn setup() {
+        INIT.call_once(|| {
+            // Initialize with test config
+            let _ = std::panic::catch_unwind(|| {
+                let _config = config::SemanticSearchConfig {
+                    chunk_size: 50,
+                    chunk_overlap: 10,
+                    default_results: 5,
+                    model_name: "test-model".to_string(),
+                    timeout: 30000,
+                    base_dir: std::path::PathBuf::from("."),
+                };
+                // Use a different approach that doesn't access private static
+                let _ = crate::config::init_config(&std::env::temp_dir());
+            });
+        });
+    }
+
+    #[test]
+    fn test_chunk_text_empty() {
+        setup();
+        let chunks = chunk_text("", None, None);
+        assert_eq!(chunks.len(), 0);
+    }
+
+    #[test]
+    fn test_chunk_text_small() {
+        setup();
+        let text = "This is a small text";
+        let chunks = chunk_text(text, Some(10), Some(2));
+        assert_eq!(chunks.len(), 1);
+        assert_eq!(chunks[0], text);
+    }
+
+    #[test]
+    fn test_chunk_text_large() {
+        setup();
+        let words: Vec<String> = (0..200).map(|i| format!("word{}", i)).collect();
+        let text = words.join(" ");
+
+        let chunks = chunk_text(&text, Some(50), Some(10));
+
+        // With 200 words, chunk size 50, and overlap 10, we should have 5 chunks
+        // (0-49, 40-89, 80-129, 120-169, 160-199)
+        assert_eq!(chunks.len(), 5);
+
+        // Check first and last words of first chunk
+        assert!(chunks[0].starts_with("word0"));
+        assert!(chunks[0].ends_with("word49"));
+
+        // Check first and last words of last chunk
+        assert!(chunks[4].starts_with("word160"));
+        assert!(chunks[4].ends_with("word199"));
+    }
+
+    #[test]
+    fn test_chunk_text_with_config_defaults() {
+        setup();
+        let words: Vec<String> = (0..200).map(|i| format!("word{}", i)).collect();
+        let text = words.join(" ");
+
+        // Use default config values
+        let chunks = chunk_text(&text, None, None);
+
+        // Should use the config values (50, 10) set in setup()
+        assert!(!chunks.is_empty());
+    }
+}
diff --git a/crates/semantic_search_client/src/types.rs b/crates/semantic_search_client/src/types.rs
new file mode 100644
index 0000000000..2537fd925f
--- /dev/null
+++ b/crates/semantic_search_client/src/types.rs
@@ -0,0 +1,148 @@
+use std::collections::HashMap;
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use chrono::{
+    DateTime,
+    Utc,
+};
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+use crate::client::SemanticContext;
+
+/// Type alias for context ID
+pub type ContextId = String;
+
+/// Type alias for search results
+pub type SearchResults = Vec<SearchResult>;
+
+/// Type alias for context map
+pub type ContextMap = HashMap<ContextId, Arc<Mutex<SemanticContext>>>;
+
+/// A memory context containing semantic information
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MemoryContext {
+    /// Unique identifier for the context
+    pub id: String,
+
+    /// Human-readable name for the context
+    pub name: String,
+
+    /// Description of the context
+    pub description: String,
+
+    /// When the context was created
+    pub created_at: DateTime<Utc>,
+
+    /// When the context was last updated
+    pub updated_at: DateTime<Utc>,
+
+    /// Whether this context is persistent (saved to disk)
+    pub persistent: bool,
+
+    /// Original source path if created from a directory
+    pub source_path: Option<String>,
+
+    /// Number of items in the context
+    pub item_count: usize,
+}
+
+impl MemoryContext {
+    /// Create a new memory context
+    pub fn new(
+        id: String,
+        name: &str,
+        description: &str,
+        persistent: bool,
+        source_path: Option<String>,
+        item_count: usize,
+    ) -> Self {
+        let now = Utc::now();
+        Self {
+            id,
+            name: name.to_string(),
+            description: description.to_string(),
+            created_at: now,
+            updated_at: now,
+            source_path,
+            persistent,
+            item_count,
+        }
+    }
+}
+
+/// A data point in the semantic index
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DataPoint {
+    /// Unique identifier for the data point
+    pub id: usize,
+
+    /// Metadata associated with the data point
+    pub payload: HashMap<String, serde_json::Value>,
+
+    /// Vector representation of the data point
+    pub vector: Vec<f32>,
+}
+
+/// A search result from the semantic index
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SearchResult {
+    /// The data point that matched
+    pub point: DataPoint,
+
+    /// Distance/similarity score (lower is better)
+    pub distance: f32,
+}
+
+impl SearchResult {
+    /// Create a new search result
+    pub fn new(point: DataPoint, distance: f32) -> Self {
+        Self { point, distance }
+    }
+
+    /// Get the text content of this result
+    pub fn text(&self) -> Option<&str> {
+        self.point.payload.get("text").and_then(|v| v.as_str())
+    }
+}
+
+/// File type for processing
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum FileType {
+    /// Plain text file
+    Text,
+    /// Markdown file
+    Markdown,
+    /// JSON file
+    Json,
+    /// Source code file (programming languages)
+    Code,
+    /// Unknown file type
+    Unknown,
+}
+
+/// Progress status for indexing operations
+#[derive(Debug, Clone)]
+pub enum ProgressStatus {
+    /// Counting files in the directory
+    CountingFiles,
+    /// Starting the indexing process with total file count
+    StartingIndexing(usize),
+    /// Indexing in progress with current file and total count
+    Indexing(usize, usize),
+    /// Creating semantic context (50% progress point)
+    CreatingSemanticContext,
+    /// Generating embeddings for items (50-80% progress range)
+    GeneratingEmbeddings(usize, usize),
+    /// Building vector index (80% progress point)
+    BuildingIndex,
+    /// Finalizing the index (90% progress point)
+    Finalizing,
+    /// Indexing complete (100% progress point)
+    Complete,
+}
diff --git a/crates/semantic_search_client/tests/test_add_context_from_path.rs b/crates/semantic_search_client/tests/test_add_context_from_path.rs
new file mode 100644
index 0000000000..1a2139e3eb
--- /dev/null
+++ b/crates/semantic_search_client/tests/test_add_context_from_path.rs
@@ -0,0 +1,153 @@
+use std::path::Path;
+use std::{
+    env,
+    fs,
+};
+
+use semantic_search_client::SemanticSearchClient;
+use semantic_search_client::types::ProgressStatus;
+
+#[test]
+fn test_add_context_from_path_with_directory() {
+    if env::var("MEMORY_BANK_USE_REAL_EMBEDDERS").is_err() {
+        println!("Skipping test: MEMORY_BANK_USE_REAL_EMBEDDERS not set");
+        assert!(true);
+        return;
+    }
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("semantic_search_test_dir");
+    let base_dir = temp_dir.join("semantic_search");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a test directory with a file
+    let test_dir = temp_dir.join("test_dir");
+    fs::create_dir_all(&test_dir).unwrap();
+    let test_file = test_dir.join("test.txt");
+    fs::write(&test_file, "This is a test file").unwrap();
+
+    // Create a semantic search client
+    let mut client = SemanticSearchClient::new(base_dir).unwrap();
+
+    // Add a context from the directory
+    let _context_id = client
+        .add_context_from_path(
+            &test_dir,
+            "Test Context",
+            "Test Description",
+            true,
+            None::<fn(ProgressStatus)>,
+        )
+        .unwrap();
+
+    // Verify the context was created
+    let contexts = client.get_contexts();
+    assert!(!contexts.is_empty());
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_add_context_from_path_with_file() {
+    // Skip this test in CI environments
+    if env::var("CI").is_ok() {
+        return;
+    }
+
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_file");
+    let base_dir = temp_dir.join("memory_bank");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a test file
+    let test_file = temp_dir.join("test.txt");
+    fs::write(&test_file, "This is a test file").unwrap();
+
+    // Create a semantic search client
+    let mut client = SemanticSearchClient::new(base_dir).unwrap();
+
+    // Add a context from the file
+    let _context_id = client
+        .add_context_from_path(
+            &test_file,
+            "Test Context",
+            "Test Description",
+            true,
+            None::<fn(ProgressStatus)>,
+        )
+        .unwrap();
+
+    // Verify the context was created
+    let contexts = client.get_contexts();
+    assert!(!contexts.is_empty());
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_add_context_from_path_with_invalid_path() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_invalid");
+    let base_dir = temp_dir.join("memory_bank");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a semantic search client
+    let mut client = SemanticSearchClient::new(base_dir).unwrap();
+
+    // Try to add a context from an invalid path
+    let invalid_path = Path::new("/path/that/does/not/exist");
+    let result = client.add_context_from_path(
+        invalid_path,
+        "Test Context",
+        "Test Description",
+        false,
+        None::<fn(ProgressStatus)>,
+    );
+
+    // Verify the operation failed
+    assert!(result.is_err());
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_backward_compatibility() {
+    // Skip this test in CI environments
+    if env::var("CI").is_ok() {
+        return;
+    }
+
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_compat");
+    let base_dir = temp_dir.join("memory_bank");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a test directory with a file
+    let test_dir = temp_dir.join("test_dir");
+    fs::create_dir_all(&test_dir).unwrap();
+    let test_file = test_dir.join("test.txt");
+    fs::write(&test_file, "This is a test file").unwrap();
+
+    // Create a semantic search client
+    let mut client = SemanticSearchClient::new(base_dir).unwrap();
+
+    // Add a context using the original method
+    let _context_id = client
+        .add_context_from_directory(
+            &test_dir,
+            "Test Context",
+            "Test Description",
+            true,
+            None::<fn(ProgressStatus)>,
+        )
+        .unwrap();
+
+    // Verify the context was created
+    let contexts = client.get_contexts();
+    assert!(!contexts.is_empty());
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
diff --git a/crates/semantic_search_client/tests/test_async_client.rs b/crates/semantic_search_client/tests/test_async_client.rs
new file mode 100644
index 0000000000..ad33020e5e
--- /dev/null
+++ b/crates/semantic_search_client/tests/test_async_client.rs
@@ -0,0 +1,194 @@
+// Async tests for semantic search client
+mod tests {
+    use std::env;
+    use std::sync::Arc;
+    use std::sync::atomic::{
+        AtomicUsize,
+        Ordering,
+    };
+    use std::time::Duration;
+
+    use semantic_search_client::SemanticSearchClient;
+    use semantic_search_client::types::ProgressStatus;
+    use tempfile::TempDir;
+    use tokio::{
+        task,
+        time,
+    };
+
+    #[tokio::test]
+    async fn test_background_indexing_example() {
+        if env::var("MEMORY_BANK_USE_REAL_EMBEDDERS").is_err() {
+            println!("Skipping test: MEMORY_BANK_USE_REAL_EMBEDDERS not set");
+            assert!(true);
+            return;
+        }
+        // Create a temp directory that will live for the duration of the test
+        let temp_dir = TempDir::new().unwrap();
+        let temp_path = temp_dir.path().to_path_buf();
+
+        // Create a test file with unique content
+        let unique_id = uuid::Uuid::new_v4().to_string();
+        let test_file = temp_path.join("test.txt");
+        let content = format!("This is a unique test document {} for semantic search", unique_id);
+        std::fs::write(&test_file, &content).unwrap();
+
+        // Example of background indexing using tokio::task::spawn_blocking
+        let path_clone = test_file.clone();
+        let name = format!("Test Context {}", unique_id);
+        let description = "Test Description";
+        let persistent = true;
+
+        // Spawn a background task for indexing
+        let handle = task::spawn(async move {
+            task::spawn_blocking(move || {
+                // Create a new client inside the blocking task
+                let mut client = SemanticSearchClient::new_with_default_dir().unwrap();
+                client.add_context_from_path(
+                    &path_clone,
+                    &name,
+                    description,
+                    persistent,
+                    Option::<fn(ProgressStatus)>::None,
+                )
+            })
+            .await
+            .unwrap()
+            .unwrap()
+        });
+
+        // Wait for the background task to complete
+        let context_id = handle.await.unwrap();
+        println!("Created context with ID: {}", context_id);
+
+        // Wait a moment for indexing to complete
+        time::sleep(Duration::from_millis(500)).await;
+
+        // Create another client to search the newly created context
+        let search_client = SemanticSearchClient::new_with_default_dir().unwrap();
+
+        // Search for the unique content
+        let results = search_client.search_all(&unique_id, None).unwrap();
+
+        // Verify we can find our content
+        assert!(!results.is_empty(), "Expected to find our test document");
+
+        // This demonstrates how to perform background indexing using tokio tasks
+        // while still being able to use the synchronous client
+    }
+
+    #[tokio::test]
+    async fn test_background_indexing_with_progress() {
+        if env::var("MEMORY_BANK_USE_REAL_EMBEDDERS").is_err() {
+            println!("Skipping test: MEMORY_BANK_USE_REAL_EMBEDDERS not set");
+            assert!(true);
+            return;
+        }
+        // Create a temp directory for our test files
+        let temp_dir = TempDir::new().unwrap();
+        let temp_path = temp_dir.path().to_path_buf();
+
+        // Create multiple test files with unique content
+        let unique_id = uuid::Uuid::new_v4().to_string();
+        let unique_id_clone = unique_id.clone(); // Clone for later use
+        let num_files = 10;
+
+        for i in 0..num_files {
+            let file_path = temp_path.join(format!("test_file_{}.txt", i));
+            let content = format!(
+                "This is test file {} with unique ID {} for semantic search.\n\n\
+                 It contains multiple paragraphs to test chunking.\n\n\
+                 This is paragraph 3 with some additional content.\n\n\
+                 And finally paragraph 4 with more text for embedding.",
+                i, unique_id
+            );
+            std::fs::write(&file_path, &content).unwrap();
+        }
+
+        // Create a progress counter to track indexing progress
+        let progress_counter = Arc::new(AtomicUsize::new(0));
+        let progress_counter_clone = Arc::clone(&progress_counter);
+
+        // Create a progress callback
+        let progress_callback = move |status: ProgressStatus| match status {
+            ProgressStatus::CountingFiles => {
+                println!("Counting files...");
+            },
+            ProgressStatus::StartingIndexing(count) => {
+                println!("Starting indexing of {} files...", count);
+            },
+            ProgressStatus::Indexing(current, total) => {
+                println!("Indexing file {}/{}", current, total);
+                progress_counter_clone.store(current, Ordering::SeqCst);
+            },
+            ProgressStatus::CreatingSemanticContext => {
+                println!("Creating semantic context...");
+            },
+            ProgressStatus::GeneratingEmbeddings(current, total) => {
+                println!("Generating embeddings {}/{}", current, total);
+            },
+            ProgressStatus::BuildingIndex => {
+                println!("Building index...");
+            },
+            ProgressStatus::Finalizing => {
+                println!("Finalizing...");
+            },
+            ProgressStatus::Complete => {
+                println!("Indexing complete!");
+            },
+        };
+
+        // Spawn a background task for indexing the directory
+        let handle = task::spawn(async move {
+            task::spawn_blocking(move || {
+                // Create a new client inside the blocking task
+                let mut client = SemanticSearchClient::new_with_default_dir().unwrap();
+                client.add_context_from_path(
+                    &temp_path,
+                    &format!("Large Test Context {}", unique_id),
+                    "Test with multiple files and progress tracking",
+                    true,
+                    Some(progress_callback),
+                )
+            })
+            .await
+            .unwrap()
+            .unwrap()
+        });
+
+        // While the indexing is happening, we can do other work
+        // For this test, we'll just periodically check the progress
+        let mut last_progress = 0;
+        for _ in 0..10 {
+            time::sleep(Duration::from_millis(100)).await;
+            let current_progress = progress_counter.load(Ordering::SeqCst);
+            if current_progress > last_progress {
+                println!("Progress update: {} files processed", current_progress);
+                last_progress = current_progress;
+            }
+        }
+
+        // Wait for the background task to complete
+        let context_id = handle.await.unwrap();
+        println!("Created context with ID: {}", context_id);
+
+        // Wait a moment for indexing to complete
+        time::sleep(Duration::from_millis(500)).await;
+
+        // Create another client to search the newly created context
+        let search_client = SemanticSearchClient::new_with_default_dir().unwrap();
+
+        // Search for the unique content
+        let results = search_client.search_all(&unique_id_clone, None).unwrap();
+
+        // Verify we can find our content
+        assert!(!results.is_empty(), "Expected to find our test documents");
+
+        // Verify that we can search for specific content in specific files
+        for i in 0..num_files {
+            let file_specific_query = format!("test file {}", i);
+            let file_results = search_client.search_all(&file_specific_query, None).unwrap();
+            assert!(!file_results.is_empty(), "Expected to find test file {}", i);
+        }
+    }
+}
diff --git a/crates/semantic_search_client/tests/test_file_processor.rs b/crates/semantic_search_client/tests/test_file_processor.rs
new file mode 100644
index 0000000000..4323635256
--- /dev/null
+++ b/crates/semantic_search_client/tests/test_file_processor.rs
@@ -0,0 +1,121 @@
+use std::path::Path;
+use std::{
+    env,
+    fs,
+};
+
+use semantic_search_client::config;
+use semantic_search_client::processing::file_processor::process_file;
+
+#[test]
+fn test_process_text_file() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("semantic_search_test_process_file");
+    fs::create_dir_all(&temp_dir).unwrap();
+
+    // Initialize config
+    config::init_config(&temp_dir).unwrap();
+
+    // Create a test text file
+    let test_file = temp_dir.join("test.txt");
+    fs::write(
+        &test_file,
+        "This is a test file\nwith multiple lines\nfor testing file processing",
+    )
+    .unwrap();
+
+    // Process the file
+    let items = process_file(&test_file).unwrap();
+
+    // Verify the file was processed correctly
+    assert!(!items.is_empty());
+
+    // Check that the text content is present
+    let text = items[0].get("text").and_then(|v| v.as_str()).unwrap_or("");
+    assert!(text.contains("This is a test file"));
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_process_markdown_file() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_process_markdown");
+    fs::create_dir_all(&temp_dir).unwrap();
+
+    // Initialize config
+    config::init_config(&temp_dir).unwrap();
+
+    // Create a test markdown file
+    let test_file = temp_dir.join("test.md");
+    fs::write(
+        &test_file,
+        "# Test Markdown\n\nThis is a **markdown** file\n\n## Section\n\nWith formatting",
+    )
+    .unwrap();
+
+    // Process the file
+    let items = process_file(&test_file).unwrap();
+
+    // Verify the file was processed correctly
+    assert!(!items.is_empty());
+
+    // Check that the text content is present and markdown is preserved
+    let text = items[0].get("text").and_then(|v| v.as_str()).unwrap_or("");
+    assert!(text.contains("# Test Markdown"));
+    assert!(text.contains("**markdown**"));
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_process_nonexistent_file() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_nonexistent");
+    fs::create_dir_all(&temp_dir).unwrap();
+
+    // Initialize config
+    config::init_config(&temp_dir).unwrap();
+
+    // Try to process a file that doesn't exist
+    let nonexistent_file = Path::new("nonexistent_file.txt");
+    let result = process_file(nonexistent_file);
+
+    // Verify the operation failed
+    assert!(result.is_err());
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_process_binary_file() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_process_binary");
+    fs::create_dir_all(&temp_dir).unwrap();
+
+    // Initialize config
+    config::init_config(&temp_dir).unwrap();
+
+    // Create a test binary file (just some non-UTF8 bytes)
+    let test_file = temp_dir.join("test.bin");
+    fs::write(&test_file, [0xff, 0xfe, 0x00, 0x01, 0x02]).unwrap();
+
+    // Process the file - this should still work but might not extract meaningful text
+    let result = process_file(&test_file);
+
+    // The processor should handle binary files gracefully
+    // Either by returning an empty result or by extracting what it can
+    if let Ok(items) = result {
+        if !items.is_empty() {
+            let text = items[0].get("text").and_then(|v| v.as_str()).unwrap_or("");
+            // The text might be empty or contain replacement characters
+            assert!(text.is_empty() || text.contains("�"));
+        }
+    }
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
diff --git a/crates/semantic_search_client/tests/test_semantic_context.rs b/crates/semantic_search_client/tests/test_semantic_context.rs
new file mode 100644
index 0000000000..e775475e8b
--- /dev/null
+++ b/crates/semantic_search_client/tests/test_semantic_context.rs
@@ -0,0 +1,100 @@
+use std::collections::HashMap;
+use std::{
+    env,
+    fs,
+};
+
+use semantic_search_client::client::SemanticContext;
+use semantic_search_client::types::DataPoint;
+use serde_json::Value;
+
+#[test]
+fn test_semantic_context_creation() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_semantic_context");
+    fs::create_dir_all(&temp_dir).unwrap();
+
+    let data_path = temp_dir.join("data.json");
+
+    // Create a new semantic context
+    let semantic_context = SemanticContext::new(data_path).unwrap();
+
+    // Verify the context was created successfully
+    assert_eq!(semantic_context.get_data_points().len(), 0);
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_add_data_points() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_add_data");
+    fs::create_dir_all(&temp_dir).unwrap();
+
+    let data_path = temp_dir.join("data.json");
+
+    // Create a new semantic context
+    let mut semantic_context = SemanticContext::new(data_path.clone()).unwrap();
+
+    // Create data points
+    let mut data_points = Vec::new();
+
+    // First data point
+    let mut payload1 = HashMap::new();
+    payload1.insert(
+        "text".to_string(),
+        Value::String("This is the first test data point".to_string()),
+    );
+    payload1.insert("source".to_string(), Value::String("test1.txt".to_string()));
+
+    // Create a mock embedding vector
+    let vector1 = vec![0.1; 384]; // 384-dimensional vector with all values set to 0.1
+
+    data_points.push(DataPoint {
+        id: 0,
+        payload: payload1,
+        vector: vector1,
+    });
+
+    // Second data point
+    let mut payload2 = HashMap::new();
+    payload2.insert(
+        "text".to_string(),
+        Value::String("This is the second test data point".to_string()),
+    );
+    payload2.insert("source".to_string(), Value::String("test2.txt".to_string()));
+
+    // Create a different mock embedding vector
+    let vector2 = vec![0.2; 384]; // 384-dimensional vector with all values set to 0.2
+
+    data_points.push(DataPoint {
+        id: 1,
+        payload: payload2,
+        vector: vector2,
+    });
+
+    // Add the data points to the context
+    let count = semantic_context.add_data_points(data_points).unwrap();
+
+    // Verify the data points were added
+    assert_eq!(count, 2);
+    assert_eq!(semantic_context.get_data_points().len(), 2);
+
+    // Test search functionality
+    let query_vector = vec![0.15; 384]; // Query vector between the two data points
+    let results = semantic_context.search(&query_vector, 2).unwrap();
+
+    // Verify search results
+    assert_eq!(results.len(), 2);
+
+    // Save the context
+    semantic_context.save().unwrap();
+
+    // Load the context again to verify persistence
+    let loaded_context = SemanticContext::new(data_path).unwrap();
+    assert_eq!(loaded_context.get_data_points().len(), 2);
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
diff --git a/crates/semantic_search_client/tests/test_semantic_search_client.rs b/crates/semantic_search_client/tests/test_semantic_search_client.rs
new file mode 100644
index 0000000000..cc94d9bbe3
--- /dev/null
+++ b/crates/semantic_search_client/tests/test_semantic_search_client.rs
@@ -0,0 +1,187 @@
+use std::{
+    env,
+    fs,
+};
+
+use semantic_search_client::SemanticSearchClient;
+
+#[test]
+fn test_client_initialization() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("semantic_search_test_client_init");
+    let base_dir = temp_dir.join("semantic_search");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a semantic search client
+    let client = SemanticSearchClient::new(base_dir.clone()).unwrap();
+
+    // Verify the client was created successfully
+    assert_eq!(client.get_contexts().len(), 0);
+
+    // Instead of using the actual default directory, use our test directory again
+    // This ensures test isolation and prevents interference from existing contexts
+    let client = SemanticSearchClient::new(base_dir.clone()).unwrap();
+    assert_eq!(client.get_contexts().len(), 0);
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_add_context_from_text() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("semantic_search_test_add_text");
+    let base_dir = temp_dir.join("semantic_search");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a semantic search client
+    let mut client = SemanticSearchClient::new(base_dir).unwrap();
+
+    // Add a context from text
+    let context_id = client
+        .add_context_from_text(
+            "This is a test text for semantic memory",
+            "Test Text Context",
+            "A context created from text",
+            false,
+        )
+        .unwrap();
+
+    // Verify the context was created
+    let contexts = client.get_all_contexts();
+    assert!(!contexts.is_empty());
+
+    // Test search functionality
+    let _results = client
+        .search_context(&context_id, "test semantic memory", Some(5))
+        .unwrap();
+    // Don't assert on results being non-empty as it depends on the embedder implementation
+    // assert!(!results.is_empty());
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_search_all_contexts() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("semantic_search_test_search_all");
+    let base_dir = temp_dir.join("semantic_search");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a semantic search client
+    let mut client = SemanticSearchClient::new(base_dir).unwrap();
+
+    // Add multiple contexts
+    let _id1 = client
+        .add_context_from_text(
+            "Information about AWS Lambda functions and serverless computing",
+            "AWS Lambda",
+            "Serverless computing information",
+            false,
+        )
+        .unwrap();
+
+    let _id2 = client
+        .add_context_from_text(
+            "Amazon S3 is a scalable object storage service",
+            "Amazon S3",
+            "Storage service information",
+            false,
+        )
+        .unwrap();
+
+    // Search across all contexts
+    let results = client.search_all("serverless lambda", Some(5)).unwrap();
+    assert!(!results.is_empty());
+
+    // Search with a different query
+    let results = client.search_all("storage S3", Some(5)).unwrap();
+    assert!(!results.is_empty());
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_persistent_context() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("semantic_search_test_persistent");
+    let base_dir = temp_dir.join("semantic_search");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a test file
+    let test_file = temp_dir.join("test.txt");
+    fs::write(&test_file, "This is a test file for persistent context").unwrap();
+
+    // Create a semantic search client
+    let mut client = SemanticSearchClient::new(base_dir.clone()).unwrap();
+
+    // Add a volatile context
+    let context_id = client
+        .add_context_from_text(
+            "This is a volatile context",
+            "Volatile Context",
+            "A non-persistent context",
+            false,
+        )
+        .unwrap();
+
+    // Make it persistent
+    client
+        .make_persistent(&context_id, "Persistent Context", "A now-persistent context")
+        .unwrap();
+
+    // Create a new client to verify persistence
+    let client2 = SemanticSearchClient::new(base_dir).unwrap();
+    let contexts = client2.get_contexts();
+
+    // Verify the context was persisted
+    assert!(contexts.iter().any(|c| c.name == "Persistent Context"));
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_remove_context() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("semantic_search_test_remove");
+    let base_dir = temp_dir.join("semantic_search");
+    fs::create_dir_all(&base_dir).unwrap();
+
+    // Create a semantic search client
+    let mut client = SemanticSearchClient::new(base_dir).unwrap();
+
+    // Add contexts
+    let id1 = client
+        .add_context_from_text(
+            "Context to be removed by ID",
+            "Remove by ID",
+            "Test removal by ID",
+            true,
+        )
+        .unwrap();
+
+    let _id2 = client
+        .add_context_from_text(
+            "Context to be removed by name",
+            "Remove by Name",
+            "Test removal by name",
+            true,
+        )
+        .unwrap();
+
+    // Remove by ID
+    client.remove_context_by_id(&id1, true).unwrap();
+
+    // Remove by name
+    client.remove_context_by_name("Remove by Name", true).unwrap();
+
+    // Verify contexts were removed
+    let contexts = client.get_contexts();
+    assert!(contexts.is_empty());
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
diff --git a/crates/semantic_search_client/tests/test_text_chunker.rs b/crates/semantic_search_client/tests/test_text_chunker.rs
new file mode 100644
index 0000000000..6ca4eb3d3d
--- /dev/null
+++ b/crates/semantic_search_client/tests/test_text_chunker.rs
@@ -0,0 +1,59 @@
+use std::{
+    env,
+    fs,
+};
+
+use semantic_search_client::config;
+use semantic_search_client::processing::text_chunker::chunk_text;
+
+#[test]
+fn test_chunk_text() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_chunk_text");
+    fs::create_dir_all(&temp_dir).unwrap();
+
+    // Initialize config
+    config::init_config(&temp_dir).unwrap();
+
+    let text = "This is a test text. It has multiple sentences. We want to split it into chunks.";
+
+    // Test with chunk size larger than text
+    let chunks = chunk_text(text, Some(100), Some(0));
+    assert_eq!(chunks.len(), 1);
+    assert_eq!(chunks[0], text);
+
+    // Test with smaller chunk size
+    let chunks = chunk_text(text, Some(5), Some(0));
+    assert!(chunks.len() > 1);
+
+    // Verify all text is preserved when joined
+    let combined = chunks.join(" ");
+    assert_eq!(combined, text);
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
+
+#[test]
+fn test_chunk_text_with_overlap() {
+    // Create a temporary directory for the test
+    let temp_dir = env::temp_dir().join("memory_bank_test_chunk_text_overlap");
+    fs::create_dir_all(&temp_dir).unwrap();
+
+    // Initialize config
+    config::init_config(&temp_dir).unwrap();
+
+    let text = "This is a test text. It has multiple sentences. We want to split it into chunks.";
+
+    // Test with chunk size larger than text
+    let chunks = chunk_text(text, Some(100), Some(10));
+    assert_eq!(chunks.len(), 1);
+    assert_eq!(chunks[0], text);
+
+    // Test with smaller chunk size and overlap
+    let chunks = chunk_text(text, Some(5), Some(2));
+    assert!(chunks.len() > 1);
+
+    // Clean up
+    fs::remove_dir_all(temp_dir).unwrap_or(());
+}
diff --git a/crates/semantic_search_client/tests/test_vector_index.rs b/crates/semantic_search_client/tests/test_vector_index.rs
new file mode 100644
index 0000000000..f989291dfd
--- /dev/null
+++ b/crates/semantic_search_client/tests/test_vector_index.rs
@@ -0,0 +1,55 @@
+use semantic_search_client::index::VectorIndex;
+
+#[test]
+fn test_vector_index_creation() {
+    // Create a new vector index
+    let index = VectorIndex::new(384); // 384-dimensional vectors
+
+    // Verify the index was created successfully
+    assert!(!index.is_empty() || index.is_empty());
+}
+
+#[test]
+fn test_add_vectors() {
+    // Create a new vector index
+    let index = VectorIndex::new(384);
+
+    // Add vectors to the index
+    let vector1 = vec![0.1; 384]; // 384-dimensional vector with all values set to 0.1
+    index.insert(&vector1, 0);
+
+    let vector2 = vec![0.2; 384]; // 384-dimensional vector with all values set to 0.2
+    index.insert(&vector2, 1);
+
+    // We can't reliably test the length since the implementation may have internal constraints
+    // Just verify the index exists
+    assert!(!index.is_empty());
+}
+
+#[test]
+fn test_search() {
+    // Create a new vector index
+    let index = VectorIndex::new(384);
+
+    // Add vectors to the index
+    let vector1 = vec![0.1; 384]; // 384-dimensional vector with all values set to 0.1
+    index.insert(&vector1, 0);
+
+    let vector2 = vec![0.2; 384]; // 384-dimensional vector with all values set to 0.2
+    index.insert(&vector2, 1);
+
+    let vector3 = vec![0.3; 384]; // 384-dimensional vector with all values set to 0.3
+    index.insert(&vector3, 2);
+
+    // Search for nearest neighbors
+    let query = vec![0.15; 384]; // Query vector between vector1 and vector2
+    let results = index.search(&query, 2, 100);
+
+    // Verify search results
+    assert!(results.len() <= 2); // May return fewer results than requested
+
+    if !results.is_empty() {
+        // The closest vector should be one of our inserted vectors
+        assert!(results[0].0 <= 2);
+    }
+}
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
index f43430fe39..32d3d8a201 100644
--- a/extensions/vscode/package.json
+++ b/extensions/vscode/package.json
@@ -43,14 +43,14 @@
     "@eslint/js": "^9.18.0",
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.20",
     "@types/vscode": "~1.80.0",
     "@vscode/test-electron": "^2.5.2",
     "@vscode/vsce": "^2.32.0",
     "eslint": "^9.18.0",
     "glob": "^11.0.2",
     "globals": "^16.1.0",
-    "mocha": "^11.1.0",
+    "mocha": "^11.4.0",
     "typescript": "^5.8.3"
   }
 }
diff --git a/packages/api-bindings/package.json b/packages/api-bindings/package.json
index 35a6515841..dcd33b08ff 100644
--- a/packages/api-bindings/package.json
+++ b/packages/api-bindings/package.json
@@ -23,18 +23,18 @@
   },
   "dependencies": {
     "@aws/amazon-q-developer-cli-proto": "workspace:^",
-    "@bufbuild/protobuf": "2.2.5"
+    "@bufbuild/protobuf": "2.4.0"
   },
   "devDependencies": {
     "@amzn/eslint-config": "workspace:^",
     "@amzn/tsconfig": "workspace:^",
     "@tsconfig/recommended": "^1.0.8",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.20",
     "@typescript/analyze-trace": "^0.10.1",
     "eslint": "^9.18.0",
     "lint-staged": "^15.5.1",
     "prettier": "^3.4.2",
-    "ts-morph": "^25.0.1",
+    "ts-morph": "^26.0.0",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3"
   },
diff --git a/packages/autocomplete-app/package.json b/packages/autocomplete-app/package.json
index 7fc2220ced..c2511e3e66 100644
--- a/packages/autocomplete-app/package.json
+++ b/packages/autocomplete-app/package.json
@@ -26,7 +26,7 @@
     "@aws/amazon-q-developer-cli-autocomplete-parser": "workspace:^",
     "@aws/amazon-q-developer-cli-proto": "workspace:^",
     "@aws/amazon-q-developer-cli-shell-parser": "workspace:^",
-    "@bufbuild/protobuf": "2.2.5",
+    "@bufbuild/protobuf": "2.4.0",
     "@fig/autocomplete-helpers": "^2.0.0",
     "@fig/autocomplete-shared": "^1.1.2",
     "@juggle/resize-observer": "^3.4.0",
@@ -46,7 +46,7 @@
     "@aws/amazon-q-developer-cli-fuzzysort": "workspace:^",
     "@aws/amazon-q-developer-cli-shared": "workspace:^",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.20",
     "@types/react-dom": "^18.3.5",
     "@types/react-window": "^1.8.8",
     "@types/react": "^18.3.18",
diff --git a/packages/autocomplete-parser/package.json b/packages/autocomplete-parser/package.json
index 0c3eaf5fa6..bdb8f7bbcc 100644
--- a/packages/autocomplete-parser/package.json
+++ b/packages/autocomplete-parser/package.json
@@ -28,8 +28,8 @@
     "@fig/autocomplete-helpers": "^2.0.0",
     "@fig/autocomplete-shared": "^1.1.2",
     "loglevel": "^1.9.2",
-    "semver": "^7.7.1",
-    "zod": "^3.24.3"
+    "semver": "^7.7.2",
+    "zod": "^3.25.7"
   },
   "devDependencies": {
     "@amzn/eslint-config": "workspace:^",
diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json
index 14a1c63e68..bda0202222 100644
--- a/packages/autocomplete/package.json
+++ b/packages/autocomplete/package.json
@@ -26,7 +26,7 @@
     "@aws/amazon-q-developer-cli-autocomplete-parser": "workspace:^",
     "@aws/amazon-q-developer-cli-proto": "workspace:^",
     "@aws/amazon-q-developer-cli-shell-parser": "workspace:^",
-    "@bufbuild/protobuf": "2.2.5",
+    "@bufbuild/protobuf": "2.4.0",
     "@fig/autocomplete-helpers": "^2.0.0",
     "@fig/autocomplete-shared": "^1.1.2",
     "@juggle/resize-observer": "^3.4.0",
@@ -46,7 +46,7 @@
     "@aws/amazon-q-developer-cli-fuzzysort": "workspace:^",
     "@aws/amazon-q-developer-cli-shared": "workspace:^",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.20",
     "@types/react-dom": "^18.3.5",
     "@types/react-window": "^1.8.8",
     "@types/react": "^18.3.18",
diff --git a/packages/dashboard-app/README.md b/packages/dashboard-app/README.md
index 29b2d450e9..1bbc990b32 100644
--- a/packages/dashboard-app/README.md
+++ b/packages/dashboard-app/README.md
@@ -2,8 +2,12 @@
 
 This folder holds the React single-page app for the Amazon Q desktop UI.
 
+<div align="center">
+  <img width="600" alt="Dashboard UI" src="https://github.com/user-attachments/assets/aaebc6ed-2048-41f9-a619-dabaedc55415" />
+</div>
+
 ## Developing
 
-1. Run the `build-ts.sh` script under the `proto/` folder in the project root to ensure typescript definitions are generated.
 1. Run `pnpm build` in the project root.
 1. Run `npm run dev`.
+1. Start the main Amazon Q Desktop according to the instructions in the [Amazon Q Desktop README](../../crates/fig_desktop/README.md).
diff --git a/packages/dashboard-app/package.json b/packages/dashboard-app/package.json
index 1716b6a956..c81befc195 100644
--- a/packages/dashboard-app/package.json
+++ b/packages/dashboard-app/package.json
@@ -27,7 +27,7 @@
     "@radix-ui/react-tabs": "^1.1.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "lucide-react": "^0.503.0",
+    "lucide-react": "^0.511.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-markdown": "^9.0.3",
@@ -35,7 +35,7 @@
     "react-router-dom": "^7.6.0",
     "tailwind-merge": "^3.2.0",
     "tailwindcss-animate": "^1.0.7",
-    "zod": "^3.24.3",
+    "zod": "^3.25.7",
     "zustand": "^4.5.6"
   },
   "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6cdd326475..c8d44a9cc3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,7 +34,7 @@ importers:
         version: 2.5.2
       vitest:
         specifier: ^3.0.8
-        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   extensions/gnome-extension:
     dependencies:
@@ -68,7 +68,7 @@ importers:
         version: 9.18.0
       '@gi.ts/cli':
         specifier: ^1.5.10
-        version: 1.5.10(@gi.ts/lib@1.5.13)(@types/node@22.15.17)(typescript@5.8.3)
+        version: 1.5.10(@gi.ts/lib@1.5.13)(@types/node@22.15.20)(typescript@5.8.3)
       '@gi.ts/lib':
         specifier: ^1.5.13
         version: 1.5.13
@@ -91,8 +91,8 @@ importers:
         specifier: ^10.0.10
         version: 10.0.10
       '@types/node':
-        specifier: ^22.15.17
-        version: 22.15.17
+        specifier: ^22.15.20
+        version: 22.15.20
       '@types/vscode':
         specifier: ~1.80.0
         version: 1.80.0
@@ -112,8 +112,8 @@ importers:
         specifier: ^16.1.0
         version: 16.1.0
       mocha:
-        specifier: ^11.1.0
-        version: 11.1.0
+        specifier: ^11.4.0
+        version: 11.4.0
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
@@ -124,8 +124,8 @@ importers:
         specifier: workspace:^
         version: link:../../proto
       '@bufbuild/protobuf':
-        specifier: 2.2.5
-        version: 2.2.5
+        specifier: 2.4.0
+        version: 2.4.0
     devDependencies:
       '@amzn/eslint-config':
         specifier: workspace:^
@@ -137,8 +137,8 @@ importers:
         specifier: ^1.0.8
         version: 1.0.8
       '@types/node':
-        specifier: ^22.15.17
-        version: 22.15.17
+        specifier: ^22.15.20
+        version: 22.15.20
       '@typescript/analyze-trace':
         specifier: ^0.10.1
         version: 0.10.1
@@ -152,8 +152,8 @@ importers:
         specifier: ^3.4.2
         version: 3.4.2
       ts-morph:
-        specifier: ^25.0.1
-        version: 25.0.1
+        specifier: ^26.0.0
+        version: 26.0.0
       tsx:
         specifier: ^4.19.4
         version: 4.19.4
@@ -213,8 +213,8 @@ importers:
         specifier: workspace:^
         version: link:../shell-parser
       '@bufbuild/protobuf':
-        specifier: 2.2.5
-        version: 2.2.5
+        specifier: 2.4.0
+        version: 2.4.0
       '@fig/autocomplete-helpers':
         specifier: ^2.0.0
         version: 2.0.0
@@ -268,8 +268,8 @@ importers:
         specifier: ^4.0.9
         version: 4.0.9
       '@types/node':
-        specifier: ^22.15.17
-        version: 22.15.17
+        specifier: ^22.15.20
+        version: 22.15.20
       '@types/react':
         specifier: ^18.3.18
         version: 18.3.18
@@ -284,10 +284,10 @@ importers:
         version: 7.7.0
       '@vitejs/plugin-legacy':
         specifier: ^6.1.1
-        version: 6.1.1(terser@5.39.0)(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
+        version: 6.1.1(terser@5.39.0)(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
       '@vitejs/plugin-react':
         specifier: ^4.3.4
-        version: 4.3.4(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
+        version: 4.3.4(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
       '@withfig/autocomplete-types':
         specifier: ^1.31.0
         version: 1.31.0
@@ -305,7 +305,7 @@ importers:
         version: 3.4.2
       tailwindcss:
         specifier: ^3.4.17
-        version: 3.4.17(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3))
+        version: 3.4.17(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3))
       terser:
         specifier: ^5.39.0
         version: 5.39.0
@@ -314,10 +314,10 @@ importers:
         version: 5.8.3
       vite:
         specifier: ^6.3.4
-        version: 6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
       vitest:
         specifier: ^3.0.8
-        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   packages/autocomplete-app:
     dependencies:
@@ -337,8 +337,8 @@ importers:
         specifier: workspace:^
         version: link:../shell-parser
       '@bufbuild/protobuf':
-        specifier: 2.2.5
-        version: 2.2.5
+        specifier: 2.4.0
+        version: 2.4.0
       '@fig/autocomplete-helpers':
         specifier: ^2.0.0
         version: 2.0.0
@@ -392,8 +392,8 @@ importers:
         specifier: ^4.0.9
         version: 4.0.9
       '@types/node':
-        specifier: ^22.15.17
-        version: 22.15.17
+        specifier: ^22.15.20
+        version: 22.15.20
       '@types/react':
         specifier: ^18.3.18
         version: 18.3.18
@@ -408,10 +408,10 @@ importers:
         version: 7.7.0
       '@vitejs/plugin-legacy':
         specifier: ^6.1.1
-        version: 6.1.1(terser@5.39.0)(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
+        version: 6.1.1(terser@5.39.0)(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
       '@vitejs/plugin-react':
         specifier: ^4.3.4
-        version: 4.3.4(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
+        version: 4.3.4(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
       '@withfig/autocomplete-types':
         specifier: ^1.31.0
         version: 1.31.0
@@ -429,7 +429,7 @@ importers:
         version: 3.4.2
       tailwindcss:
         specifier: ^3.4.17
-        version: 3.4.17(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3))
+        version: 3.4.17(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3))
       terser:
         specifier: ^5.39.0
         version: 5.39.0
@@ -438,10 +438,10 @@ importers:
         version: 5.8.3
       vite:
         specifier: ^6.3.4
-        version: 6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
       vitest:
         specifier: ^3.0.8
-        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   packages/autocomplete-parser:
     dependencies:
@@ -467,11 +467,11 @@ importers:
         specifier: ^1.9.2
         version: 1.9.2
       semver:
-        specifier: ^7.7.1
-        version: 7.7.1
+        specifier: ^7.7.2
+        version: 7.7.2
       zod:
-        specifier: ^3.24.3
-        version: 3.24.3
+        specifier: ^3.25.7
+        version: 3.25.7
     devDependencies:
       '@amzn/eslint-config':
         specifier: workspace:^
@@ -499,7 +499,7 @@ importers:
         version: 5.8.3
       vitest:
         specifier: ^3.0.8
-        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   packages/dashboard-app:
     dependencies:
@@ -534,8 +534,8 @@ importers:
         specifier: ^2.1.1
         version: 2.1.1
       lucide-react:
-        specifier: ^0.503.0
-        version: 0.503.0(react@18.3.1)
+        specifier: ^0.511.0
+        version: 0.511.0(react@18.3.1)
       react:
         specifier: ^18.3.1
         version: 18.3.1
@@ -556,10 +556,10 @@ importers:
         version: 3.2.0
       tailwindcss-animate:
         specifier: ^1.0.7
-        version: 1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3)))
+        version: 1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3)))
       zod:
-        specifier: ^3.24.3
-        version: 3.24.3
+        specifier: ^3.25.7
+        version: 3.25.7
       zustand:
         specifier: ^4.5.6
         version: 4.5.6(@types/react@18.3.18)(react@18.3.1)
@@ -584,7 +584,7 @@ importers:
         version: 8.31.1(eslint@9.18.0(jiti@1.21.7))(typescript@5.8.3)
       '@vitejs/plugin-react':
         specifier: ^4.3.4
-        version: 4.3.4(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
+        version: 4.3.4(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
       autoprefixer:
         specifier: ^10.4.21
         version: 10.4.21(postcss@8.5.3)
@@ -608,7 +608,7 @@ importers:
         version: 3.4.2
       tailwindcss:
         specifier: ^3.4.17
-        version: 3.4.17(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3))
+        version: 3.4.17(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3))
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
@@ -617,7 +617,7 @@ importers:
         version: 8.31.1(eslint@9.18.0(jiti@1.21.7))(typescript@5.8.3)
       vite:
         specifier: ^6.3.4
-        version: 6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   packages/eslint-config:
     devDependencies:
@@ -698,7 +698,7 @@ importers:
         version: 5.8.3
       vitest:
         specifier: ^3.0.8
-        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   packages/shell-parser:
     dependencies:
@@ -726,7 +726,7 @@ importers:
         version: 5.8.3
       vitest:
         specifier: ^3.0.8
-        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   packages/tsconfig:
     dependencies:
@@ -739,18 +739,18 @@ importers:
   proto:
     dependencies:
       '@bufbuild/protobuf':
-        specifier: 2.2.5
-        version: 2.2.5
+        specifier: 2.4.0
+        version: 2.4.0
     devDependencies:
       '@amzn/tsconfig':
         specifier: workspace:^
         version: link:../packages/tsconfig
       '@bufbuild/buf':
-        specifier: ^1.53.0
-        version: 1.53.0
+        specifier: ^1.54.0
+        version: 1.54.0
       '@bufbuild/protoc-gen-es':
         specifier: ^2.2.5
-        version: 2.2.5(@bufbuild/protobuf@2.2.5)
+        version: 2.2.5(@bufbuild/protobuf@2.4.0)
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
@@ -767,14 +767,14 @@ importers:
         specifier: workspace:^
         version: link:../../packages/api-bindings
       '@types/node':
-        specifier: ^22.15.17
-        version: 22.15.17
+        specifier: ^22.15.20
+        version: 22.15.20
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
       vitest:
         specifier: ^3.0.8
-        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+        version: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
 packages:
 
@@ -786,8 +786,8 @@ packages:
     resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
     engines: {node: '>=6.0.0'}
 
-  '@asamuzakjp/css-color@3.1.7':
-    resolution: {integrity: sha512-Ok5fYhtwdyJQmU1PpEv6Si7Y+A4cYb8yNM9oiIJC9TzXPMuN9fvdonKJqcnz9TbFqV6bQ8z0giRq0iaOpGZV2g==}
+  '@asamuzakjp/css-color@3.2.0':
+    resolution: {integrity: sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==}
 
   '@azure/abort-controller@2.1.2':
     resolution: {integrity: sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==}
@@ -1406,56 +1406,59 @@ packages:
     resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
     engines: {node: '>=18'}
 
-  '@bufbuild/buf-darwin-arm64@1.53.0':
-    resolution: {integrity: sha512-UVhqDYu54ciiCMeG6RODlrX5XRvLN6PfsVDqMQG0JwmMKtUi326CbUqsqO7xsQbcEUso3FTBaURir4RixoM88w==}
+  '@bufbuild/buf-darwin-arm64@1.54.0':
+    resolution: {integrity: sha512-MkwlxcuHH8YO2wyQ2nGAv5SwBRCR4PtA8zcQb7AR6q93Cgy314ac8blGjfpenprjI3kAAhxc9BQK4t+/hkIS/A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
 
-  '@bufbuild/buf-darwin-x64@1.53.0':
-    resolution: {integrity: sha512-03lKaenjf08HF6DlARPU2lEL2dRxNsU6rb9GbUu+YeLayWy7SUlfeDB8drAZ/GpfSc7SL8TKF7jqRkqxT4wFGA==}
+  '@bufbuild/buf-darwin-x64@1.54.0':
+    resolution: {integrity: sha512-59Z+6BxvVwBbcpLOAwD8TLobngb9YUvUZ1nnP1IyIJnay/tIY+yfmgAdgMwm3VUZlbaFlURGmD34UAwEsxodGQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
 
-  '@bufbuild/buf-linux-aarch64@1.53.0':
-    resolution: {integrity: sha512-FlxrB+rZJG5u7v2JovzXvSR/OdXjVXYHTTLnk6vN/73KPbpGPzZrW7mKxlYyn/Uar5tKDAYvmijjuItXZ6i31g==}
+  '@bufbuild/buf-linux-aarch64@1.54.0':
+    resolution: {integrity: sha512-cUbvujfoAQGsnRH/+UfKxt0Hfe6PGHjM/gLiC2Kgv8fcoIWjPJMBBgdl/TLbq1QrVcCXSvMc16hW5ias7Jdyfw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
 
-  '@bufbuild/buf-linux-armv7@1.53.0':
-    resolution: {integrity: sha512-e9ER+5Os1DPLhr2X1BRPrQpDZWpv5Mkk2PLnmmzh5RL4kOueJKQZj/m1qQr7SQkiPPhS0yMw7EEghsr521FFzQ==}
+  '@bufbuild/buf-linux-armv7@1.54.0':
+    resolution: {integrity: sha512-xdKjzPsOo6E2eth3uGIRoVG9TpPVHOUucr0MeCRVhM2hb5gbM8KQLn6iDxVGbQFq6eL2qe+B0b8k9HfuwzirWA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
 
-  '@bufbuild/buf-linux-x64@1.53.0':
-    resolution: {integrity: sha512-LehyZPbkRgCvIM56uUnCAUD1QSno2wkBZ5HOvjrjOd0GEjfKgw/fsEu13fJR13bGBNOeOUHbHrd59iUSyY6rGA==}
+  '@bufbuild/buf-linux-x64@1.54.0':
+    resolution: {integrity: sha512-ZnfaE5GLAhyvR/ponDgG+s6FbtMEm+RaS2f0EoBLORYC7sK/Elfmw2Q0XcjHyEl83u4hELCqej9T0eUxbgxtow==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
 
-  '@bufbuild/buf-win32-arm64@1.53.0':
-    resolution: {integrity: sha512-QRNMHYW6v4keoelIwMNZGQw2R67fsS8lEDnYxrFmiRADwZ/ri/XKJjvQfpoE2Bq0xREB0zZ++RX+1DZOkTA/Iw==}
+  '@bufbuild/buf-win32-arm64@1.54.0':
+    resolution: {integrity: sha512-N5YlX8c6p+KZIWYmx03viYF/FLuY5GyzHgor17nuJUYhF1xFyIJL8v4mhqcQ8Pq0xua9IyRwmSxHJKyrdNatcg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
 
-  '@bufbuild/buf-win32-x64@1.53.0':
-    resolution: {integrity: sha512-relZlT9gYrZGcEH4dcJhEWrjaHV9drG1PcgW6krqw1AzpQOPxR/loXJ7DycoCAnUhQ9TdsdTfUlVHqiJt98piQ==}
+  '@bufbuild/buf-win32-x64@1.54.0':
+    resolution: {integrity: sha512-PepTA9RcLCjukQhFPFBqKXF9mVwct+ZSBeuLjFuUVcHovdGUZXspNTb5LnuIDjWXx2fcALs0xb/FNUNd6pNjbA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
 
-  '@bufbuild/buf@1.53.0':
-    resolution: {integrity: sha512-GGAztQbbKSv+HaihdDIUpejUcxIx2Fse9SqHfMisJbL/hZ7aOH7BFeSH0q8/g2kSAsLABlenVKeEWKX1uZU3LQ==}
+  '@bufbuild/buf@1.54.0':
+    resolution: {integrity: sha512-UkjZmVslA7YAxhUQVxE2O4HX4qD7aMspjkuG3vsjnvmAkiV6Jhz47z3focCuPI28e59H20TiQNhc9Y3fkffWPw==}
     engines: {node: '>=12'}
     hasBin: true
 
   '@bufbuild/protobuf@2.2.5':
     resolution: {integrity: sha512-/g5EzJifw5GF8aren8wZ/G5oMuPoGeS6MQD3ca8ddcvdXR5UELUfdTZITCGNhNXynY/AYl3Z4plmxdj/tRl/hQ==}
 
+  '@bufbuild/protobuf@2.4.0':
+    resolution: {integrity: sha512-RN9M76x7N11QRihKovEglEjjVCQEA9PRBVnDgk9xw8JHLrcUrp4FpAVSPSH91cNbcTft3u2vpLN4GMbiKY9PJw==}
+
   '@bufbuild/protoc-gen-es@2.2.5':
     resolution: {integrity: sha512-81dI1PLMQXUkvCUH1fKJEZsx+G69LvU/0BOFeqxotFpCFEC/jTu1Ka1ViIEGT5U1r51udRs20kHZTlkR9zwfAA==}
     engines: {node: '>=14'}
@@ -2483,8 +2486,8 @@ packages:
   '@rtsao/scc@1.1.0':
     resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
 
-  '@ts-morph/common@0.26.1':
-    resolution: {integrity: sha512-Sn28TGl/4cFpcM+jwsH1wLncYq3FtN/BIpem+HOygfBWPT5pAeS5dB4VFVzV8FbnOKHpDLZmvAl4AjPEev5idA==}
+  '@ts-morph/common@0.27.0':
+    resolution: {integrity: sha512-Wf29UqxWDpc+i61k3oIOzcUfQt79PIT9y/MWfAGlrkjg6lBC1hwDECLXPVJAhWjiGbfBCxZd65F/LIZF3+jeJQ==}
 
   '@tsconfig/node10@1.0.11':
     resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}
@@ -2561,8 +2564,8 @@ packages:
   '@types/ms@0.7.34':
     resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==}
 
-  '@types/node@22.15.17':
-    resolution: {integrity: sha512-wIX2aSZL5FE+MR0JlvF87BNVrtFWf6AE6rxSE9X7OwnVvoyCQjpzSRJ+M87se/4QCkCiebQAqrJ0y6fwIyi7nw==}
+  '@types/node@22.15.20':
+    resolution: {integrity: sha512-A6BohGFRGHAscJsTslDCA9JG7qSJr/DWUvrvY8yi9IgnGtMxCyat7vvQ//MFa0DnLsyuS3wYTpLdw4Hf+Q5JXw==}
 
   '@types/prop-types@15.7.14':
     resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==}
@@ -2791,10 +2794,6 @@ packages:
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
-  ansi-colors@4.1.3:
-    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
-    engines: {node: '>=6'}
-
   ansi-escapes@4.3.2:
     resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
     engines: {node: '>=8'}
@@ -3099,6 +3098,10 @@ packages:
     resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
     engines: {node: '>= 8.10.0'}
 
+  chokidar@4.0.3:
+    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+    engines: {node: '>= 14.16.0'}
+
   chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
 
@@ -3270,6 +3273,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize@4.0.0:
     resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==}
     engines: {node: '>=10'}
@@ -3335,8 +3347,8 @@ packages:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
 
-  diff@5.2.0:
-    resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==}
+  diff@7.0.0:
+    resolution: {integrity: sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==}
     engines: {node: '>=0.3.1'}
 
   dir-glob@3.0.1:
@@ -4372,8 +4384,8 @@ packages:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
 
-  lucide-react@0.503.0:
-    resolution: {integrity: sha512-HGGkdlPWQ0vTF8jJ5TdIqhQXZi6uh3LnNgfZ8MHiuxFfX3RZeA79r2MW2tHAZKlAVfoNE8esm3p+O6VkIvpj6w==}
+  lucide-react@0.511.0:
+    resolution: {integrity: sha512-VK5a2ydJ7xm8GvBeKLS9mu1pVK6ucef9780JVUjw6bAjJL/QXnd4Y0p7SPeOUMC27YhzNCZvm5d/QX0Tp3rc0w==}
     peerDependencies:
       react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
@@ -4560,8 +4572,8 @@ packages:
   mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
 
-  mocha@11.1.0:
-    resolution: {integrity: sha512-8uJR5RTC2NgpY3GrYcgpZrsEd9zKbPDpob1RezyR2upGHRQtHWofmzTMzTMSV6dru3tj5Ukt0+Vnq1qhFEEwAg==}
+  mocha@11.4.0:
+    resolution: {integrity: sha512-O6oi5Y9G6uu8f9iqXR6iKNLWHLRex3PKbmHynfpmUnMJJGrdgXh8ZmS85Ei5KR2Gnl+/gQ9s+Ktv5CqKybNw4A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
 
@@ -5001,6 +5013,10 @@ packages:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
 
+  readdirp@4.1.2:
+    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
+    engines: {node: '>= 14.18.0'}
+
   redeyed@2.1.1:
     resolution: {integrity: sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==}
 
@@ -5140,6 +5156,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.7.2:
+    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   serialize-javascript@6.0.2:
     resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
 
@@ -5469,8 +5490,8 @@ packages:
   ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
-  ts-morph@25.0.1:
-    resolution: {integrity: sha512-QJEiTdnz1YjrB3JFhd626gX4rKHDLSjSVMvGGG4v7ONc3RBwa0Eei98G9AT9uNFDMtV54JyuXsFeC+OH0n6bXQ==}
+  ts-morph@26.0.0:
+    resolution: {integrity: sha512-ztMO++owQnz8c/gIENcM9XfCEzgoGphTv+nKpYNM1bgsdOVC/jRZuEBf6N+mLLDNg68Kl+GgUZfOySaRiG1/Ug==}
 
   ts-node@10.9.2:
     resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
@@ -5946,8 +5967,8 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  zod@3.24.3:
-    resolution: {integrity: sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==}
+  zod@3.25.7:
+    resolution: {integrity: sha512-YGdT1cVRmKkOg6Sq7vY7IkxdphySKnXhaUmFI4r4FcuFVNgpCb9tZfNwXbT6BPjD5oz0nubFsoo9pIqKrDcCvg==}
 
   zustand@4.5.6:
     resolution: {integrity: sha512-ibr/n1hBzLLj5Y+yUcU7dYw8p6WnIVzdJbnX+1YpaScvZVF2ziugqHs+LAmHw4lWO9c/zRj+K1ncgWDQuthEdQ==}
@@ -5976,7 +5997,7 @@ snapshots:
       '@jridgewell/gen-mapping': 0.3.8
       '@jridgewell/trace-mapping': 0.3.25
 
-  '@asamuzakjp/css-color@3.1.7':
+  '@asamuzakjp/css-color@3.2.0':
     dependencies:
       '@csstools/css-calc': 2.1.3(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)
       '@csstools/css-color-parser': 3.0.9(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)
@@ -6093,7 +6114,7 @@ snapshots:
       '@babel/traverse': 7.26.5
       '@babel/types': 7.26.5
       convert-source-map: 2.0.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -6113,7 +6134,7 @@ snapshots:
       '@babel/traverse': 7.27.1
       '@babel/types': 7.27.1
       convert-source-map: 2.0.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -6181,7 +6202,7 @@ snapshots:
       '@babel/core': 7.27.1
       '@babel/helper-compilation-targets': 7.27.1
       '@babel/helper-plugin-utils': 7.27.1
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.10
     transitivePeerDependencies:
@@ -6787,7 +6808,7 @@ snapshots:
       '@babel/parser': 7.27.1
       '@babel/template': 7.27.1
       '@babel/types': 7.27.1
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -6799,7 +6820,7 @@ snapshots:
       '@babel/parser': 7.27.1
       '@babel/template': 7.27.1
       '@babel/types': 7.27.1
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -6821,44 +6842,46 @@ snapshots:
 
   '@bcoe/v8-coverage@1.0.2': {}
 
-  '@bufbuild/buf-darwin-arm64@1.53.0':
+  '@bufbuild/buf-darwin-arm64@1.54.0':
     optional: true
 
-  '@bufbuild/buf-darwin-x64@1.53.0':
+  '@bufbuild/buf-darwin-x64@1.54.0':
     optional: true
 
-  '@bufbuild/buf-linux-aarch64@1.53.0':
+  '@bufbuild/buf-linux-aarch64@1.54.0':
     optional: true
 
-  '@bufbuild/buf-linux-armv7@1.53.0':
+  '@bufbuild/buf-linux-armv7@1.54.0':
     optional: true
 
-  '@bufbuild/buf-linux-x64@1.53.0':
+  '@bufbuild/buf-linux-x64@1.54.0':
     optional: true
 
-  '@bufbuild/buf-win32-arm64@1.53.0':
+  '@bufbuild/buf-win32-arm64@1.54.0':
     optional: true
 
-  '@bufbuild/buf-win32-x64@1.53.0':
+  '@bufbuild/buf-win32-x64@1.54.0':
     optional: true
 
-  '@bufbuild/buf@1.53.0':
+  '@bufbuild/buf@1.54.0':
     optionalDependencies:
-      '@bufbuild/buf-darwin-arm64': 1.53.0
-      '@bufbuild/buf-darwin-x64': 1.53.0
-      '@bufbuild/buf-linux-aarch64': 1.53.0
-      '@bufbuild/buf-linux-armv7': 1.53.0
-      '@bufbuild/buf-linux-x64': 1.53.0
-      '@bufbuild/buf-win32-arm64': 1.53.0
-      '@bufbuild/buf-win32-x64': 1.53.0
+      '@bufbuild/buf-darwin-arm64': 1.54.0
+      '@bufbuild/buf-darwin-x64': 1.54.0
+      '@bufbuild/buf-linux-aarch64': 1.54.0
+      '@bufbuild/buf-linux-armv7': 1.54.0
+      '@bufbuild/buf-linux-x64': 1.54.0
+      '@bufbuild/buf-win32-arm64': 1.54.0
+      '@bufbuild/buf-win32-x64': 1.54.0
 
   '@bufbuild/protobuf@2.2.5': {}
 
-  '@bufbuild/protoc-gen-es@2.2.5(@bufbuild/protobuf@2.2.5)':
+  '@bufbuild/protobuf@2.4.0': {}
+
+  '@bufbuild/protoc-gen-es@2.2.5(@bufbuild/protobuf@2.4.0)':
     dependencies:
       '@bufbuild/protoplugin': 2.2.5
     optionalDependencies:
-      '@bufbuild/protobuf': 2.2.5
+      '@bufbuild/protobuf': 2.4.0
     transitivePeerDependencies:
       - supports-color
 
@@ -6989,7 +7012,7 @@ snapshots:
   '@eslint/config-array@0.19.1':
     dependencies:
       '@eslint/object-schema': 2.1.5
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -7005,7 +7028,7 @@ snapshots:
   '@eslint/eslintrc@3.2.0':
     dependencies:
       ajv: 6.12.6
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0
       espree: 10.3.0
       globals: 14.0.0
       ignore: 5.3.2
@@ -7055,14 +7078,14 @@ snapshots:
 
   '@floating-ui/utils@0.2.9': {}
 
-  '@gi.ts/cli@1.5.10(@gi.ts/lib@1.5.13)(@types/node@22.15.17)(typescript@5.8.3)':
+  '@gi.ts/cli@1.5.10(@gi.ts/lib@1.5.13)(@types/node@22.15.20)(typescript@5.8.3)':
     dependencies:
       '@gi.ts/lib': 1.5.13
       '@gi.ts/node-loader': 1.5.10
       '@gi.ts/parser': 1.5.10
       '@oclif/command': 1.8.36(@oclif/config@1.18.17)
       '@oclif/config': 1.18.17
-      '@oclif/plugin-help': 5.2.20(@types/node@22.15.17)(typescript@5.8.3)
+      '@oclif/plugin-help': 5.2.20(@types/node@22.15.20)(typescript@5.8.3)
       prettier: 2.8.8
       tslib: 1.14.1
     transitivePeerDependencies:
@@ -7754,8 +7777,8 @@ snapshots:
       '@oclif/errors': 1.3.6
       '@oclif/help': 1.0.15
       '@oclif/parser': 3.8.17
-      debug: 4.4.0(supports-color@8.1.1)
-      semver: 7.7.1
+      debug: 4.4.0
+      semver: 7.7.2
     transitivePeerDependencies:
       - supports-color
 
@@ -7763,7 +7786,7 @@ snapshots:
     dependencies:
       '@oclif/errors': 1.3.6
       '@oclif/parser': 3.8.17
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       globby: 11.1.0
       is-wsl: 2.2.0
       tslib: 2.8.1
@@ -7774,14 +7797,14 @@ snapshots:
     dependencies:
       '@oclif/errors': 1.3.6
       '@oclif/parser': 3.8.17
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0
       globby: 11.1.0
       is-wsl: 2.2.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - supports-color
 
-  '@oclif/core@2.16.0(@types/node@22.15.17)(typescript@5.8.3)':
+  '@oclif/core@2.16.0(@types/node@22.15.20)(typescript@5.8.3)':
     dependencies:
       '@types/cli-progress': 3.11.6
       ansi-escapes: 4.3.2
@@ -7790,7 +7813,7 @@ snapshots:
       chalk: 4.1.2
       clean-stack: 3.0.1
       cli-progress: 3.12.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       ejs: 3.1.10
       get-package-type: 0.1.0
       globby: 11.1.0
@@ -7806,7 +7829,7 @@ snapshots:
       strip-ansi: 6.0.1
       supports-color: 8.1.1
       supports-hyperlinks: 2.3.0
-      ts-node: 10.9.2(@types/node@22.15.17)(typescript@5.8.3)
+      ts-node: 10.9.2(@types/node@22.15.20)(typescript@5.8.3)
       tslib: 2.8.1
       widest-line: 3.1.0
       wordwrap: 1.0.0
@@ -7848,9 +7871,9 @@ snapshots:
       chalk: 4.1.2
       tslib: 2.8.1
 
-  '@oclif/plugin-help@5.2.20(@types/node@22.15.17)(typescript@5.8.3)':
+  '@oclif/plugin-help@5.2.20(@types/node@22.15.20)(typescript@5.8.3)':
     dependencies:
-      '@oclif/core': 2.16.0(@types/node@22.15.17)(typescript@5.8.3)
+      '@oclif/core': 2.16.0(@types/node@22.15.20)(typescript@5.8.3)
     transitivePeerDependencies:
       - '@swc/core'
       - '@swc/wasm'
@@ -8259,10 +8282,10 @@ snapshots:
 
   '@rtsao/scc@1.1.0': {}
 
-  '@ts-morph/common@0.26.1':
+  '@ts-morph/common@0.27.0':
     dependencies:
       fast-glob: 3.3.3
-      minimatch: 9.0.5
+      minimatch: 10.0.1
       path-browserify: 1.0.1
 
   '@tsconfig/node10@1.0.11': {}
@@ -8298,7 +8321,7 @@ snapshots:
 
   '@types/cli-progress@3.11.6':
     dependencies:
-      '@types/node': 22.15.17
+      '@types/node': 22.15.20
 
   '@types/debug@4.1.12':
     dependencies:
@@ -8324,7 +8347,7 @@ snapshots:
   '@types/glob@8.1.0':
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 22.15.17
+      '@types/node': 22.15.20
 
   '@types/hast@3.0.4':
     dependencies:
@@ -8346,7 +8369,7 @@ snapshots:
 
   '@types/ms@0.7.34': {}
 
-  '@types/node@22.15.17':
+  '@types/node@22.15.20':
     dependencies:
       undici-types: 6.21.0
 
@@ -8396,7 +8419,7 @@ snapshots:
       '@typescript-eslint/types': 8.31.1
       '@typescript-eslint/typescript-estree': 8.31.1(typescript@5.8.3)
       '@typescript-eslint/visitor-keys': 8.31.1
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0
       eslint: 9.18.0(jiti@1.21.7)
       typescript: 5.8.3
     transitivePeerDependencies:
@@ -8411,7 +8434,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 8.31.1(typescript@5.8.3)
       '@typescript-eslint/utils': 8.31.1(eslint@9.18.0(jiti@1.21.7))(typescript@5.8.3)
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       eslint: 9.18.0(jiti@1.21.7)
       ts-api-utils: 2.1.0(typescript@5.8.3)
       typescript: 5.8.3
@@ -8424,11 +8447,11 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.31.1
       '@typescript-eslint/visitor-keys': 8.31.1
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
-      semver: 7.7.1
+      semver: 7.7.2
       ts-api-utils: 2.1.0(typescript@5.8.3)
       typescript: 5.8.3
     transitivePeerDependencies:
@@ -8463,14 +8486,14 @@ snapshots:
 
   '@typescript/vfs@1.6.1(typescript@5.4.5)':
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       typescript: 5.4.5
     transitivePeerDependencies:
       - supports-color
 
   '@ungap/structured-clone@1.2.1': {}
 
-  '@vitejs/plugin-legacy@6.1.1(terser@5.39.0)(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))':
+  '@vitejs/plugin-legacy@6.1.1(terser@5.39.0)(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))':
     dependencies:
       '@babel/core': 7.27.1
       '@babel/preset-env': 7.27.1(@babel/core@7.27.1)
@@ -8481,18 +8504,18 @@ snapshots:
       regenerator-runtime: 0.14.1
       systemjs: 6.15.1
       terser: 5.39.0
-      vite: 6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+      vite: 6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-react@4.3.4(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))':
+  '@vitejs/plugin-react@4.3.4(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))':
     dependencies:
       '@babel/core': 7.26.0
       '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.0)
       '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.0)
       '@types/babel__core': 7.20.5
       react-refresh: 0.14.2
-      vite: 6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+      vite: 6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -8500,7 +8523,7 @@ snapshots:
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
@@ -8510,7 +8533,7 @@ snapshots:
       std-env: 3.8.1
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+      vitest: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -8521,13 +8544,13 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.0.8(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))':
+  '@vitest/mocker@3.0.8(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))':
     dependencies:
       '@vitest/spy': 3.0.8
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+      vite: 6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   '@vitest/pretty-format@3.0.8':
     dependencies:
@@ -8557,7 +8580,7 @@ snapshots:
       sirv: 3.0.1
       tinyglobby: 0.2.12
       tinyrainbow: 2.0.0
-      vitest: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+      vitest: 3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
 
   '@vitest/utils@3.0.8':
     dependencies:
@@ -8668,8 +8691,6 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  ansi-colors@4.1.3: {}
-
   ansi-escapes@4.3.2:
     dependencies:
       type-fest: 0.21.3
@@ -9013,6 +9034,10 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
+  chokidar@4.0.3:
+    dependencies:
+      readdirp: 4.1.2
+
   chownr@1.1.4:
     optional: true
 
@@ -9127,7 +9152,7 @@ snapshots:
 
   cssstyle@4.3.1:
     dependencies:
-      '@asamuzakjp/css-color': 3.1.7
+      '@asamuzakjp/css-color': 3.2.0
       rrweb-cssom: 0.8.0
     optional: true
 
@@ -9163,7 +9188,11 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
-  debug@4.4.0(supports-color@8.1.1):
+  debug@4.4.0:
+    dependencies:
+      ms: 2.1.3
+
+  debug@4.4.1(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
     optionalDependencies:
@@ -9223,7 +9252,7 @@ snapshots:
 
   diff@4.0.2: {}
 
-  diff@5.2.0: {}
+  diff@7.0.0: {}
 
   dir-glob@3.0.1:
     dependencies:
@@ -9553,7 +9582,7 @@ snapshots:
       pluralize: 8.0.0
       regexp-tree: 0.1.27
       regjsparser: 0.12.0
-      semver: 7.7.1
+      semver: 7.7.2
       strip-indent: 4.0.0
 
   eslint-scope@8.2.0:
@@ -9582,7 +9611,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0
       escape-string-regexp: 4.0.0
       eslint-scope: 8.2.0
       eslint-visitor-keys: 4.2.0
@@ -9963,14 +9992,14 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.3
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.3
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -10197,7 +10226,7 @@ snapshots:
   istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -10315,7 +10344,7 @@ snapshots:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.7.1
+      semver: 7.7.2
 
   jsx-ast-utils@3.3.5:
     dependencies:
@@ -10392,7 +10421,7 @@ snapshots:
     dependencies:
       chalk: 5.4.1
       commander: 13.1.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0
       execa: 8.0.1
       lilconfig: 3.1.3
       listr2: 8.3.2
@@ -10476,7 +10505,7 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
-  lucide-react@0.503.0(react@18.3.1):
+  lucide-react@0.511.0(react@18.3.1):
     dependencies:
       react: 18.3.1
 
@@ -10492,7 +10521,7 @@ snapshots:
 
   make-dir@4.0.0:
     dependencies:
-      semver: 7.7.1
+      semver: 7.7.2
 
   make-error@1.3.6: {}
 
@@ -10719,7 +10748,7 @@ snapshots:
   micromark@4.0.1:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.2
@@ -10783,13 +10812,12 @@ snapshots:
   mkdirp-classic@0.5.3:
     optional: true
 
-  mocha@11.1.0:
+  mocha@11.4.0:
     dependencies:
-      ansi-colors: 4.1.3
       browser-stdout: 1.3.1
-      chokidar: 3.6.0
-      debug: 4.4.0(supports-color@8.1.1)
-      diff: 5.2.0
+      chokidar: 4.0.3
+      debug: 4.4.1(supports-color@8.1.1)
+      diff: 7.0.0
       escape-string-regexp: 4.0.0
       find-up: 5.0.0
       glob: 10.4.5
@@ -10798,6 +10826,7 @@ snapshots:
       log-symbols: 4.1.0
       minimatch: 5.1.6
       ms: 2.1.3
+      picocolors: 1.1.1
       serialize-javascript: 6.0.2
       strip-json-comments: 3.1.1
       supports-color: 8.1.1
@@ -10829,7 +10858,7 @@ snapshots:
 
   node-abi@3.72.0:
     dependencies:
-      semver: 7.7.1
+      semver: 7.7.2
     optional: true
 
   node-addon-api@4.3.0:
@@ -11056,13 +11085,13 @@ snapshots:
       camelcase-css: 2.0.1
       postcss: 8.5.3
 
-  postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3)):
+  postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3)):
     dependencies:
       lilconfig: 3.1.3
       yaml: 2.7.1
     optionalDependencies:
       postcss: 8.5.3
-      ts-node: 10.9.2(@types/node@22.15.17)(typescript@5.8.3)
+      ts-node: 10.9.2(@types/node@22.15.20)(typescript@5.8.3)
 
   postcss-nested@6.2.0(postcss@8.5.3):
     dependencies:
@@ -11257,6 +11286,8 @@ snapshots:
     dependencies:
       picomatch: 2.3.1
 
+  readdirp@4.1.2: {}
+
   redeyed@2.1.1:
     dependencies:
       esprima: 4.0.1
@@ -11433,6 +11464,8 @@ snapshots:
 
   semver@7.7.1: {}
 
+  semver@7.7.2: {}
+
   serialize-javascript@6.0.2:
     dependencies:
       randombytes: 2.1.0
@@ -11706,11 +11739,11 @@ snapshots:
 
   tailwind-merge@3.2.0: {}
 
-  tailwindcss-animate@1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3))):
+  tailwindcss-animate@1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3))):
     dependencies:
-      tailwindcss: 3.4.17(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3))
+      tailwindcss: 3.4.17(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3))
 
-  tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3)):
+  tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3)):
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -11729,7 +11762,7 @@ snapshots:
       postcss: 8.5.3
       postcss-import: 15.1.0(postcss@8.5.3)
       postcss-js: 4.0.1(postcss@8.5.3)
-      postcss-load-config: 4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3))
+      postcss-load-config: 4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3))
       postcss-nested: 6.2.0(postcss@8.5.3)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.10
@@ -11832,19 +11865,19 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
-  ts-morph@25.0.1:
+  ts-morph@26.0.0:
     dependencies:
-      '@ts-morph/common': 0.26.1
+      '@ts-morph/common': 0.27.0
       code-block-writer: 13.0.3
 
-  ts-node@10.9.2(@types/node@22.15.17)(typescript@5.8.3):
+  ts-node@10.9.2(@types/node@22.15.20)(typescript@5.8.3):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 22.15.17
+      '@types/node': 22.15.20
       acorn: 8.14.1
       acorn-walk: 8.3.4
       arg: 4.1.3
@@ -12099,13 +12132,13 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-  vite-node@3.0.8(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1):
+  vite-node@3.0.8(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       es-module-lexer: 1.6.0
       pathe: 2.0.3
-      vite: 6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+      vite: 6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -12120,7 +12153,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1):
+  vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1):
     dependencies:
       esbuild: 0.25.3
       fdir: 6.4.4(picomatch@4.0.2)
@@ -12129,24 +12162,24 @@ snapshots:
       rollup: 4.40.1
       tinyglobby: 0.2.13
     optionalDependencies:
-      '@types/node': 22.15.17
+      '@types/node': 22.15.20
       fsevents: 2.3.3
       jiti: 1.21.7
       terser: 5.39.0
       tsx: 4.19.4
       yaml: 2.7.1
 
-  vitest@3.0.8(@types/debug@4.1.12)(@types/node@22.15.17)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1):
+  vitest@3.0.8(@types/debug@4.1.12)(@types/node@22.15.20)(@vitest/ui@3.0.8)(jiti@1.21.7)(jsdom@24.1.0)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1):
     dependencies:
       '@vitest/expect': 3.0.8
-      '@vitest/mocker': 3.0.8(vite@6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
+      '@vitest/mocker': 3.0.8(vite@6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1))
       '@vitest/pretty-format': 3.0.8
       '@vitest/runner': 3.0.8
       '@vitest/snapshot': 3.0.8
       '@vitest/spy': 3.0.8
       '@vitest/utils': 3.0.8
       chai: 5.2.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0
       expect-type: 1.2.0
       magic-string: 0.30.17
       pathe: 2.0.3
@@ -12155,12 +12188,12 @@ snapshots:
       tinyexec: 0.3.2
       tinypool: 1.0.2
       tinyrainbow: 2.0.0
-      vite: 6.3.4(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
-      vite-node: 3.0.8(@types/node@22.15.17)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+      vite: 6.3.4(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
+      vite-node: 3.0.8(@types/node@22.15.20)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.4)(yaml@2.7.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 22.15.17
+      '@types/node': 22.15.20
       '@vitest/ui': 3.0.8(vitest@3.0.8)
       jsdom: 24.1.0
     transitivePeerDependencies:
@@ -12360,7 +12393,7 @@ snapshots:
 
   yocto-queue@0.1.0: {}
 
-  zod@3.24.3: {}
+  zod@3.25.7: {}
 
   zustand@4.5.6(@types/react@18.3.18)(react@18.3.1):
     dependencies:
diff --git a/proto/package.json b/proto/package.json
index f56e71049d..478ed0f0b5 100644
--- a/proto/package.json
+++ b/proto/package.json
@@ -24,11 +24,11 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "2.2.5"
+    "@bufbuild/protobuf": "2.4.0"
   },
   "devDependencies": {
     "@amzn/tsconfig": "workspace:^",
-    "@bufbuild/buf": "^1.53.0",
+    "@bufbuild/buf": "^1.54.0",
     "@bufbuild/protoc-gen-es": "^2.2.5",
     "typescript": "^5.8.3"
   }
diff --git a/tests/fig-api/package.json b/tests/fig-api/package.json
index 0e91b87264..c909b66734 100644
--- a/tests/fig-api/package.json
+++ b/tests/fig-api/package.json
@@ -13,7 +13,7 @@
     "@amzn/tsconfig": "workspace:^",
     "@amzn/types": "workspace:^",
     "@aws/amazon-q-developer-cli-api-bindings": "workspace:^",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.20",
     "typescript": "^5.8.3",
     "vitest": "^3.0.8"
   }