diff --git a/Cargo.lock b/Cargo.lock
index 8c6130ef4e..60f7ec51ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,19 +24,13 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -73,7 +67,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "shell-color",
+ "shell-color 1.10.0",
  "tracing",
  "unicode-width 0.2.0",
  "vte 0.15.0",
@@ -98,7 +92,7 @@ dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.12",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -118,7 +112,7 @@ dependencies = [
  "aws-runtime",
  "aws-smithy-async",
  "aws-smithy-eventstream",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.12",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -136,7 +130,7 @@ dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.12",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -156,7 +150,7 @@ dependencies = [
  "aws-runtime",
  "aws-smithy-async",
  "aws-smithy-eventstream",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.12",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -168,14 +162,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "amzn-toolkit-telemetry"
+name = "amzn-toolkit-telemetry-client"
 version = "1.0.0"
 dependencies = [
  "aws-credential-types",
  "aws-http",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.12",
  "aws-smithy-json 0.60.7",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -248,11 +242,12 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
+ "once_cell",
  "windows-sys 0.59.0",
 ]
 
@@ -298,9 +293,9 @@ checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70"
 dependencies = [
  "clipboard-win",
  "log",
- "objc2 0.6.0",
- "objc2-app-kit 0.3.0",
- "objc2-foundation 0.3.0",
+ "objc2 0.6.1",
+ "objc2-app-kit 0.3.1",
+ "objc2-foundation 0.3.1",
  "parking_lot",
  "percent-encoding",
  "wl-clipboard-rs",
@@ -326,24 +321,21 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "ashpd"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c39d707614dbcc6bed00015539f488d8e3fe3e66ed60961efc0c90f4b380b3"
+checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
 dependencies = [
  "async-fs",
  "async-net",
  "enumflags2",
  "futures-channel",
  "futures-util",
- "rand 0.8.5",
+ "rand 0.9.1",
  "raw-window-handle",
  "serde",
  "serde_repr",
  "url",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "zbus 5.2.0",
+ "zbus 5.5.0",
 ]
 
 [[package]]
@@ -369,9 +361,9 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
+checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
 dependencies = [
  "anstyle",
  "bstr",
@@ -409,9 +401,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.18"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
+checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07"
 dependencies = [
  "flate2",
  "futures-core",
@@ -543,9 +535,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.87"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -616,18 +608,18 @@ dependencies = [
 
 [[package]]
 name = "avif-serialize"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62"
+checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e"
 dependencies = [
  "arrayvec",
 ]
 
 [[package]]
 name = "aws-config"
-version = "1.5.13"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a50b30228d3af8865ce83376b4e99e1ffa34728220fe2860e4df0bb5278d6"
+checksum = "b6fcc63c9860579e4cb396239570e979376e70aab79e496621748a09913f8b36"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -635,7 +627,7 @@ dependencies = [
  "aws-sdk-ssooidc",
  "aws-sdk-sts",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.1",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -644,7 +636,7 @@ dependencies = [
  "bytes",
  "fastrand",
  "hex",
- "http 0.2.12",
+ "http 1.3.1",
  "ring",
  "time",
  "tokio",
@@ -655,9 +647,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "1.2.1"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
+checksum = "687bc16bc431a8533fe0097c7f0182874767f920989d7260950172ae8e3c4465"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -676,39 +668,37 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f409eb70b561706bf8abba8ca9c112729c481595893fd06a2dd9af8ed8441148"
+checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878"
 dependencies = [
  "aws-lc-sys",
- "paste",
  "zeroize",
 ]
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.24.1"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923ded50f602b3007e5e63e3f094c479d9c8a9b42d7f4034e4afe456aa48bfd2"
+checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1"
 dependencies = [
  "bindgen 0.69.5",
  "cc",
  "cmake",
  "dunce",
  "fs_extra",
- "paste",
 ]
 
 [[package]]
 name = "aws-runtime"
-version = "1.5.5"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76dd04d39cc12844c0994f2c9c5a6f5184c22e9188ec1ff723de41910a21dcad"
+checksum = "6c4063282c69991e57faab9e5cb21ae557e59f5b0fb285c196335243df8dc25c"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.1",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -717,7 +707,6 @@ dependencies = [
  "fastrand",
  "http 0.2.12",
  "http-body 0.4.6",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "tracing",
@@ -726,20 +715,21 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-cognitoidentity"
-version = "1.54.0"
+version = "1.66.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a63eeb333e6aac318474715bcb47130ceb02d4ce4caa4ebd632ef456ef1f7a"
+checksum = "1cdb376404ce63c89ca527732904caf24cd3a97a9b54239e87974b94f4b934c8"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.1",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
  "bytes",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -748,20 +738,21 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-cognitoidentityprovider"
-version = "1.63.0"
+version = "1.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cea251ab30246099e3b57406a312ac9d96a8f4cde3fce0470b7d2109ba27307"
+checksum = "8054c266053cc1061f6a816fb6da6066beea601b4c3677958c9df96f5f33d9d6"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.1",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
  "bytes",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -770,20 +761,21 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.53.0"
+version = "1.65.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1605dc0bf9f0a4b05b451441a17fcb0bda229db384f23bf5cead3adbab0664ac"
+checksum = "8efec445fb78df585327094fcef4cad895b154b58711e504db7a93c41aa27151"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.1",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
  "bytes",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -792,20 +784,21 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.54.0"
+version = "1.66.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f3f73466ff24f6ad109095e0f3f2c830bfb4cd6c8b12f744c8e61ebf4d3ba1"
+checksum = "5e49cca619c10e7b002dc8e66928ceed66ab7f56c1a3be86c5437bf2d8d89bba"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.1",
  "aws-smithy-json 0.61.3",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
  "bytes",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -814,14 +807,14 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.54.0"
+version = "1.66.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "249b2acaa8e02fd4718705a9494e3eb633637139aa4bb09d70965b0448e865db"
+checksum = "7420479eac0a53f776cc8f0d493841ffe58ad9d9783f3947be7265784471b47a"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.1",
  "aws-smithy-json 0.61.3",
  "aws-smithy-query",
  "aws-smithy-runtime",
@@ -829,6 +822,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-smithy-xml",
  "aws-types",
+ "fastrand",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -837,12 +831,12 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.9"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfe75fad52793ce6dec0dc3d4b1f388f038b5eb866c8d4d7f3a8e21b5ea5051"
+checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea"
 dependencies = [
  "aws-credential-types",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.1",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
@@ -850,8 +844,7 @@ dependencies = [
  "hex",
  "hmac",
  "http 0.2.12",
- "http 1.2.0",
- "once_cell",
+ "http 1.3.1",
  "percent-encoding",
  "sha2",
  "time",
@@ -901,6 +894,60 @@ dependencies = [
  "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-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http 0.2.12",
+ "http 1.3.1",
+ "http-body 0.4.6",
+ "percent-encoding",
+ "pin-project-lite",
+ "pin-utils",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-http-client"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8aff1159006441d02e57204bf57a1b890ba68bedb6904ffd2873c1c4c11c546b"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-protocol-test",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "h2 0.4.9",
+ "http 0.2.12",
+ "http 1.3.1",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
+ "hyper 0.14.32",
+ "hyper 1.6.0",
+ "hyper-rustls 0.24.2",
+ "hyper-rustls 0.27.5",
+ "hyper-util",
+ "indexmap 2.9.0",
+ "pin-project-lite",
+ "rustls 0.21.12",
+ "rustls 0.23.26",
+ "rustls-native-certs 0.8.1",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tower",
+ "tracing",
+]
+
 [[package]]
 name = "aws-smithy-json"
 version = "0.60.7"
@@ -919,11 +966,20 @@ dependencies = [
  "aws-smithy-types",
 ]
 
+[[package]]
+name = "aws-smithy-observability"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393"
+dependencies = [
+ "aws-smithy-runtime-api",
+]
+
 [[package]]
 name = "aws-smithy-protocol-test"
-version = "0.63.0"
+version = "0.63.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b92b62199921f10685c6b588fdbeb81168ae4e7950ae3e5f50145a01bb5f1ad"
+checksum = "5b42f13304bed0b96d7471e4770c270bb3eb4fea277727fb03c811e84cb4bf3a"
 dependencies = [
  "assert-json-diff 1.1.0",
  "aws-smithy-runtime-api",
@@ -950,31 +1006,24 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.8"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d526a12d9ed61fadefda24abe2e682892ba288c2018bcb38b1b4c111d13f6d92"
+checksum = "14302f06d1d5b7d333fd819943075b13d27c7700b414f574c3c35859bfb55d5e"
 dependencies = [
  "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-protocol-test",
+ "aws-smithy-http 0.62.1",
+ "aws-smithy-http-client",
+ "aws-smithy-observability",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
  "fastrand",
- "h2 0.3.26",
  "http 0.2.12",
+ "http 1.3.1",
  "http-body 0.4.6",
  "http-body 1.0.1",
- "httparse",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "indexmap 2.9.0",
- "once_cell",
  "pin-project-lite",
  "pin-utils",
- "rustls 0.21.12",
- "serde",
- "serde_json",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -982,15 +1031,15 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.7.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
+checksum = "a1e5d9e3a80a18afa109391fb5ad09c3daf887b516c6fd805a157c6ea7994a57"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
  "bytes",
  "http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
  "pin-project-lite",
  "tokio",
  "tracing",
@@ -1008,11 +1057,11 @@ dependencies = [
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
  "http-body 0.4.6",
  "http-body 1.0.1",
  "http-body-util",
- "itoa 1.0.14",
+ "itoa 1.0.15",
  "num-integer",
  "pin-project-lite",
  "pin-utils",
@@ -1036,7 +1085,7 @@ dependencies = [
 name = "aws-toolkit-telemetry-definitions"
 version = "0.1.0"
 dependencies = [
- "amzn-toolkit-telemetry",
+ "amzn-toolkit-telemetry-client",
  "convert_case 0.8.0",
  "prettyplease",
  "quote",
@@ -1047,9 +1096,9 @@ dependencies = [
 
 [[package]]
 name = "aws-types"
-version = "1.3.5"
+version = "1.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbd0a668309ec1f66c0f6bda4840dd6d4796ae26d699ebc266d7cc95c6d040f"
+checksum = "8a322fec39e4df22777ed3ad8ea868ac2f94cd15e1a55f6ee8d8d6305057689a"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
@@ -1061,17 +1110,17 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1167,7 +1216,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "shlex",
  "syn 2.0.101",
 ]
@@ -1238,6 +1287,15 @@ dependencies = [
  "objc2 0.5.2",
 ]
 
+[[package]]
+name = "block2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2"
+dependencies = [
+ "objc2 0.6.1",
+]
+
 [[package]]
 name = "blocking"
 version = "1.6.1"
@@ -1273,21 +1331,21 @@ dependencies = [
 
 [[package]]
 name = "built"
-version = "0.7.5"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
+checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "bytemuck"
-version = "1.21.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
 
 [[package]]
 name = "byteorder"
@@ -1378,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0"
 dependencies = [
  "jobserver",
  "libc",
@@ -1435,11 +1493,127 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chat_cli"
+version = "1.10.0"
+dependencies = [
+ "amzn-codewhisperer-client",
+ "amzn-codewhisperer-streaming-client",
+ "amzn-consolas-client",
+ "amzn-qdeveloper-streaming-client",
+ "amzn-toolkit-telemetry-client",
+ "anstream",
+ "arboard",
+ "assert_cmd",
+ "async-trait",
+ "aws-config",
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-sdk-cognitoidentity",
+ "aws-sdk-ssooidc",
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "base64 0.22.1",
+ "bitflags 2.9.0",
+ "bstr",
+ "bytes",
+ "camino",
+ "cfg-if",
+ "clap",
+ "clap_complete",
+ "clap_complete_fig",
+ "color-eyre",
+ "color-print",
+ "convert_case 0.8.0",
+ "cookie",
+ "criterion",
+ "crossterm",
+ "ctrlc",
+ "dialoguer",
+ "dirs 5.0.1",
+ "eyre",
+ "fd-lock",
+ "futures",
+ "glob",
+ "globset",
+ "hex",
+ "http 1.3.1",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "indicatif",
+ "indoc",
+ "insta",
+ "libc",
+ "mimalloc",
+ "mockito",
+ "nix 0.29.0",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+ "owo-colors",
+ "parking_lot",
+ "paste",
+ "percent-encoding",
+ "predicates",
+ "prettyplease",
+ "quote",
+ "r2d2",
+ "r2d2_sqlite",
+ "rand 0.9.1",
+ "regex",
+ "reqwest",
+ "ring",
+ "rusqlite",
+ "rustls 0.23.26",
+ "rustls-native-certs 0.8.1",
+ "rustls-pemfile 2.2.0",
+ "rustyline",
+ "security-framework 3.2.0",
+ "self_update",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2",
+ "shell-color 1.0.0",
+ "shell-words",
+ "shellexpand",
+ "shlex",
+ "similar",
+ "skim",
+ "spinners",
+ "strip-ansi-escapes",
+ "strum 0.27.1",
+ "syn 2.0.101",
+ "syntect",
+ "sysinfo",
+ "tempfile",
+ "thiserror 2.0.12",
+ "time",
+ "tokio",
+ "tokio-tungstenite",
+ "tokio-util",
+ "toml",
+ "tracing",
+ "tracing-appender",
+ "tracing-subscriber",
+ "tracing-test",
+ "unicode-width 0.2.0",
+ "url",
+ "uuid",
+ "walkdir",
+ "webpki-roots",
+ "whoami",
+ "winnow 0.6.2",
+]
+
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -1525,9 +1699,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.46"
+version = "4.5.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
+checksum = "be8c97f3a6f02b9e24cadc12aaba75201d18754b53ea0a9d99642f806ccdb4c9"
 dependencies = [
  "clap",
 ]
@@ -1573,9 +1747,9 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.52"
+version = "0.1.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
 dependencies = [
  "cc",
 ]
@@ -1591,7 +1765,7 @@ dependencies = [
  "cocoa-foundation",
  "core-foundation 0.10.0",
  "core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
  "objc",
 ]
@@ -1612,16 +1786,16 @@ dependencies = [
 
 [[package]]
 name = "color-eyre"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+checksum = "e6e1761c0e16f8883bbbb8ce5990867f4f06bf11a0253da6495a04ce4b6ef0ec"
 dependencies = [
  "backtrace",
  "color-spantrace",
  "eyre",
  "indenter",
  "once_cell",
- "owo-colors 3.5.0",
+ "owo-colors",
  "tracing-error",
 ]
 
@@ -1648,12 +1822,12 @@ dependencies = [
 
 [[package]]
 name = "color-spantrace"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+checksum = "2ddd8d5bfda1e11a501d0a7303f3bfed9aa632ebdb859be40d0fd70478ed70d5"
 dependencies = [
  "once_cell",
- "owo-colors 3.5.0",
+ "owo-colors",
  "tracing-core",
  "tracing-error",
 ]
@@ -1672,11 +1846,10 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colored"
-version = "2.2.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
+checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "lazy_static",
  "windows-sys 0.59.0",
 ]
 
@@ -1701,9 +1874,9 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.10"
+version = "0.15.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
 dependencies = [
  "encode_unicode",
  "libc",
@@ -1727,7 +1900,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "once_cell",
  "tiny-keccak",
 ]
@@ -1811,7 +1984,7 @@ dependencies = [
  "bitflags 2.9.0",
  "core-foundation 0.10.0",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -1828,9 +2001,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -1964,9 +2137,9 @@ dependencies = [
 
 [[package]]
 name = "crunchy"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 
 [[package]]
 name = "crypto-common"
@@ -2066,9 +2239,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "dbus"
@@ -2152,9 +2325,9 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "0.99.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
@@ -2206,7 +2379,16 @@ version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys",
+ "dirs-sys 0.4.1",
+]
+
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys 0.5.0",
 ]
 
 [[package]]
@@ -2227,10 +2409,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
  "option-ext",
- "redox_users",
+ "redox_users 0.4.6",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users 0.5.0",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "dirs-sys-next"
 version = "0.1.2"
@@ -2238,7 +2432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
  "libc",
- "redox_users",
+ "redox_users 0.4.6",
  "winapi",
 ]
 
@@ -2248,6 +2442,28 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "dispatch2"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a0d569e003ff27784e0e14e4a594048698e0c0f0b66cabcb51511be55a7caa0"
+dependencies = [
+ "bitflags 2.9.0",
+ "block2 0.6.1",
+ "libc",
+ "objc2 0.6.1",
+]
+
+[[package]]
+name = "dispatch2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.1",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -2259,15 +2475,6 @@ dependencies = [
  "syn 2.0.101",
 ]
 
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading 0.8.6",
-]
-
 [[package]]
 name = "dlopen2"
 version = "0.7.0"
@@ -2308,9 +2515,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "document-features"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
+checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
 dependencies = [
  "litrs",
 ]
@@ -2323,18 +2530,18 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
 [[package]]
 name = "dpi"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
+checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "dtoa"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
+checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
 
 [[package]]
 name = "dtoa-short"
@@ -2353,9 +2560,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "encode_unicode"
@@ -2436,15 +2643,15 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "erased-serde"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
 dependencies = [
  "serde",
  "typeid",
@@ -2452,9 +2659,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -2479,9 +2686,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
  "event-listener",
  "pin-project-lite",
@@ -2496,7 +2703,7 @@ dependencies = [
  "bit_field",
  "half",
  "lebe",
- "miniz_oxide 0.8.5",
+ "miniz_oxide",
  "rayon-core",
  "smallvec",
  "zune-inflate",
@@ -2560,7 +2767,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
 dependencies = [
  "cfg-if",
- "rustix 1.0.5",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
@@ -2617,7 +2824,7 @@ dependencies = [
  "fig_request",
  "fig_settings",
  "fig_util",
- "http 1.2.0",
+ "http 1.3.1",
  "regex",
  "serde",
  "serde_json",
@@ -2653,7 +2860,7 @@ dependencies = [
  "hyper-util",
  "insta",
  "percent-encoding",
- "rand 0.9.0",
+ "rand 0.9.1",
  "reqwest",
  "serde",
  "serde_json",
@@ -2675,7 +2882,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "fig_request",
- "http 1.2.0",
+ "http 1.3.1",
  "tracing",
 ]
 
@@ -2715,7 +2922,7 @@ dependencies = [
  "freedesktop-icons",
  "futures",
  "gtk",
- "http 1.2.0",
+ "http 1.3.1",
  "image",
  "infer",
  "keyboard-types 0.8.0",
@@ -2733,7 +2940,7 @@ dependencies = [
  "parking_lot",
  "paste",
  "percent-encoding",
- "rand 0.9.0",
+ "rand 0.9.1",
  "regex",
  "rfd",
  "semver",
@@ -2898,7 +3105,7 @@ dependencies = [
  "clap",
  "core-foundation 0.10.0",
  "dbus",
- "dirs",
+ "dirs 5.0.1",
  "dispatch",
  "fig_os_shim",
  "fig_settings",
@@ -2909,7 +3116,7 @@ dependencies = [
  "macos-utils",
  "nix 0.29.0",
  "objc",
- "owo-colors 4.2.0",
+ "owo-colors",
  "plist",
  "regex",
  "serde",
@@ -2934,7 +3141,7 @@ dependencies = [
  "flate2",
  "nix 0.29.0",
  "pin-project-lite",
- "rand 0.9.0",
+ "rand 0.9.1",
  "tempfile",
  "thiserror 2.0.12",
  "tokio",
@@ -2962,7 +3169,7 @@ name = "fig_os_shim"
 version = "1.10.0"
 dependencies = [
  "cfg-if",
- "dirs",
+ "dirs 5.0.1",
  "nix 0.29.0",
  "serde",
  "sysinfo",
@@ -2984,7 +3191,7 @@ dependencies = [
  "prost-build",
  "prost-reflect",
  "prost-reflect-build",
- "rand 0.9.0",
+ "rand 0.9.1",
  "rmp-serde",
  "serde",
  "serde_json",
@@ -3023,7 +3230,7 @@ dependencies = [
  "mockito",
  "reqwest",
  "reqwest_cookie_store",
- "rustls 0.23.23",
+ "rustls 0.23.26",
  "rustls-native-certs 0.8.1",
  "rustls-pemfile 2.2.0",
  "serde",
@@ -3062,7 +3269,7 @@ name = "fig_telemetry"
 version = "1.10.0"
 dependencies = [
  "amzn-codewhisperer-client",
- "amzn-toolkit-telemetry",
+ "amzn-toolkit-telemetry-client",
  "anyhow",
  "async-trait",
  "aws-credential-types",
@@ -3096,7 +3303,7 @@ name = "fig_telemetry_core"
 version = "1.10.0"
 dependencies = [
  "amzn-codewhisperer-client",
- "amzn-toolkit-telemetry",
+ "amzn-toolkit-telemetry-client",
  "async-trait",
  "aws-toolkit-telemetry-definitions",
  "fig_util",
@@ -3129,7 +3336,7 @@ dependencies = [
  "fig_os_shim",
  "fig_util",
  "hex",
- "http 1.2.0",
+ "http 1.3.1",
  "http-body-util",
  "hyper 1.6.0",
  "hyper-util",
@@ -3149,7 +3356,7 @@ dependencies = [
  "cfg-if",
  "clap",
  "core-foundation 0.10.0",
- "dirs",
+ "dirs 5.0.1",
  "fig_os_shim",
  "fig_test",
  "hex",
@@ -3162,7 +3369,7 @@ dependencies = [
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
  "paste",
- "rand 0.9.0",
+ "rand 0.9.1",
  "regex",
  "serde",
  "serde_json",
@@ -3226,7 +3433,7 @@ dependencies = [
  "serde",
  "serde_json",
  "shared_library",
- "shell-color",
+ "shell-color 1.10.0",
  "shell-words",
  "shellexpand",
  "shlex",
@@ -3288,6 +3495,12 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
 version = "1.1.1"
@@ -3295,7 +3508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.5",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -3327,9 +3540,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
 
 [[package]]
 name = "foreign-types"
@@ -3338,7 +3560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]
 
 [[package]]
@@ -3352,6 +3574,12 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -3373,7 +3601,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16"
 dependencies = [
- "dirs",
+ "dirs 5.0.1",
  "once_cell",
  "rust-ini",
  "thiserror 1.0.69",
@@ -3670,9 +3898,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3683,14 +3911,16 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3705,9 +3935,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "gio"
@@ -3891,16 +4121,16 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.2.0",
+ "http 1.3.1",
  "indexmap 2.9.0",
  "slab",
  "tokio",
@@ -3910,9 +4140,9 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -3944,9 +4174,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -3991,6 +4221,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
+[[package]]
+name = "hermit-abi"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -4037,18 +4273,18 @@ checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.14",
+ "itoa 1.0.15",
 ]
 
 [[package]]
 name = "http"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.14",
+ "itoa 1.0.15",
 ]
 
 [[package]]
@@ -4069,7 +4305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.2.0",
+ "http 1.3.1",
 ]
 
 [[package]]
@@ -4080,16 +4316,16 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.2.0",
+ "http 1.3.1",
  "http-body 1.0.1",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.9.5"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "httpdate"
@@ -4112,7 +4348,7 @@ dependencies = [
  "http-body 0.4.6",
  "httparse",
  "httpdate",
- "itoa 1.0.14",
+ "itoa 1.0.15",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -4130,12 +4366,12 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.7",
- "http 1.2.0",
+ "h2 0.4.9",
+ "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
  "httpdate",
- "itoa 1.0.14",
+ "itoa 1.0.15",
  "pin-project-lite",
  "smallvec",
  "tokio",
@@ -4165,18 +4401,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
- "http 1.2.0",
+ "http 1.3.1",
  "hyper 1.6.0",
  "hyper-util",
- "rustls 0.23.23",
+ "rustls 0.23.26",
  "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.1",
+ "tokio-rustls 0.26.2",
  "tower-service",
  "webpki-roots",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.11"
@@ -4186,7 +4438,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.2.0",
+ "http 1.3.1",
  "http-body 1.0.1",
  "hyper 1.6.0",
  "libc",
@@ -4199,16 +4451,17 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core 0.61.0",
 ]
 
 [[package]]
@@ -4261,9 +4514,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locid_transform_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
 
 [[package]]
 name = "icu_normalizer"
@@ -4285,9 +4538,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
 
 [[package]]
 name = "icu_properties"
@@ -4306,9 +4559,9 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
 
 [[package]]
 name = "icu_provider"
@@ -4390,9 +4643,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
+checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
 dependencies = [
  "byteorder-lite",
  "quick-error",
@@ -4427,7 +4680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
  "serde",
 ]
 
@@ -4503,9 +4756,9 @@ dependencies = [
 
 [[package]]
 name = "inventory"
-version = "0.3.17"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b31349d02fe60f80bbbab1a9402364cad7460626d6030494b08ac4a2075bf81"
+checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83"
 dependencies = [
  "rustversion",
 ]
@@ -4521,19 +4774,19 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.13"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.5.0",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4575,6 +4828,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -4583,9 +4845,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "javascriptcore-rs"
@@ -4612,9 +4874,9 @@ dependencies = [
 
 [[package]]
 name = "jiff"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0"
+checksum = "27e77966151130221b079bcec80f1f34a9e414fa489d99152a201c07fd2182bc"
 dependencies = [
  "jiff-static",
  "log",
@@ -4625,9 +4887,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605"
+checksum = "97265751f8a9a4228476f2fc17874a9e7e70e96b893368e42619880fe143b48a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4658,10 +4920,11 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
+ "getrandom 0.3.2",
  "libc",
 ]
 
@@ -4873,15 +5136,15 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
 
 [[package]]
 name = "litrs"
@@ -4934,7 +5197,7 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
@@ -4968,7 +5231,7 @@ dependencies = [
  "accessibility",
  "accessibility-sys",
  "appkit-nsworkspace-bindings",
- "block2",
+ "block2 0.5.1",
  "cocoa",
  "core-foundation 0.10.0",
  "core-graphics",
@@ -5085,27 +5348,26 @@ dependencies = [
 
 [[package]]
 name = "miette"
-version = "7.5.0"
+version = "7.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484"
+checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7"
 dependencies = [
  "cfg-if",
  "miette-derive",
- "owo-colors 4.2.0",
+ "owo-colors",
  "supports-color",
  "supports-hyperlinks",
  "supports-unicode",
  "terminal_size",
  "textwrap",
- "thiserror 1.0.69",
  "unicode-width 0.1.14",
 ]
 
 [[package]]
 name = "miette-derive"
-version = "7.5.0"
+version = "7.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147"
+checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5135,18 +5397,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -5174,13 +5427,13 @@ dependencies = [
  "bytes",
  "colored",
  "futures-util",
- "http 1.2.0",
+ "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
  "hyper-util",
  "log",
- "rand 0.9.0",
+ "rand 0.9.1",
  "regex",
  "serde_json",
  "serde_urlencoded",
@@ -5241,7 +5494,24 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework 2.11.1",
+ "security-framework-sys",
+ "tempfile",
 ]
 
 [[package]]
@@ -5416,7 +5686,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc7c92f190c97f79b4a332f5e81dcf68c8420af2045c936c9be0bc9de6f63b5"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -5504,7 +5774,7 @@ version = "0.104.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41c68c7c06898a5c4c9f10038da63759661cb8ac8f301ce7d159173a595c8258"
 dependencies = [
- "dirs",
+ "dirs 5.0.1",
  "omnipath",
  "pwd",
  "ref-cast",
@@ -5519,8 +5789,8 @@ dependencies = [
  "bytes",
  "chrono",
  "chrono-humanize",
- "dirs",
- "dirs-sys",
+ "dirs 5.0.1",
+ "dirs-sys 0.4.1",
  "fancy-regex",
  "heck 0.5.0",
  "indexmap 2.9.0",
@@ -5618,7 +5888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
  "arrayvec",
- "itoa 1.0.14",
+ "itoa 1.0.15",
 ]
 
 [[package]]
@@ -5665,7 +5935,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
@@ -5716,9 +5986,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59"
+checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551"
 dependencies = [
  "objc2-encode",
 ]
@@ -5730,7 +6000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
+ "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
  "objc2-core-data",
@@ -5741,14 +6011,16 @@ dependencies = [
 
 [[package]]
 name = "objc2-app-kit"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5906f93257178e2f7ae069efb89fbd6ee94f0592740b5f8a1512ca498814d0fb"
+checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
 dependencies = [
  "bitflags 2.9.0",
- "objc2 0.6.0",
+ "block2 0.6.1",
+ "objc2 0.6.1",
+ "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
 ]
 
 [[package]]
@@ -5758,7 +6030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
  "objc2-foundation 0.2.2",
@@ -5770,7 +6042,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
@@ -5782,29 +6054,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
 
 [[package]]
 name = "objc2-core-foundation"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925"
+checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
 dependencies = [
  "bitflags 2.9.0",
- "objc2 0.6.0",
+ "dispatch2 0.3.0",
+ "objc2 0.6.1",
 ]
 
 [[package]]
 name = "objc2-core-graphics"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dca602628b65356b6513290a21a6405b4d4027b8b250f0b98dddbb28b7de02"
+checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
 dependencies = [
  "bitflags 2.9.0",
- "objc2 0.6.0",
+ "dispatch2 0.3.0",
+ "objc2 0.6.1",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
@@ -5815,7 +6089,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
  "objc2-metal",
@@ -5827,7 +6101,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-contacts",
  "objc2-foundation 0.2.2",
@@ -5846,20 +6120,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
- "dispatch",
+ "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
 ]
 
 [[package]]
 name = "objc2-foundation"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998"
+checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
 dependencies = [
  "bitflags 2.9.0",
- "objc2 0.6.0",
+ "block2 0.6.1",
+ "objc2 0.6.1",
  "objc2-core-foundation",
 ]
 
@@ -5876,12 +6150,12 @@ dependencies = [
 
 [[package]]
 name = "objc2-io-surface"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161a8b87e32610086e1a7a9e9ec39f84459db7b3a0881c1f16ca5a2605581c19"
+checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
 dependencies = [
  "bitflags 2.9.0",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-core-foundation",
 ]
 
@@ -5891,7 +6165,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
@@ -5904,7 +6178,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
@@ -5916,7 +6190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
  "objc2-metal",
@@ -5939,7 +6213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
  "objc2-core-data",
@@ -5959,7 +6233,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
@@ -5971,7 +6245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
  "objc2-foundation 0.2.2",
@@ -5984,7 +6258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65"
 dependencies = [
  "bitflags 2.9.0",
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
@@ -5992,9 +6266,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -6007,9 +6281,9 @@ checksum = "80adb31078122c880307e9cdfd4e3361e6545c319f9b9dcafcb03acd3b51a575"
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "onig"
@@ -6035,15 +6309,53 @@ dependencies = [
 
 [[package]]
 name = "oorandom"
-version = "11.1.4"
+version = "11.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+
+[[package]]
+name = "openssl"
+version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
+checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+dependencies = [
+ "bitflags 2.9.0",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
 
 [[package]]
 name = "option-ext"
@@ -6092,9 +6404,9 @@ dependencies = [
 
 [[package]]
 name = "outref"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
+checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "overload"
@@ -6102,12 +6414,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
-[[package]]
-name = "owo-colors"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
-
 [[package]]
 name = "owo-colors"
 version = "4.2.0"
@@ -6186,7 +6492,17 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
- "fixedbitset",
+ "fixedbitset 0.4.2",
+ "indexmap 2.9.0",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
+dependencies = [
+ "fixedbitset 0.5.7",
  "indexmap 2.9.0",
 ]
 
@@ -6250,6 +6566,16 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared 0.11.3",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "phf_macros"
 version = "0.8.0"
@@ -6270,7 +6596,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
- "siphasher",
+ "siphasher 0.3.11",
 ]
 
 [[package]]
@@ -6279,7 +6605,16 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
 dependencies = [
- "siphasher",
+ "siphasher 0.3.11",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher 1.0.1",
 ]
 
 [[package]]
@@ -6327,9 +6662,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "plist"
@@ -6382,7 +6717,7 @@ dependencies = [
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.8.5",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -6393,7 +6728,7 @@ checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi",
+ "hermit-abi 0.4.0",
  "pin-project-lite",
  "rustix 0.38.44",
  "tracing",
@@ -6408,9 +6743,9 @@ checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
 [[package]]
 name = "portable-atomic"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 
 [[package]]
 name = "portable-atomic-util"
@@ -6450,11 +6785,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.7.35",
+ "zerocopy 0.8.25",
 ]
 
 [[package]]
@@ -6534,11 +6869,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
- "toml_edit 0.22.22",
+ "toml_edit 0.22.26",
 ]
 
 [[package]]
@@ -6595,9 +6930,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -6663,11 +6998,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "log",
  "multimap",
  "once_cell",
- "petgraph",
+ "petgraph 0.7.1",
  "prettyplease",
  "prost",
  "prost-types",
@@ -6683,7 +7018,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
@@ -6776,56 +7111,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "q_chat"
-version = "1.10.0"
-dependencies = [
- "anstream",
- "aws-smithy-types",
- "bstr",
- "clap",
- "color-print",
- "convert_case 0.8.0",
- "crossterm",
- "eyre",
- "fig_api_client",
- "fig_auth",
- "fig_diagnostic",
- "fig_install",
- "fig_os_shim",
- "fig_settings",
- "fig_telemetry",
- "fig_util",
- "futures",
- "glob",
- "mcp_client",
- "rand 0.9.0",
- "regex",
- "rustyline",
- "semver",
- "serde",
- "serde_json",
- "shell-color",
- "shell-words",
- "shellexpand",
- "shlex",
- "similar",
- "skim",
- "spinners",
- "strip-ansi-escapes",
- "syntect",
- "tempfile",
- "thiserror 2.0.12",
- "time",
- "tokio",
- "tracing",
- "tracing-subscriber",
- "unicode-width 0.2.0",
- "url",
- "uuid",
- "winnow 0.6.22",
-]
-
 [[package]]
 name = "q_cli"
 version = "1.10.0"
@@ -6882,12 +7167,11 @@ dependencies = [
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
- "owo-colors 4.2.0",
+ "owo-colors",
  "parking_lot",
  "paste",
  "predicates",
- "q_chat",
- "rand 0.9.0",
+ "rand 0.9.1",
  "regex",
  "semver",
  "serde",
@@ -6948,43 +7232,45 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.37.4"
+version = "0.37.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4ce8c88de324ff838700f36fb6ab86c96df0e3c4ab6ef3a9b2044465cce1369"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.6"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
+checksum = "c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012"
 dependencies = [
  "bytes",
+ "cfg_aliases",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.1.0",
- "rustls 0.23.23",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.26",
  "socket2",
  "thiserror 2.0.12",
  "tokio",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.9"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
+checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b"
 dependencies = [
  "bytes",
- "getrandom 0.2.15",
- "rand 0.8.5",
+ "getrandom 0.3.2",
+ "rand 0.9.1",
  "ring",
- "rustc-hash 2.1.0",
- "rustls 0.23.23",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.26",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.12",
@@ -6995,9 +7281,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.9"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
+checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
 dependencies = [
  "cfg_aliases",
  "libc",
@@ -7016,6 +7302,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "r2d2"
 version = "0.8.10"
@@ -7075,13 +7367,12 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
- "zerocopy 0.8.23",
 ]
 
 [[package]]
@@ -7129,7 +7420,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
@@ -7138,7 +7429,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.1",
+ "getrandom 0.3.2",
 ]
 
 [[package]]
@@ -7196,9 +7487,9 @@ dependencies = [
 
 [[package]]
 name = "ravif"
-version = "0.11.11"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2413fd96bd0ea5cdeeb37eaf446a22e6ed7b981d792828721e74ded1980a45c6"
+checksum = "d6a5f31fcf7500f9401fea858ea4ab5525c99f2322cfcee732c0e6c74208c0c6"
 dependencies = [
  "avif-serialize",
  "imgref",
@@ -7237,9 +7528,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
 dependencies = [
  "bitflags 2.9.0",
 ]
@@ -7250,11 +7541,22 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libredox",
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
+dependencies = [
+ "getrandom 0.2.16",
+ "libredox",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "ref-cast"
 version = "1.0.24"
@@ -7327,9 +7629,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.14"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e327e510263980e231de548a33e63d34962d29ae61b467389a1a09627a254"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
 dependencies = [
  "async-compression",
  "base64 0.22.1",
@@ -7337,24 +7639,27 @@ dependencies = [
  "cookie",
  "cookie_store",
  "encoding_rs",
+ "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.7",
- "http 1.2.0",
+ "h2 0.4.9",
+ "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
  "hyper-rustls 0.27.5",
+ "hyper-tls",
  "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
+ "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.23",
+ "rustls 0.23.26",
  "rustls-native-certs 0.8.1",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
@@ -7363,7 +7668,8 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper",
  "tokio",
- "tokio-rustls 0.26.1",
+ "tokio-native-tls",
+ "tokio-rustls 0.26.2",
  "tokio-socks",
  "tokio-util",
  "tower",
@@ -7390,19 +7696,19 @@ dependencies = [
 
 [[package]]
 name = "rfd"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a24763657bff09769a8ccf12c8b8a50416fb035fe199263b4c5071e4e3f006f"
+checksum = "80c844748fdc82aae252ee4594a89b6e7ebef1063de7951545564cbc4e57075d"
 dependencies = [
  "ashpd",
- "block2",
- "core-foundation 0.10.0",
- "core-foundation-sys",
+ "block2 0.6.1",
+ "dispatch2 0.2.0",
  "js-sys",
  "log",
- "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
+ "objc2 0.6.1",
+ "objc2-app-kit 0.3.1",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.1",
  "pollster",
  "raw-window-handle",
  "urlencoding",
@@ -7426,7 +7732,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -7502,9 +7808,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -7530,14 +7836,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
  "bitflags 2.9.0",
  "errno",
  "libc",
- "linux-raw-sys 0.9.2",
+ "linux-raw-sys 0.9.4",
  "windows-sys 0.59.0",
 ]
 
@@ -7555,16 +7861,16 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.23"
+version = "0.23.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
+checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.8",
+ "rustls-webpki 0.103.1",
  "subtle",
  "zeroize",
 ]
@@ -7613,9 +7919,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 dependencies = [
  "web-time",
 ]
@@ -7632,9 +7938,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -7644,9 +7950,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
 
 [[package]]
 name = "rustyline"
@@ -7658,7 +7964,6 @@ dependencies = [
  "cfg-if",
  "clipboard-win",
  "fd-lock",
- "home",
  "libc",
  "log",
  "memchr",
@@ -7684,9 +7989,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "same-file"
@@ -7793,6 +8098,36 @@ dependencies = [
  "thin-slice",
 ]
 
+[[package]]
+name = "self-replace"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7"
+dependencies = [
+ "fastrand",
+ "tempfile",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "self_update"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d832c086ece0dacc29fb2947bb4219b8f6e12fe9e40b7108f9e57c4224e47b5c"
+dependencies = [
+ "hyper 1.6.0",
+ "indicatif",
+ "log",
+ "quick-xml 0.37.5",
+ "regex",
+ "reqwest",
+ "self-replace",
+ "semver",
+ "serde_json",
+ "tempfile",
+ "urlencoding",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.26"
@@ -7845,7 +8180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "indexmap 2.9.0",
- "itoa 1.0.14",
+ "itoa 1.0.15",
  "memchr",
  "ryu",
  "serde",
@@ -7887,7 +8222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.14",
+ "itoa 1.0.15",
  "ryu",
  "serde",
 ]
@@ -7899,7 +8234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
  "indexmap 2.9.0",
- "itoa 1.0.14",
+ "itoa 1.0.15",
  "ryu",
  "serde",
  "unsafe-libyaml",
@@ -7998,6 +8333,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "shell-color"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fce6d5bc71503c9ec2337c80dc41f4fb2ac62fe52d6ab7500d899db19ae436f8"
+dependencies = [
+ "bitflags 2.9.0",
+ "nu-ansi-term 0.50.1",
+ "nu-color-config",
+]
+
 [[package]]
 name = "shell-color"
 version = "1.10.0"
@@ -8029,7 +8375,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb"
 dependencies = [
- "dirs",
+ "dirs 6.0.0",
 ]
 
 [[package]]
@@ -8061,9 +8407,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
@@ -8095,6 +8441,12 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
 [[package]]
 name = "skim"
 version = "0.16.2"
@@ -8113,7 +8465,7 @@ dependencies = [
  "indexmap 2.9.0",
  "log",
  "nix 0.29.0",
- "rand 0.9.0",
+ "rand 0.9.1",
  "rayon",
  "regex",
  "shell-quote",
@@ -8137,9 +8489,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "socket2"
@@ -8211,26 +8563,25 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "string_cache"
-version = "0.8.7"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
 dependencies = [
  "new_debug_unreachable",
- "once_cell",
  "parking_lot",
- "phf_shared 0.10.0",
+ "phf_shared 0.11.3",
  "precomputed-hash",
  "serde",
 ]
 
 [[package]]
 name = "string_cache_codegen"
-version = "0.5.2"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
+checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
 dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
+ "phf_generator 0.11.3",
+ "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
 ]
@@ -8373,9 +8724,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8536,15 +8887,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.18.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 dependencies = [
- "cfg-if",
  "fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.2",
  "once_cell",
- "rustix 1.0.5",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
@@ -8572,11 +8922,11 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
+checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
 dependencies = [
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
@@ -8607,9 +8957,9 @@ dependencies = [
 
 [[package]]
 name = "test-log-macros"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
+checksum = "888d0c3c6db53c0fdab160d2ed5e12ba745383d3e85813f2ea0f2b1475ab553f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8618,12 +8968,12 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 dependencies = [
  "unicode-linebreak",
- "unicode-width 0.1.14",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -8700,7 +9050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
- "itoa 1.0.14",
+ "itoa 1.0.15",
  "libc",
  "num-conv",
  "num_threads",
@@ -8766,9 +9116,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -8809,6 +9159,16 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.24.1"
@@ -8821,11 +9181,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.23",
+ "rustls 0.23.26",
  "tokio",
 ]
 
@@ -8882,21 +9242,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.22",
+ "toml_edit 0.22.26",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
 dependencies = [
  "serde",
 ]
@@ -8925,17 +9285,24 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap 2.9.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.22",
+ "toml_write",
+ "winnow 0.7.9",
 ]
 
+[[package]]
+name = "toml_write"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
+
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -9085,21 +9452,22 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.19.2"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b"
+checksum = "eadd75f5002e2513eaa19b2365f533090cc3e93abd38788452d9ea85cff7b48a"
 dependencies = [
- "core-graphics",
  "crossbeam-channel",
- "dirs",
+ "dirs 6.0.0",
  "libappindicator",
  "muda",
- "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
+ "objc2 0.6.1",
+ "objc2-app-kit 0.3.1",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.1",
  "once_cell",
  "png",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "windows-sys 0.59.0",
 ]
 
@@ -9113,7 +9481,7 @@ dependencies = [
  "memchr",
  "nom",
  "once_cell",
- "petgraph",
+ "petgraph 0.6.5",
 ]
 
 [[package]]
@@ -9144,10 +9512,10 @@ checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.2.0",
+ "http 1.3.1",
  "httparse",
  "log",
- "rand 0.9.0",
+ "rand 0.9.1",
  "sha1",
  "thiserror 2.0.12",
  "utf-8",
@@ -9155,21 +9523,21 @@ dependencies = [
 
 [[package]]
 name = "typeid"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
 [[package]]
 name = "typetag"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+checksum = "73f22b40dd7bfe8c14230cf9702081366421890435b2d625fa92b4acc4c3de6f"
 dependencies = [
  "erased-serde",
  "inventory",
@@ -9180,9 +9548,9 @@ dependencies = [
 
 [[package]]
 name = "typetag-impl"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9208,9 +9576,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-linebreak"
@@ -9292,12 +9660,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.15.1"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
- "getrandom 0.3.1",
- "rand 0.9.0",
+ "getrandom 0.3.2",
+ "rand 0.9.1",
  "serde",
 ]
 
@@ -9314,9 +9682,9 @@ dependencies = [
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "vcpkg"
@@ -9373,9 +9741,9 @@ dependencies = [
 
 [[package]]
 name = "wait-timeout"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
 dependencies = [
  "libc",
 ]
@@ -9413,9 +9781,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
  "wit-bindgen-rt",
 ]
@@ -9499,23 +9867,22 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7208998eaa3870dad37ec8836979581506e0c5c64c20c9e79e9d2a10d6f47bf"
+checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
 dependencies = [
  "cc",
  "downcast-rs",
  "rustix 0.38.44",
- "scoped-tls",
  "smallvec",
  "wayland-sys",
 ]
 
 [[package]]
 name = "wayland-client"
-version = "0.31.8"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2120de3d33638aaef5b9f4472bff75f07c56379cf76ea320bd3a3d65ecaf73f"
+checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
 dependencies = [
  "bitflags 2.9.0",
  "rustix 0.38.44",
@@ -9525,9 +9892,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.6"
+version = "0.32.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0781cf46869b37e36928f7b432273c0995aa8aed9552c556fb18754420541efc"
+checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
 dependencies = [
  "bitflags 2.9.0",
  "wayland-backend",
@@ -9537,9 +9904,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248a02e6f595aad796561fa82d25601bd2c8c3b145b1c7453fc8f94c1a58f8b2"
+checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
 dependencies = [
  "bitflags 2.9.0",
  "wayland-backend",
@@ -9555,7 +9922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.37.4",
+ "quick-xml 0.37.5",
  "quote",
 ]
 
@@ -9565,8 +9932,6 @@ version = "0.31.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
 dependencies = [
- "dlib",
- "log",
  "pkg-config",
 ]
 
@@ -9636,9 +10001,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.8"
+version = "0.26.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
+checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -9717,7 +10082,7 @@ checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762"
 dependencies = [
  "either",
  "env_home",
- "rustix 1.0.5",
+ "rustix 1.0.7",
  "winsafe",
 ]
 
@@ -9793,15 +10158,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.56.0"
@@ -9839,6 +10195,19 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+dependencies = [
+ "windows-implement 0.60.0",
+ "windows-interface 0.59.1",
+ "windows-link",
+ "windows-result 0.3.2",
+ "windows-strings 0.4.0",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.56.0"
@@ -9872,6 +10241,17 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.56.0"
@@ -9905,11 +10285,22 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "windows-link"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
 [[package]]
 name = "windows-registry"
@@ -9917,7 +10308,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
- "windows-result 0.3.1",
+ "windows-result 0.3.2",
  "windows-strings 0.3.1",
  "windows-targets 0.53.0",
 ]
@@ -9942,9 +10333,9 @@ dependencies = [
 
 [[package]]
 name = "windows-result"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189"
+checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
 dependencies = [
  "windows-link",
 ]
@@ -9968,6 +10359,15 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -10068,11 +10468,11 @@ dependencies = [
 
 [[package]]
 name = "windows-version"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c12476c23a74725c539b24eae8bfc0dac4029c39cdb561d9f23616accd4ae26d"
+checksum = "e04a5c6627e310a23ad2358483286c7df260c964eb2d003d8efd6d0f4e79265c"
 dependencies = [
- "windows-targets 0.53.0",
+ "windows-link",
 ]
 
 [[package]]
@@ -10266,9 +10666,18 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.22"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980"
+checksum = "d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3"
 dependencies = [
  "memchr",
 ]
@@ -10300,9 +10709,9 @@ checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
 [[package]]
 name = "wit-bindgen-rt"
-version = "0.33.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
  "bitflags 2.9.0",
 ]
@@ -10345,7 +10754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2e33c08b174442ff80d5c791020696f9f8b4e4a87b8cfc7494aad6167ec44e1"
 dependencies = [
  "base64 0.22.1",
- "block2",
+ "block2 0.5.1",
  "cookie",
  "crossbeam-channel",
  "dpi",
@@ -10353,7 +10762,7 @@ dependencies = [
  "gdkx11",
  "gtk",
  "html5ever",
- "http 1.2.0",
+ "http 1.3.1",
  "javascriptcore-rs",
  "jni",
  "kuchikiki",
@@ -10421,13 +10830,12 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
 [[package]]
 name = "xattr"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909"
+checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
 dependencies = [
  "libc",
- "linux-raw-sys 0.4.15",
- "rustix 0.38.44",
+ "rustix 1.0.7",
 ]
 
 [[package]]
@@ -10538,9 +10946,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.2.0"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb67eadba43784b6fb14857eba0d8fc518686d3ee537066eb6086dc318e2c8a1"
+checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -10555,7 +10963,7 @@ dependencies = [
  "enumflags2",
  "event-listener",
  "futures-core",
- "futures-util",
+ "futures-lite",
  "hex",
  "nix 0.29.0",
  "ordered-stream",
@@ -10565,11 +10973,11 @@ dependencies = [
  "tracing",
  "uds_windows",
  "windows-sys 0.59.0",
- "winnow 0.6.22",
+ "winnow 0.7.9",
  "xdg-home",
- "zbus_macros 5.2.0",
- "zbus_names 4.1.0",
- "zvariant 5.1.0",
+ "zbus_macros 5.5.0",
+ "zbus_names 4.2.0",
+ "zvariant 5.4.0",
 ]
 
 [[package]]
@@ -10578,7 +10986,7 @@ version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
@@ -10587,17 +10995,17 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.2.0"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d49ebc960ceb660f2abe40a5904da975de6986f2af0d7884b39eec6528c57"
+checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
- "zbus_names 4.1.0",
- "zvariant 5.1.0",
- "zvariant_utils 3.0.2",
+ "zbus_names 4.2.0",
+ "zvariant 5.4.0",
+ "zvariant_utils 3.2.0",
 ]
 
 [[package]]
@@ -10622,14 +11030,14 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b"
+checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
 dependencies = [
  "serde",
  "static_assertions",
- "winnow 0.6.22",
- "zvariant 5.1.0",
+ "winnow 0.7.9",
+ "zvariant 5.4.0",
 ]
 
 [[package]]
@@ -10651,17 +11059,16 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
- "byteorder",
  "zerocopy-derive 0.7.35",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.23"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
 dependencies = [
- "zerocopy-derive 0.8.23",
+ "zerocopy-derive 0.8.25",
 ]
 
 [[package]]
@@ -10677,9 +11084,9 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.23"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10688,18 +11095,18 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10746,18 +11153,18 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.1"
+version = "7.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.15+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 dependencies = [
  "cc",
  "pkg-config",
@@ -10807,18 +11214,18 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.1.0"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f"
+checksum = "b2df9ee044893fcffbdc25de30546edef3e32341466811ca18421e3cd6c5a3ac"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
  "static_assertions",
  "url",
- "winnow 0.6.22",
- "zvariant_derive 5.1.0",
- "zvariant_utils 3.0.2",
+ "winnow 0.7.9",
+ "zvariant_derive 5.4.0",
+ "zvariant_utils 3.2.0",
 ]
 
 [[package]]
@@ -10827,7 +11234,7 @@ version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
@@ -10836,15 +11243,15 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.1.0"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916"
+checksum = "74170caa85b8b84cc4935f2d56a57c7a15ea6185ccdd7eadb57e6edd90f94b2f"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
- "zvariant_utils 3.0.2",
+ "zvariant_utils 3.2.0",
 ]
 
 [[package]]
@@ -10860,14 +11267,14 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "3.0.2"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6"
+checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
  "static_assertions",
  "syn 2.0.101",
- "winnow 0.6.22",
+ "winnow 0.7.9",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 1a5369068c..90ae9c21b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,7 +106,6 @@ objc2-input-method-kit = "0.2.2"
 parking_lot = "0.12.3"
 percent-encoding = "2.2.0"
 portable-pty = "0.8.1"
-q_chat = { path = "crates/q_chat" }
 r2d2 = "0.8.10"
 r2d2_sqlite = "0.25.0"
 rand = "0.9.0"
diff --git a/crates/amzn-toolkit-telemetry/Cargo.toml b/crates/amzn-toolkit-telemetry-client/Cargo.toml
similarity index 81%
rename from crates/amzn-toolkit-telemetry/Cargo.toml
rename to crates/amzn-toolkit-telemetry-client/Cargo.toml
index 8a9ac5ca86..5ac7b22007 100644
--- a/crates/amzn-toolkit-telemetry/Cargo.toml
+++ b/crates/amzn-toolkit-telemetry-client/Cargo.toml
@@ -11,14 +11,10 @@
 
 [package]
 edition = "2021"
-name = "amzn-toolkit-telemetry"
+name = "amzn-toolkit-telemetry-client"
 version = "1.0.0"
 authors = ["Grant Gurvis <grangurv@amazon.com>"]
-exclude = [
-    "/build",
-    "/Config",
-    "/build-tools/",
-]
+exclude = ["/build", "/Config", "/build-tools/"]
 publish = ["brazil"]
 description = "Rust client bindings for the toolkit-telemetry service"
 
@@ -53,10 +49,7 @@ features = ["client"]
 
 [dependencies.aws-smithy-runtime-api]
 version = "1.1.3"
-features = [
-    "client",
-    "http-02x",
-]
+features = ["client", "http-02x"]
 
 [dependencies.aws-smithy-types]
 version = "1.1.3"
@@ -79,16 +72,7 @@ features = ["test-util"]
 
 [features]
 behavior-version-latest = []
-default = [
-    "rustls",
-    "rt-tokio",
-]
-rt-tokio = [
-    "aws-smithy-async/rt-tokio",
-    "aws-smithy-types/rt-tokio",
-]
+default = ["rustls", "rt-tokio"]
+rt-tokio = ["aws-smithy-async/rt-tokio", "aws-smithy-types/rt-tokio"]
 rustls = ["aws-smithy-runtime/tls-rustls"]
-test-util = [
-    "aws-credential-types/test-util",
-    "aws-smithy-runtime/test-util",
-]
+test-util = ["aws-credential-types/test-util", "aws-smithy-runtime/test-util"]
diff --git a/crates/amzn-toolkit-telemetry/LICENSE b/crates/amzn-toolkit-telemetry-client/LICENSE
similarity index 100%
rename from crates/amzn-toolkit-telemetry/LICENSE
rename to crates/amzn-toolkit-telemetry-client/LICENSE
diff --git a/crates/amzn-toolkit-telemetry/src/auth_plugin.rs b/crates/amzn-toolkit-telemetry-client/src/auth_plugin.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/auth_plugin.rs
rename to crates/amzn-toolkit-telemetry-client/src/auth_plugin.rs
diff --git a/crates/amzn-toolkit-telemetry/src/client.rs b/crates/amzn-toolkit-telemetry-client/src/client.rs
similarity index 97%
rename from crates/amzn-toolkit-telemetry/src/client.rs
rename to crates/amzn-toolkit-telemetry-client/src/client.rs
index e602f0421e..08bfb13912 100644
--- a/crates/amzn-toolkit-telemetry/src/client.rs
+++ b/crates/amzn-toolkit-telemetry-client/src/client.rs
@@ -100,8 +100,8 @@ impl Client {
 /// operation call. For example, this can be used to add an additional HTTP header:
 ///
 /// ```ignore
-/// # async fn wrapper() -> ::std::result::Result<(), amzn_toolkit_telemetry::Error> {
-/// # let client: amzn_toolkit_telemetry::Client = unimplemented!();
+/// # async fn wrapper() -> ::std::result::Result<(), amzn_toolkit_telemetry_client::Error> {
+/// # let client: amzn_toolkit_telemetry_client::Client = unimplemented!();
 /// use ::http::header::{HeaderName, HeaderValue};
 ///
 /// let result = client.post_error_report()
diff --git a/crates/amzn-toolkit-telemetry/src/client/customize.rs b/crates/amzn-toolkit-telemetry-client/src/client/customize.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/client/customize.rs
rename to crates/amzn-toolkit-telemetry-client/src/client/customize.rs
diff --git a/crates/amzn-toolkit-telemetry/src/client/post_error_report.rs b/crates/amzn-toolkit-telemetry-client/src/client/post_error_report.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/client/post_error_report.rs
rename to crates/amzn-toolkit-telemetry-client/src/client/post_error_report.rs
diff --git a/crates/amzn-toolkit-telemetry/src/client/post_feedback.rs b/crates/amzn-toolkit-telemetry-client/src/client/post_feedback.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/client/post_feedback.rs
rename to crates/amzn-toolkit-telemetry-client/src/client/post_feedback.rs
diff --git a/crates/amzn-toolkit-telemetry/src/client/post_metrics.rs b/crates/amzn-toolkit-telemetry-client/src/client/post_metrics.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/client/post_metrics.rs
rename to crates/amzn-toolkit-telemetry-client/src/client/post_metrics.rs
diff --git a/crates/amzn-toolkit-telemetry/src/config.rs b/crates/amzn-toolkit-telemetry-client/src/config.rs
similarity index 94%
rename from crates/amzn-toolkit-telemetry/src/config.rs
rename to crates/amzn-toolkit-telemetry-client/src/config.rs
index 9d8629ebd1..c70286e86e 100644
--- a/crates/amzn-toolkit-telemetry/src/config.rs
+++ b/crates/amzn-toolkit-telemetry-client/src/config.rs
@@ -1,6 +1,6 @@
 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 
-/// Configuration for a amzn_toolkit_telemetry service client.
+/// Configuration for a amzn_toolkit_telemetry_client service client.
 ///
 ///
 /// Service configuration allows for customization of endpoints, region, credentials providers,
@@ -211,7 +211,7 @@ impl Builder {
     /// # fn example() {
     /// use std::time::Duration;
     ///
-    /// use amzn_toolkit_telemetry::config::Config;
+    /// use amzn_toolkit_telemetry_client::config::Config;
     /// use aws_smithy_runtime::client::http::hyper_014::HyperClientBuilder;
     ///
     /// let https_connector = hyper_rustls::HttpsConnectorBuilder::new()
@@ -248,7 +248,7 @@ impl Builder {
     /// # fn example() {
     /// use std::time::Duration;
     ///
-    /// use amzn_toolkit_telemetry::config::{
+    /// use amzn_toolkit_telemetry_client::config::{
     ///     Builder,
     ///     Config,
     /// };
@@ -265,7 +265,7 @@ impl Builder {
     ///     builder.set_http_client(Some(hyper_client));
     /// }
     ///
-    /// let mut builder = amzn_toolkit_telemetry::Config::builder();
+    /// let mut builder = amzn_toolkit_telemetry_client::Config::builder();
     /// override_http_client(&mut builder);
     /// let config = builder.build();
     /// # }
@@ -288,7 +288,7 @@ impl Builder {
     /// # Examples
     /// Create a custom endpoint resolver that resolves a different endpoing per-stage, e.g. staging
     /// vs. production. ```no_run
-    /// use amzn_toolkit_telemetry::config::endpoint::{
+    /// use amzn_toolkit_telemetry_client::config::endpoint::{
     ///     Endpoint,
     ///     EndpointFuture,
     ///     Params,
@@ -309,10 +309,10 @@ impl Builder {
     /// let resolver = StageResolver {
     ///     stage: std::env::var("STAGE").unwrap(),
     /// };
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .endpoint_resolver(resolver)
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     pub fn endpoint_resolver(
         mut self,
@@ -337,8 +337,8 @@ impl Builder {
     ///
     /// # Examples
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::Config;
-    /// use amzn_toolkit_telemetry::config::retry::RetryConfig;
+    /// use amzn_toolkit_telemetry_client::config::Config;
+    /// use amzn_toolkit_telemetry_client::config::retry::RetryConfig;
     ///
     /// let retry_config = RetryConfig::standard().with_max_attempts(5);
     /// let config = Config::builder().retry_config(retry_config).build();
@@ -352,8 +352,8 @@ impl Builder {
     ///
     /// # Examples
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::retry::RetryConfig;
-    /// use amzn_toolkit_telemetry::config::{
+    /// use amzn_toolkit_telemetry_client::config::retry::RetryConfig;
+    /// use amzn_toolkit_telemetry_client::config::{
     ///     Builder,
     ///     Config,
     /// };
@@ -380,7 +380,7 @@ impl Builder {
     /// # Examples
     ///
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::{
+    /// use amzn_toolkit_telemetry_client::config::{
     ///     AsyncSleep,
     ///     Config,
     ///     SharedAsyncSleep,
@@ -411,7 +411,7 @@ impl Builder {
     /// # Examples
     ///
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::{
+    /// use amzn_toolkit_telemetry_client::config::{
     ///     AsyncSleep,
     ///     Builder,
     ///     Config,
@@ -448,8 +448,8 @@ impl Builder {
     ///
     /// ```no_run
     /// # use std::time::Duration;
-    /// use amzn_toolkit_telemetry::config::Config;
-    /// use amzn_toolkit_telemetry::config::timeout::TimeoutConfig;
+    /// use amzn_toolkit_telemetry_client::config::Config;
+    /// use amzn_toolkit_telemetry_client::config::timeout::TimeoutConfig;
     ///
     /// let timeout_config = TimeoutConfig::builder()
     ///     .operation_attempt_timeout(Duration::from_secs(1))
@@ -467,8 +467,8 @@ impl Builder {
     ///
     /// ```no_run
     /// # use std::time::Duration;
-    /// use amzn_toolkit_telemetry::config::timeout::TimeoutConfig;
-    /// use amzn_toolkit_telemetry::config::{
+    /// use amzn_toolkit_telemetry_client::config::timeout::TimeoutConfig;
+    /// use amzn_toolkit_telemetry_client::config::{
     ///     Builder,
     ///     Config,
     /// };
@@ -527,22 +527,22 @@ impl Builder {
     ///
     /// Disabling identity caching:
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::IdentityCache;
+    /// use amzn_toolkit_telemetry_client::config::IdentityCache;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .identity_cache(IdentityCache::no_cache())
     ///     // ...
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     ///
     /// Customizing lazy caching:
     /// ```no_run
     /// use std::time::Duration;
     ///
-    /// use amzn_toolkit_telemetry::config::IdentityCache;
+    /// use amzn_toolkit_telemetry_client::config::IdentityCache;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .identity_cache(
     ///         IdentityCache::lazy()
     ///             // change the load timeout to 10 seconds
@@ -551,7 +551,7 @@ impl Builder {
     ///     )
     ///     // ...
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     pub fn identity_cache(mut self, identity_cache: impl crate::config::ResolveCachedIdentity + 'static) -> Self {
         self.set_identity_cache(identity_cache);
@@ -574,22 +574,22 @@ impl Builder {
     ///
     /// Disabling identity caching:
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::IdentityCache;
+    /// use amzn_toolkit_telemetry_client::config::IdentityCache;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .identity_cache(IdentityCache::no_cache())
     ///     // ...
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     ///
     /// Customizing lazy caching:
     /// ```no_run
     /// use std::time::Duration;
     ///
-    /// use amzn_toolkit_telemetry::config::IdentityCache;
+    /// use amzn_toolkit_telemetry_client::config::IdentityCache;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .identity_cache(
     ///         IdentityCache::lazy()
     ///             // change the load timeout to 10 seconds
@@ -598,7 +598,7 @@ impl Builder {
     ///     )
     ///     // ...
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     pub fn set_identity_cache(
         &mut self,
@@ -622,7 +622,7 @@ impl Builder {
     /// # mod tests {
     /// # #[test]
     /// # fn example() {
-    /// use amzn_toolkit_telemetry::config::Config;
+    /// use amzn_toolkit_telemetry_client::config::Config;
     /// use aws_smithy_runtime_api::client::interceptors::context::phase::BeforeTransmit;
     /// use aws_smithy_runtime_api::client::interceptors::{
     ///     Interceptor,
@@ -675,7 +675,7 @@ impl Builder {
     /// # mod tests {
     /// # #[test]
     /// # fn example() {
-    /// use amzn_toolkit_telemetry::config::{
+    /// use amzn_toolkit_telemetry_client::config::{
     ///     Builder,
     ///     Config,
     /// };
@@ -772,7 +772,7 @@ impl Builder {
     /// use aws_smithy_types::retry::ErrorKind;
     /// use std::error::Error as StdError;
     /// use std::marker::PhantomData;
-    /// use amzn_toolkit_telemetry::config::Config;
+    /// use amzn_toolkit_telemetry_client::config::Config;
     /// # struct SomeOperationError {}
     ///
     /// const RETRYABLE_ERROR_CODES: &[&str] = [
@@ -865,7 +865,7 @@ impl Builder {
     /// use aws_smithy_types::retry::ErrorKind;
     /// use std::error::Error as StdError;
     /// use std::marker::PhantomData;
-    /// use amzn_toolkit_telemetry::config::{Builder, Config};
+    /// use amzn_toolkit_telemetry_client::config::{Builder, Config};
     /// # struct SomeOperationError {}
     ///
     /// const RETRYABLE_ERROR_CODES: &[&str] = [
@@ -1001,13 +1001,13 @@ impl Builder {
     ///
     /// # Examples
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::{
+    /// use amzn_toolkit_telemetry_client::config::{
     ///     Builder,
     ///     Config,
     /// };
     /// use aws_types::region::Region;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .region(Region::new("us-east-1"))
     ///     .build();
     /// ```
@@ -1058,25 +1058,25 @@ impl Builder {
     /// `behavior-version-latest` cargo feature.
     ///
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::BehaviorVersion;
+    /// use amzn_toolkit_telemetry_client::config::BehaviorVersion;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .behavior_version(BehaviorVersion::latest())
     ///     // ...
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     ///
     /// Customizing behavior major version:
     ///
     ///  ```no_run
-    /// use amzn_toolkit_telemetry::config::BehaviorVersion;
+    /// use amzn_toolkit_telemetry_client::config::BehaviorVersion;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .behavior_version(BehaviorVersion::v2023_11_09())
     ///     // ...
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     pub fn behavior_version(mut self, behavior_version: crate::config::BehaviorVersion) -> Self {
         self.set_behavior_version(Some(behavior_version));
@@ -1096,25 +1096,25 @@ impl Builder {
     /// `behavior-version-latest` cargo feature.
     ///
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::BehaviorVersion;
+    /// use amzn_toolkit_telemetry_client::config::BehaviorVersion;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .behavior_version(BehaviorVersion::latest())
     ///     // ...
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     ///
     /// Customizing behavior major version:
     ///
     /// ```no_run
-    /// use amzn_toolkit_telemetry::config::BehaviorVersion;
+    /// use amzn_toolkit_telemetry_client::config::BehaviorVersion;
     ///
-    /// let config = amzn_toolkit_telemetry::Config::builder()
+    /// let config = amzn_toolkit_telemetry_client::Config::builder()
     ///     .behavior_version(BehaviorVersion::v2023_11_09())
     ///     // ...
     ///     .build();
-    /// let client = amzn_toolkit_telemetry::Client::from_conf(config);
+    /// let client = amzn_toolkit_telemetry_client::Client::from_conf(config);
     /// ```
     pub fn set_behavior_version(&mut self, behavior_version: Option<crate::config::BehaviorVersion>) -> &mut Self {
         self.behavior_version = behavior_version;
@@ -1182,7 +1182,7 @@ impl Builder {
             .map(|r| layer.store_put(::aws_types::region::SigningRegion::from(r)));
         Config {
             config: crate::config::Layer::from(layer.clone())
-                .with_name("amzn_toolkit_telemetry::config::Config")
+                .with_name("amzn_toolkit_telemetry_client::config::Config")
                 .freeze(),
             cloneable: layer,
             runtime_components: self.runtime_components,
@@ -1281,7 +1281,7 @@ impl ConfigOverrideRuntimePlugin {
         let _ = resolver;
         Self {
             config: ::aws_smithy_types::config_bag::Layer::from(layer)
-                .with_name("amzn_toolkit_telemetry::config::ConfigOverrideRuntimePlugin")
+                .with_name("amzn_toolkit_telemetry_client::config::ConfigOverrideRuntimePlugin")
                 .freeze(),
             components,
         }
diff --git a/crates/amzn-toolkit-telemetry/src/config/endpoint.rs b/crates/amzn-toolkit-telemetry-client/src/config/endpoint.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/config/endpoint.rs
rename to crates/amzn-toolkit-telemetry-client/src/config/endpoint.rs
diff --git a/crates/amzn-toolkit-telemetry/src/config/interceptors.rs b/crates/amzn-toolkit-telemetry-client/src/config/interceptors.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/config/interceptors.rs
rename to crates/amzn-toolkit-telemetry-client/src/config/interceptors.rs
diff --git a/crates/amzn-toolkit-telemetry/src/config/retry.rs b/crates/amzn-toolkit-telemetry-client/src/config/retry.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/config/retry.rs
rename to crates/amzn-toolkit-telemetry-client/src/config/retry.rs
diff --git a/crates/amzn-toolkit-telemetry/src/config/timeout.rs b/crates/amzn-toolkit-telemetry-client/src/config/timeout.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/config/timeout.rs
rename to crates/amzn-toolkit-telemetry-client/src/config/timeout.rs
diff --git a/crates/amzn-toolkit-telemetry/src/error.rs b/crates/amzn-toolkit-telemetry-client/src/error.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/error.rs
rename to crates/amzn-toolkit-telemetry-client/src/error.rs
diff --git a/crates/amzn-toolkit-telemetry/src/error/sealed_unhandled.rs b/crates/amzn-toolkit-telemetry-client/src/error/sealed_unhandled.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/error/sealed_unhandled.rs
rename to crates/amzn-toolkit-telemetry-client/src/error/sealed_unhandled.rs
diff --git a/crates/amzn-toolkit-telemetry/src/error_meta.rs b/crates/amzn-toolkit-telemetry-client/src/error_meta.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/error_meta.rs
rename to crates/amzn-toolkit-telemetry-client/src/error_meta.rs
diff --git a/crates/amzn-toolkit-telemetry/src/json_errors.rs b/crates/amzn-toolkit-telemetry-client/src/json_errors.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/json_errors.rs
rename to crates/amzn-toolkit-telemetry-client/src/json_errors.rs
diff --git a/crates/amzn-toolkit-telemetry/src/lib.rs b/crates/amzn-toolkit-telemetry-client/src/lib.rs
similarity index 99%
rename from crates/amzn-toolkit-telemetry/src/lib.rs
rename to crates/amzn-toolkit-telemetry-client/src/lib.rs
index 0d30f01da8..56b7d2192d 100644
--- a/crates/amzn-toolkit-telemetry/src/lib.rs
+++ b/crates/amzn-toolkit-telemetry-client/src/lib.rs
@@ -15,7 +15,7 @@
 #![allow(rustdoc::redundant_explicit_links)]
 #![warn(missing_docs)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
-//! amzn-toolkit-telemetry
+//! amzn-toolkit-telemetry-client
 //!
 //! # Crate Organization
 //!
diff --git a/crates/amzn-toolkit-telemetry/src/meta.rs b/crates/amzn-toolkit-telemetry-client/src/meta.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/meta.rs
rename to crates/amzn-toolkit-telemetry-client/src/meta.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation.rs b/crates/amzn-toolkit-telemetry-client/src/operation.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_error_report.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_error_report.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_error_report.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_error_report.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_error_report/_post_error_report_input.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_error_report/_post_error_report_input.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_error_report/_post_error_report_input.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_error_report/_post_error_report_input.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_error_report/_post_error_report_output.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_error_report/_post_error_report_output.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_error_report/_post_error_report_output.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_error_report/_post_error_report_output.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_error_report/builders.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_error_report/builders.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_error_report/builders.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_error_report/builders.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_feedback.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_feedback.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_feedback.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_feedback.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_feedback/_post_feedback_input.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_feedback/_post_feedback_input.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_feedback/_post_feedback_input.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_feedback/_post_feedback_input.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_feedback/_post_feedback_output.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_feedback/_post_feedback_output.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_feedback/_post_feedback_output.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_feedback/_post_feedback_output.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_feedback/builders.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_feedback/builders.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_feedback/builders.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_feedback/builders.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_metrics.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_metrics.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_metrics.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_metrics.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_metrics/_post_metrics_input.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_metrics/_post_metrics_input.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_metrics/_post_metrics_input.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_metrics/_post_metrics_input.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_metrics/_post_metrics_output.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_metrics/_post_metrics_output.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_metrics/_post_metrics_output.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_metrics/_post_metrics_output.rs
diff --git a/crates/amzn-toolkit-telemetry/src/operation/post_metrics/builders.rs b/crates/amzn-toolkit-telemetry-client/src/operation/post_metrics/builders.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/operation/post_metrics/builders.rs
rename to crates/amzn-toolkit-telemetry-client/src/operation/post_metrics/builders.rs
diff --git a/crates/amzn-toolkit-telemetry/src/primitives.rs b/crates/amzn-toolkit-telemetry-client/src/primitives.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/primitives.rs
rename to crates/amzn-toolkit-telemetry-client/src/primitives.rs
diff --git a/crates/amzn-toolkit-telemetry/src/primitives/event_stream.rs b/crates/amzn-toolkit-telemetry-client/src/primitives/event_stream.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/primitives/event_stream.rs
rename to crates/amzn-toolkit-telemetry-client/src/primitives/event_stream.rs
diff --git a/crates/amzn-toolkit-telemetry/src/primitives/sealed_enum_unknown.rs b/crates/amzn-toolkit-telemetry-client/src/primitives/sealed_enum_unknown.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/primitives/sealed_enum_unknown.rs
rename to crates/amzn-toolkit-telemetry-client/src/primitives/sealed_enum_unknown.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_error_details.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_error_details.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_error_details.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_error_details.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_metadata_entry.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_metadata_entry.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_metadata_entry.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_metadata_entry.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_metric_datum.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_metric_datum.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_metric_datum.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_metric_datum.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_error_report.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_error_report.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_error_report.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_error_report.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_error_report_input.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_error_report_input.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_error_report_input.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_error_report_input.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_feedback.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_feedback.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_feedback.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_feedback.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_feedback_input.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_feedback_input.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_feedback_input.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_feedback_input.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_metrics.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_metrics.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_metrics.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_metrics.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_metrics_input.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_metrics_input.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_post_metrics_input.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_post_metrics_input.rs
diff --git a/crates/amzn-toolkit-telemetry/src/protocol_serde/shape_userdata.rs b/crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_userdata.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/protocol_serde/shape_userdata.rs
rename to crates/amzn-toolkit-telemetry-client/src/protocol_serde/shape_userdata.rs
diff --git a/crates/amzn-toolkit-telemetry/src/serialization_settings.rs b/crates/amzn-toolkit-telemetry-client/src/serialization_settings.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/serialization_settings.rs
rename to crates/amzn-toolkit-telemetry-client/src/serialization_settings.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types.rs b/crates/amzn-toolkit-telemetry-client/src/types.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types.rs
rename to crates/amzn-toolkit-telemetry-client/src/types.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types/_aws_product.rs b/crates/amzn-toolkit-telemetry-client/src/types/_aws_product.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types/_aws_product.rs
rename to crates/amzn-toolkit-telemetry-client/src/types/_aws_product.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types/_error_details.rs b/crates/amzn-toolkit-telemetry-client/src/types/_error_details.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types/_error_details.rs
rename to crates/amzn-toolkit-telemetry-client/src/types/_error_details.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types/_metadata_entry.rs b/crates/amzn-toolkit-telemetry-client/src/types/_metadata_entry.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types/_metadata_entry.rs
rename to crates/amzn-toolkit-telemetry-client/src/types/_metadata_entry.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types/_metric_datum.rs b/crates/amzn-toolkit-telemetry-client/src/types/_metric_datum.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types/_metric_datum.rs
rename to crates/amzn-toolkit-telemetry-client/src/types/_metric_datum.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types/_sentiment.rs b/crates/amzn-toolkit-telemetry-client/src/types/_sentiment.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types/_sentiment.rs
rename to crates/amzn-toolkit-telemetry-client/src/types/_sentiment.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types/_unit.rs b/crates/amzn-toolkit-telemetry-client/src/types/_unit.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types/_unit.rs
rename to crates/amzn-toolkit-telemetry-client/src/types/_unit.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types/_userdata.rs b/crates/amzn-toolkit-telemetry-client/src/types/_userdata.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types/_userdata.rs
rename to crates/amzn-toolkit-telemetry-client/src/types/_userdata.rs
diff --git a/crates/amzn-toolkit-telemetry/src/types/builders.rs b/crates/amzn-toolkit-telemetry-client/src/types/builders.rs
similarity index 100%
rename from crates/amzn-toolkit-telemetry/src/types/builders.rs
rename to crates/amzn-toolkit-telemetry-client/src/types/builders.rs
diff --git a/crates/aws-toolkit-telemetry-definitions/Cargo.toml b/crates/aws-toolkit-telemetry-definitions/Cargo.toml
index 353222f519..d29de564c8 100644
--- a/crates/aws-toolkit-telemetry-definitions/Cargo.toml
+++ b/crates/aws-toolkit-telemetry-definitions/Cargo.toml
@@ -16,7 +16,7 @@ serde_json.workspace = true
 syn = "2.0.101"
 
 [dependencies]
-amzn-toolkit-telemetry = { path = "../amzn-toolkit-telemetry" }
+amzn-toolkit-telemetry-client = { path = "../amzn-toolkit-telemetry-client" }
 serde.workspace = true
 
 [dev-dependencies]
diff --git a/crates/aws-toolkit-telemetry-definitions/build.rs b/crates/aws-toolkit-telemetry-definitions/build.rs
index 9628f288f0..d7d286fddc 100644
--- a/crates/aws-toolkit-telemetry-definitions/build.rs
+++ b/crates/aws-toolkit-telemetry-definitions/build.rs
@@ -162,11 +162,11 @@ fn main() {
         let passive = m.passive.unwrap_or_default();
 
         let unit = match m.unit.map(|u| u.to_lowercase()).as_deref() {
-            Some("bytes") => quote!(::amzn_toolkit_telemetry::types::Unit::Bytes),
-            Some("count") => quote!(::amzn_toolkit_telemetry::types::Unit::Count),
-            Some("milliseconds") => quote!(::amzn_toolkit_telemetry::types::Unit::Milliseconds),
-            Some("percent") => quote!(::amzn_toolkit_telemetry::types::Unit::Percent),
-            Some("none") | None => quote!(::amzn_toolkit_telemetry::types::Unit::None),
+            Some("bytes") => quote!(::amzn_toolkit_telemetry_client::types::Unit::Bytes),
+            Some("count") => quote!(::amzn_toolkit_telemetry_client::types::Unit::Count),
+            Some("milliseconds") => quote!(::amzn_toolkit_telemetry_client::types::Unit::Milliseconds),
+            Some("percent") => quote!(::amzn_toolkit_telemetry_client::types::Unit::Percent),
+            Some("none") | None => quote!(::amzn_toolkit_telemetry_client::types::Unit::None),
             Some(unknown) => {
                 panic!("unknown unit: {:?}", unknown);
             },
@@ -200,7 +200,7 @@ fn main() {
             };
 
             quote!(
-                ::amzn_toolkit_telemetry::types::MetadataEntry::builder()
+                ::amzn_toolkit_telemetry_client::types::MetadataEntry::builder()
                     .key(#raw_name)
                     #value
                     .build()
@@ -222,11 +222,11 @@ fn main() {
             impl #name {
                 const NAME: &'static ::std::primitive::str = #raw_name;
                 const PASSIVE: ::std::primitive::bool = #passive;
-                const UNIT: ::amzn_toolkit_telemetry::types::Unit = #unit;
+                const UNIT: ::amzn_toolkit_telemetry_client::types::Unit = #unit;
             }
 
             impl crate::IntoMetricDatum for #name {
-                fn into_metric_datum(self) -> ::amzn_toolkit_telemetry::types::MetricDatum {
+                fn into_metric_datum(self) -> ::amzn_toolkit_telemetry_client::types::MetricDatum {
                     let metadata_entries = vec![
                         #(
                             #metadata_entries,
@@ -239,7 +239,7 @@ fn main() {
                             |t| t.duration_since(std::time::UNIX_EPOCH).unwrap().as_millis() as ::std::primitive::i64
                         );
 
-                    ::amzn_toolkit_telemetry::types::MetricDatum::builder()
+                    ::amzn_toolkit_telemetry_client::types::MetricDatum::builder()
                         .metric_name(#name::NAME)
                         .passive(#name::PASSIVE)
                         .unit(#name::UNIT)
diff --git a/crates/aws-toolkit-telemetry-definitions/src/lib.rs b/crates/aws-toolkit-telemetry-definitions/src/lib.rs
index c1e2f2c8ca..cd3bee5889 100644
--- a/crates/aws-toolkit-telemetry-definitions/src/lib.rs
+++ b/crates/aws-toolkit-telemetry-definitions/src/lib.rs
@@ -1,5 +1,5 @@
 pub trait IntoMetricDatum: Send {
-    fn into_metric_datum(self) -> amzn_toolkit_telemetry::types::MetricDatum;
+    fn into_metric_datum(self) -> amzn_toolkit_telemetry_client::types::MetricDatum;
 }
 
 include!(concat!(env!("OUT_DIR"), "/mod.rs"));
diff --git a/crates/fig_auth/src/builder_id.rs b/crates/fig_auth/src/builder_id.rs
index a7fe7f0b7c..e99a13f3dd 100644
--- a/crates/fig_auth/src/builder_id.rs
+++ b/crates/fig_auth/src/builder_id.rs
@@ -96,7 +96,7 @@ pub(crate) fn client(region: Region) -> Client {
     let retry_config = RetryConfig::standard().with_max_attempts(3);
     let sdk_config = aws_types::SdkConfig::builder()
         .http_client(fig_aws_common::http_client::client())
-        .behavior_version(BehaviorVersion::v2024_03_28())
+        .behavior_version(BehaviorVersion::v2025_01_17())
         .endpoint_url(oidc_url(&region))
         .region(region)
         .retry_config(retry_config)
diff --git a/crates/fig_aws_common/src/lib.rs b/crates/fig_aws_common/src/lib.rs
index caa4dbc106..b9739f9109 100644
--- a/crates/fig_aws_common/src/lib.rs
+++ b/crates/fig_aws_common/src/lib.rs
@@ -17,7 +17,7 @@ pub fn app_name() -> AppName {
 }
 
 pub fn behavior_version() -> BehaviorVersion {
-    BehaviorVersion::v2024_03_28()
+    BehaviorVersion::v2025_01_17()
 }
 
 #[cfg(test)]
diff --git a/crates/fig_telemetry/Cargo.toml b/crates/fig_telemetry/Cargo.toml
index 735e350470..df3ad45e7d 100644
--- a/crates/fig_telemetry/Cargo.toml
+++ b/crates/fig_telemetry/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
 
 [dependencies]
 amzn-codewhisperer-client = { path = "../amzn-codewhisperer-client" }
-amzn-toolkit-telemetry = { path = "../amzn-toolkit-telemetry" }
+amzn-toolkit-telemetry-client = { path = "../amzn-toolkit-telemetry-client" }
 anyhow.workspace = true
 async-trait.workspace = true
 aws-credential-types = "1.1.6"
diff --git a/crates/fig_telemetry/src/cognito.rs b/crates/fig_telemetry/src/cognito.rs
index 4c26c0de54..f50b6125cb 100644
--- a/crates/fig_telemetry/src/cognito.rs
+++ b/crates/fig_telemetry/src/cognito.rs
@@ -1,4 +1,4 @@
-use amzn_toolkit_telemetry::config::BehaviorVersion;
+use amzn_toolkit_telemetry_client::config::BehaviorVersion;
 use aws_credential_types::provider::error::CredentialsError;
 use aws_credential_types::{
     Credentials,
@@ -28,7 +28,7 @@ pub(crate) async fn get_cognito_credentials_send(
     telemetry_stage: &TelemetryStage,
 ) -> Result<Credentials, CredentialsError> {
     let conf = aws_sdk_cognitoidentity::Config::builder()
-        .behavior_version(BehaviorVersion::v2024_03_28())
+        .behavior_version(BehaviorVersion::v2025_01_17())
         .region(telemetry_stage.region.clone())
         .app_name(app_name())
         .build();
diff --git a/crates/fig_telemetry/src/endpoint.rs b/crates/fig_telemetry/src/endpoint.rs
index 0612322712..681d19af76 100644
--- a/crates/fig_telemetry/src/endpoint.rs
+++ b/crates/fig_telemetry/src/endpoint.rs
@@ -1,4 +1,4 @@
-use amzn_toolkit_telemetry::config::endpoint::{
+use amzn_toolkit_telemetry_client::config::endpoint::{
     Endpoint,
     EndpointFuture,
     Params,
diff --git a/crates/fig_telemetry/src/lib.rs b/crates/fig_telemetry/src/lib.rs
index ef73492d07..aabd80cd1f 100644
--- a/crates/fig_telemetry/src/lib.rs
+++ b/crates/fig_telemetry/src/lib.rs
@@ -25,13 +25,13 @@ use amzn_codewhisperer_client::types::{
     UserContext,
     UserTriggerDecisionEvent,
 };
-use amzn_toolkit_telemetry::config::{
+use amzn_toolkit_telemetry_client::config::{
     BehaviorVersion,
     Region,
 };
-use amzn_toolkit_telemetry::error::DisplayErrorContext;
-use amzn_toolkit_telemetry::types::AwsProduct;
-use amzn_toolkit_telemetry::{
+use amzn_toolkit_telemetry_client::error::DisplayErrorContext;
+use amzn_toolkit_telemetry_client::types::AwsProduct;
+use amzn_toolkit_telemetry_client::{
     Client as ToolkitTelemetryClient,
     Config,
 };
@@ -92,7 +92,7 @@ pub enum Error {
     #[error("Telemetry is disabled")]
     TelemetryDisabled,
     #[error(transparent)]
-    ClientError(#[from] amzn_toolkit_telemetry::operation::post_metrics::PostMetricsError),
+    ClientError(#[from] amzn_toolkit_telemetry_client::operation::post_metrics::PostMetricsError),
 }
 
 const PRODUCT: &str = "CodeWhisperer";
@@ -205,10 +205,10 @@ pub struct Client {
 impl Client {
     pub async fn new(telemetry_stage: TelemetryStage) -> Self {
         let client_id = util::get_client_id();
-        let toolkit_telemetry_client = Some(amzn_toolkit_telemetry::Client::from_conf(
+        let toolkit_telemetry_client = Some(amzn_toolkit_telemetry_client::Client::from_conf(
             Config::builder()
                 .http_client(fig_aws_common::http_client::client())
-                .behavior_version(BehaviorVersion::v2024_03_28())
+                .behavior_version(BehaviorVersion::v2025_01_17())
                 .endpoint_resolver(StaticEndpoint(telemetry_stage.endpoint))
                 .app_name(app_name())
                 .region(telemetry_stage.region.clone())
diff --git a/crates/fig_telemetry_core/Cargo.toml b/crates/fig_telemetry_core/Cargo.toml
index f4a2704750..10cf49ef69 100644
--- a/crates/fig_telemetry_core/Cargo.toml
+++ b/crates/fig_telemetry_core/Cargo.toml
@@ -9,7 +9,7 @@ license.workspace = true
 
 [dependencies]
 amzn-codewhisperer-client = { path = "../amzn-codewhisperer-client" }
-amzn-toolkit-telemetry = { path = "../amzn-toolkit-telemetry" }
+amzn-toolkit-telemetry-client = { path = "../amzn-toolkit-telemetry-client" }
 async-trait.workspace = true
 aws-toolkit-telemetry-definitions = { path = "../aws-toolkit-telemetry-definitions" }
 fig_util.workspace = true
diff --git a/crates/fig_telemetry_core/src/lib.rs b/crates/fig_telemetry_core/src/lib.rs
index 85aa5d5a2e..26d6bd8412 100644
--- a/crates/fig_telemetry_core/src/lib.rs
+++ b/crates/fig_telemetry_core/src/lib.rs
@@ -5,7 +5,7 @@ use std::time::{
     SystemTime,
 };
 
-pub use amzn_toolkit_telemetry::types::MetricDatum;
+pub use amzn_toolkit_telemetry_client::types::MetricDatum;
 use aws_toolkit_telemetry_definitions::IntoMetricDatum;
 use aws_toolkit_telemetry_definitions::metrics::{
     AmazonqDidSelectProfile,
diff --git a/crates/kiro-cli/.gitignore b/crates/kiro-cli/.gitignore
new file mode 100644
index 0000000000..0b0c025e2a
--- /dev/null
+++ b/crates/kiro-cli/.gitignore
@@ -0,0 +1,2 @@
+build/
+spec.ts
\ No newline at end of file
diff --git a/crates/kiro-cli/Cargo.toml b/crates/kiro-cli/Cargo.toml
new file mode 100644
index 0000000000..b8668d6841
--- /dev/null
+++ b/crates/kiro-cli/Cargo.toml
@@ -0,0 +1,186 @@
+[package]
+name = "chat_cli"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+publish.workspace = true
+version.workspace = true
+license.workspace = true
+
+[lints]
+workspace = true
+
+[features]
+default = []
+wayland = ["arboard/wayland-data-control"]
+
+[dependencies]
+amzn-codewhisperer-client = { path = "../amzn-codewhisperer-client" }
+amzn-codewhisperer-streaming-client = { path = "../amzn-codewhisperer-streaming-client" }
+amzn-consolas-client = { path = "../amzn-consolas-client" }
+amzn-qdeveloper-streaming-client = { path = "../amzn-qdeveloper-streaming-client" }
+amzn-toolkit-telemetry-client = { path = "../amzn-toolkit-telemetry-client" }
+anstream = "0.6.13"
+arboard = { version = "3.5.0", default-features = false }
+async-trait = "0.1.87"
+aws-config = "1.0.3"
+aws-credential-types = "1.0.3"
+aws-runtime = "1.4.4"
+aws-sdk-cognitoidentity = "1.51.0"
+aws-sdk-ssooidc = "1.51.0"
+aws-smithy-async = "1.2.2"
+aws-smithy-runtime-api = "1.6.1"
+aws-smithy-types = "1.2.10"
+aws-types = "1.3.0"
+base64 = "0.22.1"
+bitflags = "2.9.0"
+bstr = "1.12.0"
+bytes = "1.10.1"
+camino = { version = "1.1.3", features = ["serde1"] }
+cfg-if = "1.0.0"
+clap = { version = "4.5.32", features = [
+    "deprecated",
+    "derive",
+    "string",
+    "unicode",
+    "wrap_help",
+] }
+clap_complete = "4.5.46"
+clap_complete_fig = "4.4.0"
+color-eyre = "0.6.2"
+color-print = "0.3.5"
+convert_case = "0.8.0"
+cookie = "0.18.1"
+crossterm = { version = "0.28.1", features = ["event-stream", "events"] }
+ctrlc = "3.4.6"
+dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
+dirs = "5.0.0"
+eyre = "0.6.8"
+fd-lock = "4.0.4"
+futures = "0.3.26"
+glob = "0.3.2"
+globset = "0.4.16"
+hex = "0.4.3"
+http = "1.2.0"
+http-body-util = "0.1.3"
+hyper = { version = "1.6.0", features = ["server"] }
+hyper-util = { version = "0.1.11", features = ["tokio"] }
+indicatif = "0.17.11"
+indoc = "2.0.6"
+insta = "1.43.1"
+libc = "0.2.172"
+mimalloc = "0.1.46"
+nix = { version = "0.29.0", features = [
+    "feature",
+    "fs",
+    "ioctl",
+    "process",
+    "signal",
+    "term",
+    "user",
+] }
+owo-colors = "4.2.0"
+parking_lot = "0.12.3"
+paste = "1.0.11"
+percent-encoding = "2.2.0"
+r2d2 = "0.8.10"
+r2d2_sqlite = "0.25.0"
+rand = "0.9.0"
+regex = "1.7.0"
+reqwest = { version = "0.12.14", default-features = false, features = [
+    "http2",
+    "charset",
+    "rustls-tls",
+    "rustls-tls-native-roots",
+    "gzip",
+    "json",
+    "socks",
+    "cookies",
+] }
+ring = "0.17.14"
+rusqlite = { version = "0.32.1", features = ["bundled", "serde_json"] }
+rustls = "0.23.23"
+rustls-native-certs = "0.8.1"
+rustls-pemfile = "2.1.0"
+rustyline = { version = "15.0.0", features = [
+    "custom-bindings",
+    "derive",
+    "with-file-history",
+], default-features = false }
+self_update = "0.42.0"
+semver = { version = "1.0.26", features = ["serde"] }
+serde = { version = "1.0.219", features = ["derive", "rc"] }
+serde_json = "1.0.140"
+sha2 = "0.10.9"
+shell-color = "1.0.0"
+shell-words = "1.1.0"
+shellexpand = "3.0.0"
+shlex = "1.3.0"
+similar = "2.7.0"
+skim = { version = "0.16.2" }
+spinners = "4.1.0"
+strip-ansi-escapes = "0.2.1"
+strum = { version = "0.27.1", features = ["derive"] }
+syntect = "5.2.0"
+sysinfo = "0.33.1"
+tempfile = "3.18.0"
+thiserror = "2.0.12"
+time = { version = "0.3.39", features = [
+    "parsing",
+    "formatting",
+    "local-offset",
+    "macros",
+    "serde",
+] }
+tokio = { version = "1.44.2", features = ["full"] }
+tokio-tungstenite = "0.26.2"
+tokio-util = { version = "0.7.15", features = ["codec", "compat"] }
+toml = "0.8.12"
+tracing = { version = "0.1.40", features = ["log"] }
+tracing-appender = "0.2.2"
+tracing-subscriber = { version = "0.3.19", features = [
+    "env-filter",
+    "fmt",
+    "parking_lot",
+    "time",
+] }
+unicode-width = "0.2.0"
+url = "2.5.4"
+uuid = { version = "1.15.1", features = ["v4", "serde"] }
+walkdir = "2.5.0"
+webpki-roots = "0.26.8"
+whoami = "1.6.0"
+winnow = "=0.6.2"
+
+[target.'cfg(unix)'.dependencies]
+nix = { version = "0.29.0", features = [
+    "feature",
+    "fs",
+    "ioctl",
+    "process",
+    "signal",
+    "term",
+    "user",
+] }
+
+[target.'cfg(target_os = "macos")'.dependencies]
+objc2 = "0.5.2"
+objc2-app-kit = { version = "0.2.2", features = ["NSWorkspace"] }
+objc2-foundation = { version = "0.2.2", features = ["NSString", "NSURL"] }
+security-framework = "3.2.0"
+
+[dev-dependencies]
+assert_cmd = "2.0"
+criterion = "0.5.1"
+mockito = "1.7.0"
+paste = "1.0.11"
+predicates = "3.0"
+tracing-test = "0.2.4"
+
+[build-dependencies]
+convert_case = "0.8.0"
+prettyplease = "0.2.32"
+quote = "1.0.40"
+serde = { version = "1.0.219", features = ["derive", "rc"] }
+serde_json = "1.0.140"
+syn = "2.0.101"
diff --git a/crates/kiro-cli/build.rs b/crates/kiro-cli/build.rs
new file mode 100644
index 0000000000..b7320f27d5
--- /dev/null
+++ b/crates/kiro-cli/build.rs
@@ -0,0 +1,280 @@
+use convert_case::{
+    Case,
+    Casing,
+};
+use quote::{
+    format_ident,
+    quote,
+};
+
+const DEF: &str = include_str!("./telemetry_definitions.json");
+
+#[derive(Debug, Clone, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct TypeDef {
+    name: String,
+    r#type: Option<String>,
+    allowed_values: Option<Vec<String>>,
+    description: String,
+}
+
+#[derive(Debug, Clone, serde::Deserialize)]
+struct MetricDef {
+    name: String,
+    description: String,
+    metadata: Option<Vec<MetricMetadata>>,
+    passive: Option<bool>,
+    unit: Option<String>,
+}
+
+#[derive(Debug, Clone, serde::Deserialize)]
+struct MetricMetadata {
+    r#type: String,
+    required: Option<bool>,
+}
+
+#[derive(Debug, Clone, serde::Deserialize)]
+struct Def {
+    types: Vec<TypeDef>,
+    metrics: Vec<MetricDef>,
+}
+
+fn main() {
+    println!("cargo:rerun-if-changed=def.json");
+
+    let outdir = std::env::var("OUT_DIR").unwrap();
+
+    let data = serde_json::from_str::<Def>(DEF).unwrap();
+
+    let mut out = "
+        #[allow(rustdoc::invalid_html_tags)]
+        #[allow(rustdoc::bare_urls)]
+        mod inner {
+    "
+    .to_string();
+
+    out.push_str("pub mod types {");
+    for t in data.types {
+        let name = format_ident!("{}", t.name.to_case(Case::Pascal));
+
+        let rust_type = match t.allowed_values {
+            // enum
+            Some(allowed_values) => {
+                let mut variants = vec![];
+                let mut variant_as_str = vec![];
+
+                for v in allowed_values {
+                    let ident = format_ident!("{}", v.replace('.', "").to_case(Case::Pascal));
+                    variants.push(quote!(
+                        #[doc = concat!("`", #v, "`")]
+                        #ident
+                    ));
+                    variant_as_str.push(quote!(
+                        #name::#ident => #v
+                    ));
+                }
+
+                let description = t.description;
+
+                quote::quote!(
+                    #[doc = #description]
+                    #[derive(Debug, Clone, PartialEq)]
+                    #[non_exhaustive]
+                    pub enum #name {
+                        #(
+                            #variants,
+                        )*
+                    }
+
+                    impl #name {
+                        pub fn as_str(&self) -> &'static str {
+                            match self {
+                                #( #variant_as_str, )*
+                            }
+                        }
+                    }
+
+                    impl ::std::fmt::Display for #name {
+                        fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+                            f.write_str(self.as_str())
+                        }
+                    }
+                )
+                .to_string()
+            },
+            // struct
+            None => {
+                let r#type = match t.r#type.as_deref() {
+                    Some("string") | None => quote!(::std::string::String),
+                    Some("int") => quote!(::std::primitive::i64),
+                    Some("double") => quote!(::std::primitive::f64),
+                    Some("boolean") => quote!(::std::primitive::bool),
+                    Some(other) => panic!("{}", other),
+                };
+                let description = t.description;
+
+                quote::quote!(
+                    #[doc = #description]
+                    #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+                    #[serde(transparent)]
+                    pub struct #name(pub #r#type);
+
+                    impl #name {
+                        pub fn new(t: #r#type) -> Self {
+                            Self(t)
+                        }
+
+                        pub fn value(&self) -> &#r#type {
+                            &self.0
+                        }
+
+                        pub fn into_value(self) -> #r#type {
+                            self.0
+                        }
+                    }
+
+                    impl ::std::fmt::Display for #name {
+                        fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+                            write!(f, "{}", self.0)
+                        }
+                    }
+
+                    impl From<#r#type> for #name {
+                        fn from(t: #r#type) -> Self {
+                            Self(t)
+                        }
+                    }
+                )
+                .to_string()
+            },
+        };
+
+        out.push_str(&rust_type);
+    }
+    out.push('}');
+
+    out.push_str("pub mod metrics {");
+    for m in data.metrics.clone() {
+        let raw_name = m.name;
+        let name = format_ident!("{}", raw_name.to_case(Case::Pascal));
+        let description = m.description;
+
+        let passive = m.passive.unwrap_or_default();
+
+        let unit = match m.unit.map(|u| u.to_lowercase()).as_deref() {
+            Some("bytes") => quote!(::amzn_toolkit_telemetry_client::types::Unit::Bytes),
+            Some("count") => quote!(::amzn_toolkit_telemetry_client::types::Unit::Count),
+            Some("milliseconds") => quote!(::amzn_toolkit_telemetry_client::types::Unit::Milliseconds),
+            Some("percent") => quote!(::amzn_toolkit_telemetry_client::types::Unit::Percent),
+            Some("none") | None => quote!(::amzn_toolkit_telemetry_client::types::Unit::None),
+            Some(unknown) => {
+                panic!("unknown unit: {:?}", unknown);
+            },
+        };
+
+        let metadata = m.metadata.unwrap_or_default();
+
+        let mut fields = Vec::new();
+        for field in &metadata {
+            let field_name = format_ident!("{}", &field.r#type.to_case(Case::Snake));
+            let ty_name = format_ident!("{}", field.r#type.to_case(Case::Pascal));
+            let ty = if field.required.unwrap_or_default() {
+                quote!(crate::fig_telemetry::definitions::types::#ty_name)
+            } else {
+                quote!(::std::option::Option<crate::fig_telemetry::definitions::types::#ty_name>)
+            };
+
+            fields.push(quote!(
+                #field_name: #ty
+            ));
+        }
+
+        let metadata_entries = metadata.iter().map(|m| {
+            let raw_name = &m.r#type;
+            let key = format_ident!("{}", m.r#type.to_case(Case::Snake));
+
+            let value = if m.required.unwrap_or_default() {
+                quote!(.value(self.#key.to_string()))
+            } else {
+                quote!(.value(self.#key.map(|v| v.to_string()).unwrap_or_default()))
+            };
+
+            quote!(
+                ::amzn_toolkit_telemetry_client::types::MetadataEntry::builder()
+                    .key(#raw_name)
+                    #value
+                    .build()
+            )
+        });
+
+        let rust_type = quote::quote!(
+            #[doc = #description]
+            #[derive(Debug, Clone, PartialEq, ::serde::Serialize, ::serde::Deserialize)]
+            #[serde(rename_all = "camelCase")]
+            pub struct #name {
+                /// The time that the event took place,
+                pub create_time: ::std::option::Option<::std::time::SystemTime>,
+                /// Value based on unit and call type,
+                pub value: ::std::option::Option<f64>,
+                #( pub #fields, )*
+            }
+
+            impl #name {
+                const NAME: &'static ::std::primitive::str = #raw_name;
+                const PASSIVE: ::std::primitive::bool = #passive;
+                const UNIT: ::amzn_toolkit_telemetry_client::types::Unit = #unit;
+            }
+
+            impl crate::fig_telemetry::definitions::IntoMetricDatum for #name {
+                fn into_metric_datum(self) -> ::amzn_toolkit_telemetry_client::types::MetricDatum {
+                    let metadata_entries = vec![
+                        #(
+                            #metadata_entries,
+                        )*
+                    ];
+
+                    let epoch_timestamp = self.create_time
+                        .map_or_else(
+                            || ::std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_millis() as ::std::primitive::i64,
+                            |t| t.duration_since(std::time::UNIX_EPOCH).unwrap().as_millis() as ::std::primitive::i64
+                        );
+
+                    ::amzn_toolkit_telemetry_client::types::MetricDatum::builder()
+                        .metric_name(#name::NAME)
+                        .passive(#name::PASSIVE)
+                        .unit(#name::UNIT)
+                        .epoch_timestamp(epoch_timestamp)
+                        .value(self.value.unwrap_or(1.0))
+                        .set_metadata(Some(metadata_entries))
+                        .build()
+                        .unwrap()
+               }
+            }
+        );
+
+        out.push_str(&rust_type.to_string());
+    }
+    out.push('}');
+
+    // enum of all metrics
+    let mut metrics = Vec::new();
+    for m in data.metrics {
+        let name = format_ident!("{}", m.name.to_case(Case::Pascal));
+        metrics.push(quote!(
+            #name
+        ));
+    }
+    out.push_str("#[derive(Debug, Clone, PartialEq, ::serde::Serialize, ::serde::Deserialize)]\n#[serde(tag = \"type\", content = \"content\")]\npub enum Metric {\n");
+    for m in metrics {
+        out.push_str(&format!("{m}(crate::fig_telemetry::definitions::metrics::{m}),\n"));
+    }
+    out.push('}');
+
+    out.push_str("}\npub use inner::*;");
+
+    let file: syn::File = syn::parse_str(&out).unwrap();
+    let pp = prettyplease::unparse(&file);
+
+    // write an empty file to the output directory
+    std::fs::write(format!("{}/mod.rs", outdir), pp).unwrap();
+}
diff --git a/crates/q_chat/src/cli.rs b/crates/kiro-cli/src/cli/chat/cli.rs
similarity index 100%
rename from crates/q_chat/src/cli.rs
rename to crates/kiro-cli/src/cli/chat/cli.rs
diff --git a/crates/q_chat/src/command.rs b/crates/kiro-cli/src/cli/chat/command.rs
similarity index 100%
rename from crates/q_chat/src/command.rs
rename to crates/kiro-cli/src/cli/chat/command.rs
diff --git a/crates/q_chat/src/consts.rs b/crates/kiro-cli/src/cli/chat/consts.rs
similarity index 100%
rename from crates/q_chat/src/consts.rs
rename to crates/kiro-cli/src/cli/chat/consts.rs
diff --git a/crates/q_chat/src/context.rs b/crates/kiro-cli/src/cli/chat/context.rs
similarity index 99%
rename from crates/q_chat/src/context.rs
rename to crates/kiro-cli/src/cli/chat/context.rs
index 6be6aeb7fe..756d055740 100644
--- a/crates/q_chat/src/context.rs
+++ b/crates/kiro-cli/src/cli/chat/context.rs
@@ -10,8 +10,6 @@ use eyre::{
     Result,
     eyre,
 };
-use fig_os_shim::Context;
-use fig_util::directories;
 use glob::glob;
 use regex::Regex;
 use serde::{
@@ -24,6 +22,8 @@ use super::hooks::{
     Hook,
     HookExecutor,
 };
+use crate::fig_os_shim::Context;
+use crate::fig_util::directories;
 
 pub const AMAZONQ_FILENAME: &str = "AmazonQ.md";
 
diff --git a/crates/q_chat/src/conversation_state.rs b/crates/kiro-cli/src/cli/chat/conversation_state.rs
similarity index 98%
rename from crates/q_chat/src/conversation_state.rs
rename to crates/kiro-cli/src/cli/chat/conversation_state.rs
index 75a636c6d8..0a6b151e05 100644
--- a/crates/q_chat/src/conversation_state.rs
+++ b/crates/kiro-cli/src/cli/chat/conversation_state.rs
@@ -4,21 +4,6 @@ use std::collections::{
 };
 use std::sync::Arc;
 
-use fig_api_client::model::{
-    AssistantResponseMessage,
-    ChatMessage,
-    ConversationState as FigConversationState,
-    Tool,
-    ToolInputSchema,
-    ToolResult,
-    ToolResultContentBlock,
-    ToolSpecification,
-    ToolUse,
-    UserInputMessage,
-    UserInputMessageContext,
-};
-use fig_os_shim::Context;
-use mcp_client::Prompt;
 use tracing::{
     debug,
     error,
@@ -53,11 +38,26 @@ use super::tools::{
     ToolSpec,
     serde_value_to_document,
 };
+use crate::cli::chat::shared_writer::SharedWriter;
+use crate::fig_api_client::model::{
+    AssistantResponseMessage,
+    ChatMessage,
+    ConversationState as FigConversationState,
+    Tool,
+    ToolInputSchema,
+    ToolResult,
+    ToolResultContentBlock,
+    ToolSpecification,
+    ToolUse,
+    UserInputMessage,
+    UserInputMessageContext,
+};
+use crate::fig_os_shim::Context;
+use crate::mcp_client::Prompt;
 
 const CONTEXT_ENTRY_START_HEADER: &str = "--- CONTEXT ENTRY BEGIN ---\n";
 const CONTEXT_ENTRY_END_HEADER: &str = "--- CONTEXT ENTRY END ---\n\n";
 
-use crate::util::shared_writer::SharedWriter;
 /// Tracks state related to an ongoing conversation.
 #[derive(Debug, Clone)]
 pub struct ConversationState {
@@ -152,17 +152,17 @@ impl ConversationState {
     /// It asserts that the collection ends with a prompt that assumes the role of user.
     pub fn append_prompts(&mut self, mut prompts: VecDeque<Prompt>) -> Option<String> {
         debug_assert!(self.next_message.is_none(), "next_message should not exist");
-        debug_assert!(prompts.back().is_some_and(|p| p.role == mcp_client::Role::User));
+        debug_assert!(prompts.back().is_some_and(|p| p.role == crate::mcp_client::Role::User));
         let last_msg = prompts.pop_back()?;
         let (mut candidate_user, mut candidate_asst) = (None::<UserMessage>, None::<AssistantMessage>);
         while let Some(prompt) = prompts.pop_front() {
             let Prompt { role, content } = prompt;
             match role {
-                mcp_client::Role::User => {
+                crate::mcp_client::Role::User => {
                     let user_msg = UserMessage::new_prompt(content.to_string());
                     candidate_user.replace(user_msg);
                 },
-                mcp_client::Role::Assistant => {
+                crate::mcp_client::Role::Assistant => {
                     let assistant_msg = AssistantMessage::new_response(None, content.into());
                     candidate_asst.replace(assistant_msg);
                 },
@@ -582,7 +582,7 @@ impl ConversationState {
                                 content: vec![ToolResultContentBlock::Text(
                                     "Tool use was cancelled by the user".to_string(),
                                 )],
-                                status: fig_api_client::model::ToolResultStatus::Error,
+                                status: crate::fig_api_client::model::ToolResultStatus::Error,
                             })
                             .collect::<Vec<_>>(),
                     );
@@ -599,11 +599,10 @@ impl ConversationState {
                         content: vec![ToolResultContentBlock::Text(
                             "Tool use was cancelled by the user".to_string(),
                         )],
-                        status: fig_api_client::model::ToolResultStatus::Error,
+                        status: crate::fig_api_client::model::ToolResultStatus::Error,
                     })
                     .collect::<Vec<_>>();
                 let user_input_message_context = UserInputMessageContext {
-                    shell_state: None,
                     env_state: Some(build_env_state()),
                     tool_results: Some(tool_results),
                     tools: if self.tools.is_empty() {
@@ -754,18 +753,17 @@ fn format_hook_context<'a>(hook_results: impl IntoIterator<Item = &'a (Hook, Str
 
 #[cfg(test)]
 mod tests {
-    use fig_api_client::model::{
-        AssistantResponseMessage,
-        ToolResultStatus,
-    };
-
     use super::super::context::{
         AMAZONQ_FILENAME,
         profile_context_path,
     };
     use super::super::message::AssistantToolUse;
     use super::*;
-    use crate::tool_manager::ToolManager;
+    use crate::cli::chat::tool_manager::ToolManager;
+    use crate::fig_api_client::model::{
+        AssistantResponseMessage,
+        ToolResultStatus,
+    };
 
     fn assert_conversation_state_invariants(state: FigConversationState, assertion_iteration: usize) {
         if let Some(Some(msg)) = state.history.as_ref().map(|h| h.first()) {
diff --git a/crates/q_chat/src/hooks.rs b/crates/kiro-cli/src/cli/chat/hooks.rs
similarity index 100%
rename from crates/q_chat/src/hooks.rs
rename to crates/kiro-cli/src/cli/chat/hooks.rs
diff --git a/crates/q_chat/src/input_source.rs b/crates/kiro-cli/src/cli/chat/input_source.rs
similarity index 96%
rename from crates/q_chat/src/input_source.rs
rename to crates/kiro-cli/src/cli/chat/input_source.rs
index d7bd446a77..4e43bb2d13 100644
--- a/crates/q_chat/src/input_source.rs
+++ b/crates/kiro-cli/src/cli/chat/input_source.rs
@@ -41,7 +41,7 @@ impl InputSource {
 
     pub fn put_skim_command_selector(&mut self, context_manager: Arc<ContextManager>, tool_names: Vec<String>) {
         if let inner::Inner::Readline(rl) = &mut self.0 {
-            let key_char = match fig_settings::settings::get_string_opt("chat.skimCommandKey").as_deref() {
+            let key_char = match crate::fig_settings::settings::get_string_opt("chat.skimCommandKey").as_deref() {
                 Some(key) if key.len() == 1 => key.chars().next().unwrap_or('s'),
                 _ => 's', // Default to 's' if setting is missing or invalid
             };
diff --git a/crates/q_chat/src/message.rs b/crates/kiro-cli/src/cli/chat/message.rs
similarity index 93%
rename from crates/q_chat/src/message.rs
rename to crates/kiro-cli/src/cli/chat/message.rs
index 3a91d361f6..512a8fb276 100644
--- a/crates/q_chat/src/message.rs
+++ b/crates/kiro-cli/src/cli/chat/message.rs
@@ -1,17 +1,5 @@
 use std::env;
 
-use fig_api_client::model::{
-    AssistantResponseMessage,
-    EnvState,
-    ShellState,
-    ToolResult,
-    ToolResultContentBlock,
-    ToolResultStatus,
-    ToolUse,
-    UserInputMessage,
-    UserInputMessageContext,
-};
-use fig_util::Shell;
 use serde::{
     Deserialize,
     Serialize,
@@ -26,6 +14,16 @@ use super::tools::{
     serde_value_to_document,
 };
 use super::util::truncate_safe;
+use crate::fig_api_client::model::{
+    AssistantResponseMessage,
+    EnvState,
+    ToolResult,
+    ToolResultContentBlock,
+    ToolResultStatus,
+    ToolUse,
+    UserInputMessage,
+    UserInputMessageContext,
+};
 
 const USER_ENTRY_START_HEADER: &str = "--- USER MESSAGE BEGIN ---\n";
 const USER_ENTRY_END_HEADER: &str = "--- USER MESSAGE END ---\n\n";
@@ -99,7 +97,6 @@ impl UserMessage {
         UserInputMessage {
             content: self.prompt().unwrap_or_default().to_string(),
             user_input_message_context: Some(UserInputMessageContext {
-                shell_state: self.env_context.shell_state,
                 env_state: self.env_context.env_state,
                 tool_results: match self.content {
                     UserMessageContent::CancelledToolUses { tool_use_results, .. }
@@ -129,7 +126,6 @@ impl UserMessage {
                 .trim()
                 .to_string(),
             user_input_message_context: Some(UserInputMessageContext {
-                shell_state: self.env_context.shell_state,
                 env_state: self.env_context.env_state,
                 tool_results: match self.content {
                     UserMessageContent::CancelledToolUses { tool_use_results, .. }
@@ -242,14 +238,12 @@ impl From<InvokeOutput> for ToolUseResultBlock {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct UserEnvContext {
-    shell_state: Option<ShellState>,
     env_state: Option<EnvState>,
 }
 
 impl UserEnvContext {
     pub fn generate_new() -> Self {
         Self {
-            shell_state: Some(build_shell_state()),
             env_state: Some(build_env_state()),
         }
     }
@@ -376,23 +370,6 @@ pub fn build_env_state() -> EnvState {
     env_state
 }
 
-fn build_shell_state() -> ShellState {
-    // Try to grab the shell from the parent process via the `Shell::current_shell`,
-    // then try the `SHELL` env, finally just report bash
-    let shell_name = Shell::current_shell()
-        .or_else(|| {
-            let shell_name = env::var("SHELL").ok()?;
-            Shell::try_find_shell(shell_name)
-        })
-        .unwrap_or(Shell::Bash)
-        .to_string();
-
-    ShellState {
-        shell_name,
-        shell_history: None,
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/q_chat/src/lib.rs b/crates/kiro-cli/src/cli/chat/mod.rs
similarity index 95%
rename from crates/q_chat/src/lib.rs
rename to crates/kiro-cli/src/cli/chat/mod.rs
index bf19615045..6e4c7beb7b 100644
--- a/crates/q_chat/src/lib.rs
+++ b/crates/kiro-cli/src/cli/chat/mod.rs
@@ -9,6 +9,7 @@ mod message;
 mod parse;
 mod parser;
 mod prompt;
+mod shared_writer;
 mod skim_integration;
 mod token_counter;
 mod tool_manager;
@@ -53,6 +54,7 @@ use crossterm::style::{
     Color,
     Stylize,
 };
+use crossterm::terminal::ClearType;
 use crossterm::{
     cursor,
     execute,
@@ -65,20 +67,6 @@ use eyre::{
     Result,
     bail,
 };
-use fig_api_client::StreamingClient;
-use fig_api_client::clients::SendMessageOutput;
-use fig_api_client::model::{
-    ChatResponseStream,
-    Tool as FigTool,
-    ToolResultStatus,
-};
-use fig_os_shim::Context;
-use fig_settings::keys::UPDATE_AVAILABLE_KEY;
-use fig_settings::{
-    Settings,
-    State,
-};
-use fig_util::CLI_BINARY_NAME;
 use hooks::{
     Hook,
     HookTrigger,
@@ -93,7 +81,21 @@ use rand::distr::{
     Alphanumeric,
     SampleString,
 };
-use semver::Version;
+use shared_writer::SharedWriter;
+
+use crate::fig_api_client::StreamingClient;
+use crate::fig_api_client::clients::SendMessageOutput;
+use crate::fig_api_client::model::{
+    ChatResponseStream,
+    Tool as FigTool,
+    ToolResultStatus,
+};
+use crate::fig_os_shim::Context;
+use crate::fig_settings::{
+    Settings,
+    State,
+};
+use crate::fig_util::CLI_BINARY_NAME;
 
 /// Help text for the compact command
 fn compact_help_text() -> String {
@@ -124,10 +126,6 @@ that may eventually reach memory constraints.
     )
 }
 use input_source::InputSource;
-use mcp_client::{
-    Prompt,
-    PromptGetResult,
-};
 use parse::{
     ParseState,
     interpret_markdown,
@@ -182,8 +180,10 @@ use uuid::Uuid;
 use winnow::Partial;
 use winnow::stream::Offset;
 
-use crate::util::shared_writer::SharedWriter;
-use crate::util::ui::draw_box;
+use crate::mcp_client::{
+    Prompt,
+    PromptGetResult,
+};
 
 const WELCOME_TEXT: &str = color_print::cstr! {"
 <em>Welcome to </em>
@@ -311,7 +311,7 @@ pub async fn chat(
     trust_all_tools: bool,
     trust_tools: Option<Vec<String>>,
 ) -> Result<ExitCode> {
-    if !fig_util::system_info::in_cloudshell() && !fig_auth::is_logged_in().await {
+    if !crate::fig_util::system_info::in_cloudshell() && !crate::fig_auth::is_logged_in().await {
         bail!(
             "You are not logged in, please log in with {}",
             format!("{CLI_BINARY_NAME} login",).bold()
@@ -456,7 +456,7 @@ enum ToolUseStatus {
 #[derive(Debug, Error)]
 pub enum ChatError {
     #[error("{0}")]
-    Client(#[from] fig_api_client::Error),
+    Client(#[from] crate::fig_api_client::Error),
     #[error("{0}")]
     ResponseStream(#[from] parser::RecvError),
     #[error("{0}")]
@@ -676,52 +676,101 @@ impl ChatContext {
         Ok(content.trim().to_string())
     }
 
-    fn check_for_updates(&mut self) {
-        let exe_path = match std::env::current_exe().and_then(|p| p.canonicalize()) {
-            Ok(path) => path,
-            Err(_) => return, // Early return if we can't get the executable path
-        };
+    fn draw_tip_box(&mut self, text: &str) -> Result<()> {
+        let box_width = GREETING_BREAK_POINT;
+        let inner_width = box_width - 4; // account for │ and padding
 
-        if let Some(exe_parent) = exe_path.parent() {
-            let local_bin = match fig_util::directories::home_local_bin().map(|p| p.canonicalize()) {
-                Ok(path) => path,
-                Err(_) => return,
-            };
+        // wrap the single line into multiple lines respecting inner width
+        // Manually wrap the text by splitting at word boundaries
+        let mut wrapped_lines = Vec::new();
+        let mut line = String::new();
 
-            if let Ok(local_bin) = local_bin {
-                if exe_parent != local_bin {
-                    let _ = self.state.remove_value(UPDATE_AVAILABLE_KEY);
-                    return;
+        for word in text.split_whitespace() {
+            if line.len() + word.len() < inner_width {
+                if !line.is_empty() {
+                    line.push(' ');
+                }
+                line.push_str(word);
+            } else {
+                // Here we need to account for words that are too long as well
+                if word.len() >= inner_width {
+                    let mut start = 0_usize;
+                    for (i, _) in word.chars().enumerate() {
+                        if i - start >= inner_width {
+                            wrapped_lines.push(word[start..i].to_string());
+                            start = i;
+                        }
+                    }
+                    wrapped_lines.push(word[start..].to_string());
+                    line = String::new();
+                } else {
+                    wrapped_lines.push(line);
+                    line = word.to_string();
                 }
             }
         }
 
-        tokio::spawn(async {
-            let result =
-                tokio::time::timeout(std::time::Duration::from_secs(3), fig_install::check_for_updates(false)).await;
+        if !line.is_empty() {
+            wrapped_lines.push(line);
+        }
 
-            match result {
-                Ok(Ok(Some(new_package))) => {
-                    if let Err(err) =
-                        fig_settings::state::set_value(UPDATE_AVAILABLE_KEY, new_package.version.to_string())
-                    {
-                        warn!(?err, "Error setting {UPDATE_AVAILABLE_KEY}: {err}");
-                    }
-                },
-                Ok(Ok(None)) => {},
-                Ok(Err(err)) => {
-                    warn!(?err, "Error checking for updates: {err}");
-                },
-                Err(_) => {
-                    warn!("Update check timed out");
-                },
-            }
-        });
+        // ───── Did you know? ─────
+        let label = " Did you know? ";
+        let side_len = (box_width.saturating_sub(label.len())) / 2;
+        let top_border = format!(
+            "╭{}{}{}╮",
+            "─".repeat(side_len - 1),
+            label,
+            "─".repeat(box_width - side_len - label.len() - 1)
+        );
+
+        // Build output
+        execute!(
+            self.output,
+            terminal::Clear(ClearType::CurrentLine),
+            cursor::MoveToColumn(0),
+            style::Print(format!("{top_border}\n")),
+        )?;
+
+        // Top vertical padding
+        execute!(
+            self.output,
+            style::Print(format!("│{: <width$}│\n", "", width = box_width - 2))
+        )?;
+
+        // Centered wrapped content
+        for line in wrapped_lines {
+            let visible_line_len = strip_ansi_escapes::strip(&line).len();
+            let left_pad = box_width.saturating_sub(4).saturating_sub(visible_line_len) / 2;
+
+            let content = format!(
+                "│ {: <pad$}{}{: <rem$} │",
+                "",
+                line,
+                "",
+                pad = left_pad,
+                rem = box_width
+                    .saturating_sub(4)
+                    .saturating_sub(left_pad)
+                    .saturating_sub(visible_line_len),
+            );
+            execute!(self.output, style::Print(format!("{}\n", content)))?;
+        }
+
+        // Bottom vertical padding
+        execute!(
+            self.output,
+            style::Print(format!("│{: <width$}│\n", "", width = box_width - 2))
+        )?;
+
+        // Bottom rounded corner line: ╰────────────╯
+        let bottom = format!("╰{}╯", "─".repeat(box_width - 2));
+        execute!(self.output, style::Print(format!("{}\n", bottom)))?;
+
+        Ok(())
     }
 
     async fn try_chat(&mut self) -> Result<()> {
-        self.check_for_updates();
-
         let is_small_screen = self.terminal_width() < GREETING_BREAK_POINT;
         if self.interactive && self.settings.get_bool_or("chat.greeting.enabled", true) {
             execute!(
@@ -747,13 +796,7 @@ impl ChatContext {
                     style::Print("\n")
                 )?;
             } else {
-                draw_box(
-                    self.output.clone(),
-                    "Did you know?",
-                    tip,
-                    GREETING_BREAK_POINT,
-                    Color::DarkGrey,
-                )?;
+                self.draw_tip_box(tip)?;
             }
 
             execute!(
@@ -777,45 +820,6 @@ impl ChatContext {
                 .set_value("chat.greeting.rotating_tips_current_index", next_tip_index)?;
         }
 
-        match self.state.get_string(UPDATE_AVAILABLE_KEY) {
-            Ok(Some(version)) => match Version::parse(&version) {
-                Ok(version) => {
-                    let current_version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
-                    if version > current_version {
-                        execute!(self.output, style::Print("\n"), style::SetForegroundColor(Color::Reset))?;
-                        let content = format!("Run {} to update to the latest version", "q update".dark_green().bold());
-
-                        if is_small_screen {
-                            queue!(
-                                self.output,
-                                style::Print("🎉 New Update: "),
-                                style::Print(content),
-                                style::Print("\n")
-                            )?;
-                        } else {
-                            draw_box(
-                                self.output.clone(),
-                                "New Update!",
-                                &content,
-                                GREETING_BREAK_POINT,
-                                Color::DarkYellow,
-                            )?;
-                        }
-                        execute!(self.output, style::Print("\n"), style::SetForegroundColor(Color::Reset))?;
-                    }
-                },
-                Err(err) => {
-                    warn!(?err, "Error parsing {UPDATE_AVAILABLE_KEY}: {err}");
-                    let _ = fig_settings::state::remove_value(UPDATE_AVAILABLE_KEY);
-                },
-            },
-            Ok(None) => {},
-            Err(err) => {
-                warn!(?err, "Error getting {UPDATE_AVAILABLE_KEY}: {err}");
-                let _ = fig_settings::state::remove_value(UPDATE_AVAILABLE_KEY);
-            },
-        }
-
         if self.interactive && self.all_tools_trusted() {
             queue!(
                 self.output,
@@ -995,7 +999,7 @@ impl ChatContext {
                     ChatError::Client(err) => match err {
                         // Errors from attempting to send too large of a conversation history. In
                         // this case, attempt to automatically compact the history for the user.
-                        fig_api_client::Error::ContextWindowOverflow => {
+                        crate::fig_api_client::Error::ContextWindowOverflow => {
                             let history_too_small = self
                                 .conversation_state
                                 .backend_conversation_state(false, true)
@@ -1024,7 +1028,7 @@ impl ChatContext {
                                 help: false,
                             });
                         },
-                        fig_api_client::Error::QuotaBreach(msg) => {
+                        crate::fig_api_client::Error::QuotaBreach(msg) => {
                             print_err!(msg, err);
                         },
                         _ => {
@@ -1108,7 +1112,7 @@ impl ChatContext {
         let response = match response {
             Ok(res) => res,
             Err(e) => match e {
-                fig_api_client::Error::ContextWindowOverflow => {
+                crate::fig_api_client::Error::ContextWindowOverflow => {
                     self.conversation_state.clear(true);
                     if self.interactive {
                         self.spinner.take();
@@ -1162,7 +1166,7 @@ impl ChatContext {
         }
 
         if let Some(message_id) = self.conversation_state.message_id() {
-            fig_telemetry::send_chat_added_message(
+            crate::fig_telemetry::send_chat_added_message(
                 self.conversation_state.conversation_id().to_owned(),
                 message_id.to_owned(),
                 self.conversation_state.context_message_length(),
@@ -2157,7 +2161,7 @@ impl ChatContext {
                             }
                         },
                     }
-                    // fig_telemetry::send_context_command_executed
+                    // crate::fig_telemetry::send_context_command_executed
                 } else {
                     execute!(
                         self.output,
@@ -3047,7 +3051,7 @@ impl ChatContext {
 
             if ended {
                 if let Some(message_id) = self.conversation_state.message_id() {
-                    fig_telemetry::send_chat_added_message(
+                    crate::fig_telemetry::send_chat_added_message(
                         self.conversation_state.conversation_id().to_owned(),
                         message_id.to_owned(),
                         self.conversation_state.context_message_length(),
@@ -3291,9 +3295,9 @@ impl ChatContext {
                 ToolUseStatus::RetryInProgress(ref id) => Some(id.as_str()),
             }
             .map(|v| v.to_string());
-            let event: fig_telemetry::EventType = event.into();
-            let app_event = fig_telemetry::AppTelemetryEvent::new(event).await;
-            fig_telemetry::dispatch_or_send_event(app_event).await;
+            let event: crate::fig_telemetry::EventType = event.into();
+            let app_event = crate::fig_telemetry::AppTelemetryEvent::new(event).await;
+            crate::fig_telemetry::send_event(app_event).await;
         }
     }
 
@@ -3385,9 +3389,9 @@ impl ToolUseEventBuilder {
     }
 }
 
-impl From<ToolUseEventBuilder> for fig_telemetry::EventType {
+impl From<ToolUseEventBuilder> for crate::fig_telemetry::EventType {
     fn from(val: ToolUseEventBuilder) -> Self {
-        fig_telemetry::EventType::ToolUseSuggested {
+        crate::fig_telemetry::EventType::ToolUseSuggested {
             conversation_id: val.conversation_id,
             utterance_id: val.utterance_id,
             user_input_id: val.user_input_id,
@@ -3463,6 +3467,9 @@ fn create_stream(model_responses: serde_json::Value) -> StreamingClient {
 
 #[cfg(test)]
 mod tests {
+    use bstr::ByteSlice;
+    use shared_writer::TestWriterWithSink;
+
     use super::*;
 
     #[tokio::test]
@@ -3845,4 +3852,86 @@ mod tests {
             assert_eq!(processed, expected.trim().to_string(), "Failed for input: {}", input);
         }
     }
+
+    #[tokio::test]
+    async fn test_draw_tip_box() {
+        let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
+        let buf = Arc::new(std::sync::Mutex::new(Vec::<u8>::new()));
+        let test_writer = TestWriterWithSink { sink: buf.clone() };
+        let output = SharedWriter::new(test_writer.clone());
+        let tool_manager = ToolManager::default();
+        let tool_config = serde_json::from_str::<HashMap<String, ToolSpec>>(include_str!("tools/tool_index.json"))
+            .expect("Tools failed to load");
+        let test_client = create_stream(serde_json::json!([]));
+
+        let mut chat_context = ChatContext::new(
+            Arc::clone(&ctx),
+            "fake_conv_id",
+            Settings::new_fake(),
+            State::new_fake(),
+            output,
+            None,
+            InputSource::new_mock(vec![]),
+            true,
+            test_client,
+            || Some(80),
+            tool_manager,
+            None,
+            tool_config,
+            ToolPermissions::new(0),
+        )
+        .await
+        .unwrap();
+
+        // Test with a short tip
+        let short_tip = "This is a short tip";
+        chat_context.draw_tip_box(short_tip).expect("Failed to draw tip box");
+
+        // Test with a longer tip that should wrap
+        let long_tip = "This is a much longer tip that should wrap to multiple lines because it exceeds the inner width of the tip box which is calculated based on the GREETING_BREAK_POINT constant";
+        chat_context.draw_tip_box(long_tip).expect("Failed to draw tip box");
+
+        // Test with a long tip with two long words that should wrap
+        let long_tip_with_one_long_word = {
+            let mut s = "a".repeat(200);
+            s.push(' ');
+            s.push_str(&"a".repeat(200));
+            s
+        };
+        chat_context
+            .draw_tip_box(long_tip_with_one_long_word.as_str())
+            .expect("Failed to draw tip box");
+
+        // Test with a long tip with two long words that should wrap
+        let long_tip_with_two_long_words = "a".repeat(200);
+        chat_context
+            .draw_tip_box(long_tip_with_two_long_words.as_str())
+            .expect("Failed to draw tip box");
+
+        // Get the output and verify it contains expected formatting elements
+        let content = test_writer.get_content();
+        let output_str = content.to_str_lossy();
+
+        // Check for box drawing characters
+        assert!(output_str.contains("╭"), "Output should contain top-left corner");
+        assert!(output_str.contains("╮"), "Output should contain top-right corner");
+        assert!(output_str.contains("│"), "Output should contain vertical lines");
+        assert!(output_str.contains("╰"), "Output should contain bottom-left corner");
+        assert!(output_str.contains("╯"), "Output should contain bottom-right corner");
+
+        // Check for the label
+        assert!(
+            output_str.contains("Did you know?"),
+            "Output should contain the 'Did you know?' label"
+        );
+
+        // Check that both tips are present
+        assert!(output_str.contains(short_tip), "Output should contain the short tip");
+
+        // For the long tip, we check for substrings since it will be wrapped
+        let long_tip_parts: Vec<&str> = long_tip.split_whitespace().collect();
+        for part in long_tip_parts.iter().take(3) {
+            assert!(output_str.contains(part), "Output should contain parts of the long tip");
+        }
+    }
 }
diff --git a/crates/q_chat/src/parse.rs b/crates/kiro-cli/src/cli/chat/parse.rs
similarity index 100%
rename from crates/q_chat/src/parse.rs
rename to crates/kiro-cli/src/cli/chat/parse.rs
diff --git a/crates/q_chat/src/parser.rs b/crates/kiro-cli/src/cli/chat/parser.rs
similarity index 98%
rename from crates/q_chat/src/parser.rs
rename to crates/kiro-cli/src/cli/chat/parser.rs
index ffa7854dc2..c95c6f88f2 100644
--- a/crates/q_chat/src/parser.rs
+++ b/crates/kiro-cli/src/cli/chat/parser.rs
@@ -4,8 +4,6 @@ use std::time::{
 };
 
 use eyre::Result;
-use fig_api_client::clients::SendMessageOutput;
-use fig_api_client::model::ChatResponseStream;
 use rand::distr::{
     Alphanumeric,
     SampleString,
@@ -21,6 +19,8 @@ use super::message::{
     AssistantMessage,
     AssistantToolUse,
 };
+use crate::fig_api_client::clients::SendMessageOutput;
+use crate::fig_api_client::model::ChatResponseStream;
 
 #[derive(Debug, Error)]
 pub struct RecvError {
@@ -44,7 +44,7 @@ impl std::fmt::Display for RecvError {
 #[derive(Debug, Error)]
 pub enum RecvErrorKind {
     #[error("{0}")]
-    Client(#[from] fig_api_client::Error),
+    Client(#[from] crate::fig_api_client::Error),
     #[error("{0}")]
     Json(#[from] serde_json::Error),
     /// An error was encountered while waiting for the next event in the stream after a noticeably
@@ -54,7 +54,7 @@ pub enum RecvErrorKind {
     /// to an exceptionally complex tool use taking too long to generate.
     #[error("The stream ended after {}s: {source}", .duration.as_secs())]
     StreamTimeout {
-        source: fig_api_client::Error,
+        source: crate::fig_api_client::Error,
         duration: std::time::Duration,
     },
     /// Unexpected end of stream while receiving a tool use.
diff --git a/crates/q_chat/src/prompt.rs b/crates/kiro-cli/src/cli/chat/prompt.rs
similarity index 99%
rename from crates/q_chat/src/prompt.rs
rename to crates/kiro-cli/src/cli/chat/prompt.rs
index 9811f977f1..0fa7cf6f62 100644
--- a/crates/q_chat/src/prompt.rs
+++ b/crates/kiro-cli/src/cli/chat/prompt.rs
@@ -265,7 +265,7 @@ pub fn rl(
     sender: std::sync::mpsc::Sender<Option<String>>,
     receiver: std::sync::mpsc::Receiver<Vec<String>>,
 ) -> Result<Editor<ChatHelper, DefaultHistory>> {
-    let edit_mode = match fig_settings::settings::get_string_opt("chat.editMode").as_deref() {
+    let edit_mode = match crate::fig_settings::settings::get_string_opt("chat.editMode").as_deref() {
         Some("vi" | "vim") => EditMode::Vi,
         _ => EditMode::Emacs,
     };
diff --git a/crates/q_chat/src/util/shared_writer.rs b/crates/kiro-cli/src/cli/chat/shared_writer.rs
similarity index 100%
rename from crates/q_chat/src/util/shared_writer.rs
rename to crates/kiro-cli/src/cli/chat/shared_writer.rs
diff --git a/crates/q_chat/src/skim_integration.rs b/crates/kiro-cli/src/cli/chat/skim_integration.rs
similarity index 100%
rename from crates/q_chat/src/skim_integration.rs
rename to crates/kiro-cli/src/cli/chat/skim_integration.rs
diff --git a/crates/q_chat/src/token_counter.rs b/crates/kiro-cli/src/cli/chat/token_counter.rs
similarity index 100%
rename from crates/q_chat/src/token_counter.rs
rename to crates/kiro-cli/src/cli/chat/token_counter.rs
diff --git a/crates/q_chat/src/tool_manager.rs b/crates/kiro-cli/src/cli/chat/tool_manager.rs
similarity index 97%
rename from crates/q_chat/src/tool_manager.rs
rename to crates/kiro-cli/src/cli/chat/tool_manager.rs
index dfd251cb74..108c156327 100644
--- a/crates/q_chat/src/tool_manager.rs
+++ b/crates/kiro-cli/src/cli/chat/tool_manager.rs
@@ -19,19 +19,10 @@ use crossterm::{
     style,
     terminal,
 };
-use fig_api_client::model::{
-    ToolResult,
-    ToolResultContentBlock,
-    ToolResultStatus,
-};
 use futures::{
     StreamExt,
     stream,
 };
-use mcp_client::{
-    JsonRpcResponse,
-    PromptGet,
-};
 use serde::{
     Deserialize,
     Serialize,
@@ -43,6 +34,7 @@ use tracing::error;
 use super::command::PromptsGetCommand;
 use super::message::AssistantToolUse;
 use super::tools::custom_tool::{
+    CustomTool,
     CustomToolClient,
     CustomToolConfig,
 };
@@ -54,9 +46,17 @@ use super::tools::use_aws::UseAws;
 use super::tools::{
     Tool,
     ToolOrigin,
+    ToolSpec,
+};
+use crate::fig_api_client::model::{
+    ToolResult,
+    ToolResultContentBlock,
+    ToolResultStatus,
+};
+use crate::mcp_client::{
+    JsonRpcResponse,
+    PromptGet,
 };
-use crate::tools::ToolSpec;
-use crate::tools::custom_tool::CustomTool;
 
 const NAMESPACE_DELIMITER: &str = "___";
 // This applies for both mcp server and tool name since in the end the tool name as seen by the
@@ -322,14 +322,14 @@ impl ToolManagerBuilder {
                 },
                 Err(e) => {
                     error!("Error initializing mcp client for server {}: {:?}", name, &e);
-                    let event = fig_telemetry::EventType::McpServerInit {
+                    let event = crate::fig_telemetry::EventType::McpServerInit {
                         conversation_id: conversation_id.clone(),
                         init_failure_reason: Some(e.to_string()),
                         number_of_tools: 0,
                     };
                     tokio::spawn(async move {
-                        let app_event = fig_telemetry::AppTelemetryEvent::new(event).await;
-                        fig_telemetry::dispatch_or_send_event(app_event).await;
+                        let app_event = crate::fig_telemetry::AppTelemetryEvent::new(event).await;
+                        crate::fig_telemetry::send_event(app_event).await;
                     });
                     let _ = tx.send(LoadingMsg::Error {
                         name: name.clone(),
@@ -569,9 +569,9 @@ impl ToolManager {
                             }
                             // Send server load success metric datum
                             tokio::spawn(async move {
-                                let event = fig_telemetry::EventType::McpServerInit { conversation_id, init_failure_reason: None, number_of_tools  };
-                                let app_event = fig_telemetry::AppTelemetryEvent::new(event).await;
-                                fig_telemetry::dispatch_or_send_event(app_event).await;
+                                let event = crate::fig_telemetry::EventType::McpServerInit { conversation_id, init_failure_reason: None, number_of_tools  };
+                                let app_event = crate::fig_telemetry::AppTelemetryEvent::new(event).await;
+                                crate::fig_telemetry::send_event(app_event).await;
                             });
                             // Tool name translation. This is beyond of the scope of what is
                             // considered a "server load". Reasoning being:
@@ -618,9 +618,9 @@ impl ToolManager {
                             error!("Error obtaining tool spec for {}: {:?}", server_name_clone, e);
                             let init_failure_reason = Some(e.to_string());
                             tokio::spawn(async move {
-                                let event = fig_telemetry::EventType::McpServerInit { conversation_id, init_failure_reason, number_of_tools: 0  };
-                                let app_event = fig_telemetry::AppTelemetryEvent::new(event).await;
-                                fig_telemetry::dispatch_or_send_event(app_event).await;
+                                let event = crate::fig_telemetry::EventType::McpServerInit { conversation_id, init_failure_reason, number_of_tools: 0  };
+                                let app_event = crate::fig_telemetry::AppTelemetryEvent::new(event).await;
+                                crate::fig_telemetry::send_event(app_event).await;
                             });
                             if let Some(tx_clone) = &tx_clone {
                                 if let Err(e) = tx_clone.send(LoadingMsg::Error {
diff --git a/crates/q_chat/src/tools/custom_tool.rs b/crates/kiro-cli/src/cli/chat/tools/custom_tool.rs
similarity index 98%
rename from crates/q_chat/src/tools/custom_tool.rs
rename to crates/kiro-cli/src/cli/chat/tools/custom_tool.rs
index e034837bac..ee0e5c5875 100644
--- a/crates/q_chat/src/tools/custom_tool.rs
+++ b/crates/kiro-cli/src/cli/chat/tools/custom_tool.rs
@@ -8,18 +8,6 @@ use crossterm::{
     style,
 };
 use eyre::Result;
-use fig_os_shim::Context;
-use mcp_client::{
-    Client as McpClient,
-    ClientConfig as McpClientConfig,
-    JsonRpcResponse,
-    JsonRpcStdioTransport,
-    MessageContent,
-    PromptGet,
-    ServerCapabilities,
-    StdioTransport,
-    ToolCallResult,
-};
 use serde::{
     Deserialize,
     Serialize,
@@ -31,8 +19,20 @@ use super::{
     InvokeOutput,
     ToolSpec,
 };
-use crate::CONTINUATION_LINE;
-use crate::token_counter::TokenCounter;
+use crate::cli::chat::CONTINUATION_LINE;
+use crate::cli::chat::token_counter::TokenCounter;
+use crate::fig_os_shim::Context;
+use crate::mcp_client::{
+    Client as McpClient,
+    ClientConfig as McpClientConfig,
+    JsonRpcResponse,
+    JsonRpcStdioTransport,
+    MessageContent,
+    PromptGet,
+    ServerCapabilities,
+    StdioTransport,
+    ToolCallResult,
+};
 
 // TODO: support http transport type
 #[derive(Clone, Serialize, Deserialize, Debug)]
diff --git a/crates/q_chat/src/tools/execute_bash.rs b/crates/kiro-cli/src/cli/chat/tools/execute_bash.rs
similarity index 99%
rename from crates/q_chat/src/tools/execute_bash.rs
rename to crates/kiro-cli/src/cli/chat/tools/execute_bash.rs
index 5640cecc49..427435bb37 100644
--- a/crates/q_chat/src/tools/execute_bash.rs
+++ b/crates/kiro-cli/src/cli/chat/tools/execute_bash.rs
@@ -15,7 +15,6 @@ use eyre::{
     Context as EyreContext,
     Result,
 };
-use fig_os_shim::Context;
 use serde::Deserialize;
 use tokio::io::AsyncBufReadExt;
 use tokio::select;
@@ -27,6 +26,7 @@ use super::{
     MAX_TOOL_RESPONSE_SIZE,
     OutputKind,
 };
+use crate::fig_os_shim::Context;
 
 const READONLY_COMMANDS: &[&str] = &["ls", "cat", "echo", "pwd", "which", "head", "tail", "find", "grep"];
 
diff --git a/crates/q_chat/src/tools/fs_read.rs b/crates/kiro-cli/src/cli/chat/tools/fs_read.rs
similarity index 99%
rename from crates/q_chat/src/tools/fs_read.rs
rename to crates/kiro-cli/src/cli/chat/tools/fs_read.rs
index 9ff07eeb83..6cb2bc96ed 100644
--- a/crates/q_chat/src/tools/fs_read.rs
+++ b/crates/kiro-cli/src/cli/chat/tools/fs_read.rs
@@ -12,7 +12,6 @@ use eyre::{
     Result,
     bail,
 };
-use fig_os_shim::Context;
 use serde::{
     Deserialize,
     Serialize,
@@ -30,6 +29,7 @@ use super::{
     format_path,
     sanitize_path_tool_arg,
 };
+use crate::fig_os_shim::Context;
 
 #[derive(Debug, Clone, Deserialize)]
 #[serde(tag = "mode")]
diff --git a/crates/q_chat/src/tools/fs_write.rs b/crates/kiro-cli/src/cli/chat/tools/fs_write.rs
similarity index 99%
rename from crates/q_chat/src/tools/fs_write.rs
rename to crates/kiro-cli/src/cli/chat/tools/fs_write.rs
index 576937c0ba..a7eb02487e 100644
--- a/crates/q_chat/src/tools/fs_write.rs
+++ b/crates/kiro-cli/src/cli/chat/tools/fs_write.rs
@@ -13,7 +13,6 @@ use eyre::{
     bail,
     eyre,
 };
-use fig_os_shim::Context;
 use serde::Deserialize;
 use similar::DiffableStr;
 use syntect::easy::HighlightLines;
@@ -34,6 +33,7 @@ use super::{
     sanitize_path_tool_arg,
     supports_truecolor,
 };
+use crate::fig_os_shim::Context;
 
 static SYNTAX_SET: LazyLock<SyntaxSet> = LazyLock::new(SyntaxSet::load_defaults_newlines);
 static THEME_SET: LazyLock<ThemeSet> = LazyLock::new(ThemeSet::load_defaults);
diff --git a/crates/q_chat/src/tools/gh_issue.rs b/crates/kiro-cli/src/cli/chat/tools/gh_issue.rs
similarity index 98%
rename from crates/q_chat/src/tools/gh_issue.rs
rename to crates/kiro-cli/src/cli/chat/tools/gh_issue.rs
index ace4663873..58702170c5 100644
--- a/crates/q_chat/src/tools/gh_issue.rs
+++ b/crates/kiro-cli/src/cli/chat/tools/gh_issue.rs
@@ -14,7 +14,6 @@ use eyre::{
     WrapErr,
     eyre,
 };
-use fig_os_shim::Context;
 use serde::Deserialize;
 
 use super::super::context::ContextManager;
@@ -23,7 +22,8 @@ use super::{
     InvokeOutput,
     ToolPermission,
 };
-use crate::token_counter::TokenCounter;
+use crate::cli::chat::token_counter::TokenCounter;
+use crate::fig_os_shim::Context;
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct GhIssue {
diff --git a/crates/q_chat/src/tools/mod.rs b/crates/kiro-cli/src/cli/chat/tools/mod.rs
similarity index 99%
rename from crates/q_chat/src/tools/mod.rs
rename to crates/kiro-cli/src/cli/chat/tools/mod.rs
index 279586736b..316363df5d 100644
--- a/crates/q_chat/src/tools/mod.rs
+++ b/crates/kiro-cli/src/cli/chat/tools/mod.rs
@@ -20,7 +20,6 @@ use crossterm::style::Stylize;
 use custom_tool::CustomTool;
 use execute_bash::ExecuteBash;
 use eyre::Result;
-use fig_os_shim::Context;
 use fs_read::FsRead;
 use fs_write::FsWrite;
 use gh_issue::GhIssue;
@@ -31,6 +30,7 @@ use serde::{
 use use_aws::UseAws;
 
 use super::consts::MAX_TOOL_RESPONSE_SIZE;
+use crate::fig_os_shim::Context;
 
 /// Represents an executable tool use.
 #[derive(Debug, Clone)]
@@ -381,9 +381,8 @@ fn supports_truecolor(ctx: &Context) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use fig_os_shim::EnvProvider;
-
     use super::*;
+    use crate::fig_os_shim::EnvProvider;
 
     #[tokio::test]
     async fn test_tilde_path_expansion() {
diff --git a/crates/q_chat/src/tools/tool_index.json b/crates/kiro-cli/src/cli/chat/tools/tool_index.json
similarity index 100%
rename from crates/q_chat/src/tools/tool_index.json
rename to crates/kiro-cli/src/cli/chat/tools/tool_index.json
diff --git a/crates/q_chat/src/tools/use_aws.rs b/crates/kiro-cli/src/cli/chat/tools/use_aws.rs
similarity index 99%
rename from crates/q_chat/src/tools/use_aws.rs
rename to crates/kiro-cli/src/cli/chat/tools/use_aws.rs
index cfdf97c3ff..68dfd0b2af 100644
--- a/crates/q_chat/src/tools/use_aws.rs
+++ b/crates/kiro-cli/src/cli/chat/tools/use_aws.rs
@@ -15,7 +15,6 @@ use eyre::{
     Result,
     WrapErr,
 };
-use fig_os_shim::Context;
 use serde::Deserialize;
 
 use super::{
@@ -23,6 +22,7 @@ use super::{
     MAX_TOOL_RESPONSE_SIZE,
     OutputKind,
 };
+use crate::fig_os_shim::Context;
 
 const READONLY_OPS: [&str; 6] = ["get", "describe", "list", "ls", "search", "batch_get"];
 
diff --git a/crates/q_chat/src/util/issue.rs b/crates/kiro-cli/src/cli/chat/util/issue.rs
similarity index 91%
rename from crates/q_chat/src/util/issue.rs
rename to crates/kiro-cli/src/cli/chat/util/issue.rs
index 05457308da..d1d98e4bed 100644
--- a/crates/q_chat/src/util/issue.rs
+++ b/crates/kiro-cli/src/cli/chat/util/issue.rs
@@ -4,9 +4,10 @@ use anstream::{
 };
 use crossterm::style::Stylize;
 use eyre::Result;
-use fig_diagnostic::Diagnostics;
-use fig_util::GITHUB_REPO_NAME;
-use fig_util::system_info::is_remote;
+
+use crate::diagnostics::Diagnostics;
+use crate::fig_util::GITHUB_REPO_NAME;
+use crate::fig_util::system_info::is_remote;
 
 const TEMPLATE_NAME: &str = "1_bug_report_template.yml";
 
@@ -73,7 +74,7 @@ impl IssueCreator {
             params.iter(),
         )?;
 
-        if is_remote() || fig_util::open_url_async(url.as_str()).await.is_err() {
+        if is_remote() || crate::fig_util::open::open_url_async(url.as_str()).await.is_err() {
             println!("Issue Url: {}", url.as_str().underlined());
         }
 
diff --git a/crates/q_chat/src/util/mod.rs b/crates/kiro-cli/src/cli/chat/util/mod.rs
similarity index 97%
rename from crates/q_chat/src/util/mod.rs
rename to crates/kiro-cli/src/cli/chat/util/mod.rs
index f2b2d4f334..7a575db83b 100644
--- a/crates/q_chat/src/util/mod.rs
+++ b/crates/kiro-cli/src/cli/chat/util/mod.rs
@@ -1,13 +1,10 @@
 pub mod issue;
-pub mod shared_writer;
-pub mod ui;
 
 use std::io::Write;
 use std::time::Duration;
 
-use fig_util::system_info::in_cloudshell;
-
 use super::ChatError;
+use crate::fig_util::system_info::in_cloudshell;
 
 const GOV_REGIONS: &[&str] = &["us-gov-east-1", "us-gov-west-1"];
 
diff --git a/crates/kiro-cli/src/cli/debug.rs b/crates/kiro-cli/src/cli/debug.rs
new file mode 100644
index 0000000000..ea34c1cdc3
--- /dev/null
+++ b/crates/kiro-cli/src/cli/debug.rs
@@ -0,0 +1,109 @@
+use std::process::ExitCode;
+
+use anstream::eprintln;
+use clap::{
+    Subcommand,
+    ValueEnum,
+};
+use eyre::Result;
+
+#[derive(Debug, ValueEnum, Clone, PartialEq, Eq)]
+pub enum Build {
+    Production,
+    #[value(alias = "staging")]
+    Beta,
+    #[value(hide = true, alias = "dev")]
+    Develop,
+}
+
+impl std::fmt::Display for Build {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Build::Production => f.write_str("production"),
+            Build::Beta => f.write_str("beta"),
+            Build::Develop => f.write_str("develop"),
+        }
+    }
+}
+
+#[derive(Debug, ValueEnum, Clone, PartialEq, Eq)]
+pub enum App {
+    Dashboard,
+    Autocomplete,
+}
+
+impl std::fmt::Display for App {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            App::Dashboard => f.write_str("dashboard"),
+            App::Autocomplete => f.write_str("autocomplete"),
+        }
+    }
+}
+
+#[derive(Debug, ValueEnum, Clone, PartialEq, Eq)]
+pub enum AutocompleteWindowDebug {
+    On,
+    Off,
+}
+
+#[derive(Debug, ValueEnum, Clone, PartialEq, Eq)]
+pub enum AccessibilityAction {
+    Refresh,
+    Reset,
+    Prompt,
+    Open,
+    Status,
+}
+
+#[cfg(target_os = "macos")]
+#[derive(Debug, Clone, PartialEq, Eq, ValueEnum)]
+pub enum TISAction {
+    Enable,
+    Disable,
+    Select,
+    Deselect,
+}
+
+#[cfg(target_os = "macos")]
+use std::path::PathBuf;
+
+#[cfg(target_os = "macos")]
+#[derive(Debug, Subcommand, Clone, PartialEq, Eq)]
+pub enum InputMethodDebugAction {
+    Install {
+        bundle_path: Option<PathBuf>,
+    },
+    Uninstall {
+        bundle_path: Option<PathBuf>,
+    },
+    List,
+    Status {
+        bundle_path: Option<PathBuf>,
+    },
+    Source {
+        bundle_identifier: String,
+        #[arg(value_enum)]
+        action: TISAction,
+    },
+}
+
+#[derive(Debug, PartialEq, Subcommand)]
+pub enum DebugSubcommand {
+    RefreshAuthToken,
+}
+
+impl DebugSubcommand {
+    pub async fn execute(&self) -> Result<ExitCode> {
+        match self {
+            DebugSubcommand::RefreshAuthToken => match crate::fig_auth::refresh_token().await? {
+                Some(_) => eprintln!("Refreshed token"),
+                None => {
+                    eprintln!("No token to refresh");
+                    return Ok(ExitCode::FAILURE);
+                },
+            },
+        }
+        Ok(ExitCode::SUCCESS)
+    }
+}
diff --git a/crates/kiro-cli/src/cli/diagnostics.rs b/crates/kiro-cli/src/cli/diagnostics.rs
new file mode 100644
index 0000000000..83c94c2d2b
--- /dev/null
+++ b/crates/kiro-cli/src/cli/diagnostics.rs
@@ -0,0 +1,68 @@
+use std::io::{
+    IsTerminal,
+    stdout,
+};
+use std::process::ExitCode;
+
+use anstream::println;
+use clap::Args;
+use color_eyre::Result;
+use crossterm::terminal::{
+    Clear,
+    ClearType,
+};
+use crossterm::{
+    cursor,
+    execute,
+};
+use spinners::{
+    Spinner,
+    Spinners,
+};
+
+use super::OutputFormat;
+use crate::diagnostics::Diagnostics;
+
+#[derive(Debug, Args, PartialEq, Eq)]
+pub struct DiagnosticArgs {
+    /// The format of the output
+    #[arg(long, short, value_enum, default_value_t)]
+    format: OutputFormat,
+    /// Force limited diagnostic output
+    #[arg(long)]
+    force: bool,
+}
+
+impl DiagnosticArgs {
+    pub async fn execute(&self) -> Result<ExitCode> {
+        let spinner = if stdout().is_terminal() {
+            Some(Spinner::new(Spinners::Dots, "Generating...".into()))
+        } else {
+            None
+        };
+
+        if spinner.is_some() {
+            execute!(std::io::stdout(), cursor::Hide)?;
+
+            ctrlc::set_handler(move || {
+                execute!(std::io::stdout(), cursor::Show).ok();
+                std::process::exit(1);
+            })?;
+        }
+
+        let diagnostics = Diagnostics::new().await;
+
+        if let Some(mut sp) = spinner {
+            sp.stop();
+            execute!(std::io::stdout(), Clear(ClearType::CurrentLine), cursor::Show)?;
+            println!();
+        }
+
+        self.format.print(
+            || diagnostics.user_readable().expect("Failed to run user_readable()"),
+            || &diagnostics,
+        );
+
+        Ok(ExitCode::SUCCESS)
+    }
+}
diff --git a/crates/kiro-cli/src/cli/feed.rs b/crates/kiro-cli/src/cli/feed.rs
new file mode 100644
index 0000000000..7df058c946
--- /dev/null
+++ b/crates/kiro-cli/src/cli/feed.rs
@@ -0,0 +1,49 @@
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Feed {
+    pub entries: Vec<Entry>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Entry {
+    #[serde(rename = "type")]
+    pub entry_type: String,
+    pub date: String,
+    pub version: String,
+    #[serde(default)]
+    pub hidden: bool,
+    #[serde(default)]
+    pub changes: Vec<Change>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Change {
+    #[serde(rename = "type")]
+    pub change_type: String,
+    pub description: String,
+}
+
+impl Feed {
+    pub fn load() -> Self {
+        serde_json::from_str(include_str!("../../../../feed.json")).expect("feed.json is valid json")
+    }
+
+    pub fn get_version_changelog(&self, version: &str) -> Option<Entry> {
+        self.entries
+            .iter()
+            .find(|entry| entry.entry_type == "release" && entry.version == version && !entry.hidden)
+            .cloned()
+    }
+
+    pub fn get_all_changelogs(&self) -> Vec<Entry> {
+        self.entries
+            .iter()
+            .filter(|entry| entry.entry_type == "release" && !entry.hidden)
+            .cloned()
+            .collect()
+    }
+}
diff --git a/crates/kiro-cli/src/cli/issue.rs b/crates/kiro-cli/src/cli/issue.rs
new file mode 100644
index 0000000000..87ae041cbb
--- /dev/null
+++ b/crates/kiro-cli/src/cli/issue.rs
@@ -0,0 +1,39 @@
+use std::process::ExitCode;
+
+use clap::Args;
+use eyre::Result;
+
+#[derive(Debug, Args, PartialEq, Eq)]
+pub struct IssueArgs {
+    /// Force issue creation
+    #[arg(long, short = 'f')]
+    force: bool,
+    /// Issue description
+    description: Vec<String>,
+}
+
+impl IssueArgs {
+    #[allow(unreachable_code)]
+    pub async fn execute(&self) -> Result<ExitCode> {
+        let joined_description = self.description.join(" ").trim().to_owned();
+
+        let issue_title = match joined_description.len() {
+            0 => dialoguer::Input::with_theme(&crate::fig_util::dialoguer_theme())
+                .with_prompt("Issue Title")
+                .interact_text()?,
+            _ => joined_description,
+        };
+
+        let _ = crate::cli::chat::util::issue::IssueCreator {
+            title: Some(issue_title),
+            expected_behavior: None,
+            actual_behavior: None,
+            steps_to_reproduce: None,
+            additional_environment: None,
+        }
+        .create_url()
+        .await;
+
+        Ok(ExitCode::SUCCESS)
+    }
+}
diff --git a/crates/kiro-cli/src/cli/mod.rs b/crates/kiro-cli/src/cli/mod.rs
new file mode 100644
index 0000000000..b6cfa570a0
--- /dev/null
+++ b/crates/kiro-cli/src/cli/mod.rs
@@ -0,0 +1,522 @@
+//! CLI functionality
+
+mod chat;
+mod debug;
+mod diagnostics;
+mod feed;
+mod issue;
+mod settings;
+mod telemetry;
+mod uninstall;
+mod update;
+mod user;
+
+use std::io::{
+    Write as _,
+    stdout,
+};
+use std::process::ExitCode;
+
+use anstream::{
+    eprintln,
+    println,
+};
+use chat::cli::Chat;
+use clap::{
+    ArgAction,
+    CommandFactory,
+    Parser,
+    Subcommand,
+    ValueEnum,
+};
+use crossterm::style::Stylize;
+use eyre::Result;
+use feed::Feed;
+use serde::Serialize;
+use tracing::{
+    Level,
+    debug,
+};
+
+use self::user::RootUserSubcommand;
+use crate::fig_log::{
+    LogArgs,
+    initialize_logging,
+};
+use crate::fig_telemetry::send_cli_subcommand_executed;
+use crate::fig_util::directories::logs_dir;
+use crate::fig_util::{
+    CLI_BINARY_NAME,
+    CliContext,
+};
+
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, ValueEnum)]
+pub enum OutputFormat {
+    /// Outputs the results as markdown
+    #[default]
+    Plain,
+    /// Outputs the results as JSON
+    Json,
+    /// Outputs the results as pretty print JSON
+    JsonPretty,
+}
+
+impl OutputFormat {
+    pub fn print<T, TFn, J, JFn>(&self, text_fn: TFn, json_fn: JFn)
+    where
+        T: std::fmt::Display,
+        TFn: FnOnce() -> T,
+        J: Serialize,
+        JFn: FnOnce() -> J,
+    {
+        match self {
+            OutputFormat::Plain => println!("{}", text_fn()),
+            OutputFormat::Json => println!("{}", serde_json::to_string(&json_fn()).unwrap()),
+            OutputFormat::JsonPretty => println!("{}", serde_json::to_string_pretty(&json_fn()).unwrap()),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
+pub enum Processes {
+    /// Desktop Process
+    App,
+}
+
+/// The Amazon Q CLI
+#[deny(missing_docs)]
+#[derive(Debug, PartialEq, Subcommand)]
+pub enum CliRootCommands {
+    /// Debug the app
+    #[command(subcommand)]
+    Debug(debug::DebugSubcommand),
+    /// Customize appearance & behavior
+    #[command(alias("setting"))]
+    Settings(settings::SettingsArgs),
+    /// Uninstall Amazon Q
+    #[command(hide = true)]
+    Uninstall {
+        /// Force uninstall
+        #[arg(long, short = 'y')]
+        no_confirm: bool,
+    },
+    /// Update the Amazon Q application
+    #[command(alias("upgrade"))]
+    Update(update::UpdateArgs),
+    /// Run diagnostic tests
+    #[command(alias("diagnostics"))]
+    Diagnostic(diagnostics::DiagnosticArgs),
+    /// Create a new Github issue
+    Issue(issue::IssueArgs),
+    /// Root level user subcommands
+    #[command(flatten)]
+    RootUser(user::RootUserSubcommand),
+    /// Manage your account
+    #[command(subcommand)]
+    User(user::UserSubcommand),
+    /// Enable/disable telemetry
+    #[command(subcommand, hide = true)]
+    Telemetry(telemetry::TelemetrySubcommand),
+    /// Version
+    #[command(hide = true)]
+    Version {
+        /// Show the changelog (use --changelog=all for all versions, or --changelog=x.x.x for a
+        /// specific version)
+        #[arg(long, num_args = 0..=1, default_missing_value = "")]
+        changelog: Option<String>,
+    },
+    /// AI assistant in your terminal
+    #[command(alias("q"))]
+    Chat(Chat),
+}
+
+impl CliRootCommands {
+    fn name(&self) -> &'static str {
+        match self {
+            CliRootCommands::Debug(_) => "debug",
+            CliRootCommands::Settings(_) => "settings",
+            CliRootCommands::Uninstall { .. } => "uninstall",
+            CliRootCommands::Update(_) => "update",
+            CliRootCommands::Diagnostic(_) => "diagnostics",
+            CliRootCommands::Issue(_) => "issue",
+            CliRootCommands::RootUser(RootUserSubcommand::Login(_)) => "login",
+            CliRootCommands::RootUser(RootUserSubcommand::Logout) => "logout",
+            CliRootCommands::RootUser(RootUserSubcommand::Whoami { .. }) => "whoami",
+            CliRootCommands::RootUser(RootUserSubcommand::Profile) => "profile",
+            CliRootCommands::User(_) => "user",
+            CliRootCommands::Telemetry(_) => "telemetry",
+            CliRootCommands::Version { .. } => "version",
+            CliRootCommands::Chat { .. } => "chat",
+        }
+    }
+}
+
+const HELP_TEXT: &str = color_print::cstr! {"
+
+<magenta,em>q</magenta,em> (Amazon Q CLI)
+
+<magenta,em>Popular Subcommands</magenta,em>              <black!><em>Usage:</em> q [subcommand]</black!>
+╭────────────────────────────────────────────────────╮
+│ <em>chat</em>         <black!>Chat with Amazon Q</black!>                    │
+│ <em>settings</em>     <black!>Customize appearance & behavior</black!>       │
+╰────────────────────────────────────────────────────╯
+
+<black!>To see all subcommands, use:</black!>
+ <black!>❯</black!> q --help-all
+ㅤ
+"};
+
+#[derive(Debug, Parser, PartialEq, Default)]
+#[command(version, about, name = crate::CLI_BINARY_NAME, help_template = HELP_TEXT)]
+pub struct Cli {
+    #[command(subcommand)]
+    pub subcommand: Option<CliRootCommands>,
+    /// Increase logging verbosity
+    #[arg(long, short = 'v', action = ArgAction::Count, global = true)]
+    pub verbose: u8,
+    /// Print help for all subcommands
+    #[arg(long)]
+    help_all: bool,
+}
+
+impl Cli {
+    pub async fn execute(self) -> Result<ExitCode> {
+        // Initialize our logger and keep around the guard so logging can perform as expected.
+        let _log_guard = initialize_logging(LogArgs {
+            log_level: match self.verbose > 0 {
+                true => Some(
+                    match self.verbose {
+                        1 => Level::WARN,
+                        2 => Level::INFO,
+                        3 => Level::DEBUG,
+                        _ => Level::TRACE,
+                    }
+                    .to_string(),
+                ),
+                false => None,
+            },
+            log_to_stdout: std::env::var_os("Q_LOG_STDOUT").is_some() || self.verbose > 0,
+            log_file_path: match self.subcommand {
+                Some(CliRootCommands::Chat { .. }) => Some("chat.log".to_owned()),
+                _ => match crate::fig_log::get_log_level_max() >= Level::DEBUG {
+                    true => Some("cli.log".to_owned()),
+                    false => None,
+                },
+            }
+            .map(|name| logs_dir().expect("home dir must be set").join(name)),
+            delete_old_log_file: false,
+        });
+
+        debug!(command =? std::env::args().collect::<Vec<_>>(), "Command ran");
+
+        self.send_telemetry().await;
+
+        if self.help_all {
+            return self.print_help_all();
+        }
+
+        let cli_context = CliContext::new();
+
+        match self.subcommand {
+            Some(subcommand) => match subcommand {
+                CliRootCommands::Uninstall { no_confirm } => uninstall::uninstall_command(no_confirm).await,
+                CliRootCommands::Update(args) => args.execute().await,
+                CliRootCommands::Diagnostic(args) => args.execute().await,
+                CliRootCommands::User(user) => user.execute().await,
+                CliRootCommands::RootUser(root_user) => root_user.execute().await,
+                CliRootCommands::Settings(settings_args) => settings_args.execute(&cli_context).await,
+                CliRootCommands::Debug(debug_subcommand) => debug_subcommand.execute().await,
+                CliRootCommands::Issue(args) => args.execute().await,
+                CliRootCommands::Telemetry(subcommand) => subcommand.execute().await,
+                CliRootCommands::Version { changelog } => Self::print_version(changelog),
+                CliRootCommands::Chat(args) => chat::launch_chat(args).await,
+            },
+            // Root command
+            None => chat::launch_chat(chat::cli::Chat::default()).await,
+        }
+    }
+
+    async fn send_telemetry(&self) {
+        match &self.subcommand {
+            None => {},
+            Some(subcommand) => {
+                send_cli_subcommand_executed(subcommand.name()).await;
+            },
+        }
+    }
+
+    #[allow(clippy::unused_self)]
+    fn print_help_all(&self) -> Result<ExitCode> {
+        let mut cmd = Self::command().help_template("{all-args}");
+        eprintln!();
+        eprintln!(
+            "{}\n    {CLI_BINARY_NAME} [OPTIONS] [SUBCOMMAND]\n",
+            "USAGE:".bold().underlined(),
+        );
+        cmd.print_long_help()?;
+        Ok(ExitCode::SUCCESS)
+    }
+
+    fn print_changelog_entry(entry: &feed::Entry) -> Result<()> {
+        println!("Version {} ({})", entry.version, entry.date);
+
+        if entry.changes.is_empty() {
+            println!("  No changes recorded for this version.");
+        } else {
+            for change in &entry.changes {
+                let type_label = match change.change_type.as_str() {
+                    "added" => "Added",
+                    "fixed" => "Fixed",
+                    "changed" => "Changed",
+                    other => other,
+                };
+
+                println!("  - {}: {}", type_label, change.description);
+            }
+        }
+
+        println!();
+        Ok(())
+    }
+
+    #[allow(clippy::unused_self)]
+    fn print_version(changelog: Option<String>) -> Result<ExitCode> {
+        // If no changelog is requested, display normal version information
+        if changelog.is_none() {
+            let _ = writeln!(stdout(), "{}", Self::command().render_version());
+            return Ok(ExitCode::SUCCESS);
+        }
+
+        let changelog_value = changelog.unwrap_or_default();
+        let feed = Feed::load();
+
+        // Display changelog for all versions
+        if changelog_value == "all" {
+            let entries = feed.get_all_changelogs();
+            if entries.is_empty() {
+                println!("No changelog information available.");
+            } else {
+                println!("Changelog for all versions:");
+                for entry in entries {
+                    Self::print_changelog_entry(&entry)?;
+                }
+            }
+            return Ok(ExitCode::SUCCESS);
+        }
+
+        // Display changelog for a specific version (--changelog=x.x.x)
+        if !changelog_value.is_empty() {
+            match feed.get_version_changelog(&changelog_value) {
+                Some(entry) => {
+                    println!("Changelog for version {}:", changelog_value);
+                    Self::print_changelog_entry(&entry)?;
+                    return Ok(ExitCode::SUCCESS);
+                },
+                None => {
+                    println!("No changelog information available for version {}.", changelog_value);
+                    return Ok(ExitCode::SUCCESS);
+                },
+            }
+        }
+
+        // Display changelog for the current version (--changelog only)
+        let current_version = env!("CARGO_PKG_VERSION");
+        match feed.get_version_changelog(current_version) {
+            Some(entry) => {
+                println!("Changelog for version {}:", current_version);
+                Self::print_changelog_entry(&entry)?;
+            },
+            None => {
+                println!("No changelog information available for version {}.", current_version);
+            },
+        }
+
+        Ok(ExitCode::SUCCESS)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn debug_assert() {
+        Cli::command().debug_assert();
+    }
+
+    macro_rules! assert_parse {
+        (
+            [ $($args:expr),+ ],
+            $subcommand:expr
+        ) => {
+            assert_eq!(
+                Cli::parse_from([CLI_BINARY_NAME, $($args),*]),
+                Cli {
+                    subcommand: Some($subcommand),
+                    ..Default::default()
+                }
+            );
+        };
+    }
+
+    /// Test flag parsing for the top level [Cli]
+    #[test]
+    fn test_flags() {
+        assert_eq!(Cli::parse_from([CLI_BINARY_NAME, "-v"]), Cli {
+            subcommand: None,
+            verbose: 1,
+            help_all: false,
+        });
+
+        assert_eq!(Cli::parse_from([CLI_BINARY_NAME, "-vvv"]), Cli {
+            subcommand: None,
+            verbose: 3,
+            help_all: false,
+        });
+
+        assert_eq!(Cli::parse_from([CLI_BINARY_NAME, "--help-all"]), Cli {
+            subcommand: None,
+            verbose: 0,
+            help_all: true,
+        });
+
+        assert_eq!(Cli::parse_from([CLI_BINARY_NAME, "chat", "-vv"]), Cli {
+            subcommand: Some(CliRootCommands::Chat(Chat {
+                accept_all: false,
+                no_interactive: false,
+                input: None,
+                profile: None,
+                trust_all_tools: false,
+                trust_tools: None,
+            })),
+            verbose: 2,
+            help_all: false,
+        });
+    }
+
+    #[test]
+    fn test_version_changelog() {
+        assert_parse!(["version", "--changelog"], CliRootCommands::Version {
+            changelog: Some("".to_string()),
+        });
+    }
+
+    #[test]
+    fn test_version_changelog_all() {
+        assert_parse!(["version", "--changelog=all"], CliRootCommands::Version {
+            changelog: Some("all".to_string()),
+        });
+    }
+
+    #[test]
+    fn test_version_changelog_specific() {
+        assert_parse!(["version", "--changelog=1.8.0"], CliRootCommands::Version {
+            changelog: Some("1.8.0".to_string()),
+        });
+    }
+
+    #[test]
+    fn test_chat_with_context_profile() {
+        assert_parse!(
+            ["chat", "--profile", "my-profile"],
+            CliRootCommands::Chat(Chat {
+                accept_all: false,
+                no_interactive: false,
+                input: None,
+                profile: Some("my-profile".to_string()),
+                trust_all_tools: false,
+                trust_tools: None,
+            })
+        );
+    }
+
+    #[test]
+    fn test_chat_with_context_profile_and_input() {
+        assert_parse!(
+            ["chat", "--profile", "my-profile", "Hello"],
+            CliRootCommands::Chat(Chat {
+                accept_all: false,
+                no_interactive: false,
+                input: Some("Hello".to_string()),
+                profile: Some("my-profile".to_string()),
+                trust_all_tools: false,
+                trust_tools: None,
+            })
+        );
+    }
+
+    #[test]
+    fn test_chat_with_context_profile_and_accept_all() {
+        assert_parse!(
+            ["chat", "--profile", "my-profile", "--accept-all"],
+            CliRootCommands::Chat(Chat {
+                accept_all: true,
+                no_interactive: false,
+                input: None,
+                profile: Some("my-profile".to_string()),
+                trust_all_tools: false,
+                trust_tools: None,
+            })
+        );
+    }
+
+    #[test]
+    fn test_chat_with_no_interactive() {
+        assert_parse!(
+            ["chat", "--no-interactive"],
+            CliRootCommands::Chat(Chat {
+                accept_all: false,
+                no_interactive: true,
+                input: None,
+                profile: None,
+                trust_all_tools: false,
+                trust_tools: None,
+            })
+        );
+    }
+
+    #[test]
+    fn test_chat_with_tool_trust_all() {
+        assert_parse!(
+            ["chat", "--trust-all-tools"],
+            CliRootCommands::Chat(Chat {
+                accept_all: false,
+                no_interactive: false,
+                input: None,
+                profile: None,
+                trust_all_tools: true,
+                trust_tools: None,
+            })
+        );
+    }
+
+    #[test]
+    fn test_chat_with_tool_trust_none() {
+        assert_parse!(
+            ["chat", "--trust-tools="],
+            CliRootCommands::Chat(Chat {
+                accept_all: false,
+                no_interactive: false,
+                input: None,
+                profile: None,
+                trust_all_tools: false,
+                trust_tools: Some(vec!["".to_string()]),
+            })
+        );
+    }
+
+    #[test]
+    fn test_chat_with_tool_trust_some() {
+        assert_parse!(
+            ["chat", "--trust-tools=fs_read,fs_write"],
+            CliRootCommands::Chat(Chat {
+                accept_all: false,
+                no_interactive: false,
+                input: None,
+                profile: None,
+                trust_all_tools: false,
+                trust_tools: Some(vec!["fs_read".to_string(), "fs_write".to_string()]),
+            })
+        );
+    }
+}
diff --git a/crates/kiro-cli/src/cli/settings.rs b/crates/kiro-cli/src/cli/settings.rs
new file mode 100644
index 0000000000..09d21f8370
--- /dev/null
+++ b/crates/kiro-cli/src/cli/settings.rs
@@ -0,0 +1,152 @@
+use std::process::ExitCode;
+
+use anstream::println;
+use clap::{
+    ArgGroup,
+    Args,
+    Subcommand,
+};
+use eyre::{
+    Result,
+    WrapErr,
+    bail,
+};
+use globset::Glob;
+use serde_json::json;
+
+use super::OutputFormat;
+use crate::fig_os_shim::Os;
+use crate::fig_settings::JsonStore;
+use crate::fig_util::{
+    CliContext,
+    directories,
+};
+
+#[derive(Debug, Subcommand, PartialEq, Eq)]
+pub enum SettingsSubcommands {
+    /// Open the settings file
+    Open,
+    /// List all the settings
+    All {
+        /// Format of the output
+        #[arg(long, short, value_enum, default_value_t)]
+        format: OutputFormat,
+    },
+}
+
+#[derive(Debug, Args, PartialEq, Eq)]
+#[command(subcommand_negates_reqs = true)]
+#[command(args_conflicts_with_subcommands = true)]
+#[command(group(ArgGroup::new("vals").requires("key").args(&["value", "delete", "format"])))]
+pub struct SettingsArgs {
+    #[command(subcommand)]
+    cmd: Option<SettingsSubcommands>,
+    /// key
+    key: Option<String>,
+    /// value
+    value: Option<String>,
+    /// Delete a value
+    #[arg(long, short)]
+    delete: bool,
+    /// Format of the output
+    #[arg(long, short, value_enum, default_value_t)]
+    format: OutputFormat,
+}
+
+impl SettingsArgs {
+    pub async fn execute(&self, cli_context: &CliContext) -> Result<ExitCode> {
+        match self.cmd {
+            Some(SettingsSubcommands::Open) => {
+                let file = directories::settings_path().context("Could not get settings path")?;
+                if cli_context.context().platform().os() == Os::Mac {
+                    tokio::process::Command::new("open").arg(file).output().await?;
+                    Ok(ExitCode::SUCCESS)
+                } else if let Ok(editor) = cli_context.context().env().get("EDITOR") {
+                    tokio::process::Command::new(editor).arg(file).spawn()?.wait().await?;
+                    Ok(ExitCode::SUCCESS)
+                } else {
+                    bail!("The EDITOR environment variable is not set")
+                }
+            },
+            Some(SettingsSubcommands::All { format }) => {
+                let settings = crate::fig_settings::OldSettings::load()?.map().clone();
+
+                match format {
+                    OutputFormat::Plain => {
+                        for (key, value) in settings {
+                            println!("{key} = {value}");
+                        }
+                    },
+                    OutputFormat::Json => println!("{}", serde_json::to_string(&settings)?),
+                    OutputFormat::JsonPretty => {
+                        println!("{}", serde_json::to_string_pretty(&settings)?);
+                    },
+                }
+
+                Ok(ExitCode::SUCCESS)
+            },
+            None => {
+                let Some(key) = &self.key else {
+                    return Ok(ExitCode::SUCCESS);
+                };
+
+                match (&self.value, self.delete) {
+                    (None, false) => match crate::fig_settings::settings::get_value(key)? {
+                        Some(value) => {
+                            match self.format {
+                                OutputFormat::Plain => match value.as_str() {
+                                    Some(value) => println!("{value}"),
+                                    None => println!("{value:#}"),
+                                },
+                                OutputFormat::Json => println!("{value}"),
+                                OutputFormat::JsonPretty => println!("{value:#}"),
+                            }
+                            Ok(ExitCode::SUCCESS)
+                        },
+                        None => match self.format {
+                            OutputFormat::Plain => Err(eyre::eyre!("No value associated with {key}")),
+                            OutputFormat::Json | OutputFormat::JsonPretty => {
+                                println!("null");
+                                Ok(ExitCode::SUCCESS)
+                            },
+                        },
+                    },
+                    (Some(value_str), false) => {
+                        let value = serde_json::from_str(value_str).unwrap_or_else(|_| json!(value_str));
+                        crate::fig_settings::settings::set_value(key, value)?;
+                        Ok(ExitCode::SUCCESS)
+                    },
+                    (None, true) => {
+                        let glob = Glob::new(key).context("Could not create glob")?.compile_matcher();
+                        let settings = crate::fig_settings::OldSettings::load()?;
+                        let map = settings.map();
+                        let keys_to_remove = map.keys().filter(|key| glob.is_match(key)).collect::<Vec<_>>();
+
+                        match keys_to_remove.len() {
+                            0 => {
+                                return Err(eyre::eyre!("No settings found matching {key}"));
+                            },
+                            1 => {
+                                println!("Removing {:?}", keys_to_remove[0]);
+                                crate::fig_settings::settings::remove_value(keys_to_remove[0])?;
+                            },
+                            _ => {
+                                println!("Removing:");
+                                for key in &keys_to_remove {
+                                    println!("  - {key}");
+                                }
+
+                                for key in &keys_to_remove {
+                                    crate::fig_settings::settings::remove_value(key)?;
+                                }
+                            },
+                        }
+
+                        Ok(ExitCode::SUCCESS)
+                    },
+                    _ => Ok(ExitCode::SUCCESS),
+                }
+            },
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/cli/telemetry.rs b/crates/kiro-cli/src/cli/telemetry.rs
new file mode 100644
index 0000000000..86ce2d5aff
--- /dev/null
+++ b/crates/kiro-cli/src/cli/telemetry.rs
@@ -0,0 +1,53 @@
+use std::process::ExitCode;
+
+use clap::Subcommand;
+use crossterm::style::Stylize;
+use eyre::Result;
+use serde_json::json;
+
+use super::OutputFormat;
+
+const TELEMETRY_ENABLED_KEY: &str = "telemetry.enabled";
+
+#[derive(Debug, PartialEq, Eq, Subcommand)]
+pub enum TelemetrySubcommand {
+    Enable,
+    Disable,
+    Status {
+        /// Format of the output
+        #[arg(long, short, value_enum, default_value_t)]
+        format: OutputFormat,
+    },
+}
+
+impl TelemetrySubcommand {
+    pub async fn execute(&self) -> Result<ExitCode> {
+        match self {
+            TelemetrySubcommand::Enable => {
+                crate::fig_settings::settings::set_value(TELEMETRY_ENABLED_KEY, true)?;
+                Ok(ExitCode::SUCCESS)
+            },
+            TelemetrySubcommand::Disable => {
+                crate::fig_settings::settings::set_value(TELEMETRY_ENABLED_KEY, false)?;
+                Ok(ExitCode::SUCCESS)
+            },
+            TelemetrySubcommand::Status { format } => {
+                let status = crate::fig_settings::settings::get_bool_or(TELEMETRY_ENABLED_KEY, true);
+                format.print(
+                    || {
+                        format!(
+                            "Telemetry status: {}",
+                            if status { "enabled" } else { "disabled" }.bold()
+                        )
+                    },
+                    || {
+                        json!({
+                            TELEMETRY_ENABLED_KEY: status,
+                        })
+                    },
+                );
+                Ok(ExitCode::SUCCESS)
+            },
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/cli/uninstall.rs b/crates/kiro-cli/src/cli/uninstall.rs
new file mode 100644
index 0000000000..fc08b9c0c7
--- /dev/null
+++ b/crates/kiro-cli/src/cli/uninstall.rs
@@ -0,0 +1,174 @@
+use std::process::ExitCode;
+
+use anstream::println;
+use crossterm::style::Stylize;
+use eyre::Result;
+
+use crate::fig_util::{
+    CLI_BINARY_NAME,
+    PRODUCT_NAME,
+    dialoguer_theme,
+};
+
+pub async fn uninstall_command(no_confirm: bool) -> Result<ExitCode> {
+    if !no_confirm {
+        println!(
+            "\nIs {PRODUCT_NAME} not working? Try running {}\n",
+            format!("{CLI_BINARY_NAME} doctor").bold().magenta()
+        );
+        let should_continue = dialoguer::Select::with_theme(&dialoguer_theme())
+            .with_prompt(format!("Are you sure want to continue uninstalling {PRODUCT_NAME}?"))
+            .items(&["Yes", "No"])
+            .default(0)
+            .interact_opt()?;
+
+        if should_continue == Some(0) {
+            println!("Uninstalling {PRODUCT_NAME}");
+        } else {
+            println!("Cancelled");
+            return Ok(ExitCode::FAILURE);
+        }
+    };
+
+    cfg_if::cfg_if! {
+        if #[cfg(target_os = "macos")] {
+            uninstall().await?;
+        } else if #[cfg(target_os = "linux")] {
+            use crate::fig_util::manifest::is_minimal;
+            let ctx = crate::fig_os_shim::Context::new();
+            if is_minimal() {
+                uninstall_linux_minimal(ctx).await?;
+            } else {
+                uninstall_linux_full(ctx).await?;
+            }
+
+        }
+    }
+
+    Ok(ExitCode::SUCCESS)
+}
+
+#[cfg(target_os = "macos")]
+async fn uninstall() -> Result<()> {
+    crate::fig_auth::logout().await.ok();
+    crate::fig_install::uninstall().await?;
+    Ok(())
+}
+
+#[cfg(target_os = "linux")]
+async fn uninstall_linux_minimal(ctx: std::sync::Arc<fig_os_shim::Context>) -> Result<()> {
+    use eyre::bail;
+    use tracing::error;
+
+    let exe_path = ctx.fs().canonicalize(ctx.env().current_exe()?.canonicalize()?).await?;
+    let Some(exe_name) = exe_path.file_name().and_then(|s| s.to_str()) else {
+        bail!("Failed to get name of current executable: {exe_path:?}")
+    };
+    let Some(exe_parent) = exe_path.parent() else {
+        bail!("Failed to get parent of current executable: {exe_path:?}")
+    };
+    // canonicalize to handle if the home dir is a symlink (like on Dev Desktops)
+    let local_bin = crate::fig_util::directories::home_local_bin_ctx(&ctx)?.canonicalize()?;
+
+    if exe_parent != local_bin {
+        bail!(
+            "Uninstall is only supported for binaries installed in {local_bin:?}, the current executable is in {exe_parent:?}"
+        );
+    }
+
+    if exe_name != CLI_BINARY_NAME {
+        bail!("Uninstall is only supported for {CLI_BINARY_NAME:?}, the current executable is {exe_name:?}");
+    }
+
+    if let Err(err) = crate::fig_auth::logout().await {
+        error!(%err, "Failed to logout");
+    }
+    crate::fig_install::uninstall(crate::fig_install::InstallComponents::all_linux_minimal(), ctx).await?;
+    Ok(())
+}
+
+#[cfg(target_os = "linux")]
+async fn uninstall_linux_full(ctx: std::sync::Arc<fig_os_shim::Context>) -> Result<()> {
+    use eyre::bail;
+    use tracing::error;
+
+    use crate::fig_install::{
+        InstallComponents,
+        UNINSTALL_URL,
+        uninstall,
+    };
+
+    // TODO: Add a better way to distinguish binaries distributed between AppImage and package
+    // managers.
+    // We want to support q uninstall for AppImage, but not for package managers.
+    match ctx.process_info().current_pid().exe() {
+        Some(exe) => {
+            let Some(exe_parent) = exe.parent() else {
+                bail!("Failed to get parent of current executable: {exe:?}")
+            };
+            let local_bin = crate::fig_util::directories::home_local_bin_ctx(&ctx)?.canonicalize()?;
+            if exe_parent != local_bin {
+                bail!(
+                    "Managed uninstalls are not supported. Please use your package manager to uninstall {}",
+                    PRODUCT_NAME
+                );
+            }
+        },
+        None => bail!("Unable to determine the current process executable."),
+    }
+
+    if let Err(err) = crate::fig_util::open_url_async(UNINSTALL_URL).await {
+        error!(%err, %UNINSTALL_URL, "Failed to open uninstall url");
+    }
+
+    if let Err(err) = crate::fig_auth::logout().await {
+        error!(%err, "Failed to logout");
+    }
+    uninstall(InstallComponents::all(), ctx).await?;
+    Ok(())
+}
+
+#[cfg(all(unix, not(any(target_os = "macos", target_os = "linux"))))]
+async fn uninstall() -> Result<()> {
+    eyre::bail!("Guided uninstallation is not supported on this platform. Please uninstall manually.");
+}
+
+// #[cfg(target_os = "linux")]
+// mod linux {
+//     use eyre::Result;
+//
+//     pub async fn uninstall_apt(pkg: String) -> Result<()> {
+//         tokio::process::Command::new("apt")
+//             .arg("remove")
+//             .arg("-y")
+//             .arg(pkg)
+//             .status()
+//             .await?;
+//         std::fs::remove_file("/etc/apt/sources.list.d/fig.list")?;
+//         std::fs::remove_file("/etc/apt/keyrings/fig.gpg")?;
+//
+//         Ok(())
+//     }
+//
+//     pub async fn uninstall_dnf(pkg: String) -> Result<()> {
+//         tokio::process::Command::new("dnf")
+//             .arg("remove")
+//             .arg("-y")
+//             .arg(pkg)
+//             .status()
+//             .await?;
+//         std::fs::remove_file("/etc/yum.repos.d/fig.repo")?;
+//
+//         Ok(())
+//     }
+//
+//     pub async fn uninstall_pacman(pkg: String) -> Result<()> {
+//         tokio::process::Command::new("pacman")
+//             .arg("-Rs")
+//             .arg(pkg)
+//             .status()
+//             .await?;
+//
+//         Ok(())
+//     }
+// }
diff --git a/crates/kiro-cli/src/cli/update.rs b/crates/kiro-cli/src/cli/update.rs
new file mode 100644
index 0000000000..a1739856c2
--- /dev/null
+++ b/crates/kiro-cli/src/cli/update.rs
@@ -0,0 +1,58 @@
+use std::process::ExitCode;
+
+use anstream::println;
+use clap::Args;
+use crossterm::style::Stylize;
+use eyre::Result;
+use self_update::{
+    Status,
+    cargo_crate_version,
+};
+
+use crate::fig_util::CLI_BINARY_NAME;
+
+#[derive(Debug, PartialEq, Args)]
+pub struct UpdateArgs {
+    /// Don't prompt for confirmation
+    #[arg(long, short = 'y')]
+    non_interactive: bool,
+    /// Relaunch into dashboard after update (false will launch in background)
+    #[arg(long, default_value = "true")]
+    relaunch_dashboard: bool,
+    /// Uses rollout
+    #[arg(long)]
+    rollout: bool,
+}
+
+impl UpdateArgs {
+    pub async fn execute(&self) -> Result<ExitCode> {
+        todo!();
+
+        let res = self_update::backends::s3::Update::configure()
+            .bucket_name("self_update_releases")
+            .asset_prefix("something/self_update")
+            .region("eu-west-2")
+            .bin_name("self_update_example")
+            .show_download_progress(true)
+            .current_version(cargo_crate_version!())
+            .build()?
+            .update();
+
+        match res {
+            Ok(Status::UpToDate(_)) => {
+                println!(
+                    "No updates available, \n{} is the latest version.",
+                    env!("CARGO_PKG_VERSION").bold()
+                );
+                Ok(ExitCode::SUCCESS)
+            },
+            Ok(Status::Updated(_)) => Ok(ExitCode::SUCCESS),
+            Err(err) => {
+                eyre::bail!(
+                    "{err}\n\nIf this is unexpected, try running {} and then try again.\n",
+                    format!("{CLI_BINARY_NAME} doctor").bold()
+                )
+            },
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/cli/user.rs b/crates/kiro-cli/src/cli/user.rs
new file mode 100644
index 0000000000..f878a4057e
--- /dev/null
+++ b/crates/kiro-cli/src/cli/user.rs
@@ -0,0 +1,471 @@
+use std::fmt;
+use std::fmt::Display;
+use std::process::{
+    ExitCode,
+    exit,
+};
+use std::time::Duration;
+
+use anstream::{
+    eprintln,
+    println,
+};
+use clap::{
+    Args,
+    Subcommand,
+};
+use crossterm::style::Stylize;
+use dialoguer::Select;
+use eyre::{
+    Result,
+    bail,
+};
+use serde_json::json;
+use tokio::signal::unix::{
+    SignalKind,
+    signal,
+};
+use tracing::{
+    error,
+    info,
+};
+
+use super::OutputFormat;
+use crate::fig_api_client::list_available_profiles;
+use crate::fig_api_client::profile::Profile;
+use crate::fig_auth::builder_id::{
+    PollCreateToken,
+    TokenType,
+    poll_create_token,
+    start_device_authorization,
+};
+use crate::fig_auth::pkce::start_pkce_authorization;
+use crate::fig_auth::secret_store::SecretStore;
+use crate::fig_telemetry::{
+    QProfileSwitchIntent,
+    TelemetryResult,
+};
+use crate::fig_util::spinner::{
+    Spinner,
+    SpinnerComponent,
+};
+use crate::fig_util::system_info::is_remote;
+use crate::fig_util::{
+    CLI_BINARY_NAME,
+    PRODUCT_NAME,
+    choose,
+    input,
+};
+
+#[derive(Subcommand, Debug, PartialEq, Eq)]
+pub enum RootUserSubcommand {
+    /// Login
+    Login(LoginArgs),
+    /// Logout
+    Logout,
+    /// Prints details about the current user
+    Whoami {
+        /// Output format to use
+        #[arg(long, short, value_enum, default_value_t)]
+        format: OutputFormat,
+    },
+    /// Show the profile associated with this idc user
+    Profile,
+}
+
+#[derive(Args, Debug, PartialEq, Eq, Clone, Default)]
+pub struct LoginArgs {
+    /// License type (pro for Identity Center, free for Builder ID)
+    #[arg(long, value_enum)]
+    pub license: Option<LicenseType>,
+
+    /// Identity provider URL (for Identity Center)
+    #[arg(long)]
+    pub identity_provider: Option<String>,
+
+    /// Region (for Identity Center)
+    #[arg(long)]
+    pub region: Option<String>,
+
+    /// Always use the OAuth device flow for authentication. Useful for instances where browser
+    /// redirects cannot be handled.
+    #[arg(long)]
+    pub use_device_flow: bool,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, clap::ValueEnum)]
+pub enum LicenseType {
+    /// Free license with Builder ID
+    Free,
+    /// Pro license with Identity Center
+    Pro,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum AuthMethod {
+    /// Builder ID (free)
+    BuilderId,
+    /// IdC (enterprise)
+    IdentityCenter,
+}
+
+impl Display for AuthMethod {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AuthMethod::BuilderId => write!(f, "Use for Free with Builder ID"),
+            AuthMethod::IdentityCenter => write!(f, "Use with Pro license"),
+        }
+    }
+}
+
+impl RootUserSubcommand {
+    pub async fn execute(self) -> Result<ExitCode> {
+        match self {
+            Self::Login(args) => {
+                if crate::fig_auth::is_logged_in().await {
+                    eyre::bail!(
+                        "Already logged in, please logout with {} first",
+                        format!("{CLI_BINARY_NAME} logout").magenta()
+                    );
+                }
+
+                login_interactive(args).await?;
+
+                Ok(ExitCode::SUCCESS)
+            },
+            Self::Logout => {
+                let _ = crate::fig_auth::logout().await;
+
+                println!("You are now logged out");
+                println!(
+                    "Run {} to log back in to {PRODUCT_NAME}",
+                    format!("{CLI_BINARY_NAME} login").magenta()
+                );
+                Ok(ExitCode::SUCCESS)
+            },
+            Self::Whoami { format } => {
+                let builder_id = crate::fig_auth::builder_id_token().await;
+
+                match builder_id {
+                    Ok(Some(token)) => {
+                        format.print(
+                            || match token.token_type() {
+                                TokenType::BuilderId => "Logged in with Builder ID".into(),
+                                TokenType::IamIdentityCenter => {
+                                    format!(
+                                        "Logged in with IAM Identity Center ({})",
+                                        token.start_url.as_ref().unwrap()
+                                    )
+                                },
+                            },
+                            || {
+                                json!({
+                                    "accountType": match token.token_type() {
+                                        TokenType::BuilderId => "BuilderId",
+                                        TokenType::IamIdentityCenter => "IamIdentityCenter",
+                                    },
+                                    "startUrl": token.start_url,
+                                    "region": token.region,
+                                })
+                            },
+                        );
+
+                        if matches!(token.token_type(), TokenType::IamIdentityCenter) {
+                            if let Ok(Some(profile)) = crate::fig_settings::state::get::<
+                                crate::fig_api_client::profile::Profile,
+                            >("api.codewhisperer.profile")
+                            {
+                                color_print::cprintln!(
+                                    "\n<em>Profile:</em>\n{}\n{}\n",
+                                    profile.profile_name,
+                                    profile.arn
+                                );
+                            }
+                        }
+                        Ok(ExitCode::SUCCESS)
+                    },
+                    _ => {
+                        format.print(|| "Not logged in", || json!({ "account": null }));
+                        Ok(ExitCode::FAILURE)
+                    },
+                }
+            },
+            Self::Profile => {
+                if !crate::fig_util::system_info::in_cloudshell() && !crate::fig_auth::is_logged_in().await {
+                    bail!(
+                        "You are not logged in, please log in with {}",
+                        format!("{CLI_BINARY_NAME} login",).bold()
+                    );
+                }
+
+                if let Ok(Some(token)) = crate::fig_auth::builder_id_token().await {
+                    if matches!(token.token_type(), TokenType::BuilderId) {
+                        bail!("This command is only available for Pro users");
+                    }
+                }
+
+                select_profile_interactive(false).await?;
+
+                Ok(ExitCode::SUCCESS)
+            },
+        }
+    }
+}
+
+#[derive(Subcommand, Debug, PartialEq, Eq)]
+pub enum UserSubcommand {
+    #[command(flatten)]
+    Root(RootUserSubcommand),
+}
+
+impl UserSubcommand {
+    pub async fn execute(self) -> Result<ExitCode> {
+        match self {
+            Self::Root(cmd) => cmd.execute().await,
+        }
+    }
+}
+
+pub async fn login_interactive(args: LoginArgs) -> Result<()> {
+    let login_method = match args.license {
+        Some(LicenseType::Free) => AuthMethod::BuilderId,
+        Some(LicenseType::Pro) => AuthMethod::IdentityCenter,
+        None => {
+            // No license specified, prompt the user to choose
+            let options = [AuthMethod::BuilderId, AuthMethod::IdentityCenter];
+            let i = match choose("Select login method", &options)? {
+                Some(i) => i,
+                None => bail!("No login method selected"),
+            };
+            options[i]
+        },
+    };
+
+    match login_method {
+        AuthMethod::BuilderId | AuthMethod::IdentityCenter => {
+            let (start_url, region) = match login_method {
+                AuthMethod::BuilderId => (None, None),
+                AuthMethod::IdentityCenter => {
+                    let default_start_url = args.identity_provider.or_else(|| {
+                        crate::fig_settings::state::get_string("auth.idc.start-url")
+                            .ok()
+                            .flatten()
+                    });
+                    let default_region = args
+                        .region
+                        .or_else(|| crate::fig_settings::state::get_string("auth.idc.region").ok().flatten());
+
+                    let start_url = input("Enter Start URL", default_start_url.as_deref())?;
+                    let region = input("Enter Region", default_region.as_deref())?;
+
+                    let _ = crate::fig_settings::state::set_value("auth.idc.start-url", start_url.clone());
+                    let _ = crate::fig_settings::state::set_value("auth.idc.region", region.clone());
+
+                    (Some(start_url), Some(region))
+                },
+            };
+            let secret_store = SecretStore::new().await?;
+
+            // Remote machine won't be able to handle browser opening and redirects,
+            // hence always use device code flow.
+            if is_remote() || args.use_device_flow {
+                try_device_authorization(&secret_store, start_url.clone(), region.clone()).await?;
+            } else {
+                let (client, registration) = start_pkce_authorization(start_url.clone(), region.clone()).await?;
+
+                match crate::fig_util::open::open_url_async(&registration.url).await {
+                    // If it succeeded, finish PKCE.
+                    Ok(()) => {
+                        let mut spinner = Spinner::new(vec![
+                            SpinnerComponent::Spinner,
+                            SpinnerComponent::Text(" Logging in...".into()),
+                        ]);
+                        let mut ctrl_c_stream = signal(SignalKind::interrupt())?;
+                        tokio::select! {
+                            res = registration.finish(&client, Some(&secret_store)) => res?,
+                            Some(_) = ctrl_c_stream.recv() => {
+                                #[allow(clippy::exit)]
+                                exit(1);
+                            },
+                        }
+                        crate::fig_telemetry::send_user_logged_in().await;
+                        spinner.stop_with_message("Device authorized".into());
+                    },
+                    // If we are unable to open the link with the browser, then fallback to
+                    // the device code flow.
+                    Err(err) => {
+                        error!(%err, "Failed to open URL with browser, falling back to device code flow");
+
+                        // Try device code flow.
+                        try_device_authorization(&secret_store, start_url.clone(), region.clone()).await?;
+                    },
+                }
+            }
+        },
+    };
+
+    if login_method == AuthMethod::IdentityCenter {
+        select_profile_interactive(true).await?;
+    }
+
+    eprintln!("Logged in successfully");
+
+    Ok(())
+}
+
+async fn try_device_authorization(
+    secret_store: &SecretStore,
+    start_url: Option<String>,
+    region: Option<String>,
+) -> Result<()> {
+    let device_auth = start_device_authorization(secret_store, start_url.clone(), region.clone()).await?;
+
+    println!();
+    println!("Confirm the following code in the browser");
+    println!("Code: {}", device_auth.user_code.bold());
+    println!();
+
+    let print_open_url = || println!("Open this URL: {}", device_auth.verification_uri_complete);
+
+    if is_remote() {
+        print_open_url();
+    } else if let Err(err) = crate::fig_util::open::open_url_async(&device_auth.verification_uri_complete).await {
+        error!(%err, "Failed to open URL with browser");
+        print_open_url();
+    }
+
+    let mut spinner = Spinner::new(vec![
+        SpinnerComponent::Spinner,
+        SpinnerComponent::Text(" Logging in...".into()),
+    ]);
+
+    let mut ctrl_c_stream = signal(SignalKind::interrupt())?;
+    loop {
+        tokio::select! {
+            _ = tokio::time::sleep(Duration::from_secs(device_auth.interval.try_into().unwrap_or(1))) => (),
+            Some(_) = ctrl_c_stream.recv() => {
+                #[allow(clippy::exit)]
+                exit(1);
+            }
+        }
+        match poll_create_token(
+            secret_store,
+            device_auth.device_code.clone(),
+            start_url.clone(),
+            region.clone(),
+        )
+        .await
+        {
+            PollCreateToken::Pending => {},
+            PollCreateToken::Complete(_) => {
+                crate::fig_telemetry::send_user_logged_in().await;
+                spinner.stop_with_message("Device authorized".into());
+                break;
+            },
+            PollCreateToken::Error(err) => {
+                spinner.stop();
+                return Err(err.into());
+            },
+        };
+    }
+    Ok(())
+}
+
+async fn select_profile_interactive(whoami: bool) -> Result<()> {
+    let mut spinner = Spinner::new(vec![
+        SpinnerComponent::Spinner,
+        SpinnerComponent::Text(" Fetching profiles...".into()),
+    ]);
+    let profiles = list_available_profiles().await;
+    if profiles.is_empty() {
+        info!("Available profiles was empty");
+        return Ok(());
+    }
+
+    let sso_region: Option<String> = crate::fig_settings::state::get_string("auth.idc.region").ok().flatten();
+    let total_profiles = profiles.len() as i64;
+
+    if whoami && profiles.len() == 1 {
+        if let Some(profile_region) = profiles[0].arn.split(':').nth(3) {
+            crate::fig_telemetry::send_profile_state(
+                QProfileSwitchIntent::Update,
+                profile_region.to_string(),
+                TelemetryResult::Succeeded,
+                sso_region,
+            )
+            .await;
+        }
+        spinner.stop_with_message(String::new());
+        return Ok(crate::fig_settings::state::set_value(
+            "api.codewhisperer.profile",
+            serde_json::to_value(&profiles[0])?,
+        )?);
+    }
+
+    let mut items: Vec<String> = profiles
+        .iter()
+        .map(|p| format!("{} (arn: {})", p.profile_name, p.arn))
+        .collect();
+    let active_profile: Option<Profile> = crate::fig_settings::state::get("api.codewhisperer.profile")?;
+
+    if let Some(default_idx) = active_profile
+        .as_ref()
+        .and_then(|active| profiles.iter().position(|p| p.arn == active.arn))
+    {
+        items[default_idx] = format!("{} (active)", items[default_idx].as_str());
+    }
+
+    spinner.stop_with_message(String::new());
+    let selected = Select::with_theme(&crate::fig_util::dialoguer_theme())
+        .with_prompt("Select an IAM Identity Center profile")
+        .items(&items)
+        .default(0)
+        .interact_opt()?;
+
+    match selected {
+        Some(i) => {
+            let chosen = &profiles[i];
+            let profile = serde_json::to_value(chosen)?;
+            eprintln!("Set profile: {}\n", chosen.profile_name.as_str().green());
+            crate::fig_settings::state::set_value("api.codewhisperer.profile", profile)?;
+            crate::fig_settings::state::remove_value("api.selectedCustomization")?;
+
+            if let Some(profile_region) = chosen.arn.split(':').nth(3) {
+                let intent = if whoami {
+                    QProfileSwitchIntent::Auth
+                } else {
+                    QProfileSwitchIntent::User
+                };
+                crate::fig_telemetry::send_did_select_profile(
+                    intent,
+                    profile_region.to_string(),
+                    TelemetryResult::Succeeded,
+                    sso_region,
+                    Some(total_profiles),
+                )
+                .await;
+            }
+        },
+        None => {
+            crate::fig_telemetry::send_did_select_profile(
+                QProfileSwitchIntent::User,
+                "not-set".to_string(),
+                TelemetryResult::Cancelled,
+                sso_region,
+                Some(total_profiles),
+            )
+            .await;
+            bail!("No profile selected.\n");
+        },
+    }
+
+    Ok(())
+}
+
+mod tests {
+    #[test]
+    #[ignore]
+    fn unset_profile() {
+        crate::fig_settings::state::remove_value("api.codewhisperer.profile").unwrap();
+    }
+}
diff --git a/crates/kiro-cli/src/diagnostics.rs b/crates/kiro-cli/src/diagnostics.rs
new file mode 100644
index 0000000000..6de3f937e0
--- /dev/null
+++ b/crates/kiro-cli/src/diagnostics.rs
@@ -0,0 +1,253 @@
+#![allow(clippy::ref_option_ref)]
+use std::collections::BTreeMap;
+
+use serde::Serialize;
+use sysinfo::{
+    CpuRefreshKind,
+    MemoryRefreshKind,
+    RefreshKind,
+};
+use time::OffsetDateTime;
+use time::format_description::well_known::Rfc3339;
+
+use crate::fig_os_shim::{
+    Context,
+    Os,
+    PlatformProvider,
+};
+use crate::fig_telemetry::InstallMethod;
+use crate::fig_util::consts::build::HASH;
+use crate::fig_util::manifest::manifest;
+use crate::fig_util::system_info::{
+    OSVersion,
+    os_version,
+};
+
+fn serialize_display<D, S>(display: D, serializer: S) -> Result<S::Ok, S::Error>
+where
+    D: std::fmt::Display,
+    S: serde::Serializer,
+{
+    serializer.serialize_str(&display.to_string())
+}
+
+fn is_false(value: &bool) -> bool {
+    !value
+}
+
+#[derive(Debug, Clone, Serialize, Default)]
+#[serde(rename_all = "kebab-case")]
+pub struct BuildDetails {
+    pub version: String,
+    pub hash: Option<&'static str>,
+    pub date: Option<String>,
+    pub variant: String,
+}
+
+impl BuildDetails {
+    pub fn new() -> BuildDetails {
+        let date = crate::fig_util::consts::build::DATETIME
+            .and_then(|input| OffsetDateTime::parse(input, &Rfc3339).ok())
+            .and_then(|time| {
+                let rfc3339 = time.format(&Rfc3339).ok()?;
+                let duration = OffsetDateTime::now_utc() - time;
+                Some(format!("{rfc3339} ({duration:.0} ago)"))
+            });
+
+        BuildDetails {
+            version: env!("CARGO_PKG_VERSION").to_owned(),
+            hash: HASH,
+            date,
+            variant: manifest().variant.to_string(),
+        }
+    }
+}
+
+fn serialize_os_version<S>(version: &Option<&OSVersion>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    match version {
+        Some(version) => match version {
+            OSVersion::Linux { .. } => version.serialize(serializer),
+            other => serializer.serialize_str(&other.to_string()),
+        },
+        None => serializer.serialize_none(),
+    }
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct SystemInfo {
+    #[serde(serialize_with = "serialize_os_version")]
+    pub os: Option<&'static OSVersion>,
+    pub chip: Option<String>,
+    pub total_cores: Option<usize>,
+    pub memory: Option<String>,
+}
+
+impl SystemInfo {
+    fn new() -> SystemInfo {
+        let system = sysinfo::System::new_with_specifics(
+            RefreshKind::nothing()
+                .with_cpu(CpuRefreshKind::everything())
+                .with_memory(MemoryRefreshKind::everything()),
+        );
+
+        let mut hardware_info = SystemInfo {
+            os: os_version(),
+            chip: None,
+            total_cores: system.physical_core_count(),
+            memory: Some(format!("{:0.2} GB", system.total_memory() as f32 / 2.0_f32.powi(30))),
+        };
+
+        if let Some(processor) = system.cpus().first() {
+            hardware_info.chip = Some(processor.brand().into());
+        }
+
+        hardware_info
+    }
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct EnvVarDiagnostic {
+    pub env_vars: BTreeMap<String, String>,
+}
+
+impl EnvVarDiagnostic {
+    fn new() -> EnvVarDiagnostic {
+        let env_vars = std::env::vars()
+            .filter(|(key, _)| {
+                let fig_var = crate::fig_util::env_var::ALL.contains(&key.as_str());
+                let other_var = [
+                    // General env vars
+                    "SHELL",
+                    "DISPLAY",
+                    "PATH",
+                    "TERM",
+                    "ZDOTDIR",
+                    // Linux vars
+                    "XDG_CURRENT_DESKTOP",
+                    "XDG_SESSION_DESKTOP",
+                    "XDG_SESSION_TYPE",
+                    "GLFW_IM_MODULE",
+                    "GTK_IM_MODULE",
+                    "QT_IM_MODULE",
+                    "XMODIFIERS",
+                    // Macos vars
+                    "__CFBundleIdentifier",
+                ]
+                .contains(&key.as_str());
+
+                fig_var || other_var
+            })
+            .map(|(key, value)| {
+                // sanitize username from values
+                let username = format!("/{}", whoami::username());
+                (key, value.replace(&username, "/USER"))
+            })
+            .collect();
+
+        EnvVarDiagnostic { env_vars }
+    }
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct CurrentEnvironment {
+    pub cwd: Option<String>,
+    pub cli_path: Option<String>,
+    pub os: Os,
+    #[serde(serialize_with = "serialize_display")]
+    pub install_method: InstallMethod,
+    #[serde(skip_serializing_if = "is_false")]
+    pub in_cloudshell: bool,
+    #[serde(skip_serializing_if = "is_false")]
+    pub in_ssh: bool,
+    #[serde(skip_serializing_if = "is_false")]
+    pub in_ci: bool,
+    #[serde(skip_serializing_if = "is_false")]
+    pub in_wsl: bool,
+    #[serde(skip_serializing_if = "is_false")]
+    pub in_codespaces: bool,
+}
+
+impl CurrentEnvironment {
+    async fn new() -> CurrentEnvironment {
+        let ctx = Context::new();
+
+        let username = format!("/{}", whoami::username());
+
+        let cwd = ctx
+            .env()
+            .current_dir()
+            .ok()
+            .map(|path| path.to_string_lossy().replace(&username, "/USER"));
+
+        let cli_path = ctx
+            .env()
+            .current_dir()
+            .ok()
+            .map(|path| path.to_string_lossy().replace(&username, "/USER"));
+
+        let os = ctx.platform().os();
+        let install_method = crate::fig_telemetry::get_install_method();
+
+        let in_cloudshell = crate::fig_util::system_info::in_cloudshell();
+        let in_ssh = crate::fig_util::system_info::in_ssh();
+        let in_ci = crate::fig_util::system_info::in_ci();
+        let in_wsl = crate::fig_util::system_info::in_wsl();
+        let in_codespaces = crate::fig_util::system_info::in_codespaces();
+
+        CurrentEnvironment {
+            cwd,
+            cli_path,
+            os,
+            install_method,
+            in_cloudshell,
+            in_ssh,
+            in_ci,
+            in_wsl,
+            in_codespaces,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Diagnostics {
+    #[serde(rename = "q-details")]
+    pub build_details: BuildDetails,
+    pub system_info: SystemInfo,
+    pub environment: CurrentEnvironment,
+    #[serde(flatten)]
+    pub environment_variables: EnvVarDiagnostic,
+}
+
+impl Diagnostics {
+    pub async fn new() -> Diagnostics {
+        Diagnostics {
+            build_details: BuildDetails::new(),
+            system_info: SystemInfo::new(),
+            environment: CurrentEnvironment::new().await,
+            environment_variables: EnvVarDiagnostic::new(),
+        }
+    }
+
+    pub fn user_readable(&self) -> Result<String, toml::ser::Error> {
+        toml::to_string(&self)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_diagnostics_user_readable() {
+        let diagnostics = Diagnostics::new().await;
+        let toml = diagnostics.user_readable().unwrap();
+        assert!(!toml.is_empty());
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/clients/client.rs b/crates/kiro-cli/src/fig_api_client/clients/client.rs
new file mode 100644
index 0000000000..170bca43da
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/clients/client.rs
@@ -0,0 +1,208 @@
+use amzn_codewhisperer_client::Client as CodewhispererClient;
+use amzn_codewhisperer_client::types::{
+    OptOutPreference,
+    TelemetryEvent,
+    UserContext,
+};
+use amzn_consolas_client::Client as ConsolasClient;
+use tracing::error;
+
+use super::shared::{
+    bearer_sdk_config,
+    sigv4_sdk_config,
+};
+use crate::fig_api_client::interceptor::opt_out::OptOutInterceptor;
+use crate::fig_api_client::profile::Profile;
+use crate::fig_api_client::{
+    Endpoint,
+    Error,
+};
+use crate::fig_auth::builder_id::BearerResolver;
+use crate::fig_aws_common::{
+    UserAgentOverrideInterceptor,
+    app_name,
+};
+
+mod inner {
+    use amzn_codewhisperer_client::Client as CodewhispererClient;
+    use amzn_consolas_client::Client as ConsolasClient;
+
+    #[derive(Clone, Debug)]
+    pub enum Inner {
+        Codewhisperer(CodewhispererClient),
+        Consolas(ConsolasClient),
+        Mock,
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Client {
+    inner: inner::Inner,
+    profile_arn: Option<String>,
+}
+
+impl Client {
+    pub async fn new() -> Result<Client, Error> {
+        let endpoint = Endpoint::load_codewhisperer();
+        let client = if crate::fig_util::system_info::in_cloudshell() {
+            Self::new_consolas_client(&endpoint).await?
+        } else {
+            Self::new_codewhisperer_client(&endpoint).await
+        };
+        Ok(client)
+    }
+
+    pub fn mock() -> Self {
+        Self {
+            inner: inner::Inner::Mock,
+            profile_arn: None,
+        }
+    }
+
+    pub async fn new_codewhisperer_client(endpoint: &Endpoint) -> Self {
+        let conf_builder: amzn_codewhisperer_client::config::Builder = (&bearer_sdk_config(endpoint).await).into();
+        let conf = conf_builder
+            .http_client(crate::fig_aws_common::http_client::client())
+            .interceptor(OptOutInterceptor::new())
+            .interceptor(UserAgentOverrideInterceptor::new())
+            .bearer_token_resolver(BearerResolver)
+            .app_name(app_name())
+            .endpoint_url(endpoint.url())
+            .build();
+
+        let inner = inner::Inner::Codewhisperer(CodewhispererClient::from_conf(conf));
+
+        let profile_arn = match crate::fig_settings::state::get_value("api.codewhisperer.profile") {
+            Ok(Some(profile)) => match profile.get("arn") {
+                Some(arn) => match arn.as_str() {
+                    Some(arn) => Some(arn.to_string()),
+                    None => {
+                        error!("Stored arn is not a string. Instead it was: {arn}");
+                        None
+                    },
+                },
+                None => {
+                    error!("Stored profile does not contain an arn. Instead it was: {profile}");
+                    None
+                },
+            },
+            Ok(None) => None,
+            Err(err) => {
+                error!("Failed to retrieve profile: {}", err);
+                None
+            },
+        };
+
+        Self { inner, profile_arn }
+    }
+
+    pub async fn new_consolas_client(endpoint: &Endpoint) -> Result<Self, Error> {
+        let conf_builder: amzn_consolas_client::config::Builder = (&sigv4_sdk_config(endpoint).await?).into();
+        let conf = conf_builder
+            .http_client(crate::fig_aws_common::http_client::client())
+            .interceptor(OptOutInterceptor::new())
+            .interceptor(UserAgentOverrideInterceptor::new())
+            .app_name(app_name())
+            .endpoint_url(endpoint.url())
+            .build();
+        Ok(Self {
+            inner: inner::Inner::Consolas(ConsolasClient::from_conf(conf)),
+            profile_arn: None,
+        })
+    }
+
+    // .telemetry_event(TelemetryEvent::UserTriggerDecisionEvent(user_trigger_decision_event))
+    // .user_context(user_context)
+    // .opt_out_preference(opt_out_preference)
+    pub async fn send_telemetry_event(
+        &self,
+        telemetry_event: TelemetryEvent,
+        user_context: UserContext,
+        opt_out: OptOutPreference,
+    ) -> Result<(), Error> {
+        match &self.inner {
+            inner::Inner::Codewhisperer(client) => {
+                let _ = client
+                    .send_telemetry_event()
+                    .telemetry_event(telemetry_event)
+                    .user_context(user_context)
+                    .opt_out_preference(opt_out)
+                    .set_profile_arn(self.profile_arn.clone())
+                    .send()
+                    .await;
+                Ok(())
+            },
+            inner::Inner::Consolas(_) => Err(Error::UnsupportedConsolas("send_telemetry_event")),
+            inner::Inner::Mock => Ok(()),
+        }
+    }
+
+    pub async fn list_available_profiles(&self) -> Result<Vec<Profile>, Error> {
+        match &self.inner {
+            inner::Inner::Codewhisperer(client) => {
+                let mut profiles = vec![];
+                let mut client = client.list_available_profiles().into_paginator().send();
+                while let Some(profiles_output) = client.next().await {
+                    profiles.extend(profiles_output?.profiles().iter().cloned().map(Profile::from));
+                }
+
+                Ok(profiles)
+            },
+            inner::Inner::Consolas(_) => Err(Error::UnsupportedConsolas("list_available_profiles")),
+            inner::Inner::Mock => Ok(vec![
+                Profile {
+                    arn: "my:arn:1".to_owned(),
+                    profile_name: "MyProfile".to_owned(),
+                },
+                Profile {
+                    arn: "my:arn:2".to_owned(),
+                    profile_name: "MyOtherProfile".to_owned(),
+                },
+            ]),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use amzn_codewhisperer_client::types::{
+        ChatAddMessageEvent,
+        IdeCategory,
+        OperatingSystem,
+    };
+
+    use super::*;
+
+    #[tokio::test]
+    async fn create_clients() {
+        let endpoint = Endpoint::load_codewhisperer();
+
+        let _ = Client::new().await;
+        let _ = Client::new_codewhisperer_client(&endpoint).await;
+        let _ = Client::new_consolas_client(&endpoint).await;
+    }
+
+    #[tokio::test]
+    async fn test_mock() {
+        let client = Client::mock();
+        client
+            .send_telemetry_event(
+                TelemetryEvent::ChatAddMessageEvent(
+                    ChatAddMessageEvent::builder()
+                        .conversation_id("<conversation-id>")
+                        .message_id("<message-id>")
+                        .build()
+                        .unwrap(),
+                ),
+                UserContext::builder()
+                    .ide_category(IdeCategory::Cli)
+                    .operating_system(OperatingSystem::Linux)
+                    .product("<product>")
+                    .build()
+                    .unwrap(),
+                OptOutPreference::OptIn,
+            )
+            .await
+            .unwrap();
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/clients/mod.rs b/crates/kiro-cli/src/fig_api_client/clients/mod.rs
new file mode 100644
index 0000000000..75b7e4ab87
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/clients/mod.rs
@@ -0,0 +1,9 @@
+mod client;
+pub(crate) mod shared;
+mod streaming_client;
+
+pub use client::Client;
+pub use streaming_client::{
+    SendMessageOutput,
+    StreamingClient,
+};
diff --git a/crates/kiro-cli/src/fig_api_client/clients/shared.rs b/crates/kiro-cli/src/fig_api_client/clients/shared.rs
new file mode 100644
index 0000000000..a9a458cb06
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/clients/shared.rs
@@ -0,0 +1,65 @@
+use std::time::Duration;
+
+use aws_config::Region;
+use aws_config::retry::RetryConfig;
+use aws_config::timeout::TimeoutConfig;
+use aws_credential_types::Credentials;
+use aws_credential_types::provider::ProvideCredentials;
+use aws_types::SdkConfig;
+use aws_types::sdk_config::StalledStreamProtectionConfig;
+
+use crate::fig_api_client::credentials::CredentialsChain;
+use crate::fig_api_client::{
+    Endpoint,
+    Error,
+};
+use crate::fig_aws_common::behavior_version;
+
+// TODO(bskiser): confirm timeout is updated to an appropriate value?
+const DEFAULT_TIMEOUT_DURATION: Duration = Duration::from_secs(60 * 5);
+
+pub(crate) fn timeout_config() -> TimeoutConfig {
+    let timeout = crate::fig_settings::settings::get_int("api.timeout")
+        .ok()
+        .flatten()
+        .and_then(|i| i.try_into().ok())
+        .map_or(DEFAULT_TIMEOUT_DURATION, Duration::from_millis);
+
+    TimeoutConfig::builder()
+        .read_timeout(timeout)
+        .operation_timeout(timeout)
+        .operation_attempt_timeout(timeout)
+        .connect_timeout(timeout)
+        .build()
+}
+
+pub(crate) fn stalled_stream_protection_config() -> StalledStreamProtectionConfig {
+    StalledStreamProtectionConfig::enabled()
+        .grace_period(Duration::from_secs(60 * 5))
+        .build()
+}
+
+async fn base_sdk_config(region: Region, credentials_provider: impl ProvideCredentials + 'static) -> SdkConfig {
+    aws_config::defaults(behavior_version())
+        .region(region)
+        .credentials_provider(credentials_provider)
+        .timeout_config(timeout_config())
+        .retry_config(RetryConfig::adaptive())
+        .load()
+        .await
+}
+
+pub(crate) async fn bearer_sdk_config(endpoint: &Endpoint) -> SdkConfig {
+    let credentials = Credentials::new("xxx", "xxx", None, None, "xxx");
+    base_sdk_config(endpoint.region().clone(), credentials).await
+}
+
+pub(crate) async fn sigv4_sdk_config(endpoint: &Endpoint) -> Result<SdkConfig, Error> {
+    let credentials_chain = CredentialsChain::new().await;
+
+    if let Err(err) = credentials_chain.provide_credentials().await {
+        return Err(Error::Credentials(err));
+    };
+
+    Ok(base_sdk_config(endpoint.region().clone(), credentials_chain).await)
+}
diff --git a/crates/kiro-cli/src/fig_api_client/clients/streaming_client.rs b/crates/kiro-cli/src/fig_api_client/clients/streaming_client.rs
new file mode 100644
index 0000000000..1c0a9ec5db
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/clients/streaming_client.rs
@@ -0,0 +1,339 @@
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use amzn_codewhisperer_streaming_client::Client as CodewhispererStreamingClient;
+use amzn_qdeveloper_streaming_client::Client as QDeveloperStreamingClient;
+use aws_types::request_id::RequestId;
+use tracing::{
+    debug,
+    error,
+};
+
+use super::shared::{
+    bearer_sdk_config,
+    sigv4_sdk_config,
+    stalled_stream_protection_config,
+};
+use crate::fig_api_client::interceptor::opt_out::OptOutInterceptor;
+use crate::fig_api_client::model::{
+    ChatResponseStream,
+    ConversationState,
+};
+use crate::fig_api_client::{
+    Endpoint,
+    Error,
+};
+use crate::fig_auth::builder_id::BearerResolver;
+use crate::fig_aws_common::{
+    UserAgentOverrideInterceptor,
+    app_name,
+};
+
+mod inner {
+    use std::sync::{
+        Arc,
+        Mutex,
+    };
+
+    use amzn_codewhisperer_streaming_client::Client as CodewhispererStreamingClient;
+    use amzn_qdeveloper_streaming_client::Client as QDeveloperStreamingClient;
+
+    use crate::fig_api_client::model::ChatResponseStream;
+
+    #[derive(Clone, Debug)]
+    pub enum Inner {
+        Codewhisperer(CodewhispererStreamingClient),
+        QDeveloper(QDeveloperStreamingClient),
+        Mock(Arc<Mutex<std::vec::IntoIter<Vec<ChatResponseStream>>>>),
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct StreamingClient {
+    inner: inner::Inner,
+    profile_arn: Option<String>,
+}
+
+impl StreamingClient {
+    pub async fn new() -> Result<Self, Error> {
+        let client = if crate::fig_util::system_info::in_cloudshell()
+            || std::env::var("Q_USE_SENDMESSAGE").is_ok_and(|v| !v.is_empty())
+        {
+            Self::new_qdeveloper_client(&Endpoint::load_q()).await?
+        } else {
+            Self::new_codewhisperer_client(&Endpoint::load_codewhisperer()).await
+        };
+        Ok(client)
+    }
+
+    pub fn mock(events: Vec<Vec<ChatResponseStream>>) -> Self {
+        Self {
+            inner: inner::Inner::Mock(Arc::new(Mutex::new(events.into_iter()))),
+            profile_arn: None,
+        }
+    }
+
+    pub async fn new_codewhisperer_client(endpoint: &Endpoint) -> Self {
+        let conf_builder: amzn_codewhisperer_streaming_client::config::Builder =
+            (&bearer_sdk_config(endpoint).await).into();
+        let conf = conf_builder
+            .http_client(crate::fig_aws_common::http_client::client())
+            .interceptor(OptOutInterceptor::new())
+            .interceptor(UserAgentOverrideInterceptor::new())
+            .bearer_token_resolver(BearerResolver)
+            .app_name(app_name())
+            .endpoint_url(endpoint.url())
+            .stalled_stream_protection(stalled_stream_protection_config())
+            .build();
+        let inner = inner::Inner::Codewhisperer(CodewhispererStreamingClient::from_conf(conf));
+
+        let profile_arn = match crate::fig_settings::state::get_value("api.codewhisperer.profile") {
+            Ok(Some(profile)) => match profile.get("arn") {
+                Some(arn) => match arn.as_str() {
+                    Some(arn) => Some(arn.to_string()),
+                    None => {
+                        error!("Stored arn is not a string. Instead it was: {arn}");
+                        None
+                    },
+                },
+                None => {
+                    error!("Stored profile does not contain an arn. Instead it was: {profile}");
+                    None
+                },
+            },
+            Ok(None) => None,
+            Err(err) => {
+                error!("Failed to retrieve profile: {}", err);
+                None
+            },
+        };
+
+        Self { inner, profile_arn }
+    }
+
+    pub async fn new_qdeveloper_client(endpoint: &Endpoint) -> Result<Self, Error> {
+        let conf_builder: amzn_qdeveloper_streaming_client::config::Builder =
+            (&sigv4_sdk_config(endpoint).await?).into();
+        let conf = conf_builder
+            .http_client(crate::fig_aws_common::http_client::client())
+            .interceptor(OptOutInterceptor::new())
+            .interceptor(UserAgentOverrideInterceptor::new())
+            .app_name(app_name())
+            .endpoint_url(endpoint.url())
+            .stalled_stream_protection(stalled_stream_protection_config())
+            .build();
+        let client = QDeveloperStreamingClient::from_conf(conf);
+        Ok(Self {
+            inner: inner::Inner::QDeveloper(client),
+            profile_arn: None,
+        })
+    }
+
+    pub async fn send_message(&self, conversation_state: ConversationState) -> Result<SendMessageOutput, Error> {
+        debug!("Sending conversation: {:#?}", conversation_state);
+        let ConversationState {
+            conversation_id,
+            user_input_message,
+            history,
+        } = conversation_state;
+
+        match &self.inner {
+            inner::Inner::Codewhisperer(client) => {
+                let conversation_state = amzn_codewhisperer_streaming_client::types::ConversationState::builder()
+                    .set_conversation_id(conversation_id)
+                    .current_message(
+                        amzn_codewhisperer_streaming_client::types::ChatMessage::UserInputMessage(
+                            user_input_message.into(),
+                        ),
+                    )
+                    .chat_trigger_type(amzn_codewhisperer_streaming_client::types::ChatTriggerType::Manual)
+                    .set_history(
+                        history
+                            .map(|v| v.into_iter().map(|i| i.try_into()).collect::<Result<Vec<_>, _>>())
+                            .transpose()?,
+                    )
+                    .build()
+                    .expect("building conversation_state should not fail");
+                let response = client
+                    .generate_assistant_response()
+                    .conversation_state(conversation_state)
+                    .set_profile_arn(self.profile_arn.clone())
+                    .send()
+                    .await;
+
+                match response {
+                    Ok(resp) => Ok(SendMessageOutput::Codewhisperer(resp)),
+                    Err(e) => {
+                        let is_quota_breach = e.raw_response().is_some_and(|resp| resp.status().as_u16() == 429);
+                        let is_context_window_overflow = e.as_service_error().is_some_and(|err| {
+                            matches!(err, err if err.meta().code() == Some("ValidationException")
+                                && err.meta().message() == Some("Input is too long."))
+                        });
+
+                        if is_quota_breach {
+                            Err(Error::QuotaBreach("quota has reached its limit"))
+                        } else if is_context_window_overflow {
+                            Err(Error::ContextWindowOverflow)
+                        } else {
+                            Err(e.into())
+                        }
+                    },
+                }
+            },
+            inner::Inner::QDeveloper(client) => {
+                let conversation_state_builder = amzn_qdeveloper_streaming_client::types::ConversationState::builder()
+                    .set_conversation_id(conversation_id)
+                    .current_message(amzn_qdeveloper_streaming_client::types::ChatMessage::UserInputMessage(
+                        user_input_message.into(),
+                    ))
+                    .chat_trigger_type(amzn_qdeveloper_streaming_client::types::ChatTriggerType::Manual)
+                    .set_history(
+                        history
+                            .map(|v| v.into_iter().map(|i| i.try_into()).collect::<Result<Vec<_>, _>>())
+                            .transpose()?,
+                    );
+
+                Ok(SendMessageOutput::QDeveloper(
+                    client
+                        .send_message()
+                        .conversation_state(conversation_state_builder.build().expect("fix me"))
+                        .send()
+                        .await?,
+                ))
+            },
+            inner::Inner::Mock(events) => {
+                let mut new_events = events.lock().unwrap().next().unwrap_or_default().clone();
+                new_events.reverse();
+                Ok(SendMessageOutput::Mock(new_events))
+            },
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum SendMessageOutput {
+    Codewhisperer(
+        amzn_codewhisperer_streaming_client::operation::generate_assistant_response::GenerateAssistantResponseOutput,
+    ),
+    QDeveloper(amzn_qdeveloper_streaming_client::operation::send_message::SendMessageOutput),
+    Mock(Vec<ChatResponseStream>),
+}
+
+impl SendMessageOutput {
+    pub fn request_id(&self) -> Option<&str> {
+        match self {
+            SendMessageOutput::Codewhisperer(output) => output.request_id(),
+            SendMessageOutput::QDeveloper(output) => output.request_id(),
+            SendMessageOutput::Mock(_) => None,
+        }
+    }
+
+    pub async fn recv(&mut self) -> Result<Option<ChatResponseStream>, Error> {
+        match self {
+            SendMessageOutput::Codewhisperer(output) => Ok(output
+                .generate_assistant_response_response
+                .recv()
+                .await?
+                .map(|s| s.into())),
+            SendMessageOutput::QDeveloper(output) => Ok(output.send_message_response.recv().await?.map(|s| s.into())),
+            SendMessageOutput::Mock(vec) => Ok(vec.pop()),
+        }
+    }
+}
+
+impl RequestId for SendMessageOutput {
+    fn request_id(&self) -> Option<&str> {
+        match self {
+            SendMessageOutput::Codewhisperer(output) => output.request_id(),
+            SendMessageOutput::QDeveloper(output) => output.request_id(),
+            SendMessageOutput::Mock(_) => Some("<mock-request-id>"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::fig_api_client::model::{
+        AssistantResponseMessage,
+        ChatMessage,
+        UserInputMessage,
+    };
+
+    #[tokio::test]
+    async fn create_clients() {
+        let endpoint = Endpoint::load_codewhisperer();
+
+        let _ = StreamingClient::new().await;
+        let _ = StreamingClient::new_codewhisperer_client(&endpoint).await;
+        let _ = StreamingClient::new_qdeveloper_client(&endpoint).await;
+    }
+
+    #[tokio::test]
+    async fn test_mock() {
+        let client = StreamingClient::mock(vec![vec![
+            ChatResponseStream::AssistantResponseEvent {
+                content: "Hello!".to_owned(),
+            },
+            ChatResponseStream::AssistantResponseEvent {
+                content: " How can I".to_owned(),
+            },
+            ChatResponseStream::AssistantResponseEvent {
+                content: " assist you today?".to_owned(),
+            },
+        ]]);
+        let mut output = client
+            .send_message(ConversationState {
+                conversation_id: None,
+                user_input_message: UserInputMessage {
+                    content: "Hello".into(),
+                    user_input_message_context: None,
+                    user_intent: None,
+                },
+                history: None,
+            })
+            .await
+            .unwrap();
+
+        let mut output_content = String::new();
+        while let Some(ChatResponseStream::AssistantResponseEvent { content }) = output.recv().await.unwrap() {
+            output_content.push_str(&content);
+        }
+        assert_eq!(output_content, "Hello! How can I assist you today?");
+    }
+
+    #[ignore]
+    #[tokio::test]
+    async fn assistant_response() {
+        let client = StreamingClient::new().await.unwrap();
+        let mut response = client
+            .send_message(ConversationState {
+                conversation_id: None,
+                user_input_message: UserInputMessage {
+                    content: "How about rustc?".into(),
+                    user_input_message_context: None,
+                    user_intent: None,
+                },
+                history: Some(vec![
+                    ChatMessage::UserInputMessage(UserInputMessage {
+                        content: "What language is the linux kernel written in, and who wrote it?".into(),
+                        user_input_message_context: None,
+                        user_intent: None,
+                    }),
+                    ChatMessage::AssistantResponseMessage(AssistantResponseMessage {
+                        content: "It is written in C by Linus Torvalds.".into(),
+                        message_id: None,
+                        tool_uses: None,
+                    }),
+                ]),
+            })
+            .await
+            .unwrap();
+
+        while let Some(event) = response.recv().await.unwrap() {
+            println!("{:?}", event);
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/consts.rs b/crates/kiro-cli/src/fig_api_client/consts.rs
new file mode 100644
index 0000000000..8a954e3a54
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/consts.rs
@@ -0,0 +1,19 @@
+use aws_config::Region;
+
+// Endpoint constants
+pub const PROD_CODEWHISPERER_ENDPOINT_URL: &str = "https://codewhisperer.us-east-1.amazonaws.com";
+pub const PROD_CODEWHISPERER_ENDPOINT_REGION: Region = Region::from_static("us-east-1");
+
+pub const PROD_Q_ENDPOINT_URL: &str = "https://q.us-east-1.amazonaws.com";
+pub const PROD_Q_ENDPOINT_REGION: Region = Region::from_static("us-east-1");
+
+// FRA endpoint constants
+pub const PROD_CODEWHISPERER_FRA_ENDPOINT_URL: &str = "https://q.eu-central-1.amazonaws.com/";
+pub const PROD_CODEWHISPERER_FRA_ENDPOINT_REGION: Region = Region::from_static("eu-central-1");
+
+// Opt out constants
+pub const SHARE_CODEWHISPERER_CONTENT_SETTINGS_KEY: &str = "codeWhisperer.shareCodeWhispererContentWithAWS";
+pub const X_AMZN_CODEWHISPERER_OPT_OUT_HEADER: &str = "x-amzn-codewhisperer-optout";
+
+// Session ID constants
+pub const X_AMZN_SESSIONID_HEADER: &str = "x-amzn-sessionid";
diff --git a/crates/kiro-cli/src/fig_api_client/credentials/mod.rs b/crates/kiro-cli/src/fig_api_client/credentials/mod.rs
new file mode 100644
index 0000000000..508052a554
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/credentials/mod.rs
@@ -0,0 +1,80 @@
+use aws_config::default_provider::region::DefaultRegionChain;
+use aws_config::ecs::EcsCredentialsProvider;
+use aws_config::environment::credentials::EnvironmentVariableCredentialsProvider;
+use aws_config::imds::credentials::ImdsCredentialsProvider;
+use aws_config::meta::credentials::CredentialsProviderChain;
+use aws_config::profile::ProfileFileCredentialsProvider;
+use aws_config::provider_config::ProviderConfig;
+use aws_config::web_identity_token::WebIdentityTokenCredentialsProvider;
+use aws_credential_types::Credentials;
+use aws_credential_types::provider::{
+    self,
+    ProvideCredentials,
+    future,
+};
+use tracing::Instrument;
+
+#[derive(Debug)]
+pub struct CredentialsChain {
+    provider_chain: CredentialsProviderChain,
+}
+
+impl CredentialsChain {
+    /// Based on code the code for
+    /// [aws_config::default_provider::credentials::DefaultCredentialsChain]: <https://github.com/awslabs/aws-sdk-rust/blob/563b1594679844b2ba2b0008be6bfa5076730fac/sdk/aws-config/src/default_provider/credentials.rs#L175-L196>
+    pub async fn new() -> Self {
+        let region = DefaultRegionChain::builder().build().region().await;
+        let config = ProviderConfig::default().with_region(region.clone());
+
+        let env_provider = EnvironmentVariableCredentialsProvider::new();
+        let profile_provider = ProfileFileCredentialsProvider::builder().configure(&config).build();
+        let web_identity_token_provider = WebIdentityTokenCredentialsProvider::builder()
+            .configure(&config)
+            .build();
+        let imds_provider = ImdsCredentialsProvider::builder().configure(&config).build();
+        let ecs_provider = EcsCredentialsProvider::builder().configure(&config).build();
+
+        let mut provider_chain = CredentialsProviderChain::first_try("Environment", env_provider);
+
+        provider_chain = provider_chain
+            .or_else("Profile", profile_provider)
+            .or_else("WebIdentityToken", web_identity_token_provider)
+            .or_else("EcsContainer", ecs_provider)
+            .or_else("Ec2InstanceMetadata", imds_provider);
+
+        CredentialsChain { provider_chain }
+    }
+
+    async fn credentials(&self) -> provider::Result {
+        self.provider_chain
+            .provide_credentials()
+            .instrument(tracing::debug_span!("provide_credentials", provider = %"default_chain"))
+            .await
+    }
+}
+
+impl ProvideCredentials for CredentialsChain {
+    fn provide_credentials<'a>(&'a self) -> future::ProvideCredentials<'a>
+    where
+        Self: 'a,
+    {
+        future::ProvideCredentials::new(self.credentials())
+    }
+
+    fn fallback_on_interrupt(&self) -> Option<Credentials> {
+        self.provider_chain.fallback_on_interrupt()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_credentials_chain() {
+        let credentials_chain = CredentialsChain::new().await;
+        let credentials_res = credentials_chain.provide_credentials().await;
+        let fallback_on_interrupt_res = credentials_chain.fallback_on_interrupt();
+        println!("credentials_res: {credentials_res:?}, fallback_on_interrupt_res: {fallback_on_interrupt_res:?}");
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/customization.rs b/crates/kiro-cli/src/fig_api_client/customization.rs
new file mode 100644
index 0000000000..98acbc718d
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/customization.rs
@@ -0,0 +1,161 @@
+use amzn_codewhisperer_client::types::Customization as CodewhispererCustomization;
+use amzn_consolas_client::types::CustomizationSummary as ConsolasCustomization;
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+use crate::fig_settings::State;
+
+const CUSTOMIZATION_STATE_KEY: &str = "api.selectedCustomization";
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Customization {
+    pub arn: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+}
+
+impl Customization {
+    /// Load the currently selected customization from state
+    pub fn load_selected(state: &State) -> Result<Option<Self>, crate::fig_settings::Error> {
+        state.get(CUSTOMIZATION_STATE_KEY)
+    }
+
+    /// Save the currently selected customization to state
+    pub fn save_selected(&self, state: &State) -> Result<(), crate::fig_settings::Error> {
+        state.set_value(CUSTOMIZATION_STATE_KEY, serde_json::to_value(self)?)
+    }
+
+    /// Delete the currently selected customization from state
+    pub fn delete_selected(state: &State) -> Result<(), crate::fig_settings::Error> {
+        state.remove_value(CUSTOMIZATION_STATE_KEY)
+    }
+}
+
+impl From<Customization> for CodewhispererCustomization {
+    fn from(Customization { arn, name, description }: Customization) -> Self {
+        CodewhispererCustomization::builder()
+            .arn(arn)
+            .set_name(name)
+            .set_description(description)
+            .build()
+            .expect("Failed to build CW Customization")
+    }
+}
+
+impl From<CodewhispererCustomization> for Customization {
+    fn from(cw_customization: CodewhispererCustomization) -> Self {
+        Customization {
+            arn: cw_customization.arn,
+            name: cw_customization.name,
+            description: cw_customization.description,
+        }
+    }
+}
+
+impl From<ConsolasCustomization> for Customization {
+    fn from(consolas_customization: ConsolasCustomization) -> Self {
+        Customization {
+            arn: consolas_customization.arn,
+            name: Some(consolas_customization.customization_name),
+            description: consolas_customization.description,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use amzn_consolas_client::types::CustomizationStatus;
+    use aws_smithy_types::DateTime;
+
+    use super::*;
+
+    #[test]
+    fn test_customization_from_impls() {
+        let cw_customization = CodewhispererCustomization::builder()
+            .arn("arn")
+            .name("name")
+            .description("description")
+            .build()
+            .unwrap();
+
+        let custom_from_cw: Customization = cw_customization.into();
+        let cw_from_custom: CodewhispererCustomization = custom_from_cw.into();
+
+        assert_eq!(cw_from_custom.arn, "arn");
+        assert_eq!(cw_from_custom.name, Some("name".into()));
+        assert_eq!(cw_from_custom.description, Some("description".into()));
+
+        let cw_customization = CodewhispererCustomization::builder().arn("arn").build().unwrap();
+
+        let custom_from_cw: Customization = cw_customization.into();
+        let cw_from_custom: CodewhispererCustomization = custom_from_cw.into();
+
+        assert_eq!(cw_from_custom.arn, "arn");
+        assert_eq!(cw_from_custom.name, None);
+        assert_eq!(cw_from_custom.description, None);
+
+        let consolas_customization = ConsolasCustomization::builder()
+            .arn("arn")
+            .customization_name("name")
+            .description("description")
+            .status(CustomizationStatus::Activated)
+            .updated_at(DateTime::from_secs(0))
+            .build()
+            .unwrap();
+
+        let custom_from_consolas: Customization = consolas_customization.into();
+
+        assert_eq!(custom_from_consolas.arn, "arn");
+        assert_eq!(custom_from_consolas.name, Some("name".into()));
+        assert_eq!(custom_from_consolas.description, Some("description".into()));
+    }
+
+    #[test]
+    fn test_customization_save_load() {
+        let state = State::new_fake();
+
+        let value = Customization {
+            arn: "arn".into(),
+            name: Some("name".into()),
+            description: Some("description".into()),
+        };
+
+        value.save_selected(&state).unwrap();
+        let loaded_value = Customization::load_selected(&state).unwrap();
+        assert_eq!(loaded_value, Some(value));
+
+        Customization::delete_selected(&state).unwrap();
+    }
+
+    #[test]
+    fn test_customization_serde() {
+        let customization = Customization {
+            arn: "arn".into(),
+            name: Some("name".into()),
+            description: Some("description".into()),
+        };
+
+        let serialized = serde_json::to_string(&customization).unwrap();
+        assert_eq!(serialized, r#"{"arn":"arn","name":"name","description":"description"}"#);
+
+        let deserialized: Customization = serde_json::from_str(&serialized).unwrap();
+        assert_eq!(deserialized, customization);
+
+        let customization = Customization {
+            arn: "arn".into(),
+            name: None,
+            description: None,
+        };
+
+        let serialized = serde_json::to_string(&customization).unwrap();
+        assert_eq!(serialized, r#"{"arn":"arn"}"#);
+
+        let deserialized: Customization = serde_json::from_str(&serialized).unwrap();
+        assert_eq!(deserialized, customization);
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/endpoints.rs b/crates/kiro-cli/src/fig_api_client/endpoints.rs
new file mode 100644
index 0000000000..c560e6ecf4
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/endpoints.rs
@@ -0,0 +1,125 @@
+use std::borrow::Cow;
+
+use aws_config::Region;
+use serde_json::Value;
+use tracing::error;
+
+use crate::fig_api_client::consts::{
+    PROD_CODEWHISPERER_ENDPOINT_REGION,
+    PROD_CODEWHISPERER_ENDPOINT_URL,
+    PROD_CODEWHISPERER_FRA_ENDPOINT_REGION,
+    PROD_CODEWHISPERER_FRA_ENDPOINT_URL,
+    PROD_Q_ENDPOINT_REGION,
+    PROD_Q_ENDPOINT_URL,
+};
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Endpoint {
+    pub url: Cow<'static, str>,
+    pub region: Region,
+}
+
+impl Endpoint {
+    pub const CODEWHISPERER_ENDPOINTS: [Self; 2] = [Self::DEFAULT_ENDPOINT, Self {
+        url: Cow::Borrowed(PROD_CODEWHISPERER_FRA_ENDPOINT_URL),
+        region: PROD_CODEWHISPERER_FRA_ENDPOINT_REGION,
+    }];
+    pub const DEFAULT_ENDPOINT: Self = Self {
+        url: Cow::Borrowed(PROD_CODEWHISPERER_ENDPOINT_URL),
+        region: PROD_CODEWHISPERER_ENDPOINT_REGION,
+    };
+    pub const PROD_Q: Self = Self {
+        url: Cow::Borrowed(PROD_Q_ENDPOINT_URL),
+        region: PROD_Q_ENDPOINT_REGION,
+    };
+
+    pub fn load_codewhisperer() -> Self {
+        let (endpoint, region) = if let Ok(Some(Value::Object(o))) =
+            crate::fig_settings::settings::get_value("api.codewhisperer.service")
+        {
+            // The following branch is evaluated in case the user has set their own endpoint.
+            (
+                o.get("endpoint").and_then(|v| v.as_str()).map(|v| v.to_owned()),
+                o.get("region").and_then(|v| v.as_str()).map(|v| v.to_owned()),
+            )
+        } else if let Ok(Some(Value::Object(o))) = crate::fig_settings::state::get_value("api.codewhisperer.profile") {
+            // The following branch is evaluated in the case of user profile being set.
+            match o.get("arn").and_then(|v| v.as_str()).map(|v| v.to_owned()) {
+                Some(arn) => {
+                    let region = arn.split(':').nth(3).unwrap_or_default().to_owned();
+                    match Self::CODEWHISPERER_ENDPOINTS
+                        .iter()
+                        .find(|e| e.region().as_ref() == region)
+                    {
+                        Some(endpoint) => (Some(endpoint.url().to_owned()), Some(region)),
+                        None => {
+                            error!("Failed to find endpoint for region: {region}");
+                            (None, None)
+                        },
+                    }
+                },
+                None => (None, None),
+            }
+        } else {
+            (None, None)
+        };
+
+        match (endpoint, region) {
+            (Some(endpoint), Some(region)) => Self {
+                url: endpoint.clone().into(),
+                region: Region::new(region.clone()),
+            },
+            _ => Endpoint::DEFAULT_ENDPOINT,
+        }
+    }
+
+    pub fn load_q() -> Self {
+        match crate::fig_settings::settings::get_value("api.q.service") {
+            Ok(Some(Value::Object(o))) => {
+                let endpoint = o.get("endpoint").and_then(|v| v.as_str());
+                let region = o.get("region").and_then(|v| v.as_str());
+
+                match (endpoint, region) {
+                    (Some(endpoint), Some(region)) => Self {
+                        url: endpoint.to_owned().into(),
+                        region: Region::new(region.to_owned()),
+                    },
+                    _ => Endpoint::PROD_Q,
+                }
+            },
+            _ => Endpoint::PROD_Q,
+        }
+    }
+
+    pub(crate) fn url(&self) -> &str {
+        &self.url
+    }
+
+    pub(crate) fn region(&self) -> &Region {
+        &self.region
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use url::Url;
+
+    use super::*;
+
+    #[test]
+    fn test_endpoints() {
+        let _ = Endpoint::load_codewhisperer();
+        let _ = Endpoint::load_q();
+
+        let prod = &Endpoint::DEFAULT_ENDPOINT;
+        Url::parse(prod.url()).unwrap();
+        assert_eq!(prod.region(), &PROD_CODEWHISPERER_ENDPOINT_REGION);
+
+        let custom = Endpoint {
+            region: Region::new("us-west-2"),
+            url: "https://example.com".into(),
+        };
+        Url::parse(custom.url()).unwrap();
+        assert_eq!(custom.region(), &Region::new("us-west-2"));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/error.rs b/crates/kiro-cli/src/fig_api_client/error.rs
new file mode 100644
index 0000000000..52dca7db11
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/error.rs
@@ -0,0 +1,178 @@
+use amzn_codewhisperer_client::operation::generate_completions::GenerateCompletionsError;
+use amzn_codewhisperer_client::operation::list_available_customizations::ListAvailableCustomizationsError;
+use amzn_codewhisperer_client::operation::list_available_profiles::ListAvailableProfilesError;
+pub use amzn_codewhisperer_streaming_client::operation::generate_assistant_response::GenerateAssistantResponseError;
+use amzn_codewhisperer_streaming_client::types::error::ChatResponseStreamError as CodewhispererChatResponseStreamError;
+use amzn_consolas_client::operation::generate_recommendations::GenerateRecommendationsError;
+use amzn_consolas_client::operation::list_customizations::ListCustomizationsError;
+use amzn_qdeveloper_streaming_client::operation::send_message::SendMessageError as QDeveloperSendMessageError;
+use amzn_qdeveloper_streaming_client::types::error::ChatResponseStreamError as QDeveloperChatResponseStreamError;
+use aws_credential_types::provider::error::CredentialsError;
+use aws_smithy_runtime_api::client::orchestrator::HttpResponse;
+pub use aws_smithy_runtime_api::client::result::SdkError;
+use aws_smithy_types::event_stream::RawMessage;
+use thiserror::Error;
+
+use crate::fig_aws_common::SdkErrorDisplay;
+
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error("failed to load credentials: {}", .0)]
+    Credentials(CredentialsError),
+
+    // Generate completions errors
+    #[error("{}", SdkErrorDisplay(.0))]
+    GenerateCompletions(#[from] SdkError<GenerateCompletionsError, HttpResponse>),
+    #[error("{}", SdkErrorDisplay(.0))]
+    GenerateRecommendations(#[from] SdkError<GenerateRecommendationsError, HttpResponse>),
+
+    // List customizations error
+    #[error("{}", SdkErrorDisplay(.0))]
+    ListAvailableCustomizations(#[from] SdkError<ListAvailableCustomizationsError, HttpResponse>),
+    #[error("{}", SdkErrorDisplay(.0))]
+    ListAvailableServices(#[from] SdkError<ListCustomizationsError, HttpResponse>),
+
+    // Send message errors
+    #[error("{}", SdkErrorDisplay(.0))]
+    CodewhispererGenerateAssistantResponse(#[from] SdkError<GenerateAssistantResponseError, HttpResponse>),
+    #[error("{}", SdkErrorDisplay(.0))]
+    QDeveloperSendMessage(#[from] SdkError<QDeveloperSendMessageError, HttpResponse>),
+
+    // chat stream errors
+    #[error("{}", SdkErrorDisplay(.0))]
+    CodewhispererChatResponseStream(#[from] SdkError<CodewhispererChatResponseStreamError, RawMessage>),
+    #[error("{}", SdkErrorDisplay(.0))]
+    QDeveloperChatResponseStream(#[from] SdkError<QDeveloperChatResponseStreamError, RawMessage>),
+
+    // quota breach
+    #[error("quota has reached its limit")]
+    QuotaBreach(&'static str),
+
+    /// Returned from the backend when the user input is too large to fit within the model context
+    /// window.
+    ///
+    /// Note that we currently do not receive token usage information regarding how large the
+    /// context window is.
+    #[error("the context window has overflowed")]
+    ContextWindowOverflow,
+
+    #[error(transparent)]
+    SmithyBuild(#[from] aws_smithy_types::error::operation::BuildError),
+
+    #[error("unsupported action by consolas: {0}")]
+    UnsupportedConsolas(&'static str),
+
+    #[error(transparent)]
+    ListAvailableProfilesError(#[from] SdkError<ListAvailableProfilesError, HttpResponse>),
+}
+
+impl Error {
+    pub fn is_throttling_error(&self) -> bool {
+        match self {
+            Error::Credentials(_) => false,
+            Error::GenerateCompletions(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::GenerateRecommendations(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::ListAvailableCustomizations(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::ListAvailableServices(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::CodewhispererGenerateAssistantResponse(e) => {
+                e.as_service_error().is_some_and(|e| e.is_throttling_error())
+            },
+            Error::QDeveloperSendMessage(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::ListAvailableProfilesError(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::CodewhispererChatResponseStream(_)
+            | Error::QDeveloperChatResponseStream(_)
+            | Error::SmithyBuild(_)
+            | Error::UnsupportedConsolas(_)
+            | Error::ContextWindowOverflow
+            | Error::QuotaBreach(_) => false,
+        }
+    }
+
+    pub fn is_service_error(&self) -> bool {
+        match self {
+            Error::Credentials(_) => false,
+            Error::GenerateCompletions(e) => e.as_service_error().is_some(),
+            Error::GenerateRecommendations(e) => e.as_service_error().is_some(),
+            Error::ListAvailableCustomizations(e) => e.as_service_error().is_some(),
+            Error::ListAvailableServices(e) => e.as_service_error().is_some(),
+            Error::CodewhispererGenerateAssistantResponse(e) => e.as_service_error().is_some(),
+            Error::QDeveloperSendMessage(e) => e.as_service_error().is_some(),
+            Error::ContextWindowOverflow => true,
+            Error::ListAvailableProfilesError(e) => e.as_service_error().is_some(),
+            Error::CodewhispererChatResponseStream(_)
+            | Error::QDeveloperChatResponseStream(_)
+            | Error::SmithyBuild(_)
+            | Error::UnsupportedConsolas(_)
+            | Error::QuotaBreach(_) => false,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::error::Error as _;
+
+    use aws_smithy_runtime_api::http::Response;
+    use aws_smithy_types::body::SdkBody;
+    use aws_smithy_types::event_stream::Message;
+
+    use super::*;
+
+    fn response() -> Response {
+        Response::new(500.try_into().unwrap(), SdkBody::empty())
+    }
+
+    fn raw_message() -> RawMessage {
+        RawMessage::Decoded(Message::new(b"<payload>".to_vec()))
+    }
+
+    fn all_errors() -> Vec<Error> {
+        vec![
+            Error::Credentials(CredentialsError::unhandled("<unhandled>")),
+            Error::GenerateCompletions(SdkError::service_error(
+                GenerateCompletionsError::unhandled("<unhandled>"),
+                response(),
+            )),
+            Error::GenerateRecommendations(SdkError::service_error(
+                GenerateRecommendationsError::unhandled("<unhandled>"),
+                response(),
+            )),
+            Error::ListAvailableCustomizations(SdkError::service_error(
+                ListAvailableCustomizationsError::unhandled("<unhandled>"),
+                response(),
+            )),
+            Error::ListAvailableServices(SdkError::service_error(
+                ListCustomizationsError::unhandled("<unhandled>"),
+                response(),
+            )),
+            Error::CodewhispererGenerateAssistantResponse(SdkError::service_error(
+                GenerateAssistantResponseError::unhandled("<unhandled>"),
+                response(),
+            )),
+            Error::QDeveloperSendMessage(SdkError::service_error(
+                QDeveloperSendMessageError::unhandled("<unhandled>"),
+                response(),
+            )),
+            Error::CodewhispererChatResponseStream(SdkError::service_error(
+                CodewhispererChatResponseStreamError::unhandled("<unhandled>"),
+                raw_message(),
+            )),
+            Error::QDeveloperChatResponseStream(SdkError::service_error(
+                QDeveloperChatResponseStreamError::unhandled("<unhandled>"),
+                raw_message(),
+            )),
+            Error::SmithyBuild(aws_smithy_types::error::operation::BuildError::other("<other>")),
+            Error::UnsupportedConsolas("test"),
+        ]
+    }
+
+    #[test]
+    fn test_errors() {
+        for error in all_errors() {
+            let _ = error.is_throttling_error();
+            let _ = error.is_service_error();
+            let _ = error.source();
+            println!("{error} {error:?}");
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/interceptor/mod.rs b/crates/kiro-cli/src/fig_api_client/interceptor/mod.rs
new file mode 100644
index 0000000000..5722738da9
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/interceptor/mod.rs
@@ -0,0 +1,2 @@
+pub mod opt_out;
+pub mod session_id;
diff --git a/crates/kiro-cli/src/fig_api_client/interceptor/opt_out.rs b/crates/kiro-cli/src/fig_api_client/interceptor/opt_out.rs
new file mode 100644
index 0000000000..6ebc40817a
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/interceptor/opt_out.rs
@@ -0,0 +1,89 @@
+use aws_smithy_runtime_api::box_error::BoxError;
+use aws_smithy_runtime_api::client::interceptors::Intercept;
+use aws_smithy_runtime_api::client::interceptors::context::BeforeTransmitInterceptorContextMut;
+use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
+use aws_smithy_types::config_bag::ConfigBag;
+
+use crate::fig_api_client::consts::{
+    SHARE_CODEWHISPERER_CONTENT_SETTINGS_KEY,
+    X_AMZN_CODEWHISPERER_OPT_OUT_HEADER,
+};
+
+fn is_codewhisperer_content_optout() -> bool {
+    !crate::fig_settings::settings::get_bool_or(SHARE_CODEWHISPERER_CONTENT_SETTINGS_KEY, true)
+}
+
+#[derive(Debug, Clone)]
+pub struct OptOutInterceptor {
+    override_value: Option<bool>,
+    _inner: (),
+}
+
+impl OptOutInterceptor {
+    pub const fn new() -> Self {
+        Self {
+            override_value: None,
+            _inner: (),
+        }
+    }
+}
+
+impl Intercept for OptOutInterceptor {
+    fn name(&self) -> &'static str {
+        "OptOutInterceptor"
+    }
+
+    fn modify_before_signing(
+        &self,
+        context: &mut BeforeTransmitInterceptorContextMut<'_>,
+        _runtime_components: &RuntimeComponents,
+        _cfg: &mut ConfigBag,
+    ) -> Result<(), BoxError> {
+        let opt_out = self.override_value.unwrap_or_else(is_codewhisperer_content_optout);
+        context
+            .request_mut()
+            .headers_mut()
+            .insert(X_AMZN_CODEWHISPERER_OPT_OUT_HEADER, opt_out.to_string());
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use amzn_consolas_client::config::RuntimeComponentsBuilder;
+    use amzn_consolas_client::config::interceptors::InterceptorContext;
+    use aws_smithy_runtime_api::client::interceptors::context::Input;
+
+    use super::*;
+
+    #[test]
+    fn test_opt_out_interceptor() {
+        let rc = RuntimeComponentsBuilder::for_tests().build().unwrap();
+        let mut cfg = ConfigBag::base();
+
+        let mut context = InterceptorContext::new(Input::erase(()));
+        context.set_request(aws_smithy_runtime_api::http::Request::empty());
+        let mut context = BeforeTransmitInterceptorContextMut::from(&mut context);
+
+        let mut interceptor = OptOutInterceptor::new();
+        println!("Interceptor: {}", interceptor.name());
+
+        interceptor
+            .modify_before_signing(&mut context, &rc, &mut cfg)
+            .expect("success");
+
+        interceptor.override_value = Some(false);
+        interceptor
+            .modify_before_signing(&mut context, &rc, &mut cfg)
+            .expect("success");
+        let val = context.request().headers().get(X_AMZN_CODEWHISPERER_OPT_OUT_HEADER);
+        assert_eq!(val, Some("false"));
+
+        interceptor.override_value = Some(true);
+        interceptor
+            .modify_before_signing(&mut context, &rc, &mut cfg)
+            .expect("success");
+        let val = context.request().headers().get(X_AMZN_CODEWHISPERER_OPT_OUT_HEADER);
+        assert_eq!(val, Some("true"));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/interceptor/session_id.rs b/crates/kiro-cli/src/fig_api_client/interceptor/session_id.rs
new file mode 100644
index 0000000000..0ab6b2bf95
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/interceptor/session_id.rs
@@ -0,0 +1,82 @@
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use aws_smithy_runtime_api::client::interceptors::Intercept;
+use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
+use aws_smithy_types::config_bag::ConfigBag;
+
+use crate::fig_api_client::consts::X_AMZN_SESSIONID_HEADER;
+
+#[derive(Debug, Clone)]
+pub struct SessionIdInterceptor {
+    inner: Arc<Mutex<Option<String>>>,
+}
+
+impl SessionIdInterceptor {
+    pub const fn new(inner: Arc<Mutex<Option<String>>>) -> Self {
+        Self { inner }
+    }
+}
+
+impl Intercept for SessionIdInterceptor {
+    fn name(&self) -> &'static str {
+        "SessionIdInterceptor"
+    }
+
+    fn read_after_deserialization(
+        &self,
+        context: &amzn_codewhisperer_client::config::interceptors::AfterDeserializationInterceptorContextRef<'_>,
+        _runtime_components: &RuntimeComponents,
+        _cfg: &mut ConfigBag,
+    ) -> Result<(), amzn_codewhisperer_client::error::BoxError> {
+        *self
+            .inner
+            .lock()
+            .expect("Failed to write to SessionIdInterceptor mutex") = context
+            .response()
+            .headers()
+            .get(X_AMZN_SESSIONID_HEADER)
+            .map(Into::into);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use amzn_consolas_client::config::RuntimeComponentsBuilder;
+    use amzn_consolas_client::config::interceptors::{
+        AfterDeserializationInterceptorContextRef,
+        InterceptorContext,
+    };
+    use aws_smithy_runtime_api::client::interceptors::context::Input;
+    use aws_smithy_runtime_api::http::StatusCode;
+    use aws_smithy_types::body::SdkBody;
+
+    use super::*;
+
+    #[test]
+    fn test_opt_out_interceptor() {
+        let rc = RuntimeComponentsBuilder::for_tests().build().unwrap();
+        let mut cfg = ConfigBag::base();
+
+        let mut context = InterceptorContext::new(Input::erase(()));
+        let mut response =
+            aws_smithy_runtime_api::http::Response::new(StatusCode::try_from(200).unwrap(), SdkBody::empty());
+        response
+            .headers_mut()
+            .insert(X_AMZN_SESSIONID_HEADER, "test-session-id");
+        context.set_response(response);
+        let context = AfterDeserializationInterceptorContextRef::from(&context);
+
+        let session_id_lock = Arc::new(Mutex::new(None));
+        let interceptor = SessionIdInterceptor::new(session_id_lock.clone());
+        println!("Interceptor: {}", interceptor.name());
+
+        interceptor
+            .read_after_deserialization(&context, &rc, &mut cfg)
+            .expect("success");
+        assert_eq!(*session_id_lock.lock().unwrap(), Some("test-session-id".to_string()));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/mod.rs b/crates/kiro-cli/src/fig_api_client/mod.rs
new file mode 100644
index 0000000000..1a90635d0d
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/mod.rs
@@ -0,0 +1,17 @@
+pub mod clients;
+pub(crate) mod consts;
+pub(crate) mod credentials;
+mod customization;
+mod endpoints;
+mod error;
+pub(crate) mod interceptor;
+pub mod model;
+pub mod profile;
+
+pub use clients::{
+    Client,
+    StreamingClient,
+};
+pub use endpoints::Endpoint;
+pub use error::Error;
+pub use profile::list_available_profiles;
diff --git a/crates/kiro-cli/src/fig_api_client/model.rs b/crates/kiro-cli/src/fig_api_client/model.rs
new file mode 100644
index 0000000000..ab44cdb119
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/model.rs
@@ -0,0 +1,924 @@
+use aws_smithy_types::Document;
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FileContext {
+    pub left_file_content: String,
+    pub right_file_content: String,
+    pub filename: String,
+    pub programming_language: ProgrammingLanguage,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProgrammingLanguage {
+    pub language_name: LanguageName,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, strum::AsRefStr)]
+#[serde(rename_all = "lowercase")]
+#[strum(serialize_all = "lowercase")]
+pub enum LanguageName {
+    Python,
+    Javascript,
+    Java,
+    Csharp,
+    Typescript,
+    C,
+    Cpp,
+    Go,
+    Kotlin,
+    Php,
+    Ruby,
+    Rust,
+    Scala,
+    Shell,
+    Sql,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ReferenceTrackerConfiguration {
+    pub recommendations_with_references: RecommendationsWithReferences,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "UPPERCASE")]
+pub enum RecommendationsWithReferences {
+    Block,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RecommendationsInput {
+    pub file_context: FileContext,
+    pub max_results: i32,
+    pub next_token: Option<String>,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RecommendationsOutput {
+    pub recommendations: Vec<Recommendation>,
+    pub next_token: Option<String>,
+    pub session_id: Option<String>,
+    pub request_id: Option<String>,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Recommendation {
+    pub content: String,
+}
+
+// =========
+// Streaming
+// =========
+
+#[derive(Debug, Clone)]
+pub struct ConversationState {
+    pub conversation_id: Option<String>,
+    pub user_input_message: UserInputMessage,
+    pub history: Option<Vec<ChatMessage>>,
+}
+
+#[derive(Debug, Clone)]
+pub enum ChatMessage {
+    AssistantResponseMessage(AssistantResponseMessage),
+    UserInputMessage(UserInputMessage),
+}
+
+impl TryFrom<ChatMessage> for amzn_codewhisperer_streaming_client::types::ChatMessage {
+    type Error = aws_smithy_types::error::operation::BuildError;
+
+    fn try_from(value: ChatMessage) -> Result<Self, Self::Error> {
+        Ok(match value {
+            ChatMessage::AssistantResponseMessage(message) => {
+                amzn_codewhisperer_streaming_client::types::ChatMessage::AssistantResponseMessage(message.try_into()?)
+            },
+            ChatMessage::UserInputMessage(message) => {
+                amzn_codewhisperer_streaming_client::types::ChatMessage::UserInputMessage(message.into())
+            },
+        })
+    }
+}
+
+impl TryFrom<ChatMessage> for amzn_qdeveloper_streaming_client::types::ChatMessage {
+    type Error = aws_smithy_types::error::operation::BuildError;
+
+    fn try_from(value: ChatMessage) -> Result<Self, Self::Error> {
+        Ok(match value {
+            ChatMessage::AssistantResponseMessage(message) => {
+                amzn_qdeveloper_streaming_client::types::ChatMessage::AssistantResponseMessage(message.try_into()?)
+            },
+            ChatMessage::UserInputMessage(message) => {
+                amzn_qdeveloper_streaming_client::types::ChatMessage::UserInputMessage(message.into())
+            },
+        })
+    }
+}
+
+/// Information about a tool that can be used.
+#[derive(Debug, Clone)]
+pub enum Tool {
+    ToolSpecification(ToolSpecification),
+}
+
+impl From<Tool> for amzn_codewhisperer_streaming_client::types::Tool {
+    fn from(value: Tool) -> Self {
+        match value {
+            Tool::ToolSpecification(v) => amzn_codewhisperer_streaming_client::types::Tool::ToolSpecification(v.into()),
+        }
+    }
+}
+
+impl From<Tool> for amzn_qdeveloper_streaming_client::types::Tool {
+    fn from(value: Tool) -> Self {
+        match value {
+            Tool::ToolSpecification(v) => amzn_qdeveloper_streaming_client::types::Tool::ToolSpecification(v.into()),
+        }
+    }
+}
+
+/// The specification for the tool.
+#[derive(Debug, Clone)]
+pub struct ToolSpecification {
+    /// The name for the tool.
+    pub name: String,
+    /// The description for the tool.
+    pub description: String,
+    /// The input schema for the tool in JSON format.
+    pub input_schema: ToolInputSchema,
+}
+
+impl From<ToolSpecification> for amzn_codewhisperer_streaming_client::types::ToolSpecification {
+    fn from(value: ToolSpecification) -> Self {
+        Self::builder()
+            .name(value.name)
+            .description(value.description)
+            .input_schema(value.input_schema.into())
+            .build()
+            .expect("building ToolSpecification should not fail")
+    }
+}
+
+impl From<ToolSpecification> for amzn_qdeveloper_streaming_client::types::ToolSpecification {
+    fn from(value: ToolSpecification) -> Self {
+        Self::builder()
+            .name(value.name)
+            .description(value.description)
+            .input_schema(value.input_schema.into())
+            .build()
+            .expect("building ToolSpecification should not fail")
+    }
+}
+
+/// The input schema for the tool in JSON format.
+#[derive(Debug, Clone)]
+pub struct ToolInputSchema {
+    pub json: Option<Document>,
+}
+
+impl From<ToolInputSchema> for amzn_codewhisperer_streaming_client::types::ToolInputSchema {
+    fn from(value: ToolInputSchema) -> Self {
+        Self::builder().set_json(value.json).build()
+    }
+}
+
+impl From<ToolInputSchema> for amzn_qdeveloper_streaming_client::types::ToolInputSchema {
+    fn from(value: ToolInputSchema) -> Self {
+        Self::builder().set_json(value.json).build()
+    }
+}
+
+/// Contains information about a tool that the model is requesting be run. The model uses the result
+/// from the tool to generate a response.
+#[derive(Debug, Clone)]
+pub struct ToolUse {
+    /// The ID for the tool request.
+    pub tool_use_id: String,
+    /// The name for the tool.
+    pub name: String,
+    /// The input to pass to the tool.
+    pub input: Document,
+}
+
+impl From<ToolUse> for amzn_codewhisperer_streaming_client::types::ToolUse {
+    fn from(value: ToolUse) -> Self {
+        Self::builder()
+            .tool_use_id(value.tool_use_id)
+            .name(value.name)
+            .input(value.input)
+            .build()
+            .expect("building ToolUse should not fail")
+    }
+}
+
+impl From<ToolUse> for amzn_qdeveloper_streaming_client::types::ToolUse {
+    fn from(value: ToolUse) -> Self {
+        Self::builder()
+            .tool_use_id(value.tool_use_id)
+            .name(value.name)
+            .input(value.input)
+            .build()
+            .expect("building ToolUse should not fail")
+    }
+}
+
+/// A tool result that contains the results for a tool request that was previously made.
+#[derive(Debug, Clone)]
+pub struct ToolResult {
+    /// The ID for the tool request.
+    pub tool_use_id: String,
+    /// Content of the tool result.
+    pub content: Vec<ToolResultContentBlock>,
+    /// Status of the tools result.
+    pub status: ToolResultStatus,
+}
+
+impl From<ToolResult> for amzn_codewhisperer_streaming_client::types::ToolResult {
+    fn from(value: ToolResult) -> Self {
+        Self::builder()
+            .tool_use_id(value.tool_use_id)
+            .set_content(Some(value.content.into_iter().map(Into::into).collect::<_>()))
+            .status(value.status.into())
+            .build()
+            .expect("building ToolResult should not fail")
+    }
+}
+
+impl From<ToolResult> for amzn_qdeveloper_streaming_client::types::ToolResult {
+    fn from(value: ToolResult) -> Self {
+        Self::builder()
+            .tool_use_id(value.tool_use_id)
+            .set_content(Some(value.content.into_iter().map(Into::into).collect::<_>()))
+            .status(value.status.into())
+            .build()
+            .expect("building ToolResult should not fail")
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum ToolResultContentBlock {
+    /// A tool result that is JSON format data.
+    Json(Document),
+    /// A tool result that is text.
+    Text(String),
+}
+
+impl From<ToolResultContentBlock> for amzn_codewhisperer_streaming_client::types::ToolResultContentBlock {
+    fn from(value: ToolResultContentBlock) -> Self {
+        match value {
+            ToolResultContentBlock::Json(document) => Self::Json(document),
+            ToolResultContentBlock::Text(text) => Self::Text(text),
+        }
+    }
+}
+
+impl From<ToolResultContentBlock> for amzn_qdeveloper_streaming_client::types::ToolResultContentBlock {
+    fn from(value: ToolResultContentBlock) -> Self {
+        match value {
+            ToolResultContentBlock::Json(document) => Self::Json(document),
+            ToolResultContentBlock::Text(text) => Self::Text(text),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum ToolResultStatus {
+    Error,
+    Success,
+}
+
+impl From<ToolResultStatus> for amzn_codewhisperer_streaming_client::types::ToolResultStatus {
+    fn from(value: ToolResultStatus) -> Self {
+        match value {
+            ToolResultStatus::Error => Self::Error,
+            ToolResultStatus::Success => Self::Success,
+        }
+    }
+}
+
+impl From<ToolResultStatus> for amzn_qdeveloper_streaming_client::types::ToolResultStatus {
+    fn from(value: ToolResultStatus) -> Self {
+        match value {
+            ToolResultStatus::Error => Self::Error,
+            ToolResultStatus::Success => Self::Success,
+        }
+    }
+}
+
+/// Markdown text message.
+#[derive(Debug, Clone)]
+pub struct AssistantResponseMessage {
+    /// Unique identifier for the chat message
+    pub message_id: Option<String>,
+    /// The content of the text message in markdown format.
+    pub content: String,
+    /// ToolUse Request
+    pub tool_uses: Option<Vec<ToolUse>>,
+}
+
+impl TryFrom<AssistantResponseMessage> for amzn_codewhisperer_streaming_client::types::AssistantResponseMessage {
+    type Error = aws_smithy_types::error::operation::BuildError;
+
+    fn try_from(value: AssistantResponseMessage) -> Result<Self, Self::Error> {
+        Self::builder()
+            .content(value.content)
+            .set_message_id(value.message_id)
+            .set_tool_uses(value.tool_uses.map(|uses| uses.into_iter().map(Into::into).collect()))
+            .build()
+    }
+}
+
+impl TryFrom<AssistantResponseMessage> for amzn_qdeveloper_streaming_client::types::AssistantResponseMessage {
+    type Error = aws_smithy_types::error::operation::BuildError;
+
+    fn try_from(value: AssistantResponseMessage) -> Result<Self, Self::Error> {
+        Self::builder()
+            .content(value.content)
+            .set_message_id(value.message_id)
+            .set_tool_uses(value.tool_uses.map(|uses| uses.into_iter().map(Into::into).collect()))
+            .build()
+    }
+}
+
+#[non_exhaustive]
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum ChatResponseStream {
+    AssistantResponseEvent {
+        content: String,
+    },
+    /// Streaming response event for generated code text.
+    CodeEvent {
+        content: String,
+    },
+    // TODO: finish events here
+    CodeReferenceEvent(()),
+    FollowupPromptEvent(()),
+    IntentsEvent(()),
+    InvalidStateEvent {
+        reason: String,
+        message: String,
+    },
+    MessageMetadataEvent {
+        conversation_id: Option<String>,
+        utterance_id: Option<String>,
+    },
+    SupplementaryWebLinksEvent(()),
+    ToolUseEvent {
+        tool_use_id: String,
+        name: String,
+        input: Option<String>,
+        stop: Option<bool>,
+    },
+
+    #[non_exhaustive]
+    Unknown,
+}
+
+impl From<amzn_codewhisperer_streaming_client::types::ChatResponseStream> for ChatResponseStream {
+    fn from(value: amzn_codewhisperer_streaming_client::types::ChatResponseStream) -> Self {
+        match value {
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::AssistantResponseEvent(
+                amzn_codewhisperer_streaming_client::types::AssistantResponseEvent { content, .. },
+            ) => ChatResponseStream::AssistantResponseEvent { content },
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::CodeEvent(
+                amzn_codewhisperer_streaming_client::types::CodeEvent { content, .. },
+            ) => ChatResponseStream::CodeEvent { content },
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::CodeReferenceEvent(_) => {
+                ChatResponseStream::CodeReferenceEvent(())
+            },
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::FollowupPromptEvent(_) => {
+                ChatResponseStream::FollowupPromptEvent(())
+            },
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::IntentsEvent(_) => {
+                ChatResponseStream::IntentsEvent(())
+            },
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::InvalidStateEvent(
+                amzn_codewhisperer_streaming_client::types::InvalidStateEvent { reason, message, .. },
+            ) => ChatResponseStream::InvalidStateEvent {
+                reason: reason.to_string(),
+                message,
+            },
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::MessageMetadataEvent(
+                amzn_codewhisperer_streaming_client::types::MessageMetadataEvent {
+                    conversation_id,
+                    utterance_id,
+                    ..
+                },
+            ) => ChatResponseStream::MessageMetadataEvent {
+                conversation_id,
+                utterance_id,
+            },
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::ToolUseEvent(
+                amzn_codewhisperer_streaming_client::types::ToolUseEvent {
+                    tool_use_id,
+                    name,
+                    input,
+                    stop,
+                    ..
+                },
+            ) => ChatResponseStream::ToolUseEvent {
+                tool_use_id,
+                name,
+                input,
+                stop,
+            },
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::SupplementaryWebLinksEvent(_) => {
+                ChatResponseStream::SupplementaryWebLinksEvent(())
+            },
+            _ => ChatResponseStream::Unknown,
+        }
+    }
+}
+
+impl From<amzn_qdeveloper_streaming_client::types::ChatResponseStream> for ChatResponseStream {
+    fn from(value: amzn_qdeveloper_streaming_client::types::ChatResponseStream) -> Self {
+        match value {
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::AssistantResponseEvent(
+                amzn_qdeveloper_streaming_client::types::AssistantResponseEvent { content, .. },
+            ) => ChatResponseStream::AssistantResponseEvent { content },
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::CodeEvent(
+                amzn_qdeveloper_streaming_client::types::CodeEvent { content, .. },
+            ) => ChatResponseStream::CodeEvent { content },
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::CodeReferenceEvent(_) => {
+                ChatResponseStream::CodeReferenceEvent(())
+            },
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::FollowupPromptEvent(_) => {
+                ChatResponseStream::FollowupPromptEvent(())
+            },
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::IntentsEvent(_) => {
+                ChatResponseStream::IntentsEvent(())
+            },
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::InvalidStateEvent(
+                amzn_qdeveloper_streaming_client::types::InvalidStateEvent { reason, message, .. },
+            ) => ChatResponseStream::InvalidStateEvent {
+                reason: reason.to_string(),
+                message,
+            },
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::MessageMetadataEvent(
+                amzn_qdeveloper_streaming_client::types::MessageMetadataEvent {
+                    conversation_id,
+                    utterance_id,
+                    ..
+                },
+            ) => ChatResponseStream::MessageMetadataEvent {
+                conversation_id,
+                utterance_id,
+            },
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::ToolUseEvent(
+                amzn_qdeveloper_streaming_client::types::ToolUseEvent {
+                    tool_use_id,
+                    name,
+                    input,
+                    stop,
+                    ..
+                },
+            ) => ChatResponseStream::ToolUseEvent {
+                tool_use_id,
+                name,
+                input,
+                stop,
+            },
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::SupplementaryWebLinksEvent(_) => {
+                ChatResponseStream::SupplementaryWebLinksEvent(())
+            },
+            _ => ChatResponseStream::Unknown,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+pub struct EnvState {
+    pub operating_system: Option<String>,
+    pub current_working_directory: Option<String>,
+    pub environment_variables: Vec<EnvironmentVariable>,
+}
+
+impl From<EnvState> for amzn_codewhisperer_streaming_client::types::EnvState {
+    fn from(value: EnvState) -> Self {
+        let environment_variables: Vec<_> = value.environment_variables.into_iter().map(Into::into).collect();
+        Self::builder()
+            .set_operating_system(value.operating_system)
+            .set_current_working_directory(value.current_working_directory)
+            .set_environment_variables(if environment_variables.is_empty() {
+                None
+            } else {
+                Some(environment_variables)
+            })
+            .build()
+    }
+}
+
+impl From<EnvState> for amzn_qdeveloper_streaming_client::types::EnvState {
+    fn from(value: EnvState) -> Self {
+        let environment_variables: Vec<_> = value.environment_variables.into_iter().map(Into::into).collect();
+        Self::builder()
+            .set_operating_system(value.operating_system)
+            .set_current_working_directory(value.current_working_directory)
+            .set_environment_variables(if environment_variables.is_empty() {
+                None
+            } else {
+                Some(environment_variables)
+            })
+            .build()
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct EnvironmentVariable {
+    pub key: String,
+    pub value: String,
+}
+
+impl From<EnvironmentVariable> for amzn_codewhisperer_streaming_client::types::EnvironmentVariable {
+    fn from(value: EnvironmentVariable) -> Self {
+        Self::builder().key(value.key).value(value.value).build()
+    }
+}
+
+impl From<EnvironmentVariable> for amzn_qdeveloper_streaming_client::types::EnvironmentVariable {
+    fn from(value: EnvironmentVariable) -> Self {
+        Self::builder().key(value.key).value(value.value).build()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct GitState {
+    pub status: String,
+}
+
+impl From<GitState> for amzn_codewhisperer_streaming_client::types::GitState {
+    fn from(value: GitState) -> Self {
+        Self::builder().status(value.status).build()
+    }
+}
+
+impl From<GitState> for amzn_qdeveloper_streaming_client::types::GitState {
+    fn from(value: GitState) -> Self {
+        Self::builder().status(value.status).build()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct UserInputMessage {
+    pub content: String,
+    pub user_input_message_context: Option<UserInputMessageContext>,
+    pub user_intent: Option<UserIntent>,
+}
+
+impl From<UserInputMessage> for amzn_codewhisperer_streaming_client::types::UserInputMessage {
+    fn from(value: UserInputMessage) -> Self {
+        Self::builder()
+            .content(value.content)
+            .set_user_input_message_context(value.user_input_message_context.map(Into::into))
+            .set_user_intent(value.user_intent.map(Into::into))
+            .origin(amzn_codewhisperer_streaming_client::types::Origin::Cli)
+            .build()
+            .expect("Failed to build UserInputMessage")
+    }
+}
+
+impl From<UserInputMessage> for amzn_qdeveloper_streaming_client::types::UserInputMessage {
+    fn from(value: UserInputMessage) -> Self {
+        Self::builder()
+            .content(value.content)
+            .set_user_input_message_context(value.user_input_message_context.map(Into::into))
+            .set_user_intent(value.user_intent.map(Into::into))
+            .origin(amzn_qdeveloper_streaming_client::types::Origin::Cli)
+            .build()
+            .expect("Failed to build UserInputMessage")
+    }
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct UserInputMessageContext {
+    pub env_state: Option<EnvState>,
+    pub git_state: Option<GitState>,
+    pub tool_results: Option<Vec<ToolResult>>,
+    pub tools: Option<Vec<Tool>>,
+}
+
+impl From<UserInputMessageContext> for amzn_codewhisperer_streaming_client::types::UserInputMessageContext {
+    fn from(value: UserInputMessageContext) -> Self {
+        Self::builder()
+            .set_env_state(value.env_state.map(Into::into))
+            .set_git_state(value.git_state.map(Into::into))
+            .set_tool_results(value.tool_results.map(|t| t.into_iter().map(Into::into).collect()))
+            .set_tools(value.tools.map(|t| t.into_iter().map(Into::into).collect()))
+            .build()
+    }
+}
+
+impl From<UserInputMessageContext> for amzn_qdeveloper_streaming_client::types::UserInputMessageContext {
+    fn from(value: UserInputMessageContext) -> Self {
+        Self::builder()
+            .set_env_state(value.env_state.map(Into::into))
+            .set_git_state(value.git_state.map(Into::into))
+            .set_tool_results(value.tool_results.map(|t| t.into_iter().map(Into::into).collect()))
+            .set_tools(value.tools.map(|t| t.into_iter().map(Into::into).collect()))
+            .build()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum UserIntent {
+    ApplyCommonBestPractices,
+}
+
+impl From<UserIntent> for amzn_codewhisperer_streaming_client::types::UserIntent {
+    fn from(value: UserIntent) -> Self {
+        match value {
+            UserIntent::ApplyCommonBestPractices => Self::ApplyCommonBestPractices,
+        }
+    }
+}
+
+impl From<UserIntent> for amzn_qdeveloper_streaming_client::types::UserIntent {
+    fn from(value: UserIntent) -> Self {
+        match value {
+            UserIntent::ApplyCommonBestPractices => Self::ApplyCommonBestPractices,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn build_user_input_message() {
+        let user_input_message = UserInputMessage {
+            content: "test content".to_string(),
+            user_input_message_context: Some(UserInputMessageContext {
+                env_state: Some(EnvState {
+                    operating_system: Some("test os".to_string()),
+                    current_working_directory: Some("test cwd".to_string()),
+                    environment_variables: vec![EnvironmentVariable {
+                        key: "test key".to_string(),
+                        value: "test value".to_string(),
+                    }],
+                }),
+                git_state: Some(GitState {
+                    status: "test status".to_string(),
+                }),
+                tool_results: Some(vec![ToolResult {
+                    tool_use_id: "test id".to_string(),
+                    content: vec![ToolResultContentBlock::Text("test text".to_string())],
+                    status: ToolResultStatus::Success,
+                }]),
+                tools: Some(vec![Tool::ToolSpecification(ToolSpecification {
+                    name: "test tool name".to_string(),
+                    description: "test tool description".to_string(),
+                    input_schema: ToolInputSchema {
+                        json: Some(Document::Null),
+                    },
+                })]),
+            }),
+            user_intent: Some(UserIntent::ApplyCommonBestPractices),
+        };
+
+        let codewhisper_input =
+            amzn_codewhisperer_streaming_client::types::UserInputMessage::from(user_input_message.clone());
+        let qdeveloper_input = amzn_qdeveloper_streaming_client::types::UserInputMessage::from(user_input_message);
+
+        assert_eq!(format!("{codewhisper_input:?}"), format!("{qdeveloper_input:?}"));
+
+        let minimal_message = UserInputMessage {
+            content: "test content".to_string(),
+            user_input_message_context: None,
+            user_intent: None,
+        };
+
+        let codewhisper_minimal =
+            amzn_codewhisperer_streaming_client::types::UserInputMessage::from(minimal_message.clone());
+        let qdeveloper_minimal = amzn_qdeveloper_streaming_client::types::UserInputMessage::from(minimal_message);
+        assert_eq!(format!("{codewhisper_minimal:?}"), format!("{qdeveloper_minimal:?}"));
+    }
+
+    #[test]
+    fn build_assistant_response_message() {
+        let message = AssistantResponseMessage {
+            message_id: Some("testid".to_string()),
+            content: "test content".to_string(),
+            tool_uses: Some(vec![ToolUse {
+                tool_use_id: "tooluseid_test".to_string(),
+                name: "tool_name_test".to_string(),
+                input: Document::Object([("key1".to_string(), Document::Null)].into_iter().collect()),
+            }]),
+        };
+        let codewhisper_input =
+            amzn_codewhisperer_streaming_client::types::AssistantResponseMessage::try_from(message.clone()).unwrap();
+        let qdeveloper_input =
+            amzn_qdeveloper_streaming_client::types::AssistantResponseMessage::try_from(message).unwrap();
+        assert_eq!(format!("{codewhisper_input:?}"), format!("{qdeveloper_input:?}"));
+    }
+
+    #[test]
+    fn build_chat_response() {
+        let assistant_response_event =
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::AssistantResponseEvent(
+                amzn_codewhisperer_streaming_client::types::AssistantResponseEvent::builder()
+                    .content("context")
+                    .build()
+                    .unwrap(),
+            );
+        assert_eq!(
+            ChatResponseStream::from(assistant_response_event),
+            ChatResponseStream::AssistantResponseEvent {
+                content: "context".into(),
+            }
+        );
+
+        let assistant_response_event =
+            amzn_qdeveloper_streaming_client::types::ChatResponseStream::AssistantResponseEvent(
+                amzn_qdeveloper_streaming_client::types::AssistantResponseEvent::builder()
+                    .content("context")
+                    .build()
+                    .unwrap(),
+            );
+        assert_eq!(
+            ChatResponseStream::from(assistant_response_event),
+            ChatResponseStream::AssistantResponseEvent {
+                content: "context".into(),
+            }
+        );
+
+        let code_event = amzn_codewhisperer_streaming_client::types::ChatResponseStream::CodeEvent(
+            amzn_codewhisperer_streaming_client::types::CodeEvent::builder()
+                .content("context")
+                .build()
+                .unwrap(),
+        );
+        assert_eq!(ChatResponseStream::from(code_event), ChatResponseStream::CodeEvent {
+            content: "context".into()
+        });
+
+        let code_event = amzn_qdeveloper_streaming_client::types::ChatResponseStream::CodeEvent(
+            amzn_qdeveloper_streaming_client::types::CodeEvent::builder()
+                .content("context")
+                .build()
+                .unwrap(),
+        );
+        assert_eq!(ChatResponseStream::from(code_event), ChatResponseStream::CodeEvent {
+            content: "context".into()
+        });
+
+        let code_reference_event = amzn_codewhisperer_streaming_client::types::ChatResponseStream::CodeReferenceEvent(
+            amzn_codewhisperer_streaming_client::types::CodeReferenceEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(code_reference_event),
+            ChatResponseStream::CodeReferenceEvent(())
+        );
+
+        let code_reference_event = amzn_qdeveloper_streaming_client::types::ChatResponseStream::CodeReferenceEvent(
+            amzn_qdeveloper_streaming_client::types::CodeReferenceEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(code_reference_event),
+            ChatResponseStream::CodeReferenceEvent(())
+        );
+
+        let followup_prompt_event = amzn_codewhisperer_streaming_client::types::ChatResponseStream::FollowupPromptEvent(
+            amzn_codewhisperer_streaming_client::types::FollowupPromptEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(followup_prompt_event),
+            ChatResponseStream::FollowupPromptEvent(())
+        );
+
+        let followup_prompt_event = amzn_qdeveloper_streaming_client::types::ChatResponseStream::FollowupPromptEvent(
+            amzn_qdeveloper_streaming_client::types::FollowupPromptEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(followup_prompt_event),
+            ChatResponseStream::FollowupPromptEvent(())
+        );
+
+        let intents_event = amzn_codewhisperer_streaming_client::types::ChatResponseStream::IntentsEvent(
+            amzn_codewhisperer_streaming_client::types::IntentsEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(intents_event),
+            ChatResponseStream::IntentsEvent(())
+        );
+
+        let intents_event = amzn_qdeveloper_streaming_client::types::ChatResponseStream::IntentsEvent(
+            amzn_qdeveloper_streaming_client::types::IntentsEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(intents_event),
+            ChatResponseStream::IntentsEvent(())
+        );
+
+        let user_input_event = amzn_codewhisperer_streaming_client::types::ChatResponseStream::InvalidStateEvent(
+            amzn_codewhisperer_streaming_client::types::InvalidStateEvent::builder()
+                .reason(amzn_codewhisperer_streaming_client::types::InvalidStateReason::InvalidTaskAssistPlan)
+                .message("message")
+                .build()
+                .unwrap(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(user_input_event),
+            ChatResponseStream::InvalidStateEvent {
+                reason: amzn_codewhisperer_streaming_client::types::InvalidStateReason::InvalidTaskAssistPlan
+                    .to_string(),
+                message: "message".into()
+            }
+        );
+
+        let user_input_event = amzn_qdeveloper_streaming_client::types::ChatResponseStream::InvalidStateEvent(
+            amzn_qdeveloper_streaming_client::types::InvalidStateEvent::builder()
+                .reason(amzn_qdeveloper_streaming_client::types::InvalidStateReason::InvalidTaskAssistPlan)
+                .message("message")
+                .build()
+                .unwrap(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(user_input_event),
+            ChatResponseStream::InvalidStateEvent {
+                reason: amzn_qdeveloper_streaming_client::types::InvalidStateReason::InvalidTaskAssistPlan.to_string(),
+                message: "message".into()
+            }
+        );
+
+        let user_input_event = amzn_codewhisperer_streaming_client::types::ChatResponseStream::MessageMetadataEvent(
+            amzn_codewhisperer_streaming_client::types::MessageMetadataEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(user_input_event),
+            ChatResponseStream::MessageMetadataEvent {
+                conversation_id: None,
+                utterance_id: None
+            }
+        );
+
+        let user_input_event = amzn_qdeveloper_streaming_client::types::ChatResponseStream::MessageMetadataEvent(
+            amzn_qdeveloper_streaming_client::types::MessageMetadataEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(user_input_event),
+            ChatResponseStream::MessageMetadataEvent {
+                conversation_id: None,
+                utterance_id: None
+            }
+        );
+
+        let user_input_event =
+            amzn_codewhisperer_streaming_client::types::ChatResponseStream::SupplementaryWebLinksEvent(
+                amzn_codewhisperer_streaming_client::types::SupplementaryWebLinksEvent::builder().build(),
+            );
+        assert_eq!(
+            ChatResponseStream::from(user_input_event),
+            ChatResponseStream::SupplementaryWebLinksEvent(())
+        );
+
+        let user_input_event = amzn_qdeveloper_streaming_client::types::ChatResponseStream::SupplementaryWebLinksEvent(
+            amzn_qdeveloper_streaming_client::types::SupplementaryWebLinksEvent::builder().build(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(user_input_event),
+            ChatResponseStream::SupplementaryWebLinksEvent(())
+        );
+
+        let user_input_event = amzn_codewhisperer_streaming_client::types::ChatResponseStream::ToolUseEvent(
+            amzn_codewhisperer_streaming_client::types::ToolUseEvent::builder()
+                .tool_use_id("tool_use_id".to_string())
+                .name("tool_name".to_string())
+                .build()
+                .unwrap(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(user_input_event),
+            ChatResponseStream::ToolUseEvent {
+                tool_use_id: "tool_use_id".to_string(),
+                name: "tool_name".to_string(),
+                input: None,
+                stop: None,
+            }
+        );
+
+        let user_input_event = amzn_qdeveloper_streaming_client::types::ChatResponseStream::ToolUseEvent(
+            amzn_qdeveloper_streaming_client::types::ToolUseEvent::builder()
+                .tool_use_id("tool_use_id".to_string())
+                .name("tool_name".to_string())
+                .build()
+                .unwrap(),
+        );
+        assert_eq!(
+            ChatResponseStream::from(user_input_event),
+            ChatResponseStream::ToolUseEvent {
+                tool_use_id: "tool_use_id".to_string(),
+                name: "tool_name".to_string(),
+                input: None,
+                stop: None,
+            }
+        );
+    }
+}
diff --git a/crates/kiro-cli/src/fig_api_client/profile.rs b/crates/kiro-cli/src/fig_api_client/profile.rs
new file mode 100644
index 0000000000..543554eaa7
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/profile.rs
@@ -0,0 +1,35 @@
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+use crate::fig_api_client::Client;
+use crate::fig_api_client::endpoints::Endpoint;
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Profile {
+    pub arn: String,
+    pub profile_name: String,
+}
+
+impl From<amzn_codewhisperer_client::types::Profile> for Profile {
+    fn from(profile: amzn_codewhisperer_client::types::Profile) -> Self {
+        Self {
+            arn: profile.arn,
+            profile_name: profile.profile_name,
+        }
+    }
+}
+
+pub async fn list_available_profiles() -> Vec<Profile> {
+    let mut profiles = vec![];
+    for endpoint in Endpoint::CODEWHISPERER_ENDPOINTS {
+        let client = Client::new_codewhisperer_client(&endpoint).await;
+        match client.list_available_profiles().await {
+            Ok(mut p) => profiles.append(&mut p),
+            Err(e) => tracing::error!("Failed to list profiles from endpoint {:?}: {:?}", endpoint, e),
+        }
+    }
+
+    profiles
+}
diff --git a/crates/kiro-cli/src/fig_api_client/stage.rs b/crates/kiro-cli/src/fig_api_client/stage.rs
new file mode 100644
index 0000000000..31b301786f
--- /dev/null
+++ b/crates/kiro-cli/src/fig_api_client/stage.rs
@@ -0,0 +1,40 @@
+use std::str::FromStr;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum Stage {
+    Prod,
+    Gamma,
+    Alpha,
+    Beta,
+}
+
+impl Stage {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Stage::Prod => "prod",
+            Stage::Gamma => "gamma",
+            Stage::Alpha => "alpha",
+            Stage::Beta => "beta",
+        }
+    }
+}
+
+impl FromStr for Stage {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_ascii_lowercase().trim() {
+            "prod" | "production" => Ok(Stage::Prod),
+            "gamma" => Ok(Stage::Gamma),
+            "alpha" => Ok(Stage::Alpha),
+            "beta" => Ok(Stage::Beta),
+            _ => Err(()),
+        }
+    }
+}
+
+impl std::fmt::Display for Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
diff --git a/crates/kiro-cli/src/fig_auth/builder_id.rs b/crates/kiro-cli/src/fig_auth/builder_id.rs
new file mode 100644
index 0000000000..24022b0093
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/builder_id.rs
@@ -0,0 +1,708 @@
+//! # Builder ID
+//!
+//!  SSO flow (RFC: <https://tools.ietf.org/html/rfc8628>)
+//!    1. Get a client id (SSO-OIDC identifier, formatted per RFC6749).
+//!       - Code: [DeviceRegistration::register]
+//!          - Calls [Client::register_client]
+//!       - RETURNS: [DeviceRegistration]
+//!       - Client registration is valid for potentially months and creates state server-side, so
+//!         the client SHOULD cache them to disk.
+//!    2. Start device authorization.
+//!       - Code: [start_device_authorization]
+//!          - Calls [Client::start_device_authorization]
+//!       - RETURNS (RFC: <https://tools.ietf.org/html/rfc8628#section-3.2>):
+//!         [StartDeviceAuthorizationResponse]
+//!    3. Poll for the access token
+//!       - Code: [poll_create_token]
+//!          - Calls [Client::create_token]
+//!       - RETURNS: [PollCreateToken]
+//!    4. (Repeat) Tokens SHOULD be refreshed if expired and a refresh token is available.
+//!        - Code: [BuilderIdToken::refresh_token]
+//!          - Calls [Client::create_token]
+//!        - RETURNS: [BuilderIdToken]
+
+use aws_sdk_ssooidc::client::Client;
+use aws_sdk_ssooidc::config::retry::RetryConfig;
+use aws_sdk_ssooidc::config::{
+    BehaviorVersion,
+    ConfigBag,
+    RuntimeComponents,
+    SharedAsyncSleep,
+};
+use aws_sdk_ssooidc::error::SdkError;
+use aws_sdk_ssooidc::operation::create_token::CreateTokenOutput;
+use aws_sdk_ssooidc::operation::register_client::RegisterClientOutput;
+use aws_smithy_async::rt::sleep::TokioSleep;
+use aws_smithy_runtime_api::client::identity::http::Token;
+use aws_smithy_runtime_api::client::identity::{
+    Identity,
+    IdentityFuture,
+    ResolveIdentity,
+};
+use aws_smithy_types::error::display::DisplayErrorContext;
+use aws_types::region::Region;
+use aws_types::request_id::RequestId;
+use time::OffsetDateTime;
+use tracing::{
+    debug,
+    error,
+    warn,
+};
+
+use crate::fig_auth::consts::*;
+use crate::fig_auth::scope::is_scopes;
+use crate::fig_auth::secret_store::{
+    Secret,
+    SecretStore,
+};
+use crate::fig_auth::{
+    Error,
+    Result,
+};
+use crate::fig_aws_common::app_name;
+use crate::fig_telemetry_core::{
+    Event,
+    EventType,
+    TelemetryResult,
+};
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+pub enum OAuthFlow {
+    DeviceCode,
+    Pkce,
+}
+
+impl std::fmt::Display for OAuthFlow {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            OAuthFlow::DeviceCode => write!(f, "DeviceCode"),
+            OAuthFlow::Pkce => write!(f, "PKCE"),
+        }
+    }
+}
+
+/// Indicates if an expiration time has passed, there is a small 1 min window that is removed
+/// so the token will not expire in transit
+fn is_expired(expiration_time: &OffsetDateTime) -> bool {
+    let now = time::OffsetDateTime::now_utc();
+    &(now + time::Duration::minutes(1)) > expiration_time
+}
+
+pub(crate) fn oidc_url(region: &Region) -> String {
+    format!("https://oidc.{region}.amazonaws.com")
+}
+
+pub(crate) fn client(region: Region) -> Client {
+    let retry_config = RetryConfig::standard().with_max_attempts(3);
+    let sdk_config = aws_types::SdkConfig::builder()
+        .http_client(crate::fig_aws_common::http_client::client())
+        .behavior_version(BehaviorVersion::v2025_01_17())
+        .endpoint_url(oidc_url(&region))
+        .region(region)
+        .retry_config(retry_config)
+        .sleep_impl(SharedAsyncSleep::new(TokioSleep::new()))
+        .app_name(app_name())
+        .build();
+    Client::new(&sdk_config)
+}
+
+/// Represents an OIDC registered client, resulting from the "register client" API call.
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct DeviceRegistration {
+    pub client_id: String,
+    pub client_secret: Secret,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub client_secret_expires_at: Option<time::OffsetDateTime>,
+    pub region: String,
+    pub oauth_flow: OAuthFlow,
+    pub scopes: Option<Vec<String>>,
+}
+
+impl DeviceRegistration {
+    const SECRET_KEY: &'static str = "codewhisperer:odic:device-registration";
+
+    pub fn from_output(
+        output: RegisterClientOutput,
+        region: &Region,
+        oauth_flow: OAuthFlow,
+        scopes: Vec<String>,
+    ) -> Self {
+        Self {
+            client_id: output.client_id.unwrap_or_default(),
+            client_secret: output.client_secret.unwrap_or_default().into(),
+            client_secret_expires_at: time::OffsetDateTime::from_unix_timestamp(output.client_secret_expires_at).ok(),
+            region: region.to_string(),
+            oauth_flow,
+            scopes: Some(scopes),
+        }
+    }
+
+    /// Loads the OIDC registered client from the secret store, deleting it if it is expired.
+    async fn load_from_secret_store(secret_store: &SecretStore, region: &Region) -> Result<Option<Self>> {
+        let device_registration = secret_store.get(Self::SECRET_KEY).await?;
+
+        if let Some(device_registration) = device_registration {
+            // check that the data is not expired, assume it is invalid if not present
+            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() {
+                    return Ok(Some(device_registration));
+                }
+            }
+        }
+
+        // delete the data if its expired or invalid
+        if let Err(err) = secret_store.delete(Self::SECRET_KEY).await {
+            error!(?err, "Failed to delete device registration from keychain");
+        }
+
+        Ok(None)
+    }
+
+    /// Loads the client saved in the secret store if available, otherwise registers a new client
+    /// and saves it in the secret store.
+    pub async fn init_device_code_registration(
+        client: &Client,
+        secret_store: &SecretStore,
+        region: &Region,
+    ) -> Result<Self> {
+        match Self::load_from_secret_store(secret_store, region).await {
+            Ok(Some(registration)) if registration.oauth_flow == OAuthFlow::DeviceCode => match &registration.scopes {
+                Some(scopes) if is_scopes(scopes) => return Ok(registration),
+                _ => warn!("Invalid scopes in device registration, ignoring"),
+            },
+            // If it doesn't exist or is for another OAuth flow,
+            // then continue with creating a new one.
+            Ok(None | Some(_)) => {},
+            Err(err) => {
+                error!(?err, "Failed to read device registration from keychain");
+            },
+        };
+
+        let mut register = client
+            .register_client()
+            .client_name(CLIENT_NAME)
+            .client_type(CLIENT_TYPE);
+        for scope in SCOPES {
+            register = register.scopes(*scope);
+        }
+        let output = register.send().await?;
+
+        let device_registration = Self::from_output(
+            output,
+            region,
+            OAuthFlow::DeviceCode,
+            SCOPES.iter().map(|s| (*s).to_owned()).collect(),
+        );
+
+        if let Err(err) = device_registration.save(secret_store).await {
+            error!(?err, "Failed to write device registration to keychain");
+        }
+
+        Ok(device_registration)
+    }
+
+    /// Saves to the passed secret store.
+    pub async fn save(&self, secret_store: &SecretStore) -> Result<()> {
+        secret_store
+            .set(Self::SECRET_KEY, &serde_json::to_string(&self)?)
+            .await?;
+        Ok(())
+    }
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct StartDeviceAuthorizationResponse {
+    /// Device verification code.
+    pub device_code: String,
+    /// User verification code.
+    pub user_code: String,
+    /// Verification URI on the authorization server.
+    pub verification_uri: String,
+    /// User verification URI on the authorization server.
+    pub verification_uri_complete: String,
+    /// Lifetime (seconds) of `device_code` and `user_code`.
+    pub expires_in: i32,
+    /// Minimum time (seconds) the client SHOULD wait between polling intervals.
+    pub interval: i32,
+    pub region: String,
+    pub start_url: String,
+}
+
+/// Init a builder id request
+pub async fn start_device_authorization(
+    secret_store: &SecretStore,
+    start_url: Option<String>,
+    region: Option<String>,
+) -> Result<StartDeviceAuthorizationResponse> {
+    let region = region.clone().map_or(OIDC_BUILDER_ID_REGION, Region::new);
+    let client = client(region.clone());
+
+    let DeviceRegistration {
+        client_id,
+        client_secret,
+        ..
+    } = DeviceRegistration::init_device_code_registration(&client, secret_store, &region).await?;
+
+    let output = client
+        .start_device_authorization()
+        .client_id(&client_id)
+        .client_secret(&client_secret.0)
+        .start_url(start_url.as_deref().unwrap_or(START_URL))
+        .send()
+        .await?;
+
+    Ok(StartDeviceAuthorizationResponse {
+        device_code: output.device_code.unwrap_or_default(),
+        user_code: output.user_code.unwrap_or_default(),
+        verification_uri: output.verification_uri.unwrap_or_default(),
+        verification_uri_complete: output.verification_uri_complete.unwrap_or_default(),
+        expires_in: output.expires_in,
+        interval: output.interval,
+        region: region.to_string(),
+        start_url: start_url.unwrap_or_else(|| START_URL.to_owned()),
+    })
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TokenType {
+    BuilderId,
+    IamIdentityCenter,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct BuilderIdToken {
+    pub access_token: Secret,
+    #[serde(with = "time::serde::rfc3339")]
+    pub expires_at: time::OffsetDateTime,
+    pub refresh_token: Option<Secret>,
+    pub region: Option<String>,
+    pub start_url: Option<String>,
+    pub oauth_flow: OAuthFlow,
+    pub scopes: Option<Vec<String>>,
+}
+
+impl BuilderIdToken {
+    const SECRET_KEY: &'static str = "codewhisperer:odic:token";
+
+    #[cfg(test)]
+    fn test() -> Self {
+        Self {
+            access_token: Secret("test_access_token".to_string()),
+            expires_at: time::OffsetDateTime::now_utc() + time::Duration::minutes(60),
+            refresh_token: Some(Secret("test_refresh_token".to_string())),
+            region: Some(OIDC_BUILDER_ID_REGION.to_string()),
+            start_url: Some(START_URL.to_string()),
+            oauth_flow: OAuthFlow::DeviceCode,
+            scopes: Some(SCOPES.iter().map(|s| (*s).to_owned()).collect()),
+        }
+    }
+
+    /// Load the token from the keychain, refresh the token if it is expired and return it
+    pub async fn load(secret_store: &SecretStore, force_refresh: bool) -> Result<Option<Self>> {
+        match secret_store.get(Self::SECRET_KEY).await {
+            Ok(Some(secret)) => {
+                let token: Option<Self> = serde_json::from_str(&secret.0)?;
+                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() || force_refresh {
+                            token.refresh_token(&client, secret_store, &region).await
+                        } else {
+                            Ok(Some(token))
+                        }
+                    },
+                    None => Ok(None),
+                }
+            },
+            Ok(None) => Ok(None),
+            Err(err) => {
+                error!(%err, "Error getting builder id token from keychain");
+                Err(err)
+            },
+        }
+    }
+
+    /// Refresh the access token
+    pub async fn refresh_token(
+        &self,
+        client: &Client,
+        secret_store: &SecretStore,
+        region: &Region,
+    ) -> Result<Option<Self>> {
+        let Some(refresh_token) = &self.refresh_token else {
+            // if the token is expired and has no refresh token, delete it
+            if let Err(err) = self.delete(secret_store).await {
+                error!(?err, "Failed to delete builder id token");
+            }
+
+            return Ok(None);
+        };
+
+        let registration = match DeviceRegistration::load_from_secret_store(secret_store, region).await? {
+            Some(registration) if registration.oauth_flow == self.oauth_flow => registration,
+            // If the OIDC client registration is for a different oauth flow or doesn't exist, then
+            // we can't refresh the token.
+            Some(registration) => {
+                warn!(
+                    "Unable to refresh token: Stored client registration has oauth flow: {:?} but current access token has oauth flow: {:?}",
+                    registration.oauth_flow, self.oauth_flow
+                );
+                return Ok(None);
+            },
+            None => {
+                warn!("Unable to refresh token: No registered client was found");
+                return Ok(None);
+            },
+        };
+
+        debug!("Refreshing access token");
+        match client
+            .create_token()
+            .client_id(registration.client_id)
+            .client_secret(registration.client_secret.0)
+            .refresh_token(&refresh_token.0)
+            .grant_type(REFRESH_GRANT_TYPE)
+            .send()
+            .await
+        {
+            Ok(output) => {
+                crate::fig_telemetry_core::send_event(
+                    Event::new(EventType::RefreshCredentials {
+                        request_id: output.request_id().unwrap_or_default().into(),
+                        result: TelemetryResult::Succeeded,
+                        reason: None,
+                        oauth_flow: registration.oauth_flow.to_string(),
+                    })
+                    .with_credential_start_url(self.start_url.clone().unwrap_or_else(|| START_URL.to_owned())),
+                )
+                .await;
+
+                let token: BuilderIdToken = Self::from_output(
+                    output,
+                    region.clone(),
+                    self.start_url.clone(),
+                    self.oauth_flow,
+                    self.scopes.clone(),
+                );
+                debug!("Refreshed access token, new token: {:?}", token);
+
+                if let Err(err) = token.save(secret_store).await {
+                    error!(?err, "Failed to store builder id access token");
+                };
+
+                Ok(Some(token))
+            },
+            Err(err) => {
+                let display_err = DisplayErrorContext(&err);
+                error!("Failed to refresh builder id access token: {}", display_err);
+
+                // if the error is the client's fault, clear the token
+                if let SdkError::ServiceError(service_err) = &err {
+                    crate::fig_telemetry_core::send_event(
+                        Event::new(EventType::RefreshCredentials {
+                            request_id: err.request_id().unwrap_or_default().into(),
+                            result: TelemetryResult::Failed,
+                            reason: Some(display_err.to_string()),
+                            oauth_flow: registration.oauth_flow.to_string(),
+                        })
+                        .with_credential_start_url(self.start_url.clone().unwrap_or_else(|| START_URL.to_owned())),
+                    )
+                    .await;
+                    if !service_err.err().is_slow_down_exception() {
+                        if let Err(err) = self.delete(secret_store).await {
+                            error!(?err, "Failed to delete builder id token");
+                        }
+                    }
+                }
+
+                Err(err.into())
+            },
+        }
+    }
+
+    /// If the time has passed the `expires_at` time
+    ///
+    /// The token is marked as expired 1 min before it actually does to account for the potential a
+    /// token expires while in transit
+    pub fn is_expired(&self) -> bool {
+        is_expired(&self.expires_at)
+    }
+
+    /// Save the token to the keychain
+    pub async fn save(&self, secret_store: &SecretStore) -> Result<()> {
+        secret_store
+            .set(Self::SECRET_KEY, &serde_json::to_string(self)?)
+            .await?;
+        Ok(())
+    }
+
+    /// Delete the token from the keychain
+    pub async fn delete(&self, secret_store: &SecretStore) -> Result<()> {
+        secret_store.delete(Self::SECRET_KEY).await?;
+        Ok(())
+    }
+
+    pub(crate) fn from_output(
+        output: CreateTokenOutput,
+        region: Region,
+        start_url: Option<String>,
+        oauth_flow: OAuthFlow,
+        scopes: Option<Vec<String>>,
+    ) -> Self {
+        Self {
+            access_token: output.access_token.unwrap_or_default().into(),
+            expires_at: time::OffsetDateTime::now_utc() + time::Duration::seconds(output.expires_in as i64),
+            refresh_token: output.refresh_token.map(|t| t.into()),
+            region: Some(region.to_string()),
+            start_url,
+            oauth_flow,
+            scopes,
+        }
+    }
+
+    pub fn token_type(&self) -> TokenType {
+        match &self.start_url {
+            Some(url) if url == START_URL => TokenType::BuilderId,
+            None => TokenType::BuilderId,
+            Some(_) => TokenType::IamIdentityCenter,
+        }
+    }
+}
+
+pub enum PollCreateToken {
+    Pending,
+    Complete(BuilderIdToken),
+    Error(Error),
+}
+
+/// Poll for the create token response
+pub async fn poll_create_token(
+    secret_store: &SecretStore,
+    device_code: String,
+    start_url: Option<String>,
+    region: Option<String>,
+) -> PollCreateToken {
+    let region = region.clone().map_or(OIDC_BUILDER_ID_REGION, Region::new);
+    let client = client(region.clone());
+
+    let DeviceRegistration {
+        client_id,
+        client_secret,
+        scopes,
+        ..
+    } = match DeviceRegistration::init_device_code_registration(&client, secret_store, &region).await {
+        Ok(res) => res,
+        Err(err) => {
+            return PollCreateToken::Error(err);
+        },
+    };
+
+    match client
+        .create_token()
+        .grant_type(DEVICE_GRANT_TYPE)
+        .device_code(device_code)
+        .client_id(client_id)
+        .client_secret(client_secret.0)
+        .send()
+        .await
+    {
+        Ok(output) => {
+            let token: BuilderIdToken =
+                BuilderIdToken::from_output(output, region, start_url, OAuthFlow::DeviceCode, scopes);
+
+            if let Err(err) = token.save(secret_store).await {
+                error!(?err, "Failed to store builder id token");
+            };
+
+            PollCreateToken::Complete(token)
+        },
+        Err(SdkError::ServiceError(service_error)) if service_error.err().is_authorization_pending_exception() => {
+            PollCreateToken::Pending
+        },
+        Err(err) => {
+            error!(?err, "Failed to poll for builder id token");
+            PollCreateToken::Error(err.into())
+        },
+    }
+}
+
+pub async fn builder_id_token() -> Result<Option<BuilderIdToken>> {
+    let secret_store = SecretStore::new().await?;
+    BuilderIdToken::load(&secret_store, false).await
+}
+
+pub async fn refresh_token() -> Result<Option<BuilderIdToken>> {
+    let secret_store = SecretStore::new().await?;
+    BuilderIdToken::load(&secret_store, true).await
+}
+
+pub async fn is_logged_in() -> bool {
+    matches!(builder_id_token().await, Ok(Some(_)))
+}
+
+pub async fn logout() -> Result<()> {
+    let Ok(secret_store) = SecretStore::new().await else {
+        return Ok(());
+    };
+
+    let (builder_res, device_res) = tokio::join!(
+        secret_store.delete(BuilderIdToken::SECRET_KEY),
+        secret_store.delete(DeviceRegistration::SECRET_KEY),
+    );
+
+    let profile_res = crate::fig_settings::state::remove_value("api.codewhisperer.profile");
+
+    builder_res?;
+    device_res?;
+    profile_res?;
+
+    Ok(())
+}
+
+#[derive(Debug, Clone)]
+pub struct BearerResolver;
+
+impl ResolveIdentity for BearerResolver {
+    fn resolve_identity<'a>(
+        &'a self,
+        _runtime_components: &'a RuntimeComponents,
+        _config_bag: &'a ConfigBag,
+    ) -> IdentityFuture<'a> {
+        IdentityFuture::new_boxed(Box::pin(async {
+            let secret_store = SecretStore::new().await?;
+            let token = BuilderIdToken::load(&secret_store, false).await?;
+            match token {
+                Some(token) => Ok(Identity::new(
+                    Token::new(token.access_token.0, Some(token.expires_at.into())),
+                    Some(token.expires_at.into()),
+                )),
+                None => Err(Error::NoToken.into()),
+            }
+        }))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const US_EAST_1: Region = Region::from_static("us-east-1");
+    const US_WEST_2: Region = Region::from_static("us-west-2");
+
+    macro_rules! test_ser_deser {
+        ($ty:ident, $variant:expr, $text:expr) => {
+            let quoted = format!("\"{}\"", $text);
+            assert_eq!(quoted, serde_json::to_string(&$variant).unwrap());
+            assert_eq!($variant, serde_json::from_str(&quoted).unwrap());
+
+            assert_eq!($text, format!("{}", $variant));
+        };
+    }
+
+    #[test]
+    fn test_oauth_flow_ser_deser() {
+        test_ser_deser!(OAuthFlow, OAuthFlow::DeviceCode, "DeviceCode");
+        test_ser_deser!(OAuthFlow, OAuthFlow::Pkce, "PKCE");
+    }
+
+    #[test]
+    fn test_client() {
+        println!("{:?}", client(US_EAST_1));
+        println!("{:?}", client(US_WEST_2));
+    }
+
+    #[test]
+    fn oidc_url_snapshot() {
+        insta::assert_snapshot!(oidc_url(&US_EAST_1), @"https://oidc.us-east-1.amazonaws.com");
+        insta::assert_snapshot!(oidc_url(&US_WEST_2), @"https://oidc.us-west-2.amazonaws.com");
+    }
+
+    #[test]
+    fn test_is_expired() {
+        let mut token = BuilderIdToken::test();
+        assert!(!token.is_expired());
+
+        token.expires_at = time::OffsetDateTime::now_utc() - time::Duration::seconds(60);
+        assert!(token.is_expired());
+    }
+
+    #[test]
+    fn test_token_type() {
+        let mut token = BuilderIdToken::test();
+        assert_eq!(token.token_type(), TokenType::BuilderId);
+
+        token.start_url = None;
+        assert_eq!(token.token_type(), TokenType::BuilderId);
+
+        token.start_url = Some("https://amzn.awsapps.com/start".into());
+        assert_eq!(token.token_type(), TokenType::IamIdentityCenter);
+    }
+
+    #[ignore = "not in ci"]
+    #[tokio::test]
+    async fn logout_test() {
+        logout().await.unwrap();
+    }
+
+    #[ignore = "login flow"]
+    #[tokio::test]
+    async fn test_login() {
+        let start_url = Some("https://amzn.awsapps.com/start".into());
+        let region = Some("us-east-1".into());
+
+        // let start_url = None;
+        // let region = None;
+
+        let secret_store = SecretStore::new().await.unwrap();
+        let res: StartDeviceAuthorizationResponse =
+            start_device_authorization(&secret_store, start_url.clone(), region.clone())
+                .await
+                .unwrap();
+
+        println!("{:?}", res);
+
+        loop {
+            match poll_create_token(
+                &secret_store,
+                res.device_code.clone(),
+                start_url.clone(),
+                region.clone(),
+            )
+            .await
+            {
+                PollCreateToken::Pending => {
+                    tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+                },
+                PollCreateToken::Complete(token) => {
+                    println!("{:?}", token);
+                    break;
+                },
+                PollCreateToken::Error(err) => {
+                    println!("{}", err);
+                    break;
+                },
+            }
+        }
+    }
+
+    #[ignore = "not in ci"]
+    #[tokio::test]
+    async fn test_load() {
+        let secret_store = SecretStore::new().await.unwrap();
+        let token = BuilderIdToken::load(&secret_store, false).await;
+        println!("{:?}", token);
+        // println!("{:?}", token.unwrap().unwrap().access_token.0);
+    }
+
+    #[ignore = "not in ci"]
+    #[tokio::test]
+    async fn test_refresh() {
+        let token = refresh_token().await.unwrap().unwrap();
+        println!("{:?}", token);
+    }
+}
diff --git a/crates/kiro-cli/src/fig_auth/consts.rs b/crates/kiro-cli/src/fig_auth/consts.rs
new file mode 100644
index 0000000000..a55174141b
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/consts.rs
@@ -0,0 +1,25 @@
+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");
+
+/// The scopes requested for OIDC
+///
+/// Do not include `sso:account:access`, these permissions are not needed and were
+/// previously included
+pub(crate) const SCOPES: &[&str] = &[
+    "codewhisperer:completions",
+    "codewhisperer:analysis",
+    "codewhisperer:conversations",
+    // "codewhisperer:taskassist",
+    // "codewhisperer:transformations",
+];
+
+pub(crate) const CLIENT_TYPE: &str = "public";
+
+// The start URL for public builder ID users
+pub const START_URL: &str = "https://view.awsapps.com/start";
+
+pub(crate) const DEVICE_GRANT_TYPE: &str = "urn:ietf:params:oauth:grant-type:device_code";
+pub(crate) const REFRESH_GRANT_TYPE: &str = "refresh_token";
diff --git a/crates/kiro-cli/src/fig_auth/error.rs b/crates/kiro-cli/src/fig_auth/error.rs
new file mode 100644
index 0000000000..8739d33cfa
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/error.rs
@@ -0,0 +1,47 @@
+use aws_sdk_ssooidc::error::SdkError;
+use aws_sdk_ssooidc::operation::create_token::CreateTokenError;
+use aws_sdk_ssooidc::operation::register_client::RegisterClientError;
+use aws_sdk_ssooidc::operation::start_device_authorization::StartDeviceAuthorizationError;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error(transparent)]
+    Ssooidc(#[from] Box<aws_sdk_ssooidc::Error>),
+    #[error(transparent)]
+    SdkRegisterClient(#[from] SdkError<RegisterClientError>),
+    #[error(transparent)]
+    SdkCreateToken(#[from] SdkError<CreateTokenError>),
+    #[error(transparent)]
+    SdkStartDeviceAuthorization(#[from] SdkError<StartDeviceAuthorizationError>),
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[error(transparent)]
+    TimeComponentRange(#[from] time::error::ComponentRange),
+    #[error(transparent)]
+    Directories(#[from] crate::fig_util::directories::DirectoryError),
+    #[error(transparent)]
+    SerdeJson(#[from] serde_json::Error),
+    #[error("Security error: {}", .0)]
+    Security(String),
+    #[error(transparent)]
+    StringFromUtf8(#[from] std::string::FromUtf8Error),
+    #[error(transparent)]
+    StrFromUtf8(#[from] std::str::Utf8Error),
+    #[error(transparent)]
+    DbOpenError(#[from] crate::fig_settings::error::DbOpenError),
+    #[error(transparent)]
+    Setting(#[from] crate::fig_settings::Error),
+    #[error("No token")]
+    NoToken,
+    #[error("OAuth state mismatch. Actual: {} | Expected: {}", .actual, .expected)]
+    OAuthStateMismatch { actual: String, expected: String },
+    #[error("Timeout waiting for authentication to complete")]
+    OAuthTimeout,
+    #[error("No code received on redirect")]
+    OAuthMissingCode,
+    #[error("OAuth error: {0}")]
+    OAuthCustomError(String),
+}
+
+pub(crate) type Result<T, E = Error> = std::result::Result<T, E>;
diff --git a/crates/kiro-cli/src/fig_auth/index.html b/crates/kiro-cli/src/fig_auth/index.html
new file mode 100644
index 0000000000..c68c852af9
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/index.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>AWS Authentication</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <style>
+            html {
+                height: 100%;
+            }
+
+            body {
+                box-sizing: border-box;
+                min-height: 100%;
+                margin: 0;
+                padding: 15px 30px;
+                display: flex;
+                flex-direction: column;
+                font-family: Verdana, Geneva, Tahoma, sans-serif;
+                font-size: 0.9rem;
+                background-color: #f2f3f3;
+                justify-content: center;
+                min-width: 400px;
+            }
+
+            .flex-container {
+                background-color: #ffffff;
+                width: 30%;
+                margin: 0 auto;
+                padding: 2% 2% 1% 2%;
+                max-width: 400px;
+                box-shadow: 0px 1px 1px 1px #8a969a;
+            }
+
+            .request {
+                border-block: 1px solid;
+                border-inline: 1px solid;
+                border-end-end-radius: 3px;
+                border-end-start-radius: 3px;
+                border-start-end-radius: 3px;
+                border-start-start-radius: 3px;
+                margin-top: 5%;
+                padding: 5%;
+                display: flex;
+                flex-direction: row;
+            }
+
+            .request h4 {
+                margin: 1% 1% 1% 0%;
+            }
+
+            .request p {
+                margin-bottom: 0;
+                margin-top: 2%;
+            }
+
+            .approval {
+                background-color: #f2f8f0;
+                border-color: #1d8102;
+            }
+
+            .denial {
+                background-color: #fff7f7;
+                border-color: #d91515;
+            }
+
+            .request-container {
+                width: 100%;
+            }
+
+            .success-icon {
+                color: #1d8102;
+                padding-right: 5px;
+            }
+
+            .denial-icon {
+                color: #d91515;
+                padding-right: 5px;
+            }
+
+            .center-icon {
+                width: 100%;
+                text-align: center;
+            }
+
+            .hidden {
+                display: none;
+                visibility: none;
+            }
+
+            .hint {
+                color: #545b64;
+            }
+
+            .aws-icon {
+                margin-bottom: 50px;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div class="center-wrapper">
+            <div style="font-size: 3rem" class="center-icon aws-icon">
+                <svg
+                    id="Layer_1"
+                    data-name="Layer 1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="6rem"
+                    :height="`${6 * 0.61}rem`"
+                    viewBox="0 0 50 30"
+                >
+                    <path
+                        id="logo-text"
+                        d="M14.09,10.85a4.7,4.7,0,0,0,.19,1.48,7.73,7.73,0,0,0,.54,1.19.77.77,0,0,1,.12.38.64.64,0,0,1-.32.49l-1,.7a.83.83,0,0,1-.44.15.69.69,0,0,1-.49-.23,3.8,3.8,0,0,1-.6-.77q-.25-.42-.51-1a6.14,6.14,0,0,1-4.89,2.3,4.54,4.54,0,0,1-3.32-1.19,4.27,4.27,0,0,1-1.22-3.2A4.28,4.28,0,0,1,3.61,7.75,6.06,6.06,0,0,1,7.69,6.46a12.47,12.47,0,0,1,1.76.13q.92.13,1.91.36V5.73a3.65,3.65,0,0,0-.79-2.66A3.81,3.81,0,0,0,7.86,2.3a7.71,7.71,0,0,0-1.79.22,12.78,12.78,0,0,0-1.79.57,4.55,4.55,0,0,1-.58.22l-.26,0q-.35,0-.35-.52V2a1.09,1.09,0,0,1,.12-.58,1.2,1.2,0,0,1,.47-.35A10.88,10.88,0,0,1,5.77.32,10.19,10.19,0,0,1,8.36,0a6,6,0,0,1,4.35,1.35,5.49,5.49,0,0,1,1.38,4.09ZM7.34,13.38a5.36,5.36,0,0,0,1.72-.31A3.63,3.63,0,0,0,10.63,12,2.62,2.62,0,0,0,11.19,11a5.63,5.63,0,0,0,.16-1.44v-.7a14.35,14.35,0,0,0-1.53-.28,12.37,12.37,0,0,0-1.56-.1,3.84,3.84,0,0,0-2.47.67A2.34,2.34,0,0,0,5,11a2.35,2.35,0,0,0,.61,1.76A2.4,2.4,0,0,0,7.34,13.38Zm13.35,1.8a1,1,0,0,1-.64-.16,1.3,1.3,0,0,1-.35-.65L15.81,1.51a3,3,0,0,1-.15-.67.36.36,0,0,1,.41-.41H17.7a1,1,0,0,1,.65.16,1.4,1.4,0,0,1,.33.65l2.79,11,2.59-11A1.17,1.17,0,0,1,24.39.6a1.1,1.1,0,0,1,.67-.16H26.4a1.1,1.1,0,0,1,.67.16,1.17,1.17,0,0,1,.32.65L30,12.39,32.88,1.25A1.39,1.39,0,0,1,33.22.6a1,1,0,0,1,.65-.16h1.54a.36.36,0,0,1,.41.41,1.36,1.36,0,0,1,0,.26,3.64,3.64,0,0,1-.12.41l-4,12.86a1.3,1.3,0,0,1-.35.65,1,1,0,0,1-.64.16H29.25a1,1,0,0,1-.67-.17,1.26,1.26,0,0,1-.32-.67L25.67,3.64,23.11,14.34a1.26,1.26,0,0,1-.32.67,1,1,0,0,1-.67.17Zm21.36.44a11.28,11.28,0,0,1-2.56-.29,7.44,7.44,0,0,1-1.92-.67,1,1,0,0,1-.61-.93v-.84q0-.52.38-.52a.9.9,0,0,1,.31.06l.42.17a8.77,8.77,0,0,0,1.83.58,9.78,9.78,0,0,0,2,.2,4.48,4.48,0,0,0,2.43-.55,1.76,1.76,0,0,0,.86-1.57,1.61,1.61,0,0,0-.45-1.16A4.29,4.29,0,0,0,43,9.22l-2.41-.76A5.15,5.15,0,0,1,38,6.78a3.94,3.94,0,0,1-.83-2.41,3.7,3.7,0,0,1,.45-1.85,4.47,4.47,0,0,1,1.19-1.37A5.27,5.27,0,0,1,40.51.29,7.4,7.4,0,0,1,42.6,0a8.87,8.87,0,0,1,1.12.07q.57.07,1.08.19t.95.26a4.27,4.27,0,0,1,.7.29,1.59,1.59,0,0,1,.49.41.94.94,0,0,1,.15.55v.79q0,.52-.38.52a1.76,1.76,0,0,1-.64-.2,7.74,7.74,0,0,0-3.2-.64,4.37,4.37,0,0,0-2.21.47,1.6,1.6,0,0,0-.79,1.48,1.58,1.58,0,0,0,.49,1.18,4.94,4.94,0,0,0,1.83.92L44.55,7a5.08,5.08,0,0,1,2.57,1.6A3.76,3.76,0,0,1,47.9,11a4.21,4.21,0,0,1-.44,1.93,4.4,4.4,0,0,1-1.21,1.47,5.43,5.43,0,0,1-1.85.93A8.25,8.25,0,0,1,42.05,15.62Z"
+                    />
+                    <path
+                        fill="#FF9900"
+                        class="cls-1"
+                        d="M45.19,23.81C39.72,27.85,31.78,30,25,30A36.64,36.64,0,0,1,.22,20.57c-.51-.46-.06-1.09.56-.74A49.78,49.78,0,0,0,25.53,26.4,49.23,49.23,0,0,0,44.4,22.53C45.32,22.14,46.1,23.14,45.19,23.81Z"
+                    />
+                    <path
+                        fill="#FF9900"
+                        class="cls-1"
+                        d="M47.47,21.21c-.7-.9-4.63-.42-6.39-.21-.53.06-.62-.4-.14-.74,3.13-2.2,8.27-1.57,8.86-.83s-.16,5.89-3.09,8.35c-.45.38-.88.18-.68-.32C46.69,25.8,48.17,22.11,47.47,21.21Z"
+                    />
+                </svg>
+            </div>
+            <div class="flex-container">
+                <!-- Section for request approval -->
+                <div id="approved-auth">
+                    <div class="request approval">
+                        <span class="pass-icon icon-2x icon icon-vscode-pass success-icon"></span>
+                        <div class="request-container">
+                            <h4>Request approved</h4>
+                            <p id="approvalMessage" class="hint"></p>
+                        </div>
+                    </div>
+                    <p id="footerText" class="hint"></p>
+                </div>
+
+                <!-- Section for request denial -->
+                <div id="denied-auth" class="hidden">
+                    <div class="request denial">
+                        <span class="icon-2x icon icon-vscode-error denial-icon"></span>
+                        <div class="request-container">
+                            <h4>Request denied</h4>
+                            <p id="errorMessage" class="hint"></p>
+                        </div>
+                    </div>
+                    <p class="hint">You can close this window and re-start the authorization flow</p>
+                </div>
+            </div>
+        </div>
+        <script>
+            window.onload = () => {
+                const params = new URLSearchParams(window.location.search)
+
+                const error = params.get('error')
+                if (error) {
+                    showErrorMessage(error)
+                    return
+                }
+
+                const productName = 'Amazon Q for CLI'
+                document.getElementById(
+                    'approvalMessage'
+                ).innerText = `${productName} have been given requested permissions`
+                document.getElementById(
+                    'footerText'
+                ).innerText = `You can close this window and start using ${productName}`
+
+                function showErrorMessage(errorText) {
+                    document.getElementById('approved-auth').classList.add('hidden')
+                    document.getElementById('denied-auth').classList.remove('hidden')
+                    document.getElementById('errorMessage').innerText = errorText
+                }
+            }
+        </script>
+    </body>
+</html>
+
diff --git a/crates/kiro-cli/src/fig_auth/mod.rs b/crates/kiro-cli/src/fig_auth/mod.rs
new file mode 100644
index 0000000000..fd9ee6059b
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/mod.rs
@@ -0,0 +1,16 @@
+pub mod builder_id;
+mod consts;
+mod error;
+pub mod pkce;
+mod scope;
+pub mod secret_store;
+
+pub use builder_id::{
+    builder_id_token,
+    is_logged_in,
+    logout,
+    refresh_token,
+};
+pub use consts::START_URL;
+pub use error::Error;
+pub(crate) use error::Result;
diff --git a/crates/kiro-cli/src/fig_auth/pkce.rs b/crates/kiro-cli/src/fig_auth/pkce.rs
new file mode 100644
index 0000000000..e65546969c
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/pkce.rs
@@ -0,0 +1,627 @@
+//! # OAuth 2.0 Proof Key for Code Exchange
+//!
+//! This module implements the PKCE integration with AWS OIDC according to their
+//! developer guide.
+//!
+//! The benefit of PKCE over device code is to simplify the user experience by not
+//! requiring the user to validate the generated code across the browser and the
+//! device.
+//!
+//! SSO flow (RFC: <https://datatracker.ietf.org/doc/html/rfc7636>)
+//!   1. Register an OIDC client
+//!      - Code: [PkceRegistration::register]
+//!   2. Host a local HTTP server to handle the redirect
+//!      - Code: [PkceRegistration::finish]
+//!   3. Open the [PkceRegistration::url] in the browser, and approve the request.
+//!   4. Exchange the code for access and refresh tokens.
+//!      - This completes the future returned by [PkceRegistration::finish].
+//!
+//! Once access/refresh tokens are received, there is no difference between PKCE
+//! and device code (as already implemented in [crate::builder_id]).
+
+use std::future::Future;
+use std::pin::Pin;
+use std::time::Duration;
+
+pub use aws_sdk_ssooidc::client::Client;
+pub use aws_sdk_ssooidc::operation::create_token::CreateTokenOutput;
+pub use aws_sdk_ssooidc::operation::register_client::RegisterClientOutput;
+pub use aws_types::region::Region;
+use base64::Engine;
+use base64::engine::general_purpose::URL_SAFE;
+use bytes::Bytes;
+use http_body_util::Full;
+use hyper::body::Incoming;
+use hyper::server::conn::http1;
+use hyper::service::Service;
+use hyper::{
+    Request,
+    Response,
+};
+use hyper_util::rt::TokioIo;
+use percent_encoding::{
+    NON_ALPHANUMERIC,
+    utf8_percent_encode,
+};
+use rand::Rng;
+use tokio::net::TcpListener;
+use tracing::{
+    debug,
+    error,
+};
+
+use crate::fig_auth::builder_id::*;
+use crate::fig_auth::consts::*;
+use crate::fig_auth::secret_store::SecretStore;
+use crate::fig_auth::{
+    Error,
+    Result,
+    START_URL,
+};
+
+const DEFAULT_AUTHORIZATION_TIMEOUT: Duration = Duration::from_secs(60 * 3);
+
+/// Starts the PKCE authorization flow, using [`START_URL`] and [`OIDC_BUILDER_ID_REGION`] as the
+/// default issuer URL and region. Returns the [`PkceClient`] to use to finish the flow.
+pub async fn start_pkce_authorization(
+    start_url: Option<String>,
+    region: Option<String>,
+) -> Result<(Client, PkceRegistration)> {
+    let issuer_url = start_url.as_deref().unwrap_or(START_URL);
+    let region = region.clone().map_or(OIDC_BUILDER_ID_REGION, Region::new);
+    let client = client(region.clone());
+    let registration = PkceRegistration::register(&client, region, issuer_url.to_string(), None).await?;
+    Ok((client, registration))
+}
+
+/// Represents a client used for registering with AWS IAM OIDC.
+#[async_trait::async_trait]
+pub trait PkceClient {
+    /// The scopes that the client will request
+    fn scopes() -> Vec<String>;
+
+    async fn register_client(&self, redirect_uri: String, issuer_url: String) -> Result<RegisterClientResponse>;
+
+    async fn create_token(&self, args: CreateTokenArgs) -> Result<CreateTokenResponse>;
+}
+
+#[derive(Debug, Clone)]
+pub struct RegisterClientResponse {
+    pub output: RegisterClientOutput,
+}
+
+impl RegisterClientResponse {
+    pub fn client_id(&self) -> &str {
+        self.output.client_id().unwrap_or_default()
+    }
+
+    pub fn client_secret(&self) -> &str {
+        self.output.client_secret().unwrap_or_default()
+    }
+}
+
+#[derive(Debug)]
+pub struct CreateTokenResponse {
+    pub output: CreateTokenOutput,
+}
+
+#[derive(Debug)]
+pub struct CreateTokenArgs {
+    pub client_id: String,
+    pub client_secret: String,
+    pub redirect_uri: String,
+    pub code_verifier: String,
+    pub code: String,
+}
+
+#[async_trait::async_trait]
+impl PkceClient for Client {
+    fn scopes() -> Vec<String> {
+        SCOPES.iter().map(|s| (*s).to_owned()).collect()
+    }
+
+    async fn register_client(&self, redirect_uri: String, issuer_url: String) -> Result<RegisterClientResponse> {
+        let mut register = self
+            .register_client()
+            .client_name(CLIENT_NAME)
+            .client_type(CLIENT_TYPE)
+            .issuer_url(issuer_url.clone())
+            .redirect_uris(redirect_uri.clone())
+            .grant_types("authorization_code")
+            .grant_types("refresh_token");
+        for scope in Self::scopes() {
+            register = register.scopes(scope);
+        }
+        let output = register.send().await?;
+        Ok(RegisterClientResponse { output })
+    }
+
+    async fn create_token(&self, args: CreateTokenArgs) -> Result<CreateTokenResponse> {
+        let output = self
+            .create_token()
+            .client_id(args.client_id.clone())
+            .client_secret(args.client_secret.clone())
+            .grant_type("authorization_code")
+            .redirect_uri(args.redirect_uri)
+            .code_verifier(args.code_verifier)
+            .code(args.code)
+            .send()
+            .await?;
+        Ok(CreateTokenResponse { output })
+    }
+}
+
+/// Represents an active PKCE registration flow. To execute the flow, you should (in order):
+/// 1. Call [`PkceRegistration::register`] to register an AWS OIDC client and receive the URL to be
+///    opened by the browser.
+/// 2. Call [`PkceRegistration::finish`] to host a local server to handle redirects, and trade the
+///    authorization code for an access token.
+#[derive(Debug)]
+pub struct PkceRegistration {
+    /// URL to be opened by the user's browser.
+    pub url: String,
+    registered_client: RegisterClientResponse,
+    /// Configured URI that the authorization server will redirect the client to.
+    pub redirect_uri: String,
+    code_verifier: String,
+    /// Random value generated for every authentication attempt.
+    ///
+    /// <https://stackoverflow.com/questions/26132066/what-is-the-purpose-of-the-state-parameter-in-oauth-authorization-request>
+    pub state: String,
+    /// Listener for hosting the local HTTP server.
+    listener: TcpListener,
+    region: Region,
+    /// Interchangeable with the "start URL" concept in the device code flow.
+    issuer_url: String,
+    /// Time to wait for [`Self::finish`] to complete. Default is [`DEFAULT_AUTHORIZATION_TIMEOUT`].
+    timeout: Duration,
+}
+
+impl PkceRegistration {
+    pub async fn register(
+        client: &impl PkceClient,
+        region: Region,
+        issuer_url: String,
+        timeout: Option<Duration>,
+    ) -> Result<Self> {
+        let listener = TcpListener::bind("127.0.0.1:0").await?;
+        let redirect_uri = format!("http://{}/oauth/callback", listener.local_addr()?);
+        let code_verifier = generate_code_verifier();
+        let code_challenge = generate_code_challenge(&code_verifier);
+        let state = rand::rng()
+            .sample_iter(rand::distr::Alphanumeric)
+            .take(10)
+            .collect::<Vec<_>>();
+        let state = String::from_utf8(state).unwrap_or("state".to_string());
+
+        let response = client.register_client(redirect_uri.clone(), issuer_url.clone()).await?;
+
+        let query = PkceQueryParams {
+            client_id: response.client_id().to_string(),
+            redirect_uri: redirect_uri.clone(),
+            // Scopes must be space delimited.
+            scopes: SCOPES.join(" "),
+            state: state.clone(),
+            code_challenge: code_challenge.clone(),
+            code_challenge_method: "S256".to_string(),
+        };
+        let url = format!("{}/authorize?{}", oidc_url(&region), query.as_query_params());
+
+        Ok(Self {
+            url,
+            registered_client: response,
+            code_verifier,
+            state,
+            listener,
+            redirect_uri,
+            region,
+            issuer_url,
+            timeout: timeout.unwrap_or(DEFAULT_AUTHORIZATION_TIMEOUT),
+        })
+    }
+
+    /// Hosts a local HTTP server to listen for browser redirects. If a [`SecretStore`] is passed,
+    /// then the access and refresh tokens will be saved.
+    ///
+    /// Only the first connection will be served.
+    pub async fn finish<C: PkceClient>(self, client: &C, secret_store: Option<&SecretStore>) -> Result<()> {
+        let code = tokio::select! {
+            code = Self::recv_code(self.listener, self.state) => {
+                code?
+            },
+            _ = tokio::time::sleep(self.timeout) => {
+                return Err(Error::OAuthTimeout);
+            }
+        };
+
+        let response = client
+            .create_token(CreateTokenArgs {
+                client_id: self.registered_client.client_id().to_string(),
+                client_secret: self.registered_client.client_secret().to_string(),
+                redirect_uri: self.redirect_uri,
+                code_verifier: self.code_verifier,
+                code,
+            })
+            .await?;
+
+        // Tokens are redacted in the log output.
+        debug!(?response, "Received create_token response");
+
+        let token = BuilderIdToken::from_output(
+            response.output,
+            self.region.clone(),
+            Some(self.issuer_url),
+            OAuthFlow::Pkce,
+            Some(C::scopes()),
+        );
+
+        let device_registration = DeviceRegistration::from_output(
+            self.registered_client.output,
+            &self.region,
+            OAuthFlow::Pkce,
+            C::scopes(),
+        );
+
+        let Some(secret_store) = secret_store else {
+            return Ok(());
+        };
+
+        if let Err(err) = device_registration.save(secret_store).await {
+            error!(?err, "Failed to store pkce registration to secret store");
+        }
+
+        if let Err(err) = token.save(secret_store).await {
+            error!(?err, "Failed to store builder id token");
+        };
+
+        Ok(())
+    }
+
+    async fn recv_code(listener: TcpListener, expected_state: String) -> Result<String> {
+        let (code_tx, mut code_rx) = tokio::sync::mpsc::channel::<Result<(String, String)>>(1);
+        let (stream, _) = listener.accept().await?;
+        let stream = TokioIo::new(stream); // Wrapper to implement Hyper IO traits for Tokio types.
+        let host = listener.local_addr()?.to_string();
+        tokio::spawn(async move {
+            if let Err(err) = http1::Builder::new()
+                .serve_connection(stream, PkceHttpService {
+                    code_tx: std::sync::Arc::new(code_tx),
+                    host,
+                })
+                .await
+            {
+                error!(?err, "Error occurred serving the connection");
+            }
+        });
+        match code_rx.recv().await {
+            Some(Ok((code, state))) => {
+                debug!(code = "<redacted>", state, "Received code and state");
+                if state != expected_state {
+                    return Err(Error::OAuthStateMismatch {
+                        actual: state,
+                        expected: expected_state,
+                    });
+                }
+                // Give time for the user to be redirected to index.html.
+                tokio::time::sleep(Duration::from_millis(200)).await;
+                Ok(code)
+            },
+            Some(Err(err)) => {
+                // Give time for the user to be redirected to index.html.
+                tokio::time::sleep(Duration::from_millis(200)).await;
+                Err(err)
+            },
+            None => Err(Error::OAuthMissingCode),
+        }
+    }
+}
+
+type CodeSender = std::sync::Arc<tokio::sync::mpsc::Sender<Result<(String, String)>>>;
+type ServiceError = Error;
+type ServiceResponse = Response<Full<Bytes>>;
+type ServiceFuture = Pin<Box<dyn Future<Output = Result<ServiceResponse, ServiceError>> + Send>>;
+
+#[derive(Debug, Clone)]
+struct PkceHttpService {
+    /// [`tokio::sync::mpsc::Sender`] for a (code, state) pair.
+    code_tx: CodeSender,
+
+    /// The host being served - ie, the hostname and port.
+    /// Used for responding with redirects.
+    host: String,
+}
+
+impl PkceHttpService {
+    /// Handles the browser redirect to `"http://{host}/oauth/callback"` which contains either the
+    /// code and state query params, or an error query param. Redirects to "/index.html".
+    ///
+    /// The [`Request`] doesn't actually contain the host, hence the `host` argument.
+    async fn handle_oauth_callback(
+        code_tx: CodeSender,
+        host: String,
+        req: Request<Incoming>,
+    ) -> Result<ServiceResponse> {
+        let query_params = req
+            .uri()
+            .query()
+            .map(|query| {
+                query
+                    .split('&')
+                    .filter_map(|kv| kv.split_once('='))
+                    .collect::<std::collections::HashMap<_, _>>()
+            })
+            .ok_or(Error::OAuthCustomError("query parameters are missing".into()))?;
+
+        // Error handling: if something goes wrong at the authorization endpoint, the
+        // client will be redirected to the redirect url with "error" and
+        // "error_description" query parameters.
+        if let Some(error) = query_params.get("error") {
+            let error_description = query_params.get("error_description").unwrap_or(&"");
+            let _ = code_tx
+                .send(Err(Error::OAuthCustomError(format!(
+                    "error occurred during authorization: {:?}, {:?}",
+                    error, error_description
+                ))))
+                .await;
+            return Self::redirect_to_index(&host, &format!("?error={}", error));
+        } else {
+            let code = query_params.get("code");
+            let state = query_params.get("state");
+            if let (Some(code), Some(state)) = (code, state) {
+                let _ = code_tx.send(Ok(((*code).to_string(), (*state).to_string()))).await;
+            } else {
+                let _ = code_tx
+                    .send(Err(Error::OAuthCustomError(
+                        "missing code and/or state in the query parameters".into(),
+                    )))
+                    .await;
+                return Self::redirect_to_index(&host, "?error=missing%20required%20query%20parameters");
+            }
+        }
+
+        Self::redirect_to_index(&host, "")
+    }
+
+    fn redirect_to_index(host: &str, query_params: &str) -> Result<ServiceResponse> {
+        Ok(Response::builder()
+            .status(302)
+            .header("Location", format!("http://{}/index.html{}", host, query_params))
+            .body("".into())
+            .expect("is valid builder, should not panic"))
+    }
+}
+
+impl Service<Request<Incoming>> for PkceHttpService {
+    type Error = ServiceError;
+    type Future = ServiceFuture;
+    type Response = ServiceResponse;
+
+    fn call(&self, req: Request<Incoming>) -> Self::Future {
+        let code_tx: CodeSender = std::sync::Arc::clone(&self.code_tx);
+        let host = self.host.clone();
+        Box::pin(async move {
+            debug!(?req, "Handling connection");
+            match req.uri().path() {
+                "/oauth/callback" | "/oauth/callback/" => Self::handle_oauth_callback(code_tx, host, req).await,
+                "/index.html" => Ok(Response::builder()
+                    .status(200)
+                    .header("Content-Type", "text/html")
+                    .header("Connection", "close")
+                    .body(include_str!("./index.html").into())
+                    .expect("valid builder will not panic")),
+                _ => Ok(Response::builder()
+                    .status(404)
+                    .body("".into())
+                    .expect("valid builder will not panic")),
+            }
+        })
+    }
+}
+
+/// Query params for the initial GET request that starts the PKCE flow. Use
+/// [`PkceQueryParams::as_query_params`] to get a URL-safe string.
+#[derive(Debug, Clone, serde::Serialize)]
+struct PkceQueryParams {
+    client_id: String,
+    redirect_uri: String,
+    scopes: String,
+    state: String,
+    code_challenge: String,
+    code_challenge_method: String,
+}
+
+macro_rules! encode {
+    ($expr:expr) => {
+        utf8_percent_encode(&$expr, NON_ALPHANUMERIC)
+    };
+}
+
+impl PkceQueryParams {
+    fn as_query_params(&self) -> String {
+        [
+            "response_type=code".to_string(),
+            format!("client_id={}", encode!(self.client_id)),
+            format!("redirect_uri={}", encode!(self.redirect_uri)),
+            format!("scopes={}", encode!(self.scopes)),
+            format!("state={}", encode!(self.state)),
+            format!("code_challenge={}", encode!(self.code_challenge)),
+            format!("code_challenge_method={}", encode!(self.code_challenge_method)),
+        ]
+        .join("&")
+    }
+}
+
+/// Generates a random 43-octet URL safe string according to the RFC recommendation.
+///
+/// Reference: https://datatracker.ietf.org/doc/html/rfc7636#section-4.1
+fn generate_code_verifier() -> String {
+    URL_SAFE.encode(rand::random::<[u8; 32]>()).replace('=', "")
+}
+
+/// Base64 URL encoded sha256 hash of the code verifier.
+///
+/// Reference: https://datatracker.ietf.org/doc/html/rfc7636#section-4.2
+fn generate_code_challenge(code_verifier: &str) -> String {
+    use sha2::{
+        Digest,
+        Sha256,
+    };
+    let mut hasher = Sha256::new();
+    hasher.update(code_verifier);
+    URL_SAFE.encode(hasher.finalize()).replace('=', "")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::fig_auth::scope::is_scopes;
+
+    #[derive(Debug, Clone)]
+    struct TestPkceClient;
+
+    #[async_trait::async_trait]
+    impl PkceClient for TestPkceClient {
+        fn scopes() -> Vec<String> {
+            vec!["scope:1".to_string(), "scope:2".to_string()]
+        }
+
+        async fn register_client(&self, _: String, _: String) -> Result<RegisterClientResponse> {
+            Ok(RegisterClientResponse {
+                output: RegisterClientOutput::builder()
+                    .client_id("test_client_id")
+                    .client_secret("test_client_secret")
+                    .build(),
+            })
+        }
+
+        async fn create_token(&self, _: CreateTokenArgs) -> Result<CreateTokenResponse> {
+            Ok(CreateTokenResponse {
+                output: CreateTokenOutput::builder().build(),
+            })
+        }
+    }
+
+    #[ignore = "not in ci"]
+    #[tokio::test]
+    async fn test_pkce_flow_e2e() {
+        tracing_subscriber::fmt::init();
+        let start_url = "https://amzn.awsapps.com/start".to_string();
+        let region = Region::new("us-east-1");
+        let client = client(region.clone());
+        let registration = PkceRegistration::register(&client, region.clone(), start_url, None)
+            .await
+            .unwrap();
+        println!("{:?}", registration);
+        if crate::fig_util::open::open_url_async(&registration.url).await.is_err() {
+            panic!("unable to open the URL");
+        }
+        println!("Waiting for authorization to complete...");
+        let secret_store = SecretStore::new().await.unwrap();
+        registration.finish(&client, Some(&secret_store)).await.unwrap();
+        println!("Authorization successful");
+    }
+
+    #[tokio::test]
+    async fn test_pkce_flow_completes_successfully() {
+        // tracing_subscriber::fmt::init();
+        let region = Region::new("us-east-1");
+        let issuer_url = START_URL.into();
+        let client = TestPkceClient {};
+        let registration = PkceRegistration::register(&client, region, issuer_url, None)
+            .await
+            .unwrap();
+
+        let redirect_uri = registration.redirect_uri.clone();
+        let state = registration.state.clone();
+        tokio::spawn(async move {
+            // Let registration.finish be called to handle the request.
+            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+            reqwest::get(format!("{}/?code={}&state={}", redirect_uri, "code", state))
+                .await
+                .unwrap();
+        });
+
+        registration.finish(&client, None).await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn test_pkce_flow_with_state_mismatch_throws_err() {
+        let region = Region::new("us-east-1");
+        let issuer_url = START_URL.into();
+        let client = TestPkceClient {};
+        let registration = PkceRegistration::register(&client, region, issuer_url, None)
+            .await
+            .unwrap();
+
+        let redirect_uri = registration.redirect_uri.clone();
+        tokio::spawn(async move {
+            // Let registration.finish be called to handle the request.
+            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+            reqwest::get(format!("{}/?code={}&state={}", redirect_uri, "code", "not_my_state"))
+                .await
+                .unwrap();
+        });
+
+        assert!(matches!(
+            registration.finish(&client, None).await,
+            Err(Error::OAuthStateMismatch { actual: _, expected: _ })
+        ));
+    }
+
+    #[tokio::test]
+    async fn test_pkce_flow_with_authorization_redirect_error() {
+        let region = Region::new("us-east-1");
+        let issuer_url = START_URL.into();
+        let client = TestPkceClient {};
+        let registration = PkceRegistration::register(&client, region, issuer_url, None)
+            .await
+            .unwrap();
+
+        let redirect_uri = registration.redirect_uri.clone();
+        tokio::spawn(async move {
+            // Let registration.finish be called to handle the request.
+            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+            reqwest::get(format!(
+                "{}/?error={}&error_description={}",
+                redirect_uri, "error code", "something bad happened?"
+            ))
+            .await
+            .unwrap();
+        });
+
+        assert!(matches!(
+            registration.finish(&client, None).await,
+            Err(Error::OAuthCustomError(_))
+        ));
+    }
+
+    #[tokio::test]
+    async fn test_pkce_flow_with_timeout() {
+        let region = Region::new("us-east-1");
+        let issuer_url = START_URL.into();
+        let client = TestPkceClient {};
+        let registration = PkceRegistration::register(&client, region, issuer_url, Some(Duration::from_millis(100)))
+            .await
+            .unwrap();
+
+        assert!(matches!(
+            registration.finish(&client, None).await,
+            Err(Error::OAuthTimeout)
+        ));
+    }
+
+    #[tokio::test]
+    async fn verify_gen_code_challenge() {
+        let code_verifier = generate_code_verifier();
+        println!("{:?}", code_verifier);
+
+        let code_challenge = generate_code_challenge(&code_verifier);
+        println!("{:?}", code_challenge);
+        assert!(code_challenge.len() >= 43);
+    }
+
+    #[test]
+    fn verify_client_scopes() {
+        assert!(is_scopes(&Client::scopes()));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_auth/scope.rs b/crates/kiro-cli/src/fig_auth/scope.rs
new file mode 100644
index 0000000000..1a72a69687
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/scope.rs
@@ -0,0 +1,33 @@
+use crate::fig_auth::consts::SCOPES;
+
+pub fn scopes_match<A: AsRef<str>, B: AsRef<str>>(a: &[A], b: &[B]) -> bool {
+    if a.len() != b.len() {
+        return false;
+    }
+
+    let mut a = a.iter().map(|s| s.as_ref()).collect::<Vec<_>>();
+    let mut b = b.iter().map(|s| s.as_ref()).collect::<Vec<_>>();
+    a.sort();
+    b.sort();
+    a == b
+}
+
+/// Checks if the given scopes match the predefined scopes.
+pub(crate) fn is_scopes<S: AsRef<str>>(scopes: &[S]) -> bool {
+    scopes_match(SCOPES, scopes)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_scopes_match() {
+        assert!(scopes_match(&["a", "b", "c"], &["a", "b", "c"]));
+        assert!(scopes_match(&["a", "b", "c"], &["a", "c", "b"]));
+        assert!(!scopes_match(&["a", "b", "c"], &["a", "b"]));
+        assert!(!scopes_match(&["a", "b"], &["a", "b", "c"]));
+
+        assert!(is_scopes(SCOPES));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_auth/secret_store/linux.rs b/crates/kiro-cli/src/fig_auth/secret_store/linux.rs
new file mode 100644
index 0000000000..28fa153398
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/secret_store/linux.rs
@@ -0,0 +1,27 @@
+use super::Secret;
+use super::sqlite::SqliteSecretStore;
+use crate::Result;
+
+pub struct SecretStoreImpl {
+    inner: SqliteSecretStore,
+}
+
+impl SecretStoreImpl {
+    pub async fn new() -> Result<Self> {
+        Ok(Self {
+            inner: SqliteSecretStore::new().await?,
+        })
+    }
+
+    pub async fn set(&self, key: &str, password: &str) -> Result<()> {
+        self.inner.set(key, password).await
+    }
+
+    pub async fn get(&self, key: &str) -> Result<Option<Secret>> {
+        self.inner.get(key).await
+    }
+
+    pub async fn delete(&self, key: &str) -> Result<()> {
+        self.inner.delete(key).await
+    }
+}
diff --git a/crates/kiro-cli/src/fig_auth/secret_store/macos.rs b/crates/kiro-cli/src/fig_auth/secret_store/macos.rs
new file mode 100644
index 0000000000..5c28fe8386
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/secret_store/macos.rs
@@ -0,0 +1,80 @@
+use super::Secret;
+use crate::fig_auth::{
+    Error,
+    Result,
+};
+
+/// Path to the `security` binary
+const SECURITY_BIN: &str = "/usr/bin/security";
+
+/// The account name is not used.
+const ACCOUNT: &str = "";
+
+pub struct SecretStoreImpl {
+    _private: (),
+}
+
+impl SecretStoreImpl {
+    pub async fn new() -> Result<Self> {
+        Ok(Self { _private: () })
+    }
+
+    /// Sets the `key` to `password` on the keychain, this will override any existing value
+    pub async fn set(&self, key: &str, password: &str) -> Result<()> {
+        let output = tokio::process::Command::new(SECURITY_BIN)
+            .args(["add-generic-password", "-U", "-s", key, "-a", ACCOUNT, "-w", password])
+            .output()
+            .await?;
+
+        if !output.status.success() {
+            let stderr = std::str::from_utf8(&output.stderr)?;
+            return Err(Error::Security(stderr.into()));
+        }
+
+        Ok(())
+    }
+
+    /// Returns the password for the `key`
+    ///
+    /// If not found the result will be `Ok(None)`, other errors will be returned
+    pub async fn get(&self, key: &str) -> Result<Option<Secret>> {
+        let output = tokio::process::Command::new(SECURITY_BIN)
+            .args(["find-generic-password", "-s", key, "-a", ACCOUNT, "-w"])
+            .output()
+            .await?;
+
+        if !output.status.success() {
+            let stderr = std::str::from_utf8(&output.stderr)?;
+            if stderr.contains("could not be found") {
+                return Ok(None);
+            } else {
+                return Err(Error::Security(stderr.into()));
+            }
+        }
+
+        let stdout = std::str::from_utf8(&output.stdout)?;
+
+        // strip newline
+        let stdout = match stdout.strip_suffix('\n') {
+            Some(stdout) => stdout,
+            None => stdout,
+        };
+
+        Ok(Some(stdout.into()))
+    }
+
+    /// Deletes the `key` from the keychain
+    pub async fn delete(&self, key: &str) -> Result<()> {
+        let output = tokio::process::Command::new(SECURITY_BIN)
+            .args(["delete-generic-password", "-s", key, "-a", ACCOUNT])
+            .output()
+            .await?;
+
+        if !output.status.success() {
+            let stderr = std::str::from_utf8(&output.stderr)?;
+            return Err(Error::Security(stderr.into()));
+        }
+
+        Ok(())
+    }
+}
diff --git a/crates/kiro-cli/src/fig_auth/secret_store/mod.rs b/crates/kiro-cli/src/fig_auth/secret_store/mod.rs
new file mode 100644
index 0000000000..480f011395
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/secret_store/mod.rs
@@ -0,0 +1,102 @@
+#[cfg(target_os = "linux")]
+mod linux;
+#[cfg(target_os = "macos")]
+mod macos;
+mod sqlite;
+#[cfg(target_os = "linux")]
+use linux::SecretStoreImpl;
+#[cfg(target_os = "macos")]
+use macos::SecretStoreImpl;
+
+use crate::fig_auth::Result;
+
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
+#[serde(transparent)]
+pub struct Secret(pub String);
+
+impl std::fmt::Debug for Secret {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Secret").finish()
+    }
+}
+
+impl<T> From<T> for Secret
+where
+    T: Into<String>,
+{
+    fn from(value: T) -> Self {
+        Self(value.into())
+    }
+}
+
+pub struct SecretStore {
+    inner: SecretStoreImpl,
+}
+
+impl SecretStore {
+    pub async fn new() -> Result<Self> {
+        SecretStoreImpl::new().await.map(|inner| Self { inner })
+    }
+
+    pub async fn set(&self, key: &str, password: &str) -> Result<()> {
+        self.inner.set(key, password).await
+    }
+
+    pub async fn get(&self, key: &str) -> Result<Option<Secret>> {
+        self.inner.get(key).await
+    }
+
+    pub async fn delete(&self, key: &str) -> Result<()> {
+        self.inner.delete(key).await
+    }
+}
+
+impl std::fmt::Debug for SecretStore {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("SecretStore").finish()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    #[ignore = "not on ci"]
+    async fn test_set_password() {
+        let key = "test_set_password";
+        let store = SecretStore::new().await.unwrap();
+        store.set(key, "test").await.unwrap();
+        assert_eq!(store.get(key).await.unwrap().unwrap().0, "test");
+        store.delete(key).await.unwrap();
+    }
+
+    #[tokio::test]
+    #[ignore = "not on ci"]
+    async fn secret_get_time() {
+        let key = "test_secret_get_time";
+        let store = SecretStore::new().await.unwrap();
+        store.set(key, "1234").await.unwrap();
+
+        let now = std::time::Instant::now();
+        for _ in 0..100 {
+            store.get(key).await.unwrap();
+        }
+
+        println!("duration: {:?}", now.elapsed() / 100);
+
+        store.delete(key).await.unwrap();
+    }
+
+    #[tokio::test]
+    #[ignore = "not on ci"]
+    async fn secret_delete() {
+        let key = "test_secret_delete";
+
+        let store = SecretStore::new().await.unwrap();
+        store.set(key, "1234").await.unwrap();
+        assert_eq!(store.get(key).await.unwrap().unwrap().0, "1234");
+        store.delete(key).await.unwrap();
+        assert_eq!(store.get(key).await.unwrap(), None);
+    }
+}
diff --git a/crates/kiro-cli/src/fig_auth/secret_store/sqlite.rs b/crates/kiro-cli/src/fig_auth/secret_store/sqlite.rs
new file mode 100644
index 0000000000..d42fcdcc08
--- /dev/null
+++ b/crates/kiro-cli/src/fig_auth/secret_store/sqlite.rs
@@ -0,0 +1,50 @@
+#![allow(dead_code)]
+use super::Secret;
+use crate::Result;
+use crate::fig_settings::sqlite::{
+    Db,
+    database,
+};
+
+pub struct SqliteSecretStore {
+    db: &'static Db,
+}
+
+impl SqliteSecretStore {
+    pub async fn new() -> Result<Self> {
+        Ok(Self { db: database()? })
+    }
+
+    pub async fn set(&self, key: &str, password: &str) -> Result<()> {
+        Ok(self.db.set_auth_value(key, password)?)
+    }
+
+    pub async fn get(&self, key: &str) -> Result<Option<Secret>> {
+        Ok(self.db.get_auth_value(key)?.map(Secret))
+    }
+
+    pub async fn delete(&self, key: &str) -> Result<()> {
+        Ok(self.db.unset_auth_value(key)?)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_set_get_delete() {
+        let store = SqliteSecretStore::new().await.unwrap();
+        let key = "test_key";
+        let password = "test_password";
+
+        store.set(key, password).await.unwrap();
+
+        let secret = store.get(key).await.unwrap();
+        assert_eq!(secret, Some(Secret(password.to_string())));
+
+        store.delete(key).await.unwrap();
+        let secret = store.get(key).await.unwrap();
+        assert_eq!(secret, None);
+    }
+}
diff --git a/crates/kiro-cli/src/fig_aws_common/http_client.rs b/crates/kiro-cli/src/fig_aws_common/http_client.rs
new file mode 100644
index 0000000000..57a64f1682
--- /dev/null
+++ b/crates/kiro-cli/src/fig_aws_common/http_client.rs
@@ -0,0 +1,198 @@
+use std::time::Duration;
+
+use aws_smithy_runtime_api::client::http::{
+    HttpClient,
+    HttpConnector,
+    HttpConnectorFuture,
+    HttpConnectorSettings,
+    SharedHttpConnector,
+};
+use aws_smithy_runtime_api::client::result::ConnectorError;
+use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
+use aws_smithy_runtime_api::http::Request;
+use aws_smithy_types::body::SdkBody;
+use reqwest::Client as ReqwestClient;
+
+/// Returns a wrapper around the global [fig_request::client] that implements
+/// [HttpClient].
+pub fn client() -> Client {
+    let client = crate::request::client().expect("failed to create http client");
+    Client::new(client.clone())
+}
+
+/// A wrapper around [reqwest::Client] that implements [HttpClient].
+///
+/// This is required to support using proxy servers with the AWS SDK.
+#[derive(Debug, Clone)]
+pub struct Client {
+    inner: ReqwestClient,
+}
+
+impl Client {
+    pub fn new(client: ReqwestClient) -> Self {
+        Self { inner: client }
+    }
+}
+
+#[derive(Debug)]
+struct CallError {
+    kind: CallErrorKind,
+    message: &'static str,
+    source: Option<Box<dyn std::error::Error + Send + Sync>>,
+}
+
+impl CallError {
+    fn user(message: &'static str) -> Self {
+        Self {
+            kind: CallErrorKind::User,
+            message,
+            source: None,
+        }
+    }
+
+    fn user_with_source<E>(message: &'static str, source: E) -> Self
+    where
+        E: std::error::Error + Send + Sync + 'static,
+    {
+        Self {
+            kind: CallErrorKind::User,
+            message,
+            source: Some(Box::new(source)),
+        }
+    }
+
+    fn timeout<E>(source: E) -> Self
+    where
+        E: std::error::Error + Send + Sync + 'static,
+    {
+        Self {
+            kind: CallErrorKind::Timeout,
+            message: "request timed out",
+            source: Some(Box::new(source)),
+        }
+    }
+
+    fn io<E>(source: E) -> Self
+    where
+        E: std::error::Error + Send + Sync + 'static,
+    {
+        Self {
+            kind: CallErrorKind::Io,
+            message: "an i/o error occurred",
+            source: Some(Box::new(source)),
+        }
+    }
+
+    fn other<E>(message: &'static str, source: E) -> Self
+    where
+        E: std::error::Error + Send + Sync + 'static,
+    {
+        Self {
+            kind: CallErrorKind::Other,
+            message,
+            source: Some(Box::new(source)),
+        }
+    }
+}
+
+impl std::error::Error for CallError {}
+
+impl std::fmt::Display for CallError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.message)?;
+        if let Some(err) = self.source.as_ref() {
+            write!(f, ": {}", err)?;
+        }
+        Ok(())
+    }
+}
+
+impl From<CallError> for ConnectorError {
+    fn from(value: CallError) -> Self {
+        match &value.kind {
+            CallErrorKind::User => Self::user(Box::new(value)),
+            CallErrorKind::Timeout => Self::timeout(Box::new(value)),
+            CallErrorKind::Io => Self::io(Box::new(value)),
+            CallErrorKind::Other => Self::other(Box::new(value), None),
+        }
+    }
+}
+
+impl From<reqwest::Error> for CallError {
+    fn from(err: reqwest::Error) -> Self {
+        if err.is_timeout() {
+            CallError::timeout(err)
+        } else if err.is_connect() {
+            CallError::io(err)
+        } else {
+            CallError::other("an unknown error occurred", err)
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+enum CallErrorKind {
+    User,
+    Timeout,
+    Io,
+    Other,
+}
+
+#[derive(Debug)]
+struct ReqwestConnector {
+    client: ReqwestClient,
+    timeout: Option<Duration>,
+}
+
+impl HttpConnector for ReqwestConnector {
+    fn call(&self, request: Request) -> HttpConnectorFuture {
+        let client = self.client.clone();
+        let timeout = self.timeout;
+
+        HttpConnectorFuture::new(async move {
+            // Convert the aws_smithy_runtime_api request to a reqwest request.
+            // TODO: There surely has to be a better way to convert an aws_smith_runtime_api
+            // Request<SdkBody> to a reqwest Request<Body>.
+            let mut req_builder = client.request(
+                reqwest::Method::from_bytes(request.method().as_bytes())
+                    .map_err(|err| CallError::user_with_source("failed to create method name", err))?,
+                request.uri().to_owned(),
+            );
+            // Copy the header, body, and timeout.
+            let parts = request.into_parts();
+            for (name, value) in parts.headers.iter() {
+                let name = name.to_owned();
+                let value = value.as_bytes().to_owned();
+                req_builder = req_builder.header(name, value);
+            }
+            let body_bytes = parts
+                .body
+                .bytes()
+                .ok_or(CallError::user("streaming request body is not supported"))?
+                .to_owned();
+            req_builder = req_builder.body(body_bytes);
+            if let Some(timeout) = timeout {
+                req_builder = req_builder.timeout(timeout);
+            }
+
+            let reqwest_response = req_builder.send().await.map_err(CallError::from)?;
+
+            // Converts from a reqwest Response into an http::Response<SdkBody>.
+            let (parts, body) = http::Response::from(reqwest_response).into_parts();
+            let http_response = http::Response::from_parts(parts, SdkBody::from_body_1_x(body));
+
+            Ok(aws_smithy_runtime_api::http::Response::try_from(http_response)
+                .map_err(|err| CallError::other("failed to convert to a proper response", err))?)
+        })
+    }
+}
+
+impl HttpClient for Client {
+    fn http_connector(&self, settings: &HttpConnectorSettings, _components: &RuntimeComponents) -> SharedHttpConnector {
+        let connector = ReqwestConnector {
+            client: self.inner.clone(),
+            timeout: settings.read_timeout(),
+        };
+        SharedHttpConnector::new(connector)
+    }
+}
diff --git a/crates/kiro-cli/src/fig_aws_common/mod.rs b/crates/kiro-cli/src/fig_aws_common/mod.rs
new file mode 100644
index 0000000000..b9739f9109
--- /dev/null
+++ b/crates/kiro-cli/src/fig_aws_common/mod.rs
@@ -0,0 +1,36 @@
+pub mod http_client;
+mod sdk_error_display;
+mod user_agent_override_interceptor;
+
+use std::sync::LazyLock;
+
+use aws_smithy_runtime_api::client::behavior_version::BehaviorVersion;
+use aws_types::app_name::AppName;
+pub use sdk_error_display::SdkErrorDisplay;
+pub use user_agent_override_interceptor::UserAgentOverrideInterceptor;
+
+const APP_NAME_STR: &str = "AmazonQ-For-CLI";
+
+pub fn app_name() -> AppName {
+    static APP_NAME: LazyLock<AppName> = LazyLock::new(|| AppName::new(APP_NAME_STR).expect("invalid app name"));
+    APP_NAME.clone()
+}
+
+pub fn behavior_version() -> BehaviorVersion {
+    BehaviorVersion::v2025_01_17()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_app_name() {
+        println!("{}", app_name());
+    }
+
+    #[test]
+    fn test_behavior_version() {
+        assert!(behavior_version() == BehaviorVersion::latest());
+    }
+}
diff --git a/crates/kiro-cli/src/fig_aws_common/sdk_error_display.rs b/crates/kiro-cli/src/fig_aws_common/sdk_error_display.rs
new file mode 100644
index 0000000000..6bd8b544c4
--- /dev/null
+++ b/crates/kiro-cli/src/fig_aws_common/sdk_error_display.rs
@@ -0,0 +1,96 @@
+use std::error::Error;
+use std::fmt::{
+    self,
+    Debug,
+    Display,
+};
+
+use aws_smithy_runtime_api::client::result::SdkError;
+
+#[derive(Debug)]
+pub struct SdkErrorDisplay<'a, E, R>(pub &'a SdkError<E, R>);
+
+impl<E, R> Display for SdkErrorDisplay<'_, E, R>
+where
+    E: Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match &self.0 {
+            SdkError::ConstructionFailure(_) => {
+                write!(f, "failed to construct request")
+            },
+            SdkError::TimeoutError(_) => write!(f, "request has timed out"),
+            SdkError::DispatchFailure(e) => {
+                write!(f, "dispatch failure")?;
+                if let Some(connector_error) = e.as_connector_error() {
+                    if let Some(source) = connector_error.source() {
+                        write!(f, " ({connector_error}): {source}")?;
+                    } else {
+                        write!(f, ": {connector_error}")?;
+                    }
+                }
+                Ok(())
+            },
+            SdkError::ResponseError(_) => write!(f, "response error"),
+            SdkError::ServiceError(e) => {
+                write!(f, "{}", e.err())
+            },
+            other => write!(f, "{other}"),
+        }
+    }
+}
+
+impl<E, R> Error for SdkErrorDisplay<'_, E, R>
+where
+    E: Error + 'static,
+    R: Debug,
+{
+    fn source(&self) -> Option<&(dyn Error + 'static)> {
+        self.0.source()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use aws_smithy_runtime_api::client::result::{
+        ConnectorError,
+        ConstructionFailure,
+        DispatchFailure,
+        ResponseError,
+        SdkError,
+        ServiceError,
+        TimeoutError,
+    };
+
+    use super::SdkErrorDisplay;
+
+    #[test]
+    fn test_displays_sdk_error() {
+        let construction_failure = ConstructionFailure::builder().source("<source>").build();
+        let sdk_error: SdkError<String, String> = SdkError::ConstructionFailure(construction_failure);
+        let sdk_error_display = SdkErrorDisplay(&sdk_error);
+        assert_eq!("failed to construct request", sdk_error_display.to_string());
+
+        let timeout_error = TimeoutError::builder().source("<source>").build();
+        let sdk_error: SdkError<String, String> = SdkError::TimeoutError(timeout_error);
+        let sdk_error_display = SdkErrorDisplay(&sdk_error);
+        assert_eq!("request has timed out", sdk_error_display.to_string());
+
+        let dispatch_failure = DispatchFailure::builder()
+            .source(ConnectorError::io("<source>".into()))
+            .build();
+        let sdk_error: SdkError<String, String> = SdkError::DispatchFailure(dispatch_failure);
+        let sdk_error_display = SdkErrorDisplay(&sdk_error);
+        assert_eq!("dispatch failure (io error): <source>", sdk_error_display.to_string());
+
+        let response_error = ResponseError::builder().source("<source>").raw("<raw>".into()).build();
+        let sdk_error: SdkError<String, String> = SdkError::ResponseError(response_error);
+        let sdk_error_display = SdkErrorDisplay(&sdk_error);
+        assert_eq!("response error", sdk_error_display.to_string());
+
+        let service_error = ServiceError::builder().source("<source>").raw("<raw>".into()).build();
+        let sdk_error: SdkError<String, String> = SdkError::ServiceError(service_error);
+        let sdk_error_display = SdkErrorDisplay(&sdk_error);
+        assert_eq!("<source>", sdk_error_display.to_string());
+    }
+}
diff --git a/crates/kiro-cli/src/fig_aws_common/user_agent_override_interceptor.rs b/crates/kiro-cli/src/fig_aws_common/user_agent_override_interceptor.rs
new file mode 100644
index 0000000000..d53e4960d8
--- /dev/null
+++ b/crates/kiro-cli/src/fig_aws_common/user_agent_override_interceptor.rs
@@ -0,0 +1,227 @@
+use std::borrow::Cow;
+use std::error::Error;
+use std::fmt;
+
+use aws_runtime::user_agent::{
+    AdditionalMetadata,
+    ApiMetadata,
+    AwsUserAgent,
+};
+use aws_smithy_runtime_api::box_error::BoxError;
+use aws_smithy_runtime_api::client::interceptors::Intercept;
+use aws_smithy_runtime_api::client::interceptors::context::BeforeTransmitInterceptorContextMut;
+use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
+use aws_smithy_types::config_bag::ConfigBag;
+use aws_types::app_name::AppName;
+use aws_types::os_shim_internal::Env;
+use http::header::{
+    InvalidHeaderValue,
+    USER_AGENT,
+};
+use tracing::warn;
+
+/// The environment variable name of additional user agent metadata we include in the user agent
+/// string. This is used in AWS CloudShell where they want to track usage by version.
+const AWS_TOOLING_USER_AGENT: &str = "AWS_TOOLING_USER_AGENT";
+
+const VERSION_HEADER: &str = "Version";
+const VERSION_VALUE: &str = env!("CARGO_PKG_VERSION");
+
+#[derive(Debug)]
+enum UserAgentOverrideInterceptorError {
+    MissingApiMetadata,
+    InvalidHeaderValue(InvalidHeaderValue),
+}
+
+impl Error for UserAgentOverrideInterceptorError {
+    fn source(&self) -> Option<&(dyn Error + 'static)> {
+        match self {
+            Self::InvalidHeaderValue(source) => Some(source),
+            Self::MissingApiMetadata => None,
+        }
+    }
+}
+
+impl fmt::Display for UserAgentOverrideInterceptorError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(match self {
+            Self::InvalidHeaderValue(_) => "AwsUserAgent generated an invalid HTTP header value. This is a bug. Please file an issue.",
+            Self::MissingApiMetadata => "The UserAgentInterceptor requires ApiMetadata to be set before the request is made. This is a bug. Please file an issue.",
+        })
+    }
+}
+
+impl From<InvalidHeaderValue> for UserAgentOverrideInterceptorError {
+    fn from(err: InvalidHeaderValue) -> Self {
+        UserAgentOverrideInterceptorError::InvalidHeaderValue(err)
+    }
+}
+/// Generates and attaches the AWS SDK's user agent to a HTTP request
+#[non_exhaustive]
+#[derive(Debug, Default)]
+pub struct UserAgentOverrideInterceptor {
+    env: Env,
+}
+
+impl UserAgentOverrideInterceptor {
+    /// Creates a new `UserAgentInterceptor`
+    pub fn new() -> Self {
+        Self { env: Env::real() }
+    }
+
+    #[cfg(test)]
+    pub fn from_env(env: Env) -> Self {
+        Self { env }
+    }
+}
+
+impl Intercept for UserAgentOverrideInterceptor {
+    fn name(&self) -> &'static str {
+        "UserAgentOverrideInterceptor"
+    }
+
+    fn modify_before_signing(
+        &self,
+        context: &mut BeforeTransmitInterceptorContextMut<'_>,
+        _runtime_components: &RuntimeComponents,
+        cfg: &mut ConfigBag,
+    ) -> Result<(), BoxError> {
+        let env = self.env.clone();
+
+        // Allow for overriding the user agent by an earlier interceptor (so, for example,
+        // tests can use `AwsUserAgent::for_tests()`) by attempting to grab one out of the
+        // config bag before creating one.
+        let ua: Cow<'_, AwsUserAgent> = cfg.load::<AwsUserAgent>().map(Cow::Borrowed).map_or_else(
+            || {
+                let api_metadata = cfg
+                    .load::<ApiMetadata>()
+                    .ok_or(UserAgentOverrideInterceptorError::MissingApiMetadata)?;
+
+                let aws_tooling_user_agent = env.get(AWS_TOOLING_USER_AGENT);
+                let mut ua = AwsUserAgent::new_from_environment(env, api_metadata.clone());
+
+                let ver = format!("{VERSION_HEADER}/{VERSION_VALUE}");
+                match AdditionalMetadata::new(clean_metadata(&ver)) {
+                    Ok(md) => {
+                        ua.add_additional_metadata(md);
+                    },
+                    Err(err) => panic!("Failed to parse version: {err}"),
+                };
+
+                let maybe_app_name = cfg.load::<AppName>();
+                if let Some(app_name) = maybe_app_name {
+                    ua.set_app_name(app_name.clone());
+                }
+                if let Ok(val) = aws_tooling_user_agent {
+                    match AdditionalMetadata::new(clean_metadata(&val)) {
+                        Ok(md) => {
+                            ua.add_additional_metadata(md);
+                        },
+                        Err(err) => warn!(%err, %val, "Failed to parse {AWS_TOOLING_USER_AGENT}"),
+                    };
+                }
+
+                Ok(Cow::Owned(ua))
+            },
+            Result::<_, UserAgentOverrideInterceptorError>::Ok,
+        )?;
+
+        let headers = context.request_mut().headers_mut();
+        headers.insert(USER_AGENT.as_str(), ua.aws_ua_header());
+        Ok(())
+    }
+}
+
+fn clean_metadata(s: &str) -> String {
+    let valid_character = |c: char| -> bool {
+        match c {
+            _ if c.is_ascii_alphanumeric() => true,
+            '!' | '#' | '$' | '%' | '&' | '\'' | '*' | '+' | '-' | '.' | '^' | '_' | '`' | '|' | '~' => true,
+            _ => false,
+        }
+    };
+    s.chars().map(|c| if valid_character(c) { c } else { '-' }).collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use aws_smithy_runtime_api::client::interceptors::context::{
+        Input,
+        InterceptorContext,
+    };
+    use aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder;
+    use aws_smithy_types::config_bag::Layer;
+    use http::HeaderValue;
+
+    use super::*;
+    use crate::fig_aws_common::{
+        APP_NAME_STR,
+        app_name,
+    };
+
+    #[test]
+    fn error_test() {
+        let err = UserAgentOverrideInterceptorError::InvalidHeaderValue(HeaderValue::from_bytes(b"\0").unwrap_err());
+        assert!(err.source().is_some());
+        println!("{err}");
+
+        let err = UserAgentOverrideInterceptorError::MissingApiMetadata;
+        assert!(err.source().is_none());
+        println!("{err}");
+    }
+
+    fn user_agent_base() -> (RuntimeComponents, ConfigBag, InterceptorContext) {
+        let rc = RuntimeComponentsBuilder::for_tests().build().unwrap();
+        let mut cfg = ConfigBag::base();
+
+        let mut layer = Layer::new("layer");
+        layer.store_put(ApiMetadata::new("q", "123"));
+        layer.store_put(app_name());
+        cfg.push_layer(layer);
+
+        let mut context = InterceptorContext::new(Input::erase(()));
+        context.set_request(aws_smithy_runtime_api::http::Request::empty());
+
+        (rc, cfg, context)
+    }
+
+    #[test]
+    fn user_agent_override_test() {
+        let (rc, mut cfg, mut context) = user_agent_base();
+        let mut context = BeforeTransmitInterceptorContextMut::from(&mut context);
+        let interceptor = UserAgentOverrideInterceptor::new();
+        println!("Interceptor: {}", interceptor.name());
+        interceptor
+            .modify_before_signing(&mut context, &rc, &mut cfg)
+            .expect("success");
+
+        let ua = context.request().headers().get(USER_AGENT).unwrap();
+        println!("User-Agent: {ua}");
+        assert!(ua.contains(&format!("app/{APP_NAME_STR}")));
+        assert!(ua.contains(VERSION_HEADER));
+        assert!(ua.contains(VERSION_VALUE));
+    }
+
+    #[test]
+    fn user_agent_override_cloudshell_test() {
+        let (rc, mut cfg, mut context) = user_agent_base();
+        let mut context = BeforeTransmitInterceptorContextMut::from(&mut context);
+        let env = Env::from_slice(&[
+            ("AWS_EXECUTION_ENV", "CloudShell"),
+            (AWS_TOOLING_USER_AGENT, "AWS-CloudShell/2024.08.29"),
+        ]);
+        let interceptor = UserAgentOverrideInterceptor::from_env(env);
+        println!("Interceptor: {}", interceptor.name());
+        interceptor
+            .modify_before_signing(&mut context, &rc, &mut cfg)
+            .expect("success");
+
+        let ua = context.request().headers().get(USER_AGENT).unwrap();
+        println!("User-Agent: {ua}");
+        assert!(ua.contains(&format!("app/{APP_NAME_STR}")));
+        assert!(ua.contains("exec-env/CloudShell"));
+        assert!(ua.contains("md/AWS-CloudShell-2024.08.29"));
+        assert!(ua.contains(VERSION_HEADER));
+        assert!(ua.contains(VERSION_VALUE));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_install.rs b/crates/kiro-cli/src/fig_install.rs
new file mode 100644
index 0000000000..82819bcfac
--- /dev/null
+++ b/crates/kiro-cli/src/fig_install.rs
@@ -0,0 +1,119 @@
+use std::str::FromStr;
+use std::time::SystemTimeError;
+
+use thiserror::Error;
+use tracing::error;
+
+use crate::fig_util::manifest::{
+    Channel,
+    manifest,
+};
+
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[error("unsupported platform")]
+    UnsupportedPlatform,
+    #[error(transparent)]
+    Util(#[from] crate::fig_util::Error),
+    #[error(transparent)]
+    Settings(#[from] crate::fig_settings::Error),
+    #[error(transparent)]
+    Reqwest(#[from] reqwest::Error),
+    #[error(transparent)]
+    Semver(#[from] semver::Error),
+    #[error(transparent)]
+    SystemTime(#[from] SystemTimeError),
+    #[error(transparent)]
+    Strum(#[from] strum::ParseError),
+    #[error("failed to update: `{0}`")]
+    UpdateFailed(String),
+    #[cfg(target_os = "macos")]
+    #[error("failed to update due to auth error: `{0}`")]
+    SecurityFramework(#[from] security_framework::base::Error),
+    #[error("your system is not supported on this channel")]
+    SystemNotOnChannel,
+    #[error("Update in progress")]
+    UpdateInProgress,
+    #[error("could not convert path to cstring")]
+    Nul(#[from] std::ffi::NulError),
+    #[error("failed to get system id")]
+    SystemIdNotFound,
+    #[error("unable to find the bundled metadata")]
+    BundleMetadataNotFound,
+}
+
+use std::path::PathBuf;
+
+use crate::fig_util::{
+    CLI_BINARY_NAME,
+    OLD_CLI_BINARY_NAMES,
+    OLD_PTY_BINARY_NAMES,
+    PTY_BINARY_NAME,
+    directories,
+};
+
+pub async fn uninstall() -> Result<(), Error> {
+    let remove_binary = |path: PathBuf| async move {
+        match tokio::fs::remove_file(&path).await {
+            Ok(_) => tracing::info!("Removed binary: {path:?}"),
+            Err(err) if err.kind() == std::io::ErrorKind::NotFound => {},
+            Err(err) => tracing::warn!(%err, "Failed to remove binary: {path:?}"),
+        }
+    };
+
+    // let folders = [directories::home_local_bin()?, Path::new("/usr/local/bin").into()];
+    let folders = [directories::home_local_bin()?];
+
+    let mut all_binary_names = vec![CLI_BINARY_NAME, PTY_BINARY_NAME];
+    all_binary_names.extend(OLD_CLI_BINARY_NAMES);
+    all_binary_names.extend(OLD_PTY_BINARY_NAMES);
+
+    let mut pty_names = vec![PTY_BINARY_NAME];
+    pty_names.extend(OLD_PTY_BINARY_NAMES);
+
+    for folder in folders {
+        for binary_name in &all_binary_names {
+            let binary_path = folder.join(binary_name);
+            remove_binary(binary_path).await;
+        }
+    }
+
+    Ok(())
+}
+
+fn update() -> Result<(), Error> {
+    // let status = self_update::backends::s3::Update::configure()
+    //     .bucket_name("self_update_releases")
+    //     .asset_prefix("something/self_update")
+    //     .region("eu-west-2")
+    //     .bin_name("self_update_example")
+    //     .show_download_progress(true)
+    //     .current_version(cargo_crate_version!())
+    //     .build()?
+    //     .update()?;
+    // println!("S3 Update status: `{}`!", status.version());
+    todo!();
+}
+
+impl From<crate::fig_util::directories::DirectoryError> for Error {
+    fn from(err: crate::fig_util::directories::DirectoryError) -> Self {
+        crate::fig_util::Error::Directory(err).into()
+    }
+}
+
+// The current selected channel
+pub fn get_channel() -> Result<Channel, Error> {
+    Ok(match crate::fig_settings::state::get_string("updates.channel")? {
+        Some(channel) => Channel::from_str(&channel)?,
+        None => {
+            let manifest_channel = manifest().default_channel;
+            if crate::fig_settings::settings::get_bool_or("app.beta", false) {
+                manifest_channel.max(Channel::Beta)
+            } else {
+                manifest_channel
+            }
+        },
+    })
+}
diff --git a/crates/kiro-cli/src/fig_log.rs b/crates/kiro-cli/src/fig_log.rs
new file mode 100644
index 0000000000..e7051cd6c0
--- /dev/null
+++ b/crates/kiro-cli/src/fig_log.rs
@@ -0,0 +1,313 @@
+use std::fs::File;
+use std::path::Path;
+use std::sync::Mutex;
+
+use thiserror::Error;
+use tracing::info;
+use tracing::level_filters::LevelFilter;
+use tracing_appender::non_blocking::WorkerGuard;
+use tracing_subscriber::filter::Directive;
+use tracing_subscriber::prelude::*;
+use tracing_subscriber::{
+    EnvFilter,
+    Registry,
+    fmt,
+};
+
+use crate::fig_util::env_var::Q_LOG_LEVEL;
+
+const MAX_FILE_SIZE: u64 = 10 * 1024 * 1024;
+const DEFAULT_FILTER: LevelFilter = LevelFilter::ERROR;
+
+static Q_LOG_LEVEL_GLOBAL: Mutex<Option<String>> = Mutex::new(None);
+static MAX_LEVEL: Mutex<Option<LevelFilter>> = Mutex::new(None);
+static ENV_FILTER_RELOADABLE_HANDLE: Mutex<Option<tracing_subscriber::reload::Handle<EnvFilter, Registry>>> =
+    Mutex::new(None);
+
+// A logging error
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[error(transparent)]
+    TracingReload(#[from] tracing_subscriber::reload::Error),
+}
+
+/// Arguments to the initialize_logging function
+#[derive(Debug)]
+pub struct LogArgs<T: AsRef<Path>> {
+    /// The log level to use. When not set, the default log level is used.
+    pub log_level: Option<String>,
+    /// Whether or not we log to stdout.
+    pub log_to_stdout: bool,
+    /// The log file path which we write logs to. When not set, we do not write to a file.
+    pub log_file_path: Option<T>,
+    /// Whether we should delete the log file at each launch.
+    pub delete_old_log_file: bool,
+}
+
+/// The log guard maintains tracing guards which send log information to other threads.
+///
+/// This must be kept alive for logging to function as expected.
+#[must_use]
+#[derive(Debug)]
+pub struct LogGuard {
+    _file_guard: Option<WorkerGuard>,
+    _stdout_guard: Option<WorkerGuard>,
+    _mcp_file_guard: Option<WorkerGuard>,
+}
+
+/// Initialize our application level logging using the given LogArgs.
+///
+/// # Returns
+///
+/// On success, this returns a guard which must be kept alive.
+#[inline]
+pub fn initialize_logging<T: AsRef<Path>>(args: LogArgs<T>) -> Result<LogGuard, Error> {
+    let filter_layer = create_filter_layer();
+    let (reloadable_filter_layer, reloadable_handle) = tracing_subscriber::reload::Layer::new(filter_layer);
+    ENV_FILTER_RELOADABLE_HANDLE.lock().unwrap().replace(reloadable_handle);
+    let mut mcp_path = None;
+
+    // First we construct the file logging layer if a file name was provided.
+    let (file_layer, _file_guard) = match args.log_file_path {
+        Some(log_file_path) => {
+            let log_path = log_file_path.as_ref();
+
+            // Make the log path parent directory if it doesn't exist.
+            if let Some(parent) = log_path.parent() {
+                if log_path.ends_with("chat.log") {
+                    mcp_path = Some(parent.to_path_buf());
+                }
+                std::fs::create_dir_all(parent)?;
+            }
+
+            // We delete the old log file when requested each time the logger is initialized, otherwise we only
+            // delete the file when it has grown too large.
+            if args.delete_old_log_file {
+                std::fs::remove_file(log_path).ok();
+            } else if log_path.exists() && std::fs::metadata(log_path)?.len() > MAX_FILE_SIZE {
+                std::fs::remove_file(log_path)?;
+            }
+
+            // Create the new log file or append to the existing one.
+            let file = if args.delete_old_log_file {
+                File::create(log_path)?
+            } else {
+                File::options().append(true).create(true).open(log_path)?
+            };
+
+            // On posix-like systems, we modify permissions so that only the owner has access.
+            #[cfg(unix)]
+            {
+                use std::os::unix::fs::PermissionsExt;
+                if let Ok(metadata) = file.metadata() {
+                    let mut permissions = metadata.permissions();
+                    permissions.set_mode(0o600);
+                    file.set_permissions(permissions).ok();
+                }
+            }
+
+            let (non_blocking, guard) = tracing_appender::non_blocking(file);
+            let file_layer = fmt::layer().with_line_number(true).with_writer(non_blocking);
+
+            (Some(file_layer), Some(guard))
+        },
+        None => (None, None),
+    };
+
+    // If we log to stdout, we need to add this layer to our logger.
+    let (stdout_layer, _stdout_guard) = if args.log_to_stdout {
+        let (non_blocking, guard) = tracing_appender::non_blocking(std::io::stdout());
+        let stdout_layer = fmt::layer().with_line_number(true).with_writer(non_blocking);
+        (Some(stdout_layer), Some(guard))
+    } else {
+        (None, None)
+    };
+
+    // Set up for mcp servers layer if we are in chat
+    let (mcp_server_layer, _mcp_file_guard) = if let Some(parent) = mcp_path {
+        let mcp_path = parent.join("mcp.log");
+        if args.delete_old_log_file {
+            std::fs::remove_file(&mcp_path).ok();
+        } else if mcp_path.exists() && std::fs::metadata(&mcp_path)?.len() > MAX_FILE_SIZE {
+            std::fs::remove_file(&mcp_path)?;
+        }
+        let file = if args.delete_old_log_file {
+            File::create(&mcp_path)?
+        } else {
+            File::options().append(true).create(true).open(&mcp_path)?
+        };
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            if let Ok(metadata) = file.metadata() {
+                let mut permissions = metadata.permissions();
+                permissions.set_mode(0o600);
+                file.set_permissions(permissions).ok();
+            }
+        }
+        let (non_blocking, guard) = tracing_appender::non_blocking(file);
+        let file_layer = fmt::layer()
+            .with_line_number(true)
+            .with_writer(non_blocking)
+            .with_filter(EnvFilter::new("mcp=trace"));
+        (Some(file_layer), Some(guard))
+    } else {
+        (None, None)
+    };
+
+    if let Some(level) = args.log_level {
+        set_log_level(level)?;
+    }
+
+    // Finally, initialize our logging
+    let subscriber = tracing_subscriber::registry()
+        .with(reloadable_filter_layer)
+        .with(file_layer)
+        .with(stdout_layer);
+
+    if let Some(mcp_server_layer) = mcp_server_layer {
+        subscriber.with(mcp_server_layer).init();
+        return Ok(LogGuard {
+            _file_guard,
+            _stdout_guard,
+            _mcp_file_guard,
+        });
+    }
+
+    subscriber.init();
+
+    Ok(LogGuard {
+        _file_guard,
+        _stdout_guard,
+        _mcp_file_guard,
+    })
+}
+
+/// Get the current log level by first seeing if it is set in application, then environment, then
+/// otherwise using the default
+///
+/// # Returns
+///
+/// Returns a string identifying the current log level.
+pub fn get_log_level() -> String {
+    Q_LOG_LEVEL_GLOBAL
+        .lock()
+        .unwrap()
+        .clone()
+        .unwrap_or_else(|| std::env::var(Q_LOG_LEVEL).unwrap_or_else(|_| DEFAULT_FILTER.to_string()))
+}
+
+/// Set the log level to the given level.
+///
+/// # Returns
+///
+/// On success, returns the old log level.
+pub fn set_log_level(level: String) -> Result<String, Error> {
+    info!("Setting log level to {level:?}");
+
+    let old_level = get_log_level();
+    *Q_LOG_LEVEL_GLOBAL.lock().unwrap() = Some(level);
+
+    let filter_layer = create_filter_layer();
+    *MAX_LEVEL.lock().unwrap() = filter_layer.max_level_hint();
+
+    ENV_FILTER_RELOADABLE_HANDLE
+        .lock()
+        .unwrap()
+        .as_ref()
+        .expect("set_log_level must not be called before logging is initialized")
+        .reload(filter_layer)?;
+
+    Ok(old_level)
+}
+
+/// Get the current max log level
+///
+/// # Returns
+///
+/// The max log level which is set every time the log level is set.
+pub fn get_log_level_max() -> LevelFilter {
+    let max_level = *MAX_LEVEL.lock().unwrap();
+    match max_level {
+        Some(level) => level,
+        None => {
+            let filter_layer = create_filter_layer();
+            *MAX_LEVEL.lock().unwrap() = filter_layer.max_level_hint();
+            filter_layer.max_level_hint().unwrap_or(DEFAULT_FILTER)
+        },
+    }
+}
+
+fn create_filter_layer() -> EnvFilter {
+    let directive = Directive::from(DEFAULT_FILTER);
+
+    let log_level = Q_LOG_LEVEL_GLOBAL
+        .lock()
+        .unwrap()
+        .clone()
+        .or_else(|| std::env::var(Q_LOG_LEVEL).ok());
+
+    match log_level {
+        Some(level) => EnvFilter::builder()
+            .with_default_directive(directive)
+            .parse_lossy(level),
+        None => EnvFilter::default().add_directive(directive),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::fs::read_to_string;
+    use std::time::Duration;
+
+    use tracing::{
+        debug,
+        error,
+        trace,
+        warn,
+    };
+
+    use super::*;
+
+    #[test]
+    fn test_logging() {
+        // Create a temp path for where we write logs to.
+        let tempdir = tempfile::TempDir::new().unwrap();
+        let log_path = tempdir.path().join("test.log");
+
+        // Assert that initialize logging simply doesn't panic.
+        let _guard = initialize_logging(LogArgs {
+            log_level: Some("trace".to_owned()),
+            log_to_stdout: true,
+            log_file_path: Some(&log_path),
+            delete_old_log_file: true,
+        })
+        .unwrap();
+
+        // Test that get log level functions as expected.
+        assert_eq!(get_log_level(), "trace");
+
+        // Write some log messages out to file. (and stderr)
+        trace!("abc");
+        debug!("def");
+        info!("ghi");
+        warn!("jkl");
+        error!("mno");
+
+        // Test that set log level functions as expected.
+        // This also restores the default log level.
+        set_log_level(DEFAULT_FILTER.to_string()).unwrap();
+        assert_eq!(get_log_level(), DEFAULT_FILTER.to_string());
+
+        // Sleep in order to ensure logs get written to file, then assert on the contents
+        std::thread::sleep(Duration::from_millis(100));
+        let logs = read_to_string(&log_path).unwrap();
+        for i in [
+            "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "abc", "def", "ghi", "jkl", "mno",
+        ] {
+            assert!(logs.contains(i));
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_os_shim/env.rs b/crates/kiro-cli/src/fig_os_shim/env.rs
new file mode 100644
index 0000000000..ee705fd07f
--- /dev/null
+++ b/crates/kiro-cli/src/fig_os_shim/env.rs
@@ -0,0 +1,227 @@
+use std::collections::HashMap;
+use std::env::{
+    self,
+    VarError,
+};
+use std::ffi::{
+    OsStr,
+    OsString,
+};
+use std::io;
+use std::path::PathBuf;
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use crate::fig_os_shim::Shim;
+#[derive(Debug, Clone, Default)]
+pub struct Env(inner::Inner);
+
+mod inner {
+    use std::collections::HashMap;
+    use std::path::PathBuf;
+    use std::sync::{
+        Arc,
+        Mutex,
+    };
+
+    #[derive(Debug, Clone, Default)]
+    pub(super) enum Inner {
+        #[default]
+        Real,
+        Fake(Arc<Mutex<Fake>>),
+    }
+
+    #[derive(Debug, Clone)]
+    pub(super) struct Fake {
+        pub vars: HashMap<String, String>,
+        pub cwd: PathBuf,
+        pub current_exe: PathBuf,
+    }
+
+    impl Default for Fake {
+        fn default() -> Self {
+            Self {
+                vars: HashMap::default(),
+                cwd: PathBuf::from("/"),
+                current_exe: PathBuf::from("/current_exe"),
+            }
+        }
+    }
+}
+
+impl Env {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn new_fake() -> Self {
+        Self(inner::Inner::Fake(Arc::new(Mutex::new(inner::Fake::default()))))
+    }
+
+    /// Create a fake process environment from a slice of tuples.
+    pub fn from_slice(vars: &[(&str, &str)]) -> Self {
+        use inner::Inner;
+        let map: HashMap<_, _> = vars.iter().map(|(k, v)| ((*k).to_owned(), (*v).to_owned())).collect();
+        Self(Inner::Fake(Arc::new(Mutex::new(inner::Fake {
+            vars: map,
+            ..Default::default()
+        }))))
+    }
+
+    pub fn get<K: AsRef<str>>(&self, key: K) -> Result<String, VarError> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => env::var(key.as_ref()),
+            Inner::Fake(fake) => fake
+                .lock()
+                .unwrap()
+                .vars
+                .get(key.as_ref())
+                .cloned()
+                .ok_or(VarError::NotPresent),
+        }
+    }
+
+    pub fn get_os<K: AsRef<OsStr>>(&self, key: K) -> Option<OsString> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => env::var_os(key.as_ref()),
+            Inner::Fake(fake) => fake
+                .lock()
+                .unwrap()
+                .vars
+                .get(key.as_ref().to_str()?)
+                .cloned()
+                .map(OsString::from),
+        }
+    }
+
+    /// Sets the environment variable `key` to the value `value` for the currently running
+    /// process.
+    ///
+    /// # Safety
+    ///
+    /// See [std::env::set_var] for the safety requirements.
+    pub unsafe fn set_var(&self, key: impl AsRef<OsStr>, value: impl AsRef<OsStr>) {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => std::env::set_var(key, value),
+            Inner::Fake(fake) => {
+                fake.lock().unwrap().vars.insert(
+                    key.as_ref().to_str().expect("key must be valid str").to_string(),
+                    value.as_ref().to_str().expect("key must be valid str").to_string(),
+                );
+            },
+        }
+    }
+
+    pub fn home(&self) -> Option<PathBuf> {
+        match &self.0 {
+            inner::Inner::Real => dirs::home_dir(),
+            inner::Inner::Fake(fake) => fake.lock().unwrap().vars.get("HOME").map(PathBuf::from),
+        }
+    }
+
+    pub fn current_dir(&self) -> Result<PathBuf, io::Error> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => std::env::current_dir(),
+            Inner::Fake(fake) => Ok(fake.lock().unwrap().cwd.clone()),
+        }
+    }
+
+    pub fn current_exe(&self) -> Result<PathBuf, io::Error> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => std::env::current_exe(),
+            Inner::Fake(fake) => Ok(fake.lock().unwrap().current_exe.clone()),
+        }
+    }
+
+    pub fn in_cloudshell(&self) -> bool {
+        self.get("AWS_EXECUTION_ENV")
+            .is_ok_and(|v| v.trim().eq_ignore_ascii_case("cloudshell"))
+    }
+
+    pub fn in_ssh(&self) -> bool {
+        self.get("SSH_CLIENT").is_ok() || self.get("SSH_CONNECTION").is_ok() || self.get("SSH_TTY").is_ok()
+    }
+
+    pub fn in_codespaces(&self) -> bool {
+        self.get_os("CODESPACES").is_some() || self.get_os("Q_CODESPACES").is_some()
+    }
+
+    pub fn in_ci(&self) -> bool {
+        self.get_os("CI").is_some() || self.get_os("Q_CI").is_some()
+    }
+
+    /// Whether or not the current executable is run from an AppImage.
+    ///
+    /// See: https://docs.appimage.org/packaging-guide/environment-variables.html
+    pub fn in_appimage(&self) -> bool {
+        self.get_os("APPIMAGE").is_some()
+    }
+}
+
+impl Shim for Env {
+    fn is_real(&self) -> bool {
+        matches!(self.0, inner::Inner::Real)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use super::*;
+
+    #[test]
+    fn test_new() {
+        let env = Env::new();
+        assert!(matches!(env, Env(inner::Inner::Real)));
+
+        let env = Env::default();
+        assert!(matches!(env, Env(inner::Inner::Real)));
+    }
+
+    #[test]
+    fn test_get() {
+        let env = Env::new();
+        assert!(env.home().is_some());
+        assert!(env.get("PATH").is_ok());
+        assert!(env.get_os("PATH").is_some());
+        assert!(env.get("NON_EXISTENT").is_err());
+
+        let env = Env::from_slice(&[("HOME", "/home/user"), ("PATH", "/bin:/usr/bin")]);
+        assert_eq!(env.home().unwrap(), Path::new("/home/user"));
+        assert_eq!(env.get("PATH").unwrap(), "/bin:/usr/bin");
+        assert!(env.get_os("PATH").is_some());
+        assert!(env.get("NON_EXISTENT").is_err());
+    }
+
+    #[test]
+    fn test_in_envs() {
+        let env = Env::from_slice(&[]);
+        assert!(!env.in_cloudshell());
+        assert!(!env.in_ssh());
+
+        let env = Env::from_slice(&[("AWS_EXECUTION_ENV", "CloudShell"), ("SSH_CLIENT", "1")]);
+        assert!(env.in_cloudshell());
+        assert!(env.in_ssh());
+
+        let env = Env::from_slice(&[("AWS_EXECUTION_ENV", "CLOUDSHELL\n")]);
+        assert!(env.in_cloudshell());
+        assert!(!env.in_ssh());
+
+        let env = Env::from_slice(&[("APPIMAGE", "/tmp/.mount-asdf/usr")]);
+        assert!(env.in_appimage());
+    }
+
+    #[test]
+    fn test_default_current_dir() {
+        let env = Env::new_fake();
+        assert_eq!(env.current_dir().unwrap(), PathBuf::from("/"));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_os_shim/fs.rs b/crates/kiro-cli/src/fig_os_shim/fs.rs
new file mode 100644
index 0000000000..64e27dbe4c
--- /dev/null
+++ b/crates/kiro-cli/src/fig_os_shim/fs.rs
@@ -0,0 +1,611 @@
+use std::collections::HashMap;
+use std::fs::Permissions;
+use std::io;
+use std::os::unix::ffi::OsStrExt;
+use std::path::{
+    Path,
+    PathBuf,
+};
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use tempfile::TempDir;
+use tokio::fs;
+
+use crate::fig_os_shim::Shim;
+
+#[derive(Debug, Clone, Default)]
+pub struct Fs(inner::Inner);
+
+mod inner {
+    use std::collections::HashMap;
+    use std::path::PathBuf;
+    use std::sync::{
+        Arc,
+        Mutex,
+    };
+
+    use tempfile::TempDir;
+
+    #[derive(Debug, Clone, Default)]
+    pub(super) enum Inner {
+        #[default]
+        Real,
+        /// Uses the real filesystem except acts as if the process has
+        /// a different root directory by using [TempDir]
+        Chroot(Arc<TempDir>),
+        Fake(Arc<Mutex<HashMap<PathBuf, Vec<u8>>>>),
+    }
+}
+
+impl Fs {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn new_fake() -> Self {
+        Self(inner::Inner::Fake(Arc::new(Mutex::new(HashMap::new()))))
+    }
+
+    pub fn new_chroot() -> Self {
+        let tempdir = tempfile::tempdir().expect("failed creating temporary directory");
+        Self(inner::Inner::Chroot(tempdir.into()))
+    }
+
+    pub fn is_chroot(&self) -> bool {
+        matches!(self.0, inner::Inner::Chroot(_))
+    }
+
+    pub fn from_slice(vars: &[(&str, &str)]) -> Self {
+        use inner::Inner;
+        let map: HashMap<_, _> = vars
+            .iter()
+            .map(|(k, v)| (PathBuf::from(k), v.as_bytes().to_vec()))
+            .collect();
+        Self(Inner::Fake(Arc::new(Mutex::new(map))))
+    }
+
+    pub async fn create_new(&self, path: impl AsRef<Path>) -> io::Result<fs::File> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::File::create_new(path).await,
+            Inner::Chroot(root) => fs::File::create_new(append(root.path(), path)).await,
+            Inner::Fake(_) => Err(io::Error::new(io::ErrorKind::Other, "unimplemented")),
+        }
+    }
+
+    pub async fn create_dir(&self, path: impl AsRef<Path>) -> io::Result<()> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::create_dir(path).await,
+            Inner::Chroot(root) => fs::create_dir(append(root.path(), path)).await,
+            Inner::Fake(_) => Err(io::Error::new(io::ErrorKind::Other, "unimplemented")),
+        }
+    }
+
+    pub async fn create_dir_all(&self, path: impl AsRef<Path>) -> io::Result<()> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::create_dir_all(path).await,
+            Inner::Chroot(root) => fs::create_dir_all(append(root.path(), path)).await,
+            Inner::Fake(_) => Err(io::Error::new(io::ErrorKind::Other, "unimplemented")),
+        }
+    }
+
+    /// Attempts to open a file in read-only mode.
+    ///
+    /// This is a proxy to [`tokio::fs::File::open`].
+    pub async fn open(&self, path: impl AsRef<Path>) -> io::Result<fs::File> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::File::open(path).await,
+            Inner::Chroot(root) => fs::File::open(append(root.path(), path)).await,
+            Inner::Fake(_) => Err(io::Error::new(io::ErrorKind::Other, "unimplemented")),
+        }
+    }
+
+    pub async fn read(&self, path: impl AsRef<Path>) -> io::Result<Vec<u8>> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::read(path).await,
+            Inner::Chroot(root) => fs::read(append(root.path(), path)).await,
+            Inner::Fake(map) => {
+                let Ok(lock) = map.lock() else {
+                    return Err(io::Error::new(io::ErrorKind::Other, "poisoned lock"));
+                };
+                let Some(data) = lock.get(path.as_ref()) else {
+                    return Err(io::Error::new(io::ErrorKind::NotFound, "not found"));
+                };
+                Ok(data.clone())
+            },
+        }
+    }
+
+    pub async fn read_to_string(&self, path: impl AsRef<Path>) -> io::Result<String> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::read_to_string(path).await,
+            Inner::Chroot(root) => fs::read_to_string(append(root.path(), path)).await,
+            Inner::Fake(map) => {
+                let Ok(lock) = map.lock() else {
+                    return Err(io::Error::new(io::ErrorKind::Other, "poisoned lock"));
+                };
+                let Some(data) = lock.get(path.as_ref()) else {
+                    return Err(io::Error::new(io::ErrorKind::NotFound, "not found"));
+                };
+                match String::from_utf8(data.clone()) {
+                    Ok(string) => Ok(string),
+                    Err(err) => Err(io::Error::new(io::ErrorKind::InvalidData, err)),
+                }
+            },
+        }
+    }
+
+    pub fn read_to_string_sync(&self, path: impl AsRef<Path>) -> io::Result<String> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => std::fs::read_to_string(path),
+            Inner::Chroot(root) => std::fs::read_to_string(append(root.path(), path)),
+            Inner::Fake(map) => {
+                let Ok(lock) = map.lock() else {
+                    return Err(io::Error::new(io::ErrorKind::Other, "poisoned lock"));
+                };
+                let Some(data) = lock.get(path.as_ref()) else {
+                    return Err(io::Error::new(io::ErrorKind::NotFound, "not found"));
+                };
+                match String::from_utf8(data.clone()) {
+                    Ok(string) => Ok(string),
+                    Err(err) => Err(io::Error::new(io::ErrorKind::InvalidData, err)),
+                }
+            },
+        }
+    }
+
+    /// Creates a future that will open a file for writing and write the entire
+    /// contents of `contents` to it.
+    ///
+    /// This is a proxy to [`tokio::fs::write`].
+    pub async fn write(&self, path: impl AsRef<Path>, contents: impl AsRef<[u8]>) -> io::Result<()> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::write(path, contents).await,
+            Inner::Chroot(root) => fs::write(append(root.path(), path), contents).await,
+            Inner::Fake(map) => {
+                let Ok(mut lock) = map.lock() else {
+                    return Err(io::Error::new(io::ErrorKind::Other, "poisoned lock"));
+                };
+                lock.insert(path.as_ref().to_owned(), contents.as_ref().to_owned());
+                Ok(())
+            },
+        }
+    }
+
+    /// Removes a file from the filesystem.
+    ///
+    /// Note that there is no guarantee that the file is immediately deleted (e.g.
+    /// depending on platform, other open file descriptors may prevent immediate
+    /// removal).
+    ///
+    /// This is a proxy to [`tokio::fs::remove_file`].
+    pub async fn remove_file(&self, path: impl AsRef<Path>) -> io::Result<()> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::remove_file(path).await,
+            Inner::Chroot(root) => fs::remove_file(append(root.path(), path)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Removes a directory at this path, after removing all its contents. Use carefully!
+    ///
+    /// This is a proxy to [`tokio::fs::remove_dir_all`].
+    pub async fn remove_dir_all(&self, path: impl AsRef<Path>) -> io::Result<()> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::remove_dir_all(path).await,
+            Inner::Chroot(root) => fs::remove_dir_all(append(root.path(), path)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Renames a file or directory to a new name, replacing the original file if
+    /// `to` already exists.
+    ///
+    /// This will not work if the new name is on a different mount point.
+    ///
+    /// This is a proxy to [`tokio::fs::rename`].
+    pub async fn rename(&self, from: impl AsRef<Path>, to: impl AsRef<Path>) -> io::Result<()> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::rename(from, to).await,
+            Inner::Chroot(root) => fs::rename(append(root.path(), from), append(root.path(), to)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Copies the contents of one file to another. This function will also copy the permission bits
+    /// of the original file to the destination file.
+    /// This function will overwrite the contents of to.
+    ///
+    /// This is a proxy to [`tokio::fs::copy`].
+    pub async fn copy(&self, from: impl AsRef<Path>, to: impl AsRef<Path>) -> io::Result<u64> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::copy(from, to).await,
+            Inner::Chroot(root) => fs::copy(append(root.path(), from), append(root.path(), to)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Returns `Ok(true)` if the path points at an existing entity.
+    ///
+    /// This function will traverse symbolic links to query information about the
+    /// destination file. In case of broken symbolic links this will return `Ok(false)`.
+    ///
+    /// This is a proxy to [`tokio::fs::try_exists`].
+    pub async fn try_exists(&self, path: impl AsRef<Path>) -> Result<bool, io::Error> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::try_exists(path).await,
+            Inner::Chroot(root) => fs::try_exists(append(root.path(), path)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Returns `true` if the path points at an existing entity.
+    ///
+    /// This is a proxy to [std::path::Path::exists]. See the related doc comment in std
+    /// on the pitfalls of using this versus [std::path::Path::try_exists].
+    pub fn exists(&self, path: impl AsRef<Path>) -> bool {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => path.as_ref().exists(),
+            Inner::Chroot(root) => append(root.path(), path).exists(),
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Returns `true` if the path points at an existing entity without following symlinks.
+    ///
+    /// This does *not* guarantee that the path doesn't point to a symlink. For example, `false`
+    /// will be returned if the user doesn't have permission to perform a metadata operation on
+    /// `path`.
+    pub async fn symlink_exists(&self, path: impl AsRef<Path>) -> bool {
+        match self.symlink_metadata(path).await {
+            Ok(_) => true,
+            Err(err) if err.kind() != std::io::ErrorKind::NotFound => true,
+            Err(_) => false,
+        }
+    }
+
+    pub async fn create_tempdir(&self) -> io::Result<TempDir> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => TempDir::new(),
+            Inner::Chroot(root) => TempDir::new_in(root.path()),
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Creates a new symbolic link on the filesystem.
+    ///
+    /// The `link` path will be a symbolic link pointing to the `original` path.
+    ///
+    /// This is a proxy to [`tokio::fs::symlink`].
+    #[cfg(unix)]
+    pub async fn symlink(&self, original: impl AsRef<Path>, link: impl AsRef<Path>) -> io::Result<()> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::symlink(original, link).await,
+            Inner::Chroot(root) => fs::symlink(append(root.path(), original), append(root.path(), link)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Creates a new symbolic link on the filesystem.
+    ///
+    /// The `link` path will be a symbolic link pointing to the `original` path.
+    ///
+    /// This is a proxy to [`std::os::unix::fs::symlink`].
+    #[cfg(unix)]
+    pub fn symlink_sync(&self, original: impl AsRef<Path>, link: impl AsRef<Path>) -> io::Result<()> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => std::os::unix::fs::symlink(original, link),
+            Inner::Chroot(root) => std::os::unix::fs::symlink(append(root.path(), original), append(root.path(), link)),
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Query the metadata about a file without following symlinks.
+    ///
+    /// This is a proxy to [`tokio::fs::symlink_metadata`]
+    ///
+    /// # Errors
+    ///
+    /// This function will return an error in the following situations, but is not
+    /// limited to just these cases:
+    ///
+    /// * The user lacks permissions to perform `metadata` call on `path`.
+    /// * `path` does not exist.
+    #[cfg(unix)]
+    pub async fn symlink_metadata(&self, path: impl AsRef<Path>) -> io::Result<std::fs::Metadata> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::symlink_metadata(path).await,
+            Inner::Chroot(root) => fs::symlink_metadata(append(root.path(), path)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Reads a symbolic link, returning the file that the link points to.
+    ///
+    /// This is a proxy to [`tokio::fs::read_link`].
+    pub async fn read_link(&self, path: impl AsRef<Path>) -> io::Result<PathBuf> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::read_link(path).await,
+            Inner::Chroot(root) => Ok(append(root.path(), fs::read_link(append(root.path(), path)).await?)),
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Returns a stream over the entries within a directory.
+    ///
+    /// This is a proxy to [`tokio::fs::read_dir`].
+    pub async fn read_dir(&self, path: impl AsRef<Path>) -> Result<fs::ReadDir, io::Error> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::read_dir(path).await,
+            Inner::Chroot(root) => fs::read_dir(append(root.path(), path)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Returns the canonical, absolute form of a path with all intermediate
+    /// components normalized and symbolic links resolved.
+    ///
+    /// This is a proxy to [`tokio::fs::canonicalize`].
+    pub async fn canonicalize(&self, path: impl AsRef<Path>) -> Result<PathBuf, io::Error> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::canonicalize(path).await,
+            Inner::Chroot(root) => fs::canonicalize(append(root.path(), path)).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// Changes the permissions found on a file or a directory.
+    ///
+    /// This is a proxy to [`tokio::fs::set_permissions`]
+    pub async fn set_permissions(&self, path: impl AsRef<Path>, perm: Permissions) -> Result<(), io::Error> {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => fs::set_permissions(path, perm).await,
+            Inner::Chroot(root) => fs::set_permissions(append(root.path(), path), perm).await,
+            Inner::Fake(_) => panic!("unimplemented"),
+        }
+    }
+
+    /// For test [Fs]'s that use a different root, returns an absolute path.
+    ///
+    /// This must be used for any paths indirectly used by code using a chroot
+    /// [Fs].
+    pub fn chroot_path(&self, path: impl AsRef<Path>) -> PathBuf {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Chroot(root) => append(root.path(), path),
+            _ => path.as_ref().to_path_buf(),
+        }
+    }
+
+    /// See [Fs::chroot_path].
+    pub fn chroot_path_str(&self, path: impl AsRef<Path>) -> String {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Chroot(root) => append(root.path(), path).to_string_lossy().to_string(),
+            _ => path.as_ref().to_path_buf().to_string_lossy().to_string(),
+        }
+    }
+}
+
+impl Shim for Fs {
+    fn is_real(&self) -> bool {
+        matches!(self.0, inner::Inner::Real)
+    }
+}
+
+/// Performs `a.join(b)`, except:
+/// - if `b` is an absolute path, then the resulting path will equal `/a/b`
+/// - if the prefix of `b` contains some `n` copies of a, then the resulting path will equal `/a/b`
+fn append(a: impl AsRef<Path>, b: impl AsRef<Path>) -> PathBuf {
+    use std::ffi::OsString;
+    use std::os::unix::ffi::OsStringExt;
+
+    // Have to use byte slices since rust seems to always append
+    // a forward slash at the end of a path...
+    let a = a.as_ref().as_os_str().as_bytes();
+    let mut b = b.as_ref().as_os_str().as_bytes();
+    while b.starts_with(a) {
+        b = b.strip_prefix(a).unwrap();
+    }
+    while b.starts_with(b"/") {
+        b = b.strip_prefix(b"/").unwrap();
+    }
+    PathBuf::from(OsString::from_vec(a.to_vec())).join(PathBuf::from(OsString::from_vec(b.to_vec())))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn default_impl_is_real() {
+        let fs = Fs::default();
+        assert!(matches!(fs.0, inner::Inner::Real));
+    }
+
+    #[tokio::test]
+    async fn test_fake() {
+        let dir = PathBuf::from("/dir");
+        let fs = Fs::from_slice(&[("/test", "test")]);
+
+        fs.create_dir(dir.join("create_dir")).await.unwrap_err();
+        fs.create_dir_all(dir.join("create/dir/all")).await.unwrap_err();
+        fs.write(dir.join("write"), b"write").await.unwrap();
+        assert_eq!(fs.read(dir.join("write")).await.unwrap(), b"write");
+        assert_eq!(fs.read_to_string(dir.join("write")).await.unwrap(), "write");
+    }
+
+    #[tokio::test]
+    async fn test_real() {
+        let dir = tempfile::tempdir().unwrap();
+        let fs = Fs::new();
+
+        fs.create_dir(dir.path().join("create_dir")).await.unwrap();
+        fs.create_dir_all(dir.path().join("create/dir/all")).await.unwrap();
+        fs.write(dir.path().join("write"), b"write").await.unwrap();
+        assert_eq!(fs.read(dir.path().join("write")).await.unwrap(), b"write");
+        assert_eq!(fs.read_to_string(dir.path().join("write")).await.unwrap(), "write");
+    }
+
+    #[test]
+    fn test_append() {
+        macro_rules! assert_append {
+            ($a:expr, $b:expr, $expected:expr) => {
+                assert_eq!(append($a, $b), PathBuf::from($expected));
+            };
+        }
+        assert_append!("/abc/test", "/test", "/abc/test/test");
+        assert_append!("/tmp/.dir", "/tmp/.dir/home/myuser", "/tmp/.dir/home/myuser");
+        assert_append!("/tmp/.dir", "/tmp/hello", "/tmp/.dir/tmp/hello");
+        assert_append!("/tmp/.dir", "/tmp/.dir/tmp/.dir/home/user", "/tmp/.dir/home/user");
+    }
+
+    #[tokio::test]
+    async fn test_read_to_string() {
+        let fs = Fs::new_fake();
+        fs.write("fake", "contents").await.unwrap();
+        fs.write("invalid_utf8", &[255]).await.unwrap();
+
+        // async tests
+        assert_eq!(
+            fs.read_to_string("fake").await.unwrap(),
+            "contents",
+            "should read fake file"
+        );
+        assert!(
+            fs.read_to_string("unknown")
+                .await
+                .is_err_and(|err| err.kind() == io::ErrorKind::NotFound),
+            "unknown path should return NotFound"
+        );
+        assert!(
+            fs.read_to_string("invalid_utf8")
+                .await
+                .is_err_and(|err| err.kind() == io::ErrorKind::InvalidData),
+            "invalid utf8 should return InvalidData"
+        );
+
+        // sync tests
+        assert_eq!(
+            fs.read_to_string_sync("fake").unwrap(),
+            "contents",
+            "should read fake file"
+        );
+        assert!(
+            fs.read_to_string_sync("unknown")
+                .is_err_and(|err| err.kind() == io::ErrorKind::NotFound),
+            "unknown path should return NotFound"
+        );
+        assert!(
+            fs.read_to_string_sync("invalid_utf8")
+                .is_err_and(|err| err.kind() == io::ErrorKind::InvalidData),
+            "invalid utf8 should return InvalidData"
+        );
+    }
+
+    #[tokio::test]
+    #[cfg(unix)]
+    async fn test_chroot_file_operations_for_unix() {
+        if nix::unistd::Uid::effective().is_root() {
+            println!("currently running as root, skipping.");
+            return;
+        }
+
+        let fs = Fs::new_chroot();
+        assert!(fs.is_chroot());
+
+        fs.write("/fake", "contents").await.unwrap();
+        assert_eq!(fs.read_to_string("/fake").await.unwrap(), "contents");
+        assert_eq!(fs.read_to_string_sync("/fake").unwrap(), "contents");
+
+        assert!(!fs.try_exists("/etc").await.unwrap());
+
+        fs.create_dir_all("/etc/b/c").await.unwrap();
+        assert!(fs.try_exists("/etc").await.unwrap());
+        let mut read_dir = fs.read_dir("/etc").await.unwrap();
+        let e = read_dir.next_entry().await.unwrap();
+        assert!(e.unwrap().metadata().await.unwrap().is_dir());
+        assert!(read_dir.next_entry().await.unwrap().is_none());
+
+        fs.remove_dir_all("/etc").await.unwrap();
+        assert!(!fs.try_exists("/etc").await.unwrap());
+
+        fs.copy("/fake", "/fake_copy").await.unwrap();
+        assert_eq!(fs.read_to_string("/fake_copy").await.unwrap(), "contents");
+        assert_eq!(fs.read_to_string_sync("/fake_copy").unwrap(), "contents");
+
+        fs.remove_file("/fake_copy").await.unwrap();
+        assert!(!fs.try_exists("/fake_copy").await.unwrap());
+
+        fs.symlink("/fake", "/fake_symlink").await.unwrap();
+        fs.symlink_sync("/fake", "/fake_symlink_sync").unwrap();
+        assert_eq!(fs.read_to_string("/fake_symlink").await.unwrap(), "contents");
+        assert_eq!(
+            fs.read_to_string(fs.read_link("/fake_symlink").await.unwrap())
+                .await
+                .unwrap(),
+            "contents"
+        );
+        assert_eq!(fs.read_to_string("/fake_symlink_sync").await.unwrap(), "contents");
+        assert_eq!(fs.read_to_string_sync("/fake_symlink").unwrap(), "contents");
+
+        // Checking symlink exist
+        assert!(fs.symlink_exists("/fake_symlink").await);
+        assert!(fs.exists("/fake_symlink"));
+        fs.remove_file("/fake").await.unwrap();
+        assert!(fs.symlink_exists("/fake_symlink").await);
+        assert!(!fs.exists("/fake_symlink"));
+
+        // Checking rename
+        fs.write("/rename_1", "abc").await.unwrap();
+        fs.write("/rename_2", "123").await.unwrap();
+        fs.rename("/rename_2", "/rename_1").await.unwrap();
+        assert_eq!(fs.read_to_string("/rename_1").await.unwrap(), "123");
+
+        // Checking open
+        assert!(fs.open("/does_not_exist").await.is_err());
+        assert!(fs.open("/rename_1").await.is_ok());
+    }
+
+    #[tokio::test]
+    async fn test_chroot_tempdir() {
+        let fs = Fs::new_chroot();
+        let tempdir = fs.create_tempdir().await.unwrap();
+        if let Fs(inner::Inner::Chroot(root)) = fs {
+            assert_eq!(tempdir.path().parent().unwrap(), root.path());
+        } else {
+            panic!("tempdir should be created under root");
+        }
+    }
+
+    #[tokio::test]
+    async fn test_create_new() {
+        let fs = Fs::new_chroot();
+        fs.create_new("my_file.txt").await.unwrap();
+        assert!(fs.create_new("my_file.txt").await.is_err());
+    }
+}
diff --git a/crates/kiro-cli/src/fig_os_shim/mod.rs b/crates/kiro-cli/src/fig_os_shim/mod.rs
new file mode 100644
index 0000000000..200efeff5f
--- /dev/null
+++ b/crates/kiro-cli/src/fig_os_shim/mod.rs
@@ -0,0 +1,203 @@
+mod env;
+mod fs;
+mod platform;
+mod providers;
+mod sysinfo;
+
+use std::sync::Arc;
+
+pub use env::Env;
+pub use fs::Fs;
+pub use platform::{
+    Os,
+    Platform,
+};
+pub use providers::{
+    EnvProvider,
+    FsProvider,
+    PlatformProvider,
+    SysInfoProvider,
+};
+pub use sysinfo::SysInfo;
+
+pub trait Shim {
+    /// Returns whether or not the shim is a real implementation.
+    fn is_real(&self) -> bool;
+}
+
+/// Struct that contains the interface to every system related IO operation.
+///
+/// Every operation that accesses the file system, environment, or other related platform
+/// primitives should be done through a [Context] as this enables testing otherwise untestable
+/// code paths in unit tests.
+#[derive(Debug, Clone)]
+pub struct Context {
+    #[allow(dead_code)]
+    fs: Fs,
+    env: Env,
+    platform: Platform,
+    sysinfo: SysInfo,
+}
+
+impl Context {
+    /// Returns a new [Context] with real implementations of each OS shim.
+    pub fn new() -> Arc<Self> {
+        Arc::new_cyclic(|_| Self {
+            fs: Default::default(),
+            env: Default::default(),
+            platform: Default::default(),
+            sysinfo: SysInfo::default(),
+        })
+    }
+
+    pub fn new_fake() -> Arc<Self> {
+        Arc::new(Self {
+            fs: Fs::new_fake(),
+            env: Env::new_fake(),
+            platform: Platform::new_fake(Os::current()),
+            sysinfo: SysInfo::new_fake(),
+        })
+    }
+
+    pub fn builder() -> ContextBuilder {
+        ContextBuilder::new()
+    }
+
+    pub fn fs(&self) -> &Fs {
+        &self.fs
+    }
+
+    pub fn env(&self) -> &Env {
+        &self.env
+    }
+
+    pub fn platform(&self) -> &Platform {
+        &self.platform
+    }
+
+    pub fn sysinfo(&self) -> &SysInfo {
+        &self.sysinfo
+    }
+}
+
+#[derive(Default, Debug)]
+pub struct ContextBuilder {
+    fs: Option<Fs>,
+    env: Option<Env>,
+    platform: Option<Platform>,
+    sysinfo: Option<SysInfo>,
+}
+
+impl ContextBuilder {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Builds an immutable [Context] using real implementations for each field by default.
+    pub fn build(self) -> Arc<Context> {
+        let fs = self.fs.unwrap_or_default();
+        let env = self.env.unwrap_or_default();
+        let platform = self.platform.unwrap_or_default();
+        let sysinfo = self.sysinfo.unwrap_or_default();
+        Arc::new_cyclic(|_| Context {
+            fs,
+            env,
+            platform,
+            sysinfo,
+        })
+    }
+
+    /// Builds an immutable [Context] using fake implementations for each field by default.
+    pub fn build_fake(self) -> Arc<Context> {
+        let fs = self.fs.unwrap_or(Fs::new_fake());
+        let env = self.env.unwrap_or(Env::new_fake());
+        let platform = self.platform.unwrap_or(Platform::new_fake(Os::Mac));
+        let sysinfo = self.sysinfo.unwrap_or(SysInfo::new_fake());
+        Arc::new_cyclic(|_| Context {
+            fs,
+            env,
+            platform,
+            sysinfo,
+        })
+    }
+
+    pub fn with_env(mut self, env: Env) -> Self {
+        self.env = Some(env);
+        self
+    }
+
+    pub fn with_fs(mut self, fs: Fs) -> Self {
+        self.fs = Some(fs);
+        self
+    }
+
+    pub fn with_platform(mut self, platform: Platform) -> Self {
+        self.platform = Some(platform);
+        self
+    }
+
+    /// Creates a chroot filesystem and fake environment so that `$HOME`
+    /// points to `<tempdir>/home/testuser`. Note that this replaces the
+    /// [Fs] and [Env] currently set with the builder.
+    pub async fn with_test_home(mut self) -> Result<Self, std::io::Error> {
+        let home = "/home/testuser";
+        let fs = Fs::new_chroot();
+        fs.create_dir_all(home).await?;
+        self.fs = Some(fs);
+        self.env = Some(Env::from_slice(&[("HOME", "/home/testuser"), ("USER", "testuser")]));
+        Ok(self)
+    }
+
+    pub fn with_env_var(mut self, key: &str, value: &str) -> Self {
+        self.env = match self.env {
+            Some(env) if !env.is_real() => {
+                unsafe { env.set_var(key, value) };
+                Some(env)
+            },
+            _ => Some(Env::from_slice(&[(key, value)])),
+        };
+        self
+    }
+
+    pub fn with_os(mut self, os: Os) -> Self {
+        self.platform = Some(Platform::new_fake(os));
+        self
+    }
+
+    pub fn with_running_processes(mut self, process_names: &[&str]) -> Self {
+        let sysinfo = match self.sysinfo {
+            Some(sysinfo) if !sysinfo.is_real() => sysinfo,
+            _ => SysInfo::new_fake(),
+        };
+        sysinfo.add_running_processes(process_names);
+        self.sysinfo = Some(sysinfo);
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn context_builder_returns_real_impls_by_default() {
+        let ctx = ContextBuilder::new().build();
+        assert!(ctx.fs().is_real());
+        assert!(ctx.env().is_real());
+        assert!(ctx.platform().is_real());
+        assert!(ctx.sysinfo().is_real());
+    }
+
+    #[tokio::test]
+    async fn test_context_builder_with_test_home() {
+        let ctx = ContextBuilder::new()
+            .with_test_home()
+            .await
+            .unwrap()
+            .with_env_var("hello", "world")
+            .build();
+        assert!(ctx.fs().try_exists("/home/testuser").await.unwrap());
+        assert_eq!(ctx.env().get("HOME").unwrap(), "/home/testuser");
+        assert_eq!(ctx.env().get("hello").unwrap(), "world");
+    }
+}
diff --git a/crates/kiro-cli/src/fig_os_shim/platform.rs b/crates/kiro-cli/src/fig_os_shim/platform.rs
new file mode 100644
index 0000000000..29d5dc06ee
--- /dev/null
+++ b/crates/kiro-cli/src/fig_os_shim/platform.rs
@@ -0,0 +1,105 @@
+use std::fmt;
+
+use cfg_if::cfg_if;
+use serde::Serialize;
+
+use crate::fig_os_shim::Shim;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
+#[non_exhaustive]
+pub enum Os {
+    Mac,
+    Linux,
+}
+
+impl Os {
+    pub fn current() -> Self {
+        cfg_if! {
+            if #[cfg(target_os = "macos")] {
+                Self::Mac
+            } else if #[cfg(target_os = "linux")] {
+                Self::Linux
+            } else {
+                compile_error!("unsupported platform");
+            }
+        }
+    }
+
+    pub fn all() -> &'static [Self] {
+        &[Self::Mac, Self::Linux]
+    }
+
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Self::Mac => "macos",
+            Self::Linux => "linux",
+        }
+    }
+}
+
+impl fmt::Display for Os {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+#[derive(Default, Debug, Clone)]
+pub struct Platform(inner::Inner);
+
+mod inner {
+    use super::*;
+
+    #[derive(Default, Debug, Clone)]
+    pub(super) enum Inner {
+        #[default]
+        Real,
+        Fake(Os),
+    }
+}
+
+impl Platform {
+    /// Returns a real implementation of [Platform].
+    pub fn new() -> Self {
+        Self(inner::Inner::Real)
+    }
+
+    /// Returns a new fake [Platform].
+    pub fn new_fake(os: Os) -> Self {
+        Self(inner::Inner::Fake(os))
+    }
+
+    /// Returns the current [Os].
+    pub fn os(&self) -> Os {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => Os::current(),
+            Inner::Fake(os) => *os,
+        }
+    }
+}
+
+impl Shim for Platform {
+    fn is_real(&self) -> bool {
+        matches!(self.0, inner::Inner::Real)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_platform() {
+        let platform = Platform::default();
+        assert!(platform.is_real());
+
+        for os in Os::all() {
+            let platform = Platform::new_fake(*os);
+            assert!(!platform.is_real());
+            assert_eq!(&platform.os(), os);
+
+            let _ = os.as_str();
+            println!("{os:?} {os}");
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_os_shim/providers.rs b/crates/kiro-cli/src/fig_os_shim/providers.rs
new file mode 100644
index 0000000000..c430526802
--- /dev/null
+++ b/crates/kiro-cli/src/fig_os_shim/providers.rs
@@ -0,0 +1,133 @@
+use std::sync::Arc;
+
+use crate::fig_os_shim::{
+    Context,
+    Env,
+    Fs,
+    Platform,
+    SysInfo,
+};
+
+pub trait ContextProvider {
+    fn context(&self) -> &Context;
+}
+
+pub trait ContextArcProvider {
+    fn context_arc(&self) -> Arc<Context>;
+}
+
+impl ContextArcProvider for Arc<Context> {
+    fn context_arc(&self) -> Arc<Context> {
+        Arc::clone(self)
+    }
+}
+
+macro_rules! impl_context_provider {
+    ($a:ty) => {
+        impl ContextProvider for $a {
+            fn context(&self) -> &Context {
+                self
+            }
+        }
+    };
+}
+
+impl_context_provider!(Arc<Context>);
+impl_context_provider!(&Arc<Context>);
+impl_context_provider!(Context);
+impl_context_provider!(&Context);
+
+pub trait EnvProvider {
+    fn env(&self) -> &Env;
+}
+
+impl EnvProvider for Env {
+    fn env(&self) -> &Env {
+        self
+    }
+}
+
+impl<T> EnvProvider for T
+where
+    T: ContextProvider,
+{
+    fn env(&self) -> &Env {
+        self.context().env()
+    }
+}
+
+pub trait FsProvider {
+    fn fs(&self) -> &Fs;
+}
+
+impl FsProvider for Fs {
+    fn fs(&self) -> &Fs {
+        self
+    }
+}
+
+impl<T> FsProvider for T
+where
+    T: ContextProvider,
+{
+    fn fs(&self) -> &Fs {
+        self.context().fs()
+    }
+}
+
+pub trait PlatformProvider {
+    fn platform(&self) -> &Platform;
+}
+
+impl PlatformProvider for Platform {
+    fn platform(&self) -> &Platform {
+        self
+    }
+}
+
+impl<T> PlatformProvider for T
+where
+    T: ContextProvider,
+{
+    fn platform(&self) -> &Platform {
+        self.context().platform()
+    }
+}
+
+pub trait SysInfoProvider {
+    fn sysinfo(&self) -> &SysInfo;
+}
+
+impl SysInfoProvider for SysInfo {
+    fn sysinfo(&self) -> &SysInfo {
+        self
+    }
+}
+
+impl<T> SysInfoProvider for T
+where
+    T: ContextProvider,
+{
+    fn sysinfo(&self) -> &SysInfo {
+        self.context().sysinfo()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_env_provider() {
+        let env = Env::default();
+        let env_provider = &env as &dyn EnvProvider;
+        env_provider.env();
+    }
+
+    #[test]
+    fn test_fs_provider() {
+        let fs = Fs::default();
+        let fs_provider = &fs as &dyn FsProvider;
+        fs_provider.fs();
+    }
+}
diff --git a/crates/kiro-cli/src/fig_os_shim/sysinfo.rs b/crates/kiro-cli/src/fig_os_shim/sysinfo.rs
new file mode 100644
index 0000000000..0d340e97a1
--- /dev/null
+++ b/crates/kiro-cli/src/fig_os_shim/sysinfo.rs
@@ -0,0 +1,68 @@
+use std::ffi::OsString;
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use crate::fig_os_shim::Shim;
+
+#[derive(Debug, Clone, Default)]
+pub struct SysInfo(inner::Inner);
+
+mod inner {
+    use std::collections::HashSet;
+    use std::sync::{
+        Arc,
+        Mutex,
+    };
+
+    #[derive(Debug, Clone, Default)]
+    pub enum Inner {
+        #[default]
+        Real,
+        Fake(Arc<Mutex<Fake>>),
+    }
+
+    #[derive(Debug, Clone, Default)]
+    pub struct Fake {
+        pub process_names: HashSet<String>,
+    }
+}
+
+impl SysInfo {
+    pub fn new_fake() -> Self {
+        Self(inner::Inner::Fake(Arc::new(Mutex::new(inner::Fake::default()))))
+    }
+
+    /// Returns whether the process containing `name` is running.
+    pub fn is_process_running(&self, name: &str) -> bool {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => {
+                let system = sysinfo::System::new_all();
+                let is_running = system.processes_by_name(&OsString::from(name)).next().is_some();
+                is_running
+            },
+            Inner::Fake(fake) => fake.lock().unwrap().process_names.contains(name),
+        }
+    }
+
+    pub fn add_running_processes(&self, process_names: &[&str]) {
+        use inner::Inner;
+        match &self.0 {
+            Inner::Real => panic!("unimplemented"),
+            Inner::Fake(fake) => {
+                let curr_names = &mut fake.lock().unwrap().process_names;
+                for name in process_names {
+                    curr_names.insert((*name).to_string());
+                }
+            },
+        }
+    }
+}
+
+impl Shim for SysInfo {
+    fn is_real(&self) -> bool {
+        matches!(self.0, inner::Inner::Real)
+    }
+}
diff --git a/crates/kiro-cli/src/fig_settings/actions.json b/crates/kiro-cli/src/fig_settings/actions.json
new file mode 100644
index 0000000000..c5a886f665
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/actions.json
@@ -0,0 +1,216 @@
+[
+  {
+    "identifier": "insertSelected",
+    "name": "Insert selected",
+    "description": "Insert selected suggestion",
+    "category": "Insertion",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["enter"]
+  },
+  {
+    "identifier": "insertCommonPrefix",
+    "name": "Insert common prefix",
+    "description": "Insert shared prefix of available suggestions. Shake if there's no common prefix.",
+    "category": "Insertion",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["tab"]
+  },
+  {
+    "identifier": "insertCommonPrefixOrNavigateDown",
+    "name": "Insert common prefix or navigate",
+    "description": "Insert shared prefix of available suggestions. Navigate if there's no common prefix.",
+    "category": "Insertion",
+    "availability": "WHEN_FOCUSED"
+  },
+  {
+    "identifier": "insertCommonPrefixOrInsertSelected",
+    "name": "Insert common prefix or insert selected",
+    "description": "Insert shared prefix of available suggestions. Insert currently selected suggestion if there's not common prefix.",
+    "category": "Insertion",
+    "availability": "WHEN_FOCUSED"
+  },
+  {
+    "identifier": "insertSelectedAndExecute",
+    "name": "Insert selected and execute",
+    "description": "Insert selected suggestion and then execute the current command.",
+    "category": "Insertion",
+    "availability": "WHEN_FOCUSED"
+  },
+  {
+    "identifier": "execute",
+    "name": "Execute",
+    "description": "Execute the current command.",
+    "category": "Insertion",
+    "availability": "WHEN_FOCUSED"
+  },
+  {
+    "identifier": "hideAutocomplete",
+    "name": "Hide autocomplete",
+    "description": "Hide the autocomplete window",
+    "category": "General",
+    "availability": "ALWAYS",
+    "defaultBindings": ["esc"]
+  },
+  {
+    "identifier": "showAutocomplete",
+    "name": "Show autocomplete",
+    "description": "Show the autocomplete window",
+    "category": "General",
+    "availability": "ALWAYS"
+  },
+  {
+    "identifier": "toggleAutocomplete",
+    "name": "Toggle autocomplete",
+    "description": "Toggle the visibility of the autocomplete window",
+    "availability": "ALWAYS"
+  },
+  {
+    "identifier": "navigateUp",
+    "name": "Navigate up",
+    "description": "Scroll up one entry in the list of suggestions",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["shift+tab", "up", "control+k", "control+p"]
+  },
+  {
+    "identifier": "navigateDown",
+    "name": "Navigate down",
+    "description": "Scroll down one entry in the list of suggestions",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["down", "control+j", "control+n"]
+  },
+  {
+    "identifier": "selectSuggestion1",
+    "name": "Select 1st suggestion",
+    "description": "Select the 1st suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+1"]
+  },
+  {
+    "identifier": "selectSuggestion2",
+    "name": "Select 2nd suggestion",
+    "description": "Select the 2nd suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+2"]
+  },
+  {
+    "identifier": "selectSuggestion3",
+    "name": "Select 3rd suggestion",
+    "description": "Select the 3rd suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+3"]
+  },
+  {
+    "identifier": "selectSuggestion4",
+    "name": "Select 4th suggestion",
+    "description": "Select the 4th suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+4"]
+  },
+  {
+    "identifier": "selectSuggestion5",
+    "name": "Select 5th suggestion",
+    "description": "Select the 5th suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+5"]
+  },
+  {
+    "identifier": "selectSuggestion6",
+    "name": "Select 6th suggestion",
+    "description": "Select the 6th suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+6"]
+  },
+  {
+    "identifier": "selectSuggestion7",
+    "name": "Select 7th suggestion",
+    "description": "Select the 7th suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+7"]
+  },
+  {
+    "identifier": "selectSuggestion8",
+    "name": "Select 8th suggestion",
+    "description": "Select the 8th suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+8"]
+  },
+  {
+    "identifier": "selectSuggestion9",
+    "name": "Select 9th suggestion",
+    "description": "Select the 9th suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+9"]
+  },
+  {
+    "identifier": "selectSuggestion10",
+    "name": "Select 10th suggestion",
+    "description": "Select the 10th suggestion of the list",
+    "category": "Navigation",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+0"]
+  },
+  {
+    "identifier": "hideDescription",
+    "name": "Hide description popout",
+    "description": "Hide autocomplete description popout",
+    "category": "Appearance",
+    "availability": "WHEN_FOCUSED"
+  },
+  {
+    "identifier": "showDescription",
+    "name": "Show description popout",
+    "description": "Show autocomplete description popout",
+    "category": "Appearance",
+    "availability": "WHEN_FOCUSED"
+  },
+  {
+    "identifier": "toggleDescription",
+    "name": "Toggle description popout",
+    "description": "Toggle visibility of autocomplete description popout",
+    "category": "Appearance",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["command+i"]
+  },
+  {
+    "identifier": "toggleHistoryMode",
+    "name": "Toggle history mode",
+    "description": "Toggle between history suggestions and autocomplete spec suggestions",
+    "category": "General",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["control+r"]
+  },
+  {
+    "identifier": "toggleFuzzySearch",
+    "name": "Toggle fuzzy search",
+    "description": "Toggle between normal prefix search and fuzzy search",
+    "category": "General",
+    "availability": "WHEN_FOCUSED"
+  },
+  {
+    "identifier": "increaseSize",
+    "name": "Increase window size",
+    "description": "Increase the size of the autocomplete window",
+    "category": "Appearance",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["command+="]
+  },
+  {
+    "identifier": "decreaseSize",
+    "name": "Decrease window size",
+    "description": "Decrease the size of the autocomplete window",
+    "category": "Appearance",
+    "availability": "WHEN_FOCUSED",
+    "defaultBindings": ["command+-"]
+  }
+]
diff --git a/crates/kiro-cli/src/fig_settings/error.rs b/crates/kiro-cli/src/fig_settings/error.rs
new file mode 100644
index 0000000000..c9ecfe8ddb
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/error.rs
@@ -0,0 +1,70 @@
+use std::sync::PoisonError;
+
+use thiserror::Error;
+
+use crate::fig_util::directories::DirectoryError;
+
+// A cloneable error
+#[derive(Debug, Clone, thiserror::Error)]
+#[error("Failed to open database: {}", .0)]
+pub struct DbOpenError(pub(crate) String);
+
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error(transparent)]
+    IoError(#[from] std::io::Error),
+    #[error(transparent)]
+    JsonError(#[from] serde_json::Error),
+    #[error(transparent)]
+    FigUtilError(#[from] crate::fig_util::Error),
+    #[error("settings file is not a json object")]
+    SettingsNotObject,
+    #[error(transparent)]
+    DirectoryError(#[from] DirectoryError),
+    #[error("memory backend is not used")]
+    MemoryBackendNotUsed,
+    #[error(transparent)]
+    Rusqlite(#[from] rusqlite::Error),
+    #[error(transparent)]
+    R2d2(#[from] r2d2::Error),
+    #[error(transparent)]
+    DbOpenError(#[from] DbOpenError),
+    #[error("{}", .0)]
+    PoisonError(String),
+}
+
+impl<T> From<PoisonError<T>> for Error {
+    fn from(value: PoisonError<T>) -> Self {
+        Self::PoisonError(value.to_string())
+    }
+}
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn all_errors() -> Vec<Error> {
+        vec![
+            std::io::Error::new(std::io::ErrorKind::InvalidData, "oops").into(),
+            serde_json::from_str::<()>("oops").unwrap_err().into(),
+            crate::fig_util::Error::UnsupportedPlatform.into(),
+            Error::SettingsNotObject,
+            crate::fig_util::directories::DirectoryError::NoHomeDirectory.into(),
+            Error::MemoryBackendNotUsed,
+            rusqlite::Error::SqliteSingleThreadedMode.into(),
+            // r2d2::Error
+            DbOpenError("oops".into()).into(),
+            PoisonError::<()>::new(()).into(),
+        ]
+    }
+
+    #[test]
+    fn test_error_display_debug() {
+        for error in all_errors() {
+            eprintln!("{}", error);
+            eprintln!("{:?}", error);
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_settings/keybindings.rs b/crates/kiro-cli/src/fig_settings/keybindings.rs
new file mode 100644
index 0000000000..7718198a7c
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/keybindings.rs
@@ -0,0 +1,144 @@
+use std::fmt::Display;
+
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+use super::{
+    Error,
+    JsonStore,
+    OldSettings,
+};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum Availability {
+    WhenFocused,
+    Always,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct KeyBindingDescription {
+    pub identifier: String,
+    pub name: Option<String>,
+    pub description: Option<String>,
+    pub category: Option<String>,
+    pub availability: Option<Availability>,
+    pub default_bindings: Option<Vec<String>>,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct KeyBinding {
+    pub identifier: String,
+    pub binding: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct KeyBindings(pub Vec<KeyBinding>);
+
+impl KeyBindings {
+    pub fn load_hardcoded() -> Self {
+        let hardcoded_descriptions: Vec<KeyBindingDescription> =
+            serde_json::from_str(include_str!("actions.json")).expect("Unable to load hardcoded actions");
+
+        let key_bindings = hardcoded_descriptions
+            .into_iter()
+            .flat_map(|description| {
+                description
+                    .default_bindings
+                    .unwrap_or_default()
+                    .into_iter()
+                    .map(move |binding| KeyBinding {
+                        identifier: description.identifier.clone(),
+                        binding,
+                    })
+            })
+            .collect();
+
+        Self(key_bindings)
+    }
+
+    fn load_from_json_map(
+        json_map: &serde_json::Map<String, serde_json::Value>,
+        product_namespace: impl Display,
+    ) -> Self {
+        let key_bindings = json_map
+            .into_iter()
+            .filter_map(|(key, value)| {
+                if let Some(key) = key.strip_prefix(&format!("{product_namespace}.keybindings.",)) {
+                    Some(KeyBinding {
+                        identifier: value.as_str()?.into(),
+                        binding: key.into(),
+                    })
+                } else {
+                    None
+                }
+            })
+            .collect();
+        Self(key_bindings)
+    }
+
+    pub fn load_from_settings(product_namespace: impl Display) -> Result<Self, Error> {
+        let settings = OldSettings::load()?;
+        let map = settings.map();
+        Ok(Self::load_from_json_map(&map, product_namespace))
+    }
+}
+
+impl IntoIterator for KeyBindings {
+    type IntoIter = std::vec::IntoIter<Self::Item>;
+    type Item = KeyBinding;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_load_json() {
+        let json = KeyBindings::load_hardcoded();
+        assert_eq!(json.0.len(), 24);
+
+        assert_eq!(json.0[0].identifier, "insertSelected");
+        assert_eq!(json.0[0].binding, "enter");
+    }
+
+    #[test]
+    fn test_load_from_json_map() {
+        let json_map = serde_json::json!({
+            "autocomplete.keybindings.command+i": "toggleDescription",
+            "autocomplete.keybindings.control+-": "increaseSize",
+            "autocomplete.keybindings.control+/": "toggleDescription",
+            "autocomplete.keybindings.control+=": "decreaseSize",
+            "autocomplete.other": "other",
+            "other": "other",
+        })
+        .as_object()
+        .unwrap()
+        .clone();
+
+        let json = KeyBindings::load_from_json_map(&json_map, "autocomplete");
+
+        assert_eq!(json.0.len(), 4);
+
+        assert_eq!(json.0[0].identifier, "toggleDescription");
+        assert_eq!(json.0[0].binding, "command+i");
+
+        assert_eq!(json.0[1].identifier, "increaseSize");
+        assert_eq!(json.0[1].binding, "control+-");
+
+        assert_eq!(json.0[2].identifier, "toggleDescription");
+        assert_eq!(json.0[2].binding, "control+/");
+
+        assert_eq!(json.0[3].identifier, "decreaseSize");
+        assert_eq!(json.0[3].binding, "control+=");
+    }
+}
diff --git a/crates/kiro-cli/src/fig_settings/mod.rs b/crates/kiro-cli/src/fig_settings/mod.rs
new file mode 100644
index 0000000000..415f2646ef
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/mod.rs
@@ -0,0 +1,349 @@
+pub mod error;
+pub mod keybindings;
+pub mod settings;
+pub mod sqlite;
+pub mod state;
+
+use std::fs::{
+    self,
+    File,
+};
+use std::io::{
+    Read,
+    Seek,
+    SeekFrom,
+    Write,
+};
+use std::path::PathBuf;
+
+pub use error::{
+    Error,
+    Result,
+};
+use fd_lock::RwLock as FileRwLock;
+use parking_lot::{
+    MappedRwLockReadGuard,
+    MappedRwLockWriteGuard,
+    RwLock,
+    RwLockReadGuard,
+    RwLockWriteGuard,
+};
+use serde_json::Value;
+pub use settings::Settings;
+pub use state::State;
+use thiserror::Error;
+use tracing::error;
+
+use crate::fig_util::directories;
+
+pub type Map = serde_json::Map<String, Value>;
+
+static SETTINGS_FILE_LOCK: RwLock<()> = RwLock::new(());
+
+static SETTINGS_DATA: RwLock<Option<Map>> = RwLock::new(None);
+
+#[derive(Debug, Clone)]
+pub enum Backend {
+    Global,
+    Memory(Map),
+}
+
+pub enum ReadGuard<'a, T> {
+    Global(RwLockReadGuard<'a, Option<T>>),
+    Memory(&'a T),
+}
+
+impl<'a, T> ReadGuard<'a, T> {
+    pub fn map<U, F: FnOnce(&T) -> &U>(self, f: F) -> MappedReadGuard<'a, U> {
+        match self {
+            ReadGuard::Global(guard) => {
+                MappedReadGuard::Global(RwLockReadGuard::<'a, Option<T>>::map(guard, |data: &Option<T>| {
+                    f(data.as_ref().expect("global backend is not used"))
+                }))
+            },
+            ReadGuard::Memory(data) => MappedReadGuard::Memory(f(data)),
+        }
+    }
+
+    pub fn try_map<U, F: FnOnce(&T) -> Option<&U>>(self, f: F) -> Option<MappedReadGuard<'a, U>> {
+        match self {
+            ReadGuard::Global(guard) => RwLockReadGuard::<'a, Option<T>>::try_map(guard, |data: &Option<T>| {
+                f(data.as_ref().expect("global backend is not used"))
+            })
+            .ok()
+            .map(MappedReadGuard::Global),
+            ReadGuard::Memory(data) => f(data).map(MappedReadGuard::Memory),
+        }
+    }
+}
+
+impl<T> std::ops::Deref for ReadGuard<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            ReadGuard::Global(guard) => guard.as_ref().expect("global backend is not used"),
+            ReadGuard::Memory(data) => data,
+        }
+    }
+}
+
+pub enum MappedReadGuard<'a, T> {
+    Global(MappedRwLockReadGuard<'a, T>),
+    Memory(&'a T),
+}
+
+impl<T> std::ops::Deref for MappedReadGuard<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            MappedReadGuard::Global(guard) => guard,
+            MappedReadGuard::Memory(data) => data,
+        }
+    }
+}
+
+pub enum WriteGuard<'a, T> {
+    Global(RwLockWriteGuard<'a, Option<T>>),
+    Memory(&'a mut T),
+}
+
+impl<'a, T> WriteGuard<'a, T> {
+    pub fn map<U, F: FnOnce(&mut T) -> &mut U>(self, f: F) -> MappedWriteGuard<'a, U> {
+        match self {
+            WriteGuard::Global(guard) => {
+                MappedWriteGuard::Global(RwLockWriteGuard::<'a, Option<T>>::map(guard, |data: &mut Option<T>| {
+                    f(data.as_mut().expect("global backend is not used"))
+                }))
+            },
+            WriteGuard::Memory(data) => MappedWriteGuard::Memory(f(data)),
+        }
+    }
+
+    pub fn try_map<U, F: FnOnce(&mut T) -> Option<&mut U>>(self, f: F) -> Option<MappedWriteGuard<'a, U>> {
+        match self {
+            WriteGuard::Global(guard) => RwLockWriteGuard::<'a, Option<T>>::try_map(guard, |data: &mut Option<T>| {
+                f(data.as_mut().expect("global backend is not used"))
+            })
+            .ok()
+            .map(MappedWriteGuard::Global),
+            WriteGuard::Memory(data) => f(data).map(MappedWriteGuard::Memory),
+        }
+    }
+}
+
+impl<T> std::ops::Deref for WriteGuard<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            WriteGuard::Global(guard) => guard.as_ref().expect("global backend is not used"),
+            WriteGuard::Memory(data) => data,
+        }
+    }
+}
+
+impl<T> std::ops::DerefMut for WriteGuard<'_, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            WriteGuard::Global(guard) => guard.as_mut().expect("global backend is not used"),
+            WriteGuard::Memory(data) => data,
+        }
+    }
+}
+
+pub enum MappedWriteGuard<'a, T> {
+    Global(MappedRwLockWriteGuard<'a, T>),
+    Memory(&'a mut T),
+}
+
+impl<T> std::ops::Deref for MappedWriteGuard<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            MappedWriteGuard::Global(guard) => guard,
+            MappedWriteGuard::Memory(data) => data,
+        }
+    }
+}
+
+impl<T> std::ops::DerefMut for MappedWriteGuard<'_, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            MappedWriteGuard::Global(guard) => guard,
+            MappedWriteGuard::Memory(data) => data,
+        }
+    }
+}
+
+pub trait JsonStore: Sized {
+    /// Path to the file
+    fn path() -> Result<PathBuf>;
+
+    /// In mem lock on the file
+    fn file_lock() -> &'static RwLock<()>;
+
+    /// [RwLock] on the data, [None] if not using the global backend
+    fn data_lock() -> &'static RwLock<Option<Map>>;
+
+    fn new_from_backend(backend: Backend) -> Self;
+
+    fn map(&self) -> ReadGuard<'_, Map>;
+
+    fn map_mut(&mut self) -> WriteGuard<'_, Map>;
+
+    fn load() -> Result<Self> {
+        let is_global = Self::data_lock().read().as_ref().is_some();
+        if is_global {
+            Ok(Self::new_from_backend(Backend::Global))
+        } else {
+            Ok(Self::new_from_backend(Backend::Memory(Self::load_from_file()?)))
+        }
+    }
+
+    fn load_from_file() -> Result<Map> {
+        let path = Self::path()?;
+
+        // If the folder doesn't exist, create it.
+        if let Some(parent) = path.parent() {
+            if !parent.exists() {
+                fs::create_dir_all(parent)?;
+            }
+        }
+
+        let json: Map = {
+            let _lock_guard = Self::file_lock().write();
+
+            // If the file doesn't exist, create it.
+            if !path.exists() {
+                let mut file = FileRwLock::new(File::create(path)?);
+                file.write()?.write_all(b"{}")?;
+                serde_json::Map::new()
+            } else {
+                let mut file = FileRwLock::new(File::open(&path)?);
+                let mut read = file.write()?;
+                serde_json::from_reader(&mut *read)?
+            }
+        };
+
+        Ok(json)
+    }
+
+    fn save_to_file(&self) -> Result<()> {
+        let path = Self::path()?;
+
+        // If the folder doesn't exist, create it.
+        if let Some(parent) = path.parent() {
+            if !parent.exists() {
+                fs::create_dir_all(parent)?;
+            }
+        }
+
+        let _lock_guard = Self::file_lock().write();
+
+        let mut file_opts = File::options();
+        file_opts.create(true).write(true).truncate(true);
+
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::OpenOptionsExt;
+            file_opts.mode(0o600);
+        }
+
+        let mut file = FileRwLock::new(file_opts.open(&path)?);
+        let mut lock = file.write()?;
+
+        if let Err(_err) = serde_json::to_writer_pretty(&mut *lock, &*self.map()) {
+            // Write {} to the file if the serialization failed
+            lock.seek(SeekFrom::Start(0))?;
+            lock.set_len(0)?;
+            lock.write_all(b"{}")?;
+        };
+        lock.flush()?;
+
+        Ok(())
+    }
+
+    fn set(&mut self, key: impl Into<String>, value: impl Into<serde_json::Value>) {
+        self.map_mut().insert(key.into(), value.into());
+    }
+
+    fn get(&self, key: impl AsRef<str>) -> Option<MappedReadGuard<'_, Value>> {
+        self.map().try_map(|data| data.get(key.as_ref()))
+    }
+
+    fn remove(&mut self, key: impl AsRef<str>) -> Option<Value> {
+        self.map_mut().remove(key.as_ref())
+    }
+
+    fn get_mut(&mut self, key: impl Into<String>) -> Option<MappedWriteGuard<'_, Value>> {
+        self.map_mut().try_map(|data| data.get_mut(&key.into()))
+    }
+
+    fn get_bool(&self, key: impl AsRef<str>) -> Option<bool> {
+        self.get(key).and_then(|value| value.as_bool())
+    }
+
+    fn get_bool_or(&self, key: impl AsRef<str>, default: bool) -> bool {
+        self.get_bool(key).unwrap_or(default)
+    }
+
+    fn get_string(&self, key: impl AsRef<str>) -> Option<String> {
+        self.get(key).and_then(|value| value.as_str().map(|s| s.into()))
+    }
+
+    fn get_string_or(&self, key: impl AsRef<str>, default: String) -> String {
+        self.get_string(key).unwrap_or(default)
+    }
+
+    fn get_int(&self, key: impl AsRef<str>) -> Option<i64> {
+        self.get(key).and_then(|value| value.as_i64())
+    }
+
+    fn get_int_or(&self, key: impl AsRef<str>, default: i64) -> i64 {
+        self.get_int(key).unwrap_or(default)
+    }
+}
+
+pub struct OldSettings {
+    pub(crate) inner: Backend,
+}
+
+impl JsonStore for OldSettings {
+    fn path() -> Result<PathBuf> {
+        Ok(directories::settings_path()?)
+    }
+
+    fn file_lock() -> &'static RwLock<()> {
+        &SETTINGS_FILE_LOCK
+    }
+
+    fn data_lock() -> &'static RwLock<Option<Map>> {
+        &SETTINGS_DATA
+    }
+
+    fn new_from_backend(backend: Backend) -> Self {
+        match backend {
+            Backend::Global => Self { inner: Backend::Global },
+            Backend::Memory(map) => Self {
+                inner: Backend::Memory(map),
+            },
+        }
+    }
+
+    fn map(&self) -> ReadGuard<'_, Map> {
+        match &self.inner {
+            Backend::Global => ReadGuard::Global(Self::data_lock().read()),
+            Backend::Memory(map) => ReadGuard::Memory(map),
+        }
+    }
+
+    fn map_mut(&mut self) -> WriteGuard<'_, Map> {
+        match &mut self.inner {
+            Backend::Global => WriteGuard::Global(Self::data_lock().write()),
+            Backend::Memory(map) => WriteGuard::Memory(map),
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_settings/settings.rs b/crates/kiro-cli/src/fig_settings/settings.rs
new file mode 100644
index 0000000000..0a0be53c01
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/settings.rs
@@ -0,0 +1,243 @@
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use serde::de::DeserializeOwned;
+use serde_json::{
+    Map,
+    Value,
+};
+
+use super::{
+    JsonStore,
+    OldSettings,
+    Result,
+};
+
+#[derive(Debug, Clone, Default)]
+pub struct Settings(inner::Inner);
+
+mod inner {
+    use std::sync::{
+        Arc,
+        Mutex,
+    };
+
+    use serde_json::{
+        Map,
+        Value,
+    };
+
+    #[derive(Debug, Clone, Default)]
+    pub enum Inner {
+        #[default]
+        Real,
+        Fake(Arc<Mutex<Map<String, Value>>>),
+    }
+}
+
+impl Settings {
+    pub fn new() -> Self {
+        Self(inner::Inner::Real)
+    }
+
+    pub fn new_fake() -> Self {
+        Self(inner::Inner::Fake(Arc::new(Mutex::new(Map::new()))))
+    }
+
+    pub fn from_slice(slice: &[(&str, Value)]) -> Self {
+        Self(inner::Inner::Fake(Arc::new(Mutex::new(
+            slice.iter().map(|(k, v)| ((*k).to_owned(), v.clone())).collect(),
+        ))))
+    }
+
+    pub fn set_value(&self, key: impl Into<String>, value: impl Into<serde_json::Value>) -> Result<()> {
+        match &self.0 {
+            inner::Inner::Real => {
+                let mut settings = OldSettings::load()?;
+                settings.set(key, value);
+                settings.save_to_file()?;
+                Ok(())
+            },
+            inner::Inner::Fake(map) => {
+                map.lock()?.insert(key.into(), value.into());
+                Ok(())
+            },
+        }
+    }
+
+    pub fn remove_value(&self, key: impl AsRef<str>) -> Result<()> {
+        match &self.0 {
+            inner::Inner::Real => {
+                let mut settings = OldSettings::load()?;
+                settings.remove(key);
+                settings.save_to_file()?;
+                Ok(())
+            },
+            inner::Inner::Fake(map) => {
+                map.lock()?.remove(key.as_ref());
+                Ok(())
+            },
+        }
+    }
+
+    pub fn get_value(&self, key: impl AsRef<str>) -> Result<Option<serde_json::Value>> {
+        match &self.0 {
+            inner::Inner::Real => Ok(OldSettings::load()?.get(key.as_ref()).map(|v| v.clone())),
+            inner::Inner::Fake(map) => Ok(map.lock()?.get(key.as_ref()).cloned()),
+        }
+    }
+
+    pub fn get<T: DeserializeOwned>(&self, key: impl AsRef<str>) -> Result<Option<T>> {
+        match &self.0 {
+            inner::Inner::Real => {
+                let settings = OldSettings::load()?;
+                let v = settings.get(key);
+                match v.as_deref() {
+                    Some(value) => Ok(Some(serde_json::from_value(value.clone())?)),
+                    None => Ok(None),
+                }
+            },
+            inner::Inner::Fake(map) => {
+                let value = map.lock()?.get(key.as_ref()).cloned();
+                match value {
+                    Some(value) => Ok(Some(serde_json::from_value(value)?)),
+                    None => Ok(None),
+                }
+            },
+        }
+    }
+
+    pub fn get_bool(&self, key: impl AsRef<str>) -> Result<Option<bool>> {
+        match &self.0 {
+            inner::Inner::Real => Ok(OldSettings::load()?.get_bool(key.as_ref())),
+            inner::Inner::Fake(map) => Ok(map.lock()?.get(key.as_ref()).cloned().and_then(|v| v.as_bool())),
+        }
+    }
+
+    pub fn get_bool_or(&self, key: impl AsRef<str>, default: bool) -> bool {
+        self.get_bool(key).ok().flatten().unwrap_or(default)
+    }
+
+    pub fn get_string(&self, key: impl AsRef<str>) -> Result<Option<String>> {
+        match &self.0 {
+            inner::Inner::Real => Ok(OldSettings::load()?.get_string(key.as_ref())),
+            inner::Inner::Fake(map) => Ok(map
+                .lock()?
+                .get(key.as_ref())
+                .cloned()
+                .and_then(|v| v.as_str().map(|s| s.to_owned()))),
+        }
+    }
+
+    pub fn get_string_opt(&self, key: impl AsRef<str>) -> Option<String> {
+        self.get_string(key).ok().flatten()
+    }
+
+    pub fn get_string_or(&self, key: impl AsRef<str>, default: String) -> String {
+        self.get_string(key).ok().flatten().unwrap_or(default)
+    }
+
+    pub fn get_int(&self, key: impl AsRef<str>) -> Result<Option<i64>> {
+        match &self.0 {
+            inner::Inner::Real => Ok(OldSettings::load()?.get_int(key.as_ref())),
+            inner::Inner::Fake(map) => Ok(map.lock()?.get(key.as_ref()).cloned().and_then(|v| v.as_i64())),
+        }
+    }
+
+    pub fn get_int_or(&self, key: impl AsRef<str>, default: i64) -> i64 {
+        self.get_int(key).ok().flatten().unwrap_or(default)
+    }
+}
+
+pub trait SettingsProvider {
+    fn settings(&self) -> &Settings;
+}
+
+impl SettingsProvider for Settings {
+    fn settings(&self) -> &Settings {
+        self
+    }
+}
+
+pub fn set_value(key: impl Into<String>, value: impl Into<serde_json::Value>) -> Result<()> {
+    Settings::new().set_value(key, value)
+}
+
+pub fn remove_value(key: impl AsRef<str>) -> Result<()> {
+    Settings::new().remove_value(key)
+}
+
+pub fn get_value(key: impl AsRef<str>) -> Result<Option<serde_json::Value>> {
+    Settings::new().get_value(key)
+}
+
+pub fn get<T: DeserializeOwned>(key: impl AsRef<str>) -> Result<Option<T>> {
+    Settings::new().get(key)
+}
+
+pub fn get_bool(key: impl AsRef<str>) -> Result<Option<bool>> {
+    Settings::new().get_bool(key)
+}
+
+pub fn get_bool_or(key: impl AsRef<str>, default: bool) -> bool {
+    Settings::new().get_bool_or(key, default)
+}
+
+pub fn get_string(key: impl AsRef<str>) -> Result<Option<String>> {
+    Settings::new().get_string(key)
+}
+
+pub fn get_string_opt(key: impl AsRef<str>) -> Option<String> {
+    Settings::new().get_string_opt(key)
+}
+
+pub fn get_string_or(key: impl AsRef<str>, default: String) -> String {
+    Settings::new().get_string_or(key, default)
+}
+
+pub fn get_int(key: impl AsRef<str>) -> Result<Option<i64>> {
+    Settings::new().get_int(key)
+}
+
+pub fn get_int_or(key: impl AsRef<str>, default: i64) -> i64 {
+    Settings::new().get_int_or(key, default)
+}
+
+#[cfg(test)]
+mod test {
+    use super::{
+        Result,
+        Settings,
+    };
+
+    /// General read/write settings test
+    #[test]
+    fn test_settings() -> Result<()> {
+        let settings = Settings::from_slice(&[]);
+
+        assert!(settings.get_value("test").unwrap().is_none());
+        assert!(settings.get::<String>("test").unwrap().is_none());
+        settings.set_value("test", "hello :)")?;
+        assert!(settings.get_value("test").unwrap().is_some());
+        assert!(settings.get::<String>("test").unwrap().is_some());
+        settings.remove_value("test")?;
+        assert!(settings.get_value("test").unwrap().is_none());
+        assert!(settings.get::<String>("test").unwrap().is_none());
+
+        assert!(!settings.get_bool_or("bool", false));
+        settings.set_value("bool", true).unwrap();
+        assert!(settings.get_bool("bool").unwrap().unwrap());
+
+        assert_eq!(settings.get_string_or("string", "hi".into()), "hi");
+        settings.set_value("string", "hi").unwrap();
+        assert_eq!(settings.get_string("string").unwrap().unwrap(), "hi");
+
+        assert_eq!(settings.get_int_or("int", 32), 32);
+        settings.set_value("int", 32).unwrap();
+        assert_eq!(settings.get_int("int").unwrap().unwrap(), 32);
+
+        Ok(())
+    }
+}
diff --git a/crates/kiro-cli/src/fig_settings/sqlite.rs b/crates/kiro-cli/src/fig_settings/sqlite.rs
new file mode 100644
index 0000000000..f8569f8c77
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/sqlite.rs
@@ -0,0 +1,437 @@
+use std::ops::Deref;
+use std::path::{
+    Path,
+    PathBuf,
+};
+use std::sync::LazyLock;
+
+use r2d2::Pool;
+use r2d2_sqlite::SqliteConnectionManager;
+use rusqlite::types::FromSql;
+use rusqlite::{
+    Connection,
+    Error,
+    ToSql,
+    params,
+};
+use serde_json::Map;
+use tracing::{
+    debug,
+    info,
+};
+
+use super::error::DbOpenError;
+use crate::fig_settings::Result;
+use crate::fig_util::directories::fig_data_dir;
+
+const STATE_TABLE_NAME: &str = "state";
+const AUTH_TABLE_NAME: &str = "auth_kv";
+
+pub static DATABASE: LazyLock<Result<Db, DbOpenError>> = LazyLock::new(|| {
+    let db = Db::new().map_err(|e| DbOpenError(e.to_string()))?;
+    db.migrate().map_err(|e| DbOpenError(e.to_string()))?;
+    Ok(db)
+});
+
+pub fn database() -> Result<&'static Db, DbOpenError> {
+    match DATABASE.as_ref() {
+        Ok(db) => Ok(db),
+        Err(err) => Err(err.clone()),
+    }
+}
+
+#[derive(Debug)]
+struct Migration {
+    name: &'static str,
+    sql: &'static str,
+}
+
+macro_rules! migrations {
+    ($($name:expr),*) => {{
+        &[
+            $(
+                Migration {
+                    name: $name,
+                    sql: include_str!(concat!("sqlite_migrations/", $name, ".sql")),
+                }
+            ),*
+        ]
+    }};
+}
+
+const MIGRATIONS: &[Migration] = migrations![
+    "000_migration_table",
+    "001_history_table",
+    "002_drop_history_in_ssh_docker",
+    "003_improved_history_timing",
+    "004_state_table",
+    "005_auth_table"
+];
+
+#[derive(Debug, Clone)]
+pub struct Db {
+    pub(crate) pool: Pool<SqliteConnectionManager>,
+}
+
+impl Db {
+    fn path() -> Result<PathBuf> {
+        Ok(fig_data_dir()?.join("data.sqlite3"))
+    }
+
+    pub fn new() -> Result<Self> {
+        Self::open(&Self::path()?)
+    }
+
+    fn open(path: &Path) -> Result<Self> {
+        // make the parent dir if it doesnt exist
+        if let Some(parent) = path.parent() {
+            if !parent.exists() {
+                std::fs::create_dir_all(parent)?;
+            }
+        }
+
+        let conn = SqliteConnectionManager::file(path);
+        let pool = Pool::builder().build(conn)?;
+
+        // Check the unix permissions of the database file, set them to 0600 if they are not
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            let metadata = std::fs::metadata(path)?;
+            let mut permissions = metadata.permissions();
+            if permissions.mode() & 0o777 != 0o600 {
+                debug!(?path, "Setting database file permissions to 0600");
+                permissions.set_mode(0o600);
+                std::fs::set_permissions(path, permissions)?;
+            }
+        }
+
+        Ok(Self { pool })
+    }
+
+    pub(crate) fn mock() -> Self {
+        let conn = SqliteConnectionManager::memory();
+        let pool = Pool::builder().build(conn).unwrap();
+        Self { pool }
+    }
+
+    pub fn migrate(&self) -> Result<()> {
+        let mut conn = self.pool.get()?;
+        let transaction = conn.transaction()?;
+
+        // select the max migration id
+        let max_id = max_migration(&transaction);
+
+        for (version, migration) in MIGRATIONS.iter().enumerate() {
+            // skip migrations that already exist
+            match max_id {
+                Some(max_id) if max_id >= version as i64 => continue,
+                _ => (),
+            };
+
+            // execute the migration
+            transaction.execute_batch(migration.sql)?;
+
+            info!(%version, name =% migration.name, "Applying migration");
+
+            // insert the migration entry
+            transaction.execute(
+                "INSERT INTO migrations (version, migration_time) VALUES (?1, strftime('%s', 'now'));",
+                params![version],
+            )?;
+        }
+
+        // commit the transaction
+        transaction.commit()?;
+
+        Ok(())
+    }
+
+    fn get_value<T: FromSql>(&self, table: &'static str, key: impl AsRef<str>) -> Result<Option<T>> {
+        let conn = self.pool.get()?;
+        let mut stmt = conn.prepare(&format!("SELECT value FROM {table} WHERE key = ?1"))?;
+        match stmt.query_row([key.as_ref()], |row| row.get(0)) {
+            Ok(data) => Ok(Some(data)),
+            Err(Error::QueryReturnedNoRows) => Ok(None),
+            Err(err) => Err(err.into()),
+        }
+    }
+
+    pub fn get_state_value(&self, key: impl AsRef<str>) -> Result<Option<serde_json::Value>> {
+        self.get_value(STATE_TABLE_NAME, key)
+    }
+
+    pub fn get_auth_value(&self, key: impl AsRef<str>) -> Result<Option<String>> {
+        self.get_value(AUTH_TABLE_NAME, key)
+    }
+
+    fn set_value<T: ToSql>(&self, table: &'static str, key: impl AsRef<str>, value: T) -> Result<()> {
+        self.pool.get()?.execute(
+            &format!("INSERT OR REPLACE INTO {table} (key, value) VALUES (?1, ?2)"),
+            params![key.as_ref(), value],
+        )?;
+        Ok(())
+    }
+
+    pub fn set_state_value(&self, key: impl AsRef<str>, value: impl Into<serde_json::Value>) -> Result<()> {
+        self.set_value(STATE_TABLE_NAME, key, value.into())
+    }
+
+    pub fn set_auth_value(&self, key: impl AsRef<str>, value: impl Into<String>) -> Result<()> {
+        self.set_value(AUTH_TABLE_NAME, key, value.into())
+    }
+
+    fn unset_value(&self, table: &'static str, key: impl AsRef<str>) -> Result<()> {
+        self.pool
+            .get()?
+            .execute(&format!("DELETE FROM {table} WHERE key = ?1"), [key.as_ref()])?;
+        Ok(())
+    }
+
+    pub fn unset_state_value(&self, key: impl AsRef<str>) -> Result<()> {
+        self.unset_value(STATE_TABLE_NAME, key)
+    }
+
+    pub fn unset_auth_value(&self, key: impl AsRef<str>) -> Result<()> {
+        self.unset_value(AUTH_TABLE_NAME, key)
+    }
+
+    fn is_value_set(&self, table: &'static str, key: impl AsRef<str>) -> Result<bool> {
+        let conn = self.pool.get()?;
+        let mut stmt = conn.prepare(&format!("SELECT value FROM {table} WHERE key = ?1"))?;
+        match stmt.query_row([key.as_ref()], |_| Ok(())) {
+            Ok(()) => Ok(true),
+            Err(Error::QueryReturnedNoRows) => Ok(false),
+            Err(err) => Err(err.into()),
+        }
+    }
+
+    pub fn is_state_value_set(&self, key: impl AsRef<str>) -> Result<bool> {
+        self.is_value_set(STATE_TABLE_NAME, key)
+    }
+
+    pub fn is_auth_value_set(&self, key: impl AsRef<str>) -> Result<bool> {
+        self.is_value_set(AUTH_TABLE_NAME, key)
+    }
+
+    fn all_values(&self, table: &'static str) -> Result<Map<String, serde_json::Value>> {
+        let conn = self.pool.get()?;
+        let mut stmt = conn.prepare(&format!("SELECT key, value FROM {table}"))?;
+        let rows = stmt.query_map([], |row| {
+            let key = row.get(0)?;
+            let value = row.get(1)?;
+            Ok((key, value))
+        })?;
+
+        let mut map = Map::new();
+        for row in rows {
+            let (key, value) = row?;
+            map.insert(key, value);
+        }
+
+        Ok(map)
+    }
+
+    pub fn all_state_values(&self) -> Result<Map<String, serde_json::Value>> {
+        self.all_values(STATE_TABLE_NAME)
+    }
+
+    // atomic style operations
+
+    fn atomic_op<T: FromSql + ToSql>(
+        &self,
+        key: impl AsRef<str>,
+        op: impl FnOnce(&Option<T>) -> Option<T>,
+    ) -> Result<Option<T>> {
+        let mut conn = self.pool.get()?;
+        let tx = conn.transaction()?;
+
+        let value = tx.query_row::<Option<T>, _, _>(
+            &format!("SELECT value FROM {STATE_TABLE_NAME} WHERE key = ?1"),
+            [key.as_ref()],
+            |row| row.get(0),
+        );
+
+        let value_0: Option<T> = match value {
+            Ok(value) => value,
+            Err(Error::QueryReturnedNoRows) => None,
+            Err(err) => return Err(err.into()),
+        };
+
+        let value_1 = op(&value_0);
+
+        if let Some(value) = value_1 {
+            tx.execute(
+                &format!("INSERT OR REPLACE INTO {STATE_TABLE_NAME} (key, value) VALUES (?1, ?2)"),
+                params![key.as_ref(), value],
+            )?;
+        } else {
+            tx.execute(
+                &format!("DELETE FROM {STATE_TABLE_NAME} WHERE key = ?1"),
+                [key.as_ref()],
+            )?;
+        }
+
+        tx.commit()?;
+
+        Ok(value_0)
+    }
+
+    /// Atomically get the value of a key, then perform an or operation on it
+    /// and set the new value. If the key does not exist, set it to the or value.
+    pub fn atomic_bool_or(&self, key: impl AsRef<str>, or: bool) -> Result<bool> {
+        self.atomic_op::<serde_json::Value>(key, |val| match val {
+            // Some(val) => Some(serde_json::Value::Bool( || or)),
+            Some(serde_json::Value::Bool(b)) => Some(serde_json::Value::Bool(*b || or)),
+            Some(_) | None => Some(serde_json::Value::Bool(or)),
+        })
+        .map(|val| val.and_then(|val| val.as_bool()).unwrap_or(false))
+    }
+}
+
+fn max_migration<C: Deref<Target = Connection>>(conn: &C) -> Option<i64> {
+    let mut stmt = conn.prepare("SELECT MAX(id) FROM migrations").ok()?;
+    stmt.query_row([], |row| row.get(0)).ok()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn mock() -> Db {
+        let db = Db::mock();
+        db.migrate().unwrap();
+        db
+    }
+
+    #[test]
+    fn test_migrate() {
+        let db = mock();
+
+        // assert migration count is correct
+        let max_migration = max_migration(&&*db.pool.get().unwrap());
+        assert_eq!(max_migration, Some(MIGRATIONS.len() as i64));
+    }
+
+    #[test]
+    fn list_migrations() {
+        // Assert the migrations are in order
+        assert!(MIGRATIONS.windows(2).all(|w| w[0].name <= w[1].name));
+
+        // Assert the migrations start with their index
+        assert!(
+            MIGRATIONS
+                .iter()
+                .enumerate()
+                .all(|(i, m)| m.name.starts_with(&format!("{:03}_", i)))
+        );
+
+        // Assert all the files in migrations/ are in the list
+        let migration_folder = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("src/sqlite/migrations");
+        let migration_count = std::fs::read_dir(migration_folder).unwrap().count();
+        assert_eq!(MIGRATIONS.len(), migration_count);
+    }
+
+    #[test]
+    fn state_table_tests() {
+        let db = mock();
+
+        // set
+        db.set_state_value("test", "test").unwrap();
+        db.set_state_value("int", 1).unwrap();
+        db.set_state_value("float", 1.0).unwrap();
+        db.set_state_value("bool", true).unwrap();
+        db.set_state_value("null", ()).unwrap();
+        db.set_state_value("array", vec![1, 2, 3]).unwrap();
+        db.set_state_value("object", serde_json::json!({ "test": "test" }))
+            .unwrap();
+        db.set_state_value("binary", b"test".to_vec()).unwrap();
+
+        // get
+        assert_eq!(db.get_state_value("test").unwrap().unwrap(), "test");
+        assert_eq!(db.get_state_value("int").unwrap().unwrap(), 1);
+        assert_eq!(db.get_state_value("float").unwrap().unwrap(), 1.0);
+        assert_eq!(db.get_state_value("bool").unwrap().unwrap(), true);
+        assert_eq!(db.get_state_value("null").unwrap().unwrap(), serde_json::Value::Null);
+        assert_eq!(
+            db.get_state_value("array").unwrap().unwrap(),
+            serde_json::json!([1, 2, 3])
+        );
+        assert_eq!(
+            db.get_state_value("object").unwrap().unwrap(),
+            serde_json::json!({ "test": "test" })
+        );
+        assert_eq!(
+            db.get_state_value("binary").unwrap().unwrap(),
+            serde_json::json!(b"test".to_vec())
+        );
+
+        // unset
+        db.unset_state_value("test").unwrap();
+        db.unset_state_value("int").unwrap();
+
+        // is_set
+        assert!(!db.is_state_value_set("test").unwrap());
+        assert!(!db.is_state_value_set("int").unwrap());
+        assert!(db.is_state_value_set("float").unwrap());
+        assert!(db.is_state_value_set("bool").unwrap());
+    }
+
+    #[test]
+    fn auth_table_tests() {
+        let db = mock();
+
+        db.set_auth_value("test", "test").unwrap();
+        assert_eq!(db.get_auth_value("test").unwrap().unwrap(), "test");
+        assert!(db.is_auth_value_set("test").unwrap());
+        db.unset_auth_value("test").unwrap();
+        assert!(!db.is_auth_value_set("test").unwrap());
+
+        assert_eq!(db.get_auth_value("test2").unwrap(), None);
+        assert!(!db.is_auth_value_set("test2").unwrap());
+    }
+
+    #[test]
+    fn db_open_time() {
+        let tempdir = tempfile::tempdir().unwrap();
+        let path = tempdir.path().join("data.sqlite3");
+
+        // init the db
+        let db = Db::open(&path).unwrap();
+        db.migrate().unwrap();
+        drop(db);
+
+        let test_count = 100;
+
+        let instant = std::time::Instant::now();
+        let db = Db::open(&path).unwrap();
+        for _ in 0..test_count {
+            db.set_state_value("test", "test").unwrap();
+            db.get_state_value("test").unwrap().unwrap();
+        }
+        let elapsed = instant.elapsed() / test_count;
+        println!("time: {:?}", elapsed);
+    }
+
+    #[test]
+    fn test_atomic_bool() {
+        let key = "test";
+        let db = mock();
+
+        let cases = [
+            (None, false, false, false),
+            (None, true, false, true),
+            (Some(false), false, false, false),
+            (Some(false), true, false, true),
+            (Some(true), false, true, true),
+            (Some(true), true, true, true),
+        ];
+
+        for (a, b, c, d) in cases {
+            db.set_state_value(key, a).unwrap();
+            assert_eq!(db.atomic_bool_or(key, b).unwrap(), c);
+            assert_eq!(db.get_state_value(key).unwrap().unwrap(), d);
+            db.unset_state_value(key).unwrap();
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_settings/sqlite_migrations/000_migration_table.sql b/crates/kiro-cli/src/fig_settings/sqlite_migrations/000_migration_table.sql
new file mode 100644
index 0000000000..1437deb0d9
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/sqlite_migrations/000_migration_table.sql
@@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS migrations (
+    id INTEGER PRIMARY KEY,
+    version INTEGER NOT NULL,
+    migration_time INTEGER NOT NULL
+);
\ No newline at end of file
diff --git a/crates/kiro-cli/src/fig_settings/sqlite_migrations/001_history_table.sql b/crates/kiro-cli/src/fig_settings/sqlite_migrations/001_history_table.sql
new file mode 100644
index 0000000000..7d25913387
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/sqlite_migrations/001_history_table.sql
@@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS history (
+    id INTEGER PRIMARY KEY,
+    command TEXT,
+    shell TEXT,
+    pid INTEGER,
+    session_id TEXT,
+    cwd TEXT,
+    time INTEGER,
+    in_ssh INTEGER,
+    in_docker INTEGER,
+    hostname TEXT,
+    exit_code INTEGER
+);
diff --git a/crates/kiro-cli/src/fig_settings/sqlite_migrations/002_drop_history_in_ssh_docker.sql b/crates/kiro-cli/src/fig_settings/sqlite_migrations/002_drop_history_in_ssh_docker.sql
new file mode 100644
index 0000000000..45e518e024
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/sqlite_migrations/002_drop_history_in_ssh_docker.sql
@@ -0,0 +1,3 @@
+ALTER TABLE history DROP COLUMN in_ssh;
+ALTER TABLE history DROP COLUMN in_docker;
+ 
\ No newline at end of file
diff --git a/crates/kiro-cli/src/fig_settings/sqlite_migrations/003_improved_history_timing.sql b/crates/kiro-cli/src/fig_settings/sqlite_migrations/003_improved_history_timing.sql
new file mode 100644
index 0000000000..58e3bb1c3c
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/sqlite_migrations/003_improved_history_timing.sql
@@ -0,0 +1,3 @@
+ALTER TABLE history RENAME COLUMN time TO start_time;
+ALTER TABLE history ADD COLUMN end_time INTEGER;
+ALTER TABLE history ADD COLUMN duration INTEGER;
diff --git a/crates/kiro-cli/src/fig_settings/sqlite_migrations/004_state_table.sql b/crates/kiro-cli/src/fig_settings/sqlite_migrations/004_state_table.sql
new file mode 100644
index 0000000000..3a7b43c00e
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/sqlite_migrations/004_state_table.sql
@@ -0,0 +1,4 @@
+CREATE TABLE state (
+    key TEXT PRIMARY KEY,
+    value TEXT
+);
diff --git a/crates/kiro-cli/src/fig_settings/sqlite_migrations/005_auth_table.sql b/crates/kiro-cli/src/fig_settings/sqlite_migrations/005_auth_table.sql
new file mode 100644
index 0000000000..17b28fb8e1
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/sqlite_migrations/005_auth_table.sql
@@ -0,0 +1,6 @@
+-- We create a separate auth_kv to ensure the data is not available in all the same
+-- places that the state is available in
+CREATE TABLE auth_kv (
+    key TEXT PRIMARY KEY,
+    value TEXT
+);
diff --git a/crates/kiro-cli/src/fig_settings/state.rs b/crates/kiro-cli/src/fig_settings/state.rs
new file mode 100644
index 0000000000..dea24596f9
--- /dev/null
+++ b/crates/kiro-cli/src/fig_settings/state.rs
@@ -0,0 +1,202 @@
+use serde::de::DeserializeOwned;
+use serde_json::{
+    Map,
+    Value,
+};
+
+use super::sqlite::{
+    Db,
+    database,
+};
+use crate::fig_settings::Result;
+
+#[derive(Debug, Clone, Default)]
+pub struct State(inner::Inner);
+
+mod inner {
+    use super::*;
+
+    #[derive(Debug, Clone, Default)]
+    pub enum Inner {
+        #[default]
+        Real,
+        Fake(Db),
+    }
+}
+
+impl State {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn new_fake() -> Self {
+        let db = Db::mock();
+        db.migrate().unwrap();
+        Self(inner::Inner::Fake(db))
+    }
+
+    pub fn from_slice(slice: &[(&str, Value)]) -> Self {
+        let fake = Self::new_fake();
+        for (key, value) in slice {
+            fake.set_value(key, value.clone()).unwrap();
+        }
+        fake
+    }
+
+    fn database(&self) -> Result<&Db> {
+        match &self.0 {
+            inner::Inner::Real => Ok(database()?),
+            inner::Inner::Fake(db) => Ok(db),
+        }
+    }
+
+    pub fn all(&self) -> Result<Map<String, Value>> {
+        self.database()?.all_state_values()
+    }
+
+    pub fn set_value(&self, key: impl AsRef<str>, value: impl Into<Value>) -> Result<()> {
+        self.database()?.set_state_value(key, value)?;
+        Ok(())
+    }
+
+    pub fn remove_value(&self, key: impl AsRef<str>) -> Result<()> {
+        self.database()?.unset_state_value(key)?;
+        Ok(())
+    }
+
+    pub fn get_value(&self, key: impl AsRef<str>) -> Result<Option<Value>> {
+        self.database()?.get_state_value(key)
+    }
+
+    pub fn get<T: DeserializeOwned>(&self, key: impl AsRef<str>) -> Result<Option<T>> {
+        Ok(self
+            .database()?
+            .get_state_value(key)?
+            .map(|value| serde_json::from_value(value.clone()))
+            .transpose()?)
+    }
+
+    pub fn get_bool(&self, key: impl AsRef<str>) -> Result<Option<bool>> {
+        Ok(self.database()?.get_state_value(key)?.and_then(|value| value.as_bool()))
+    }
+
+    pub fn get_bool_or(&self, key: impl AsRef<str>, default: bool) -> bool {
+        self.get_bool(key).ok().flatten().unwrap_or(default)
+    }
+
+    pub fn get_string(&self, key: impl AsRef<str>) -> Result<Option<String>> {
+        Ok(self.database()?.get_state_value(key)?.and_then(|value| match value {
+            Value::String(s) => Some(s),
+            _ => None,
+        }))
+    }
+
+    pub fn get_string_or(&self, key: impl AsRef<str>, default: impl Into<String>) -> String {
+        self.get_string(key).ok().flatten().unwrap_or_else(|| default.into())
+    }
+
+    pub fn get_int(&self, key: impl AsRef<str>) -> Result<Option<i64>> {
+        Ok(self.database()?.get_state_value(key)?.and_then(|value| value.as_i64()))
+    }
+
+    pub fn get_int_or(&self, key: impl AsRef<str>, default: i64) -> i64 {
+        self.get_int(key).ok().flatten().unwrap_or(default)
+    }
+
+    // Atomic style operations
+
+    pub fn atomic_bool_or(&self, key: impl AsRef<str>, or: bool) -> Result<bool> {
+        self.database()?.atomic_bool_or(key, or)
+    }
+}
+
+pub trait StateProvider {
+    fn state(&self) -> &State;
+}
+
+impl StateProvider for State {
+    fn state(&self) -> &State {
+        self
+    }
+}
+
+pub fn all() -> Result<Map<String, Value>> {
+    State::new().all()
+}
+
+pub fn set_value(key: impl AsRef<str>, value: impl Into<Value>) -> Result<()> {
+    State::new().set_value(key, value)
+}
+
+pub fn remove_value(key: impl AsRef<str>) -> Result<()> {
+    State::new().remove_value(key)
+}
+
+pub fn get_value(key: impl AsRef<str>) -> Result<Option<Value>> {
+    State::new().get_value(key)
+}
+
+pub fn get<T: DeserializeOwned>(key: impl AsRef<str>) -> Result<Option<T>> {
+    State::new().get(key)
+}
+
+pub fn get_bool(key: impl AsRef<str>) -> Result<Option<bool>> {
+    State::new().get_bool(key)
+}
+
+pub fn get_bool_or(key: impl AsRef<str>, default: bool) -> bool {
+    State::new().get_bool_or(key, default)
+}
+
+pub fn get_string(key: impl AsRef<str>) -> Result<Option<String>> {
+    State::new().get_string(key)
+}
+
+pub fn get_string_or(key: impl AsRef<str>, default: impl Into<String>) -> String {
+    State::new().get_string_or(key, default)
+}
+
+pub fn get_int(key: impl AsRef<str>) -> Result<Option<i64>> {
+    State::new().get_int(key)
+}
+
+pub fn get_int_or(key: impl AsRef<str>, default: i64) -> i64 {
+    State::new().get_int_or(key, default)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{
+        Result,
+        State,
+    };
+
+    /// General read/write state test
+    #[test]
+    fn test_state() -> Result<()> {
+        let state = State::new_fake();
+
+        assert!(state.get_value("test").unwrap().is_none());
+        assert!(state.get::<String>("test").unwrap().is_none());
+        state.set_value("test", "hello :)")?;
+        assert!(state.get_value("test").unwrap().is_some());
+        assert!(state.get::<String>("test").unwrap().is_some());
+        state.remove_value("test")?;
+        assert!(state.get_value("test").unwrap().is_none());
+        assert!(state.get::<String>("test").unwrap().is_none());
+
+        assert!(!state.get_bool_or("bool", false));
+        state.set_value("bool", true).unwrap();
+        assert!(state.get_bool("bool").unwrap().unwrap());
+
+        assert_eq!(state.get_string_or("string", "hi"), "hi");
+        state.set_value("string", "hi").unwrap();
+        assert_eq!(state.get_string("string").unwrap().unwrap(), "hi");
+
+        assert_eq!(state.get_int_or("int", 32), 32);
+        state.set_value("int", 32).unwrap();
+        assert_eq!(state.get_int("int").unwrap().unwrap(), 32);
+
+        Ok(())
+    }
+}
diff --git a/crates/kiro-cli/src/fig_telemetry/cognito.rs b/crates/kiro-cli/src/fig_telemetry/cognito.rs
new file mode 100644
index 0000000000..21e286a570
--- /dev/null
+++ b/crates/kiro-cli/src/fig_telemetry/cognito.rs
@@ -0,0 +1,145 @@
+use amzn_toolkit_telemetry_client::config::BehaviorVersion;
+use aws_credential_types::provider::error::CredentialsError;
+use aws_credential_types::{
+    Credentials,
+    provider,
+};
+use aws_sdk_cognitoidentity::primitives::{
+    DateTime,
+    DateTimeFormat,
+};
+
+use crate::fig_aws_common::app_name;
+use crate::fig_telemetry::TelemetryStage;
+
+const CREDENTIALS_KEY: &str = "telemetry-cognito-credentials";
+
+const DATE_TIME_FORMAT: DateTimeFormat = DateTimeFormat::DateTime;
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+struct CredentialsJson {
+    pub access_key_id: Option<String>,
+    pub secret_key: Option<String>,
+    pub session_token: Option<String>,
+    pub expiration: Option<String>,
+}
+
+pub(crate) async fn get_cognito_credentials_send(
+    telemetry_stage: &TelemetryStage,
+) -> Result<Credentials, CredentialsError> {
+    let conf = aws_sdk_cognitoidentity::Config::builder()
+        .behavior_version(BehaviorVersion::v2025_01_17())
+        .region(telemetry_stage.region.clone())
+        .app_name(app_name())
+        .build();
+    let client = aws_sdk_cognitoidentity::Client::from_conf(conf);
+
+    let identity_id = client
+        .get_id()
+        .identity_pool_id(telemetry_stage.cognito_pool_id)
+        .send()
+        .await
+        .map_err(CredentialsError::provider_error)?
+        .identity_id
+        .ok_or(CredentialsError::provider_error("no identity_id from get_id"))?;
+
+    let credentials = client
+        .get_credentials_for_identity()
+        .identity_id(identity_id)
+        .send()
+        .await
+        .map_err(CredentialsError::provider_error)?
+        .credentials
+        .ok_or(CredentialsError::provider_error(
+            "no credentials from get_credentials_for_identity",
+        ))?;
+
+    if let Ok(json) = serde_json::to_value(CredentialsJson {
+        access_key_id: credentials.access_key_id.clone(),
+        secret_key: credentials.secret_key.clone(),
+        session_token: credentials.session_token.clone(),
+        expiration: credentials.expiration.and_then(|t| t.fmt(DATE_TIME_FORMAT).ok()),
+    }) {
+        crate::fig_settings::state::set_value(CREDENTIALS_KEY, json).ok();
+    }
+
+    let Some(access_key_id) = credentials.access_key_id else {
+        return Err(CredentialsError::provider_error("access key id not found"));
+    };
+
+    let Some(secret_key) = credentials.secret_key else {
+        return Err(CredentialsError::provider_error("secret access key not found"));
+    };
+
+    Ok(Credentials::new(
+        access_key_id,
+        secret_key,
+        credentials.session_token,
+        credentials.expiration.and_then(|dt| dt.try_into().ok()),
+        "",
+    ))
+}
+
+pub(crate) async fn get_cognito_credentials(telemetry_stage: &TelemetryStage) -> Result<Credentials, CredentialsError> {
+    match crate::fig_settings::state::get_string(CREDENTIALS_KEY).ok().flatten() {
+        Some(creds) => {
+            let CredentialsJson {
+                access_key_id,
+                secret_key,
+                session_token,
+                expiration,
+            }: CredentialsJson = serde_json::from_str(&creds).map_err(CredentialsError::provider_error)?;
+
+            let Some(access_key_id) = access_key_id else {
+                return get_cognito_credentials_send(telemetry_stage).await;
+            };
+
+            let Some(secret_key) = secret_key else {
+                return get_cognito_credentials_send(telemetry_stage).await;
+            };
+
+            Ok(Credentials::new(
+                access_key_id,
+                secret_key,
+                session_token,
+                expiration
+                    .and_then(|s| DateTime::from_str(&s, DATE_TIME_FORMAT).ok())
+                    .and_then(|dt| dt.try_into().ok()),
+                "",
+            ))
+        },
+        None => get_cognito_credentials_send(telemetry_stage).await,
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct CognitoProvider {
+    telemetry_stage: TelemetryStage,
+}
+
+impl CognitoProvider {
+    pub(crate) fn new(telemetry_stage: TelemetryStage) -> CognitoProvider {
+        CognitoProvider { telemetry_stage }
+    }
+}
+
+impl provider::ProvideCredentials for CognitoProvider {
+    fn provide_credentials<'a>(&'a self) -> provider::future::ProvideCredentials<'a>
+    where
+        Self: 'a,
+    {
+        provider::future::ProvideCredentials::new(get_cognito_credentials(&self.telemetry_stage))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[tokio::test]
+    async fn pools() {
+        for telemetry_stage in [TelemetryStage::BETA, TelemetryStage::EXTERNAL_PROD] {
+            get_cognito_credentials_send(&telemetry_stage).await.unwrap();
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_telemetry/definitions.rs b/crates/kiro-cli/src/fig_telemetry/definitions.rs
new file mode 100644
index 0000000000..0421534f75
--- /dev/null
+++ b/crates/kiro-cli/src/fig_telemetry/definitions.rs
@@ -0,0 +1,35 @@
+// https://github.com/aws/aws-toolkit-common/blob/main/telemetry/telemetryformat.md
+
+pub trait IntoMetricDatum: Send {
+    fn into_metric_datum(self) -> amzn_toolkit_telemetry_client::types::MetricDatum;
+}
+
+include!(concat!(env!("OUT_DIR"), "/mod.rs"));
+
+#[cfg(test)]
+mod tests {
+    use std::time::SystemTime;
+
+    use super::*;
+    use crate::fig_telemetry::definitions::metrics::CodewhispererterminalAddChatMessage;
+
+    #[test]
+    fn test_serde() {
+        let metric_datum_init = Metric::CodewhispererterminalAddChatMessage(CodewhispererterminalAddChatMessage {
+            amazonq_conversation_id: None,
+            codewhispererterminal_context_file_length: None,
+            create_time: Some(SystemTime::now()),
+            value: None,
+            credential_start_url: Some("https://example.com".to_owned().into()),
+            codewhispererterminal_in_cloudshell: Some(false.into()),
+        });
+
+        let s = serde_json::to_string_pretty(&metric_datum_init).unwrap();
+        println!("{s}");
+
+        let metric_datum_out: Metric = serde_json::from_str(&s).unwrap();
+        println!("{metric_datum_out:#?}");
+
+        assert_eq!(metric_datum_init, metric_datum_out);
+    }
+}
diff --git a/crates/kiro-cli/src/fig_telemetry/endpoint.rs b/crates/kiro-cli/src/fig_telemetry/endpoint.rs
new file mode 100644
index 0000000000..681d19af76
--- /dev/null
+++ b/crates/kiro-cli/src/fig_telemetry/endpoint.rs
@@ -0,0 +1,32 @@
+use amzn_toolkit_telemetry_client::config::endpoint::{
+    Endpoint,
+    EndpointFuture,
+    Params,
+    ResolveEndpoint,
+};
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct StaticEndpoint(pub &'static str);
+
+impl ResolveEndpoint for StaticEndpoint {
+    fn resolve_endpoint<'a>(&'a self, _params: &'a Params) -> EndpointFuture<'a> {
+        let endpoint = Endpoint::builder().url(self.0).build();
+        tracing::info!(?endpoint, "Resolving endpoint");
+        EndpointFuture::ready(Ok(endpoint))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_static_endpoint() {
+        let endpoint = StaticEndpoint("https://example.com");
+        let params = Params::builder().build().unwrap();
+        let endpoint = endpoint.resolve_endpoint(&params).await.unwrap();
+        assert_eq!(endpoint.url(), "https://example.com");
+        assert!(endpoint.properties().is_empty());
+        assert!(endpoint.headers().count() == 0);
+    }
+}
diff --git a/crates/kiro-cli/src/fig_telemetry/event.rs b/crates/kiro-cli/src/fig_telemetry/event.rs
new file mode 100644
index 0000000000..91832e6d34
--- /dev/null
+++ b/crates/kiro-cli/src/fig_telemetry/event.rs
@@ -0,0 +1,150 @@
+use std::time::SystemTime;
+
+use crate::fig_telemetry_core::{
+    Event,
+    EventType,
+    MetricDatum,
+};
+
+/// Wrapper around the default telemetry [Event]. Used to initialize other metadata fields
+/// within the global telemetry emitter implementation.
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+pub struct AppTelemetryEvent(Event);
+
+impl std::ops::Deref for AppTelemetryEvent {
+    type Target = Event;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl AppTelemetryEvent {
+    pub async fn new(ty: EventType) -> Self {
+        Self(Event {
+            ty,
+            credential_start_url: crate::fig_auth::builder_id_token()
+                .await
+                .ok()
+                .flatten()
+                .and_then(|t| t.start_url),
+            created_time: Some(SystemTime::now()),
+        })
+    }
+
+    pub async fn from_event(event: Event) -> Self {
+        let credential_start_url = match event.credential_start_url {
+            Some(v) => Some(v),
+            None => crate::fig_auth::builder_id_token()
+                .await
+                .ok()
+                .flatten()
+                .and_then(|t| t.start_url),
+        };
+        Self(Event {
+            ty: event.ty,
+            credential_start_url,
+            created_time: event.created_time.or_else(|| Some(SystemTime::now())),
+        })
+    }
+
+    pub fn into_metric_datum(self) -> Option<MetricDatum> {
+        self.0.into_metric_datum()
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct InlineShellCompletionActionedOptions {}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::fig_telemetry_core::TelemetryResult;
+
+    async fn user_logged_in() -> AppTelemetryEvent {
+        AppTelemetryEvent::new(EventType::UserLoggedIn {}).await
+    }
+
+    async fn refresh_credentials() -> AppTelemetryEvent {
+        AppTelemetryEvent::new(EventType::RefreshCredentials {
+            request_id: "request_id".into(),
+            result: TelemetryResult::Failed,
+            reason: Some("some failure".into()),
+            oauth_flow: "pkce".into(),
+        })
+        .await
+    }
+
+    async fn cli_subcommand_executed() -> AppTelemetryEvent {
+        AppTelemetryEvent::new(EventType::CliSubcommandExecuted {
+            subcommand: "test".into(),
+        })
+        .await
+    }
+
+    async fn chat_start() -> AppTelemetryEvent {
+        AppTelemetryEvent::new(EventType::ChatStart {
+            conversation_id: "XXX".into(),
+        })
+        .await
+    }
+
+    async fn chat_end() -> AppTelemetryEvent {
+        AppTelemetryEvent::new(EventType::ChatEnd {
+            conversation_id: "XXX".into(),
+        })
+        .await
+    }
+
+    async fn chat_added_message() -> AppTelemetryEvent {
+        AppTelemetryEvent::new(EventType::ChatAddedMessage {
+            conversation_id: "XXX".into(),
+            message_id: "YYY".into(),
+            context_file_length: Some(5),
+        })
+        .await
+    }
+
+    pub(crate) async fn all_events() -> Vec<AppTelemetryEvent> {
+        vec![
+            user_logged_in().await,
+            refresh_credentials().await,
+            cli_subcommand_executed().await,
+            chat_start().await,
+            chat_end().await,
+            chat_added_message().await,
+        ]
+    }
+
+    #[tokio::test]
+    async fn from_event_test() {
+        let event = Event {
+            ty: EventType::UserLoggedIn {},
+            credential_start_url: Some("https://example.com".into()),
+            created_time: None,
+        };
+        let app_event = AppTelemetryEvent::from_event(event).await;
+        assert_eq!(app_event.ty, EventType::UserLoggedIn {});
+        assert_eq!(app_event.credential_start_url, Some("https://example.com".into()));
+        assert!(app_event.created_time.is_some());
+    }
+
+    #[tokio::test]
+    async fn test_event_ser() {
+        for event in all_events().await {
+            let json = serde_json::to_string_pretty(&event).unwrap();
+            println!("\n{json}\n");
+        }
+    }
+
+    #[tokio::test]
+    async fn test_into_metric_datum() {
+        for event in all_events().await {
+            let metric_datum = event.into_metric_datum();
+            if let Some(metric_datum) = metric_datum {
+                println!("\n{}: {metric_datum:?}\n", metric_datum.metric_name());
+            }
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_telemetry/install_method.rs b/crates/kiro-cli/src/fig_telemetry/install_method.rs
new file mode 100644
index 0000000000..2a541252af
--- /dev/null
+++ b/crates/kiro-cli/src/fig_telemetry/install_method.rs
@@ -0,0 +1,45 @@
+use std::process::Command;
+use std::sync::LazyLock;
+
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+static INSTALL_METHOD: LazyLock<InstallMethod> = LazyLock::new(|| {
+    if let Ok(output) = Command::new("brew").args(["list", "amazon-q", "-1"]).output() {
+        if output.status.success() {
+            return InstallMethod::Brew;
+        }
+    }
+
+    if let Ok(current_exe) = std::env::current_exe() {
+        if current_exe.components().any(|c| c.as_os_str() == ".toolbox") {
+            return InstallMethod::Toolbox;
+        }
+    }
+
+    InstallMethod::Unknown
+});
+
+/// The method of installation that Fig was installed with
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+pub enum InstallMethod {
+    Brew,
+    Toolbox,
+    Unknown,
+}
+
+impl std::fmt::Display for InstallMethod {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(match self {
+            InstallMethod::Brew => "brew",
+            InstallMethod::Toolbox => "toolbox",
+            InstallMethod::Unknown => "unknown",
+        })
+    }
+}
+
+pub fn get_install_method() -> InstallMethod {
+    *INSTALL_METHOD
+}
diff --git a/crates/kiro-cli/src/fig_telemetry/mod.rs b/crates/kiro-cli/src/fig_telemetry/mod.rs
new file mode 100644
index 0000000000..f7292925a3
--- /dev/null
+++ b/crates/kiro-cli/src/fig_telemetry/mod.rs
@@ -0,0 +1,693 @@
+pub mod cognito;
+pub mod definitions;
+pub mod endpoint;
+mod event;
+mod install_method;
+mod util;
+
+use std::any::Any;
+use std::sync::LazyLock;
+use std::time::{
+    Duration,
+    SystemTime,
+};
+
+use amzn_codewhisperer_client::types::{
+    ChatAddMessageEvent,
+    CompletionType,
+    IdeCategory,
+    OperatingSystem,
+    OptOutPreference,
+    ProgrammingLanguage,
+    TelemetryEvent,
+    TerminalUserInteractionEvent,
+    TerminalUserInteractionEventType,
+    UserContext,
+    UserTriggerDecisionEvent,
+};
+use amzn_toolkit_telemetry_client::config::{
+    BehaviorVersion,
+    Region,
+};
+use amzn_toolkit_telemetry_client::error::DisplayErrorContext;
+use amzn_toolkit_telemetry_client::types::AwsProduct;
+use amzn_toolkit_telemetry_client::{
+    Client as ToolkitTelemetryClient,
+    Config,
+};
+use aws_credential_types::provider::SharedCredentialsProvider;
+use aws_smithy_types::DateTime;
+use cognito::CognitoProvider;
+use endpoint::StaticEndpoint;
+pub use event::AppTelemetryEvent;
+pub use install_method::{
+    InstallMethod,
+    get_install_method,
+};
+use tokio::sync::{
+    Mutex,
+    OnceCell,
+};
+use tokio::task::JoinSet;
+use tracing::{
+    debug,
+    error,
+};
+use util::telemetry_is_disabled;
+use uuid::Uuid;
+
+use crate::fig_api_client::Client as CodewhispererClient;
+use crate::fig_aws_common::app_name;
+use crate::fig_settings::State;
+pub use crate::fig_telemetry_core::{
+    EventType,
+    QProfileSwitchIntent,
+    SuggestionState,
+    TelemetryEmitter,
+    TelemetryResult,
+};
+use crate::fig_util::system_info::os_version;
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("Telemetry is disabled")]
+    TelemetryDisabled,
+    #[error(transparent)]
+    ClientError(#[from] amzn_toolkit_telemetry_client::operation::post_metrics::PostMetricsError),
+}
+
+const PRODUCT: &str = "CodeWhisperer";
+const PRODUCT_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+async fn client() -> &'static Client {
+    static CLIENT: OnceCell<Client> = OnceCell::const_new();
+    CLIENT
+        .get_or_init(|| async { Client::new(TelemetryStage::EXTERNAL_PROD).await })
+        .await
+}
+
+/// A telemetry emitter that first tries sending the event to figterm so that the CLI commands can
+/// execute much quicker. Only falls back to sending it directly on the current task if sending to
+/// figterm fails.
+struct DispatchingTelemetryEmitter;
+
+#[async_trait::async_trait]
+impl TelemetryEmitter for DispatchingTelemetryEmitter {
+    async fn send(&self, event: crate::fig_telemetry_core::Event) {
+        let event = AppTelemetryEvent::from_event(event).await;
+        send_event(event).await;
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+}
+
+pub fn init_global_telemetry_emitter() {
+    crate::fig_telemetry_core::init_global_telemetry_emitter(DispatchingTelemetryEmitter {});
+}
+
+/// A IDE toolkit telemetry stage
+#[derive(Debug, Clone)]
+#[non_exhaustive]
+pub struct TelemetryStage {
+    pub name: &'static str,
+    pub endpoint: &'static str,
+    pub cognito_pool_id: &'static str,
+    pub region: Region,
+}
+
+impl TelemetryStage {
+    #[allow(dead_code)]
+    const BETA: Self = Self::new(
+        "beta",
+        "https://7zftft3lj2.execute-api.us-east-1.amazonaws.com/Beta",
+        "us-east-1:db7bfc9f-8ecd-4fbb-bea7-280c16069a99",
+        "us-east-1",
+    );
+    const EXTERNAL_PROD: Self = Self::new(
+        "prod",
+        "https://client-telemetry.us-east-1.amazonaws.com",
+        "us-east-1:820fd6d1-95c0-4ca4-bffb-3f01d32da842",
+        "us-east-1",
+    );
+
+    const fn new(
+        name: &'static str,
+        endpoint: &'static str,
+        cognito_pool_id: &'static str,
+        region: &'static str,
+    ) -> Self {
+        Self {
+            name,
+            endpoint,
+            cognito_pool_id,
+            region: Region::from_static(region),
+        }
+    }
+}
+
+static JOIN_SET: LazyLock<Mutex<JoinSet<()>>> = LazyLock::new(|| Mutex::new(JoinSet::new()));
+
+/// Joins all current telemetry events
+pub async fn finish_telemetry() {
+    let mut set = JOIN_SET.lock().await;
+    while let Some(res) = set.join_next().await {
+        if let Err(err) = res {
+            error!(%err, "Failed to join telemetry event");
+        }
+    }
+}
+
+/// Joins all current telemetry events and panics if any fail to join
+pub async fn finish_telemetry_unwrap() {
+    let mut set = JOIN_SET.lock().await;
+    while let Some(res) = set.join_next().await {
+        res.unwrap();
+    }
+}
+
+fn opt_out_preference() -> OptOutPreference {
+    if telemetry_is_disabled() {
+        OptOutPreference::OptOut
+    } else {
+        OptOutPreference::OptIn
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Client {
+    client_id: Uuid,
+    toolkit_telemetry_client: Option<ToolkitTelemetryClient>,
+    codewhisperer_client: Option<CodewhispererClient>,
+    state: State,
+}
+
+impl Client {
+    pub async fn new(telemetry_stage: TelemetryStage) -> Self {
+        let client_id = util::get_client_id();
+        let toolkit_telemetry_client = Some(amzn_toolkit_telemetry_client::Client::from_conf(
+            Config::builder()
+                .http_client(crate::fig_aws_common::http_client::client())
+                .behavior_version(BehaviorVersion::v2025_01_17())
+                .endpoint_resolver(StaticEndpoint(telemetry_stage.endpoint))
+                .app_name(app_name())
+                .region(telemetry_stage.region.clone())
+                .credentials_provider(SharedCredentialsProvider::new(CognitoProvider::new(telemetry_stage)))
+                .build(),
+        ));
+        let codewhisperer_client = CodewhispererClient::new().await.ok();
+        let state = State::new();
+
+        Self {
+            client_id,
+            toolkit_telemetry_client,
+            codewhisperer_client,
+            state,
+        }
+    }
+
+    pub fn mock() -> Self {
+        let client_id = util::get_client_id();
+        let toolkit_telemetry_client = None;
+        let codewhisperer_client = Some(CodewhispererClient::mock());
+        let state = State::new_fake();
+
+        Self {
+            client_id,
+            toolkit_telemetry_client,
+            codewhisperer_client,
+            state,
+        }
+    }
+
+    async fn send_event(&self, event: AppTelemetryEvent) {
+        self.send_cw_telemetry_event(&event).await;
+        self.send_telemetry_toolkit_metric(event).await;
+    }
+
+    async fn send_telemetry_toolkit_metric(&self, event: AppTelemetryEvent) {
+        if telemetry_is_disabled() {
+            return;
+        }
+        let Some(toolkit_telemetry_client) = self.toolkit_telemetry_client.clone() else {
+            return;
+        };
+        let client_id = self.client_id;
+        let Some(metric_datum) = event.into_metric_datum() else {
+            return;
+        };
+
+        let mut set = JOIN_SET.lock().await;
+        set.spawn({
+            async move {
+                let product = AwsProduct::CodewhispererTerminal;
+                let product_version = env!("CARGO_PKG_VERSION");
+                let os = std::env::consts::OS;
+                let os_architecture = std::env::consts::ARCH;
+                let os_version = os_version().map(|v| v.to_string()).unwrap_or_default();
+                let metric_name = metric_datum.metric_name().to_owned();
+
+                debug!(?product, ?metric_datum, "Posting metrics");
+                if let Err(err) = toolkit_telemetry_client
+                    .post_metrics()
+                    .aws_product(product)
+                    .aws_product_version(product_version)
+                    .client_id(client_id)
+                    .os(os)
+                    .os_architecture(os_architecture)
+                    .os_version(os_version)
+                    .metric_data(metric_datum)
+                    .send()
+                    .await
+                    .map_err(DisplayErrorContext)
+                {
+                    error!(%err, ?metric_name, "Failed to post metric");
+                }
+            }
+        });
+    }
+
+    async fn send_cw_telemetry_event(&self, event: &AppTelemetryEvent) {
+        match &event.ty {
+            EventType::ChatAddedMessage {
+                conversation_id,
+                message_id,
+                ..
+            } => {
+                self.send_cw_telemetry_chat_add_message_event(conversation_id.clone(), message_id.clone())
+                    .await;
+            },
+            _ => {},
+        }
+    }
+
+    fn user_context(&self) -> Option<UserContext> {
+        let operating_system = match std::env::consts::OS {
+            "linux" => OperatingSystem::Linux,
+            "macos" => OperatingSystem::Mac,
+            "windows" => OperatingSystem::Windows,
+            os => {
+                error!(%os, "Unsupported operating system");
+                return None;
+            },
+        };
+
+        match UserContext::builder()
+            .client_id(self.client_id.hyphenated().to_string())
+            .operating_system(operating_system)
+            .product(PRODUCT)
+            .ide_category(IdeCategory::Cli)
+            .ide_version(PRODUCT_VERSION)
+            .build()
+        {
+            Ok(user_context) => Some(user_context),
+            Err(err) => {
+                error!(%err, "Failed to build user context");
+                None
+            },
+        }
+    }
+
+    async fn send_cw_telemetry_translation_action(
+        &self,
+        latency: Duration,
+        suggestion_state: SuggestionState,
+        terminal: Option<String>,
+        terminal_version: Option<String>,
+        shell: Option<String>,
+        shell_version: Option<String>,
+    ) {
+        let Some(codewhisperer_client) = self.codewhisperer_client.clone() else {
+            return;
+        };
+        let user_context = self.user_context().unwrap();
+        let opt_out_preference = opt_out_preference();
+
+        let mut set = JOIN_SET.lock().await;
+        set.spawn(async move {
+            let mut terminal_user_interaction_event_builder = TerminalUserInteractionEvent::builder()
+                .terminal_user_interaction_event_type(
+                    TerminalUserInteractionEventType::CodewhispererTerminalTranslationAction,
+                )
+                .time_to_suggestion(latency.as_millis() as i32)
+                .is_completion_accepted(suggestion_state == SuggestionState::Accept);
+
+            if let Some(terminal) = terminal {
+                terminal_user_interaction_event_builder = terminal_user_interaction_event_builder.terminal(terminal);
+            }
+
+            if let Some(terminal_version) = terminal_version {
+                terminal_user_interaction_event_builder =
+                    terminal_user_interaction_event_builder.terminal_version(terminal_version);
+            }
+
+            if let Some(shell) = shell {
+                terminal_user_interaction_event_builder = terminal_user_interaction_event_builder.shell(shell);
+            }
+
+            if let Some(shell_version) = shell_version {
+                terminal_user_interaction_event_builder =
+                    terminal_user_interaction_event_builder.shell_version(shell_version);
+            }
+
+            let terminal_user_interaction_event = terminal_user_interaction_event_builder.build();
+
+            if let Err(err) = codewhisperer_client
+                .send_telemetry_event(
+                    TelemetryEvent::TerminalUserInteractionEvent(terminal_user_interaction_event),
+                    user_context,
+                    opt_out_preference,
+                )
+                .await
+            {
+                error!(err =% DisplayErrorContext(err), "Failed to send telemetry event");
+            }
+        });
+    }
+
+    async fn send_cw_telemetry_completion_inserted(
+        &self,
+        command: String,
+        terminal: Option<String>,
+        shell: Option<String>,
+    ) {
+        let Some(codewhisperer_client) = self.codewhisperer_client.clone() else {
+            return;
+        };
+        let user_context = self.user_context().unwrap();
+        let opt_out_preference = opt_out_preference();
+
+        let mut set = JOIN_SET.lock().await;
+        set.spawn(async move {
+            let mut terminal_user_interaction_event_builder = TerminalUserInteractionEvent::builder()
+                .terminal_user_interaction_event_type(
+                    TerminalUserInteractionEventType::CodewhispererTerminalCompletionInserted,
+                )
+                .cli_tool_command(command);
+
+            if let Some(terminal) = terminal {
+                terminal_user_interaction_event_builder = terminal_user_interaction_event_builder.terminal(terminal);
+            }
+
+            if let Some(shell) = shell {
+                terminal_user_interaction_event_builder = terminal_user_interaction_event_builder.shell(shell);
+            }
+
+            let terminal_user_interaction_event = terminal_user_interaction_event_builder.build();
+
+            if let Err(err) = codewhisperer_client
+                .send_telemetry_event(
+                    TelemetryEvent::TerminalUserInteractionEvent(terminal_user_interaction_event),
+                    user_context,
+                    opt_out_preference,
+                )
+                .await
+            {
+                error!(err =% DisplayErrorContext(err), "Failed to send telemetry event");
+            }
+        });
+    }
+
+    async fn send_cw_telemetry_chat_add_message_event(&self, conversation_id: String, message_id: String) {
+        let Some(codewhisperer_client) = self.codewhisperer_client.clone() else {
+            return;
+        };
+        let user_context = self.user_context().unwrap();
+        let opt_out_preference = opt_out_preference();
+
+        let chat_add_message_event = match ChatAddMessageEvent::builder()
+            .conversation_id(conversation_id)
+            .message_id(message_id)
+            .build()
+        {
+            Ok(event) => event,
+            Err(err) => {
+                error!(err =% DisplayErrorContext(err), "Failed to send telemetry event");
+                return;
+            },
+        };
+
+        let mut set = JOIN_SET.lock().await;
+        set.spawn(async move {
+            if let Err(err) = codewhisperer_client
+                .send_telemetry_event(
+                    TelemetryEvent::ChatAddMessageEvent(chat_add_message_event),
+                    user_context,
+                    opt_out_preference,
+                )
+                .await
+            {
+                error!(err =% DisplayErrorContext(err), "Failed to send telemetry event");
+            }
+        });
+    }
+
+    /// This is the user decision to accept a suggestion for inline suggestions
+    async fn send_cw_telemetry_user_trigger_decision_event(
+        &self,
+        session_id: String,
+        request_id: String,
+        latency: Duration,
+        accepted: bool,
+        suggested_chars_len: i32,
+        number_of_recommendations: i32,
+    ) {
+        let Some(codewhisperer_client) = self.codewhisperer_client.clone() else {
+            return;
+        };
+        let user_context = self.user_context().unwrap();
+        let opt_out_preference = opt_out_preference();
+
+        let programming_language = match ProgrammingLanguage::builder().language_name("shell").build() {
+            Ok(language) => language,
+            Err(err) => {
+                error!(err =% DisplayErrorContext(err), "Failed to build programming language");
+                return;
+            },
+        };
+
+        let suggestion_state = if accepted {
+            SuggestionState::Accept
+        } else {
+            SuggestionState::Reject
+        };
+
+        let user_trigger_decision_event = match UserTriggerDecisionEvent::builder()
+            .session_id(session_id)
+            .request_id(request_id)
+            .programming_language(programming_language)
+            .completion_type(CompletionType::Line)
+            .suggestion_state(suggestion_state.into())
+            .accepted_character_count(if accepted { suggested_chars_len } else { 0 })
+            .number_of_recommendations(number_of_recommendations)
+            .generated_line(1)
+            .recommendation_latency_milliseconds(latency.as_secs_f64() * 1000.0)
+            .timestamp(DateTime::from(SystemTime::now()))
+            .build()
+        {
+            Ok(event) => event,
+            Err(err) => {
+                error!(err =% DisplayErrorContext(err), "Failed to build user trigger decision event");
+                return;
+            },
+        };
+
+        let mut set = JOIN_SET.lock().await;
+        set.spawn(async move {
+            if let Err(err) = codewhisperer_client
+                .send_telemetry_event(
+                    TelemetryEvent::UserTriggerDecisionEvent(user_trigger_decision_event),
+                    user_context,
+                    opt_out_preference,
+                )
+                .await
+            {
+                error!(err =% DisplayErrorContext(err), "Failed to send telemetry event");
+            }
+        });
+    }
+}
+
+pub async fn send_event(event: AppTelemetryEvent) {
+    client().await.send_event(event).await;
+}
+
+pub async fn send_user_logged_in() {
+    let event = AppTelemetryEvent::new(EventType::UserLoggedIn {}).await;
+    send_event(event).await;
+}
+
+pub async fn send_cli_subcommand_executed(subcommand: impl Into<String>) {
+    let event = AppTelemetryEvent::new(EventType::CliSubcommandExecuted {
+        subcommand: subcommand.into(),
+    })
+    .await;
+    send_event(event).await;
+}
+
+pub async fn send_start_chat(conversation_id: String) {
+    let event = AppTelemetryEvent::new(EventType::ChatStart { conversation_id }).await;
+    send_event(event).await;
+}
+
+pub async fn send_end_chat(conversation_id: String) {
+    let event = AppTelemetryEvent::new(EventType::ChatEnd { conversation_id }).await;
+    send_event(event).await;
+}
+
+pub async fn send_chat_added_message(conversation_id: String, message_id: String, context_file_length: Option<usize>) {
+    let event = AppTelemetryEvent::new(EventType::ChatAddedMessage {
+        conversation_id,
+        message_id,
+        context_file_length,
+    })
+    .await;
+    send_event(event).await;
+}
+
+pub async fn send_did_select_profile(
+    source: QProfileSwitchIntent,
+    amazonq_profile_region: String,
+    result: TelemetryResult,
+    sso_region: Option<String>,
+    profile_count: Option<i64>,
+) {
+    let event = AppTelemetryEvent::new(EventType::DidSelectProfile {
+        source,
+        amazonq_profile_region,
+        result,
+        sso_region,
+        profile_count,
+    })
+    .await;
+    send_event(event).await;
+}
+
+pub async fn send_profile_state(
+    source: QProfileSwitchIntent,
+    amazonq_profile_region: String,
+    result: TelemetryResult,
+    sso_region: Option<String>,
+) {
+    let event = AppTelemetryEvent::new(EventType::ProfileState {
+        source,
+        amazonq_profile_region,
+        result,
+        sso_region,
+    })
+    .await;
+    send_event(event).await;
+}
+
+#[cfg(test)]
+mod test {
+    use event::tests::all_events;
+    use uuid::uuid;
+
+    use super::*;
+
+    #[tokio::test]
+    async fn client_context() {
+        let client = client().await;
+        let context = client.user_context().unwrap();
+
+        assert_eq!(context.ide_category, IdeCategory::Cli);
+        assert!(matches!(
+            context.operating_system,
+            OperatingSystem::Linux | OperatingSystem::Mac | OperatingSystem::Windows
+        ));
+        assert_eq!(context.product, PRODUCT);
+        assert_eq!(
+            context.client_id,
+            Some(uuid!("ffffffff-ffff-ffff-ffff-ffffffffffff").hyphenated().to_string())
+        );
+        assert_eq!(context.ide_version.as_deref(), Some(PRODUCT_VERSION));
+    }
+
+    #[tokio::test]
+    async fn client_send_event_test() {
+        let client = Client::mock();
+        for event in all_events().await {
+            client.send_event(event).await;
+        }
+    }
+
+    #[tracing_test::traced_test]
+    #[tokio::test]
+    #[ignore = "needs auth which is not in CI"]
+    async fn test_send() {
+        // let (shell, shell_version) = Shell::current_shell_version()
+        //     .await
+        //     .map(|(shell, shell_version)| (Some(shell), Some(shell_version)))
+        //     .unwrap_or((None, None));
+
+        // let client = Client::new(TelemetryStage::BETA).await;
+
+        // client
+        //     .post_metric(metrics::CodewhispererterminalCliSubcommandExecuted {
+        //         create_time: None,
+        //         value: None,
+        //         codewhispererterminal_subcommand: Some(CodewhispererterminalSubcommand("doctor".into())),
+        //         codewhispererterminal_terminal: CURRENT_TERMINAL
+        //             .clone()
+        //             .map(|terminal| CodewhispererterminalTerminal(terminal.internal_id().to_string())),
+        //         codewhispererterminal_terminal_version: CURRENT_TERMINAL_VERSION
+        //             .clone()
+        //             .map(CodewhispererterminalTerminalVersion),
+        //         codewhispererterminal_shell: shell.map(|shell|
+        // CodewhispererterminalShell(shell.to_string())),
+        //         codewhispererterminal_shell_version:
+        // shell_version.map(CodewhispererterminalShellVersion),         credential_start_url:
+        // start_url().await,     })
+        //     .await;
+
+        finish_telemetry_unwrap().await;
+
+        assert!(!logs_contain("ERROR"));
+        assert!(!logs_contain("error"));
+        assert!(!logs_contain("WARN"));
+        assert!(!logs_contain("warn"));
+        assert!(!logs_contain("Failed to post metric"));
+    }
+
+    #[tracing_test::traced_test]
+    #[tokio::test]
+    #[ignore = "needs auth which is not in CI"]
+    async fn test_all_telemetry() {
+        send_user_logged_in().await;
+        send_cli_subcommand_executed("doctor").await;
+        send_chat_added_message("debug".to_owned(), "debug".to_owned(), Some(123)).await;
+
+        finish_telemetry_unwrap().await;
+
+        assert!(!logs_contain("ERROR"));
+        assert!(!logs_contain("error"));
+        assert!(!logs_contain("WARN"));
+        assert!(!logs_contain("warn"));
+        assert!(!logs_contain("Failed to post metric"));
+    }
+
+    #[tokio::test]
+    #[ignore = "needs auth which is not in CI"]
+    async fn test_without_optout() {
+        let client = Client::new(TelemetryStage::BETA).await;
+        client
+            .codewhisperer_client
+            .as_ref()
+            .unwrap()
+            .send_telemetry_event(
+                TelemetryEvent::ChatAddMessageEvent(
+                    ChatAddMessageEvent::builder()
+                        .conversation_id("debug".to_owned())
+                        .message_id("debug".to_owned())
+                        .build()
+                        .unwrap(),
+                ),
+                client.user_context().unwrap(),
+                OptOutPreference::OptIn,
+            )
+            .await
+            .unwrap();
+    }
+}
diff --git a/crates/kiro-cli/src/fig_telemetry/util.rs b/crates/kiro-cli/src/fig_telemetry/util.rs
new file mode 100644
index 0000000000..6a725abbb6
--- /dev/null
+++ b/crates/kiro-cli/src/fig_telemetry/util.rs
@@ -0,0 +1,162 @@
+use std::str::FromStr;
+
+use tracing::error;
+use uuid::{
+    Uuid,
+    uuid,
+};
+
+use crate::fig_os_shim::Env;
+use crate::fig_settings::{
+    Settings,
+    State,
+};
+
+const CLIENT_ID_STATE_KEY: &str = "telemetryClientId";
+const CLIENT_ID_ENV_VAR: &str = "Q_TELEMETRY_CLIENT_ID";
+
+pub(crate) fn telemetry_is_disabled() -> bool {
+    let is_test = cfg!(test);
+    telemetry_is_disabled_inner(is_test, &Env::new(), &Settings::new())
+}
+
+/// Returns whether or not the user has disabled telemetry through settings or environment
+fn telemetry_is_disabled_inner(is_test: bool, env: &Env, settings: &Settings) -> bool {
+    let env_var = env.get_os("Q_DISABLE_TELEMETRY").is_some();
+    let setting = !settings
+        .get_value("telemetry.enabled")
+        .ok()
+        .flatten()
+        .and_then(|v| v.as_bool())
+        .unwrap_or(true);
+    !is_test && (env_var || setting)
+}
+
+pub(crate) fn get_client_id() -> Uuid {
+    get_client_id_inner(cfg!(test), &Env::new(), &State::new(), &Settings::new())
+}
+
+/// Generates or gets the client id and caches the result
+///
+/// Based on: <https://github.com/aws/aws-toolkit-vscode/blob/7c70b1909050043627e6a1471392e22358a15985/src/shared/telemetry/util.ts#L41C1-L62>
+pub(crate) fn get_client_id_inner(is_test: bool, env: &Env, state: &State, settings: &Settings) -> Uuid {
+    if is_test {
+        return uuid!("ffffffff-ffff-ffff-ffff-ffffffffffff");
+    }
+
+    if telemetry_is_disabled_inner(is_test, env, settings) {
+        return uuid!("11111111-1111-1111-1111-111111111111");
+    }
+
+    if let Ok(client_id) = env.get(CLIENT_ID_ENV_VAR) {
+        if let Ok(uuid) = Uuid::from_str(&client_id) {
+            return uuid;
+        }
+    }
+
+    let state_uuid = state
+        .get_string(CLIENT_ID_STATE_KEY)
+        .ok()
+        .flatten()
+        .and_then(|s| Uuid::from_str(&s).ok());
+
+    match state_uuid {
+        Some(uuid) => uuid,
+        None => {
+            let uuid = old_client_id_inner(settings).unwrap_or_else(Uuid::new_v4);
+            if let Err(err) = state.set_value(CLIENT_ID_STATE_KEY, uuid.to_string()) {
+                error!(%err, "Failed to set client id in state");
+            }
+            uuid
+        },
+    }
+}
+
+/// We accidently generates some clientIds in the settings file, we want to include those in the
+/// telemetry events so we corolate those users with the correct clientIds
+fn old_client_id_inner(settings: &Settings) -> Option<Uuid> {
+    settings
+        .get_string(CLIENT_ID_STATE_KEY)
+        .ok()
+        .flatten()
+        .and_then(|s| Uuid::from_str(&s).ok())
+}
+
+pub(crate) fn old_client_id() -> Option<Uuid> {
+    old_client_id_inner(&Settings::new())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const TEST_UUID_STR: &str = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";
+    const TEST_UUID: Uuid = uuid!(TEST_UUID_STR);
+
+    #[test]
+    fn test_is_telemetry_disabled() {
+        // disabled by default in tests
+        // let is_disabled = telemetry_is_disabled();
+        // assert!(!is_disabled);
+
+        // let settings = Settings::new_fake();
+
+        // let env = Env::from_slice(&[("Q_DISABLE_TELEMETRY", "1")]);
+        // assert!(telemetry_is_disabled_inner(true, &env, &settings));
+        // assert!(telemetry_is_disabled_inner(false, &env, &settings));
+
+        // let env = Env::new_fake();
+        // assert!(telemetry_is_disabled_inner(true, &env, &settings));
+        // assert!(!telemetry_is_disabled_inner(false, &env, &settings));
+
+        // settings.set_value("telemetry.enabled", false).unwrap();
+        // assert!(telemetry_is_disabled_inner(false, &env, &settings));
+        // assert!(!telemetry_is_disabled_inner(true, &env, &settings));
+
+        // settings.set_value("telemetry.enabled", true).unwrap();
+        // assert!(!telemetry_is_disabled_inner(false, &env, &settings));
+        // assert!(!telemetry_is_disabled_inner(true, &env, &settings));
+    }
+
+    #[test]
+    fn test_get_client_id() {
+        // max by default in tests
+        let id = get_client_id();
+        assert!(id.is_max());
+
+        let state = State::new_fake();
+        let settings = Settings::new_fake();
+
+        let env = Env::from_slice(&[(CLIENT_ID_ENV_VAR, TEST_UUID_STR)]);
+        assert_eq!(get_client_id_inner(false, &env, &state, &settings), TEST_UUID);
+
+        let env = Env::new_fake();
+
+        // in tests returns the test uuid
+        assert!(get_client_id_inner(true, &env, &state, &settings).is_max());
+
+        // returns the currently set client id if one is found
+        state.set_value(CLIENT_ID_STATE_KEY, TEST_UUID_STR).unwrap();
+        assert_eq!(get_client_id_inner(false, &env, &state, &settings), TEST_UUID);
+
+        // generates a new client id if none is found
+        state.remove_value(CLIENT_ID_STATE_KEY).unwrap();
+        assert_eq!(
+            get_client_id_inner(false, &env, &state, &settings).to_string(),
+            state.get_string(CLIENT_ID_STATE_KEY).unwrap().unwrap()
+        );
+
+        // migrates the client id in settings
+        state.remove_value(CLIENT_ID_STATE_KEY).unwrap();
+        settings.set_value(CLIENT_ID_STATE_KEY, TEST_UUID_STR).unwrap();
+        assert_eq!(get_client_id_inner(false, &env, &state, &settings), TEST_UUID);
+    }
+
+    #[test]
+    fn test_get_client_id_old() {
+        let settings = Settings::new_fake();
+        assert!(old_client_id_inner(&settings).is_none());
+        settings.set_value(CLIENT_ID_STATE_KEY, TEST_UUID_STR).unwrap();
+        assert_eq!(old_client_id_inner(&settings), Some(TEST_UUID));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_telemetry_core.rs b/crates/kiro-cli/src/fig_telemetry_core.rs
new file mode 100644
index 0000000000..63cdb98bf0
--- /dev/null
+++ b/crates/kiro-cli/src/fig_telemetry_core.rs
@@ -0,0 +1,418 @@
+use std::any::Any;
+use std::sync::OnceLock;
+use std::time::SystemTime;
+
+pub use amzn_toolkit_telemetry_client::types::MetricDatum;
+use strum::{
+    Display,
+    EnumString,
+};
+
+use crate::fig_telemetry::definitions::IntoMetricDatum;
+use crate::fig_telemetry::definitions::metrics::{
+    AmazonqDidSelectProfile,
+    AmazonqEndChat,
+    AmazonqProfileState,
+    AmazonqStartChat,
+    CodewhispererterminalAddChatMessage,
+    CodewhispererterminalCliSubcommandExecuted,
+    CodewhispererterminalMcpServerInit,
+    CodewhispererterminalRefreshCredentials,
+    CodewhispererterminalToolUseSuggested,
+    CodewhispererterminalUserLoggedIn,
+};
+use crate::fig_telemetry::definitions::types::{
+    CodewhispererterminalCustomToolInputTokenSize,
+    CodewhispererterminalCustomToolLatency,
+    CodewhispererterminalCustomToolOutputTokenSize,
+    CodewhispererterminalInCloudshell,
+    CodewhispererterminalIsToolValid,
+    CodewhispererterminalMcpServerInitFailureReason,
+    CodewhispererterminalToolName,
+    CodewhispererterminalToolUseId,
+    CodewhispererterminalToolUseIsSuccess,
+    CodewhispererterminalToolsPerMcpServer,
+    CodewhispererterminalUserInputId,
+    CodewhispererterminalUtteranceId,
+};
+
+type GlobalTelemetryEmitter = dyn TelemetryEmitter + Send + Sync + 'static;
+
+/// Global telemetry emitter for the current process.
+static EMITTER: OnceLock<Box<GlobalTelemetryEmitter>> = OnceLock::new();
+
+pub fn init_global_telemetry_emitter<T>(telemetry_emitter: T)
+where
+    T: TelemetryEmitter + Send + Sync + 'static,
+{
+    match EMITTER.set(Box::new(telemetry_emitter)) {
+        Ok(_) => (),
+        Err(_) => panic!("The global telemetry emitter can only be initialized once"),
+    }
+}
+
+/// Sends the telemetry event through the global [TelemetryEmitter] as set by
+/// [init_global_telemetry_emitter], returning [None] if no telemetry emitter was set.
+pub async fn send_event(event: Event) -> Option<()> {
+    if let Some(emitter) = EMITTER.get() {
+        emitter.send(event).await;
+        Some(())
+    } else {
+        None
+    }
+}
+
+/// Trait to handle sending telemetry events. This is intended to be used globally within the
+/// application, and can be set using [init_global_telemetry_emitter]. Only one global
+/// [TelemetryEmitter] impl should exist.
+///
+/// TODO: Update all telemetry calls to go through the global [TelemetryEmitter] impl instead.
+#[async_trait::async_trait]
+pub trait TelemetryEmitter {
+    async fn send(&self, event: Event);
+
+    fn as_any(&self) -> &dyn Any;
+}
+
+/// A serializable telemetry event that can be sent or queued.
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Event {
+    pub created_time: Option<SystemTime>,
+    pub credential_start_url: Option<String>,
+    #[serde(flatten)]
+    pub ty: EventType,
+}
+
+impl Event {
+    pub fn new(ty: EventType) -> Self {
+        Self {
+            ty,
+            created_time: Some(SystemTime::now()),
+            credential_start_url: None,
+        }
+    }
+
+    pub fn with_credential_start_url(mut self, credential_start_url: String) -> Self {
+        self.credential_start_url = Some(credential_start_url);
+        self
+    }
+
+    pub fn into_metric_datum(self) -> Option<MetricDatum> {
+        match self.ty {
+            EventType::UserLoggedIn {} => Some(
+                CodewhispererterminalUserLoggedIn {
+                    create_time: self.created_time,
+                    value: None,
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                    codewhispererterminal_in_cloudshell: in_cloudshell(),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::RefreshCredentials {
+                request_id,
+                result,
+                reason,
+                oauth_flow,
+            } => Some(
+                CodewhispererterminalRefreshCredentials {
+                    create_time: self.created_time,
+                    value: None,
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                    request_id: Some(request_id.into()),
+                    result: Some(result.to_string().into()),
+                    reason: reason.map(Into::into),
+                    oauth_flow: Some(oauth_flow.into()),
+                    codewhispererterminal_in_cloudshell: in_cloudshell(),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::CliSubcommandExecuted { subcommand } => Some(
+                CodewhispererterminalCliSubcommandExecuted {
+                    create_time: self.created_time,
+                    value: None,
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                    codewhispererterminal_subcommand: Some(subcommand.into()),
+                    codewhispererterminal_in_cloudshell: in_cloudshell(),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::ChatStart { conversation_id } => Some(
+                AmazonqStartChat {
+                    create_time: self.created_time,
+                    value: None,
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                    amazonq_conversation_id: Some(conversation_id.into()),
+                    codewhispererterminal_in_cloudshell: in_cloudshell(),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::ChatEnd { conversation_id } => Some(
+                AmazonqEndChat {
+                    create_time: self.created_time,
+                    value: None,
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                    amazonq_conversation_id: Some(conversation_id.into()),
+                    codewhispererterminal_in_cloudshell: in_cloudshell(),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::ChatAddedMessage {
+                conversation_id,
+                context_file_length,
+                ..
+            } => Some(
+                CodewhispererterminalAddChatMessage {
+                    create_time: self.created_time,
+                    value: None,
+                    amazonq_conversation_id: Some(conversation_id.into()),
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                    codewhispererterminal_in_cloudshell: in_cloudshell(),
+                    codewhispererterminal_context_file_length: context_file_length.map(|l| l as i64).map(Into::into),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::ToolUseSuggested {
+                conversation_id,
+                utterance_id,
+                user_input_id,
+                tool_use_id,
+                tool_name,
+                is_accepted,
+                is_valid,
+                is_success,
+                is_custom_tool,
+                input_token_size,
+                output_token_size,
+                custom_tool_call_latency,
+            } => Some(
+                CodewhispererterminalToolUseSuggested {
+                    create_time: self.created_time,
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                    value: None,
+                    amazonq_conversation_id: Some(conversation_id.into()),
+                    codewhispererterminal_utterance_id: utterance_id.map(CodewhispererterminalUtteranceId),
+                    codewhispererterminal_user_input_id: user_input_id.map(CodewhispererterminalUserInputId),
+                    codewhispererterminal_tool_use_id: tool_use_id.map(CodewhispererterminalToolUseId),
+                    codewhispererterminal_tool_name: tool_name.map(CodewhispererterminalToolName),
+                    codewhispererterminal_is_tool_use_accepted: Some(is_accepted.into()),
+                    codewhispererterminal_is_tool_valid: is_valid.map(CodewhispererterminalIsToolValid),
+                    codewhispererterminal_tool_use_is_success: is_success.map(CodewhispererterminalToolUseIsSuccess),
+                    codewhispererterminal_is_custom_tool: Some(is_custom_tool.into()),
+                    codewhispererterminal_custom_tool_input_token_size: input_token_size
+                        .map(|s| CodewhispererterminalCustomToolInputTokenSize(s as i64)),
+                    codewhispererterminal_custom_tool_output_token_size: output_token_size
+                        .map(|s| CodewhispererterminalCustomToolOutputTokenSize(s as i64)),
+                    codewhispererterminal_custom_tool_latency: custom_tool_call_latency
+                        .map(|l| CodewhispererterminalCustomToolLatency(l as i64)),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::McpServerInit {
+                conversation_id,
+                init_failure_reason,
+                number_of_tools,
+            } => Some(
+                CodewhispererterminalMcpServerInit {
+                    create_time: self.created_time,
+                    value: None,
+                    amazonq_conversation_id: Some(conversation_id.into()),
+                    codewhispererterminal_mcp_server_init_failure_reason: init_failure_reason
+                        .map(CodewhispererterminalMcpServerInitFailureReason),
+                    codewhispererterminal_tools_per_mcp_server: Some(CodewhispererterminalToolsPerMcpServer(
+                        number_of_tools as i64,
+                    )),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::DidSelectProfile {
+                source,
+                amazonq_profile_region,
+                result,
+                sso_region,
+                profile_count,
+            } => Some(
+                AmazonqDidSelectProfile {
+                    create_time: self.created_time,
+                    value: None,
+                    source: Some(source.to_string().into()),
+                    amazon_q_profile_region: Some(amazonq_profile_region.into()),
+                    result: Some(result.to_string().into()),
+                    sso_region: sso_region.map(Into::into),
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                    profile_count: profile_count.map(Into::into),
+                }
+                .into_metric_datum(),
+            ),
+            EventType::ProfileState {
+                source,
+                amazonq_profile_region,
+                result,
+                sso_region,
+            } => Some(
+                AmazonqProfileState {
+                    create_time: self.created_time,
+                    value: None,
+                    source: Some(source.to_string().into()),
+                    amazon_q_profile_region: Some(amazonq_profile_region.into()),
+                    result: Some(result.to_string().into()),
+                    sso_region: sso_region.map(Into::into),
+                    credential_start_url: self.credential_start_url.map(Into::into),
+                }
+                .into_metric_datum(),
+            ),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[serde(tag = "type")]
+pub enum EventType {
+    UserLoggedIn {},
+    RefreshCredentials {
+        request_id: String,
+        result: TelemetryResult,
+        reason: Option<String>,
+        oauth_flow: String,
+    },
+    CliSubcommandExecuted {
+        subcommand: String,
+    },
+    ChatStart {
+        conversation_id: String,
+    },
+    ChatEnd {
+        conversation_id: String,
+    },
+    ChatAddedMessage {
+        conversation_id: String,
+        message_id: String,
+        context_file_length: Option<usize>,
+    },
+    ToolUseSuggested {
+        conversation_id: String,
+        utterance_id: Option<String>,
+        user_input_id: Option<String>,
+        tool_use_id: Option<String>,
+        tool_name: Option<String>,
+        is_accepted: bool,
+        is_success: Option<bool>,
+        is_valid: Option<bool>,
+        is_custom_tool: bool,
+        input_token_size: Option<usize>,
+        output_token_size: Option<usize>,
+        custom_tool_call_latency: Option<usize>,
+    },
+    McpServerInit {
+        conversation_id: String,
+        init_failure_reason: Option<String>,
+        number_of_tools: usize,
+    },
+    DidSelectProfile {
+        source: QProfileSwitchIntent,
+        amazonq_profile_region: String,
+        result: TelemetryResult,
+        sso_region: Option<String>,
+        profile_count: Option<i64>,
+    },
+    ProfileState {
+        source: QProfileSwitchIntent,
+        amazonq_profile_region: String,
+        result: TelemetryResult,
+        sso_region: Option<String>,
+    },
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+pub enum SuggestionState {
+    Accept,
+    Discard,
+    Empty,
+    Reject,
+}
+
+impl SuggestionState {
+    pub fn is_accepted(&self) -> bool {
+        matches!(self, SuggestionState::Accept)
+    }
+}
+
+impl From<SuggestionState> for amzn_codewhisperer_client::types::SuggestionState {
+    fn from(value: SuggestionState) -> Self {
+        match value {
+            SuggestionState::Accept => amzn_codewhisperer_client::types::SuggestionState::Accept,
+            SuggestionState::Discard => amzn_codewhisperer_client::types::SuggestionState::Discard,
+            SuggestionState::Empty => amzn_codewhisperer_client::types::SuggestionState::Empty,
+            SuggestionState::Reject => amzn_codewhisperer_client::types::SuggestionState::Reject,
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, EnumString, Display, serde::Serialize, serde::Deserialize)]
+pub enum TelemetryResult {
+    Succeeded,
+    Failed,
+    Cancelled,
+}
+
+/// 'user' -> users change the profile through Q CLI user profile command
+/// 'auth' -> users change the profile through dashboard
+/// 'update' -> CLI auto select the profile on users' behalf as there is only 1 profile
+/// 'reload' -> CLI will try to reload previous selected profile upon CLI is running
+#[derive(Debug, Copy, Clone, PartialEq, Eq, EnumString, Display, serde::Serialize, serde::Deserialize)]
+pub enum QProfileSwitchIntent {
+    User,
+    Auth,
+    Update,
+    Reload,
+}
+
+fn in_cloudshell() -> Option<CodewhispererterminalInCloudshell> {
+    Some(crate::fig_util::system_info::in_cloudshell().into())
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Mutex;
+
+    use super::*;
+
+    #[derive(Debug, Default)]
+    struct DummyEmitter(Mutex<Vec<Event>>);
+
+    #[async_trait::async_trait]
+    impl TelemetryEmitter for DummyEmitter {
+        async fn send(&self, event: Event) {
+            self.0.lock().unwrap().push(event);
+        }
+
+        fn as_any(&self) -> &dyn Any {
+            self
+        }
+    }
+
+    #[tokio::test]
+    async fn test_init_global_telemetry_emitter_receives_event() {
+        init_global_telemetry_emitter(DummyEmitter::default());
+        send_event(Event::new(EventType::UserLoggedIn {})).await;
+
+        let events = EMITTER
+            .get()
+            .unwrap()
+            .as_any()
+            .downcast_ref::<DummyEmitter>()
+            .unwrap()
+            .0
+            .lock()
+            .unwrap();
+        assert!(events.len() == 1);
+        assert!(matches!(events.first().unwrap().ty, EventType::UserLoggedIn {}));
+    }
+
+    #[ignore = "depends on test_init_global_telemetry_emitter_receives_event not being ran"]
+    #[tokio::test]
+    async fn test_no_global_telemetry_emitter() {
+        assert!(send_event(Event::new(EventType::UserLoggedIn {})).await.is_none());
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/cli_context.rs b/crates/kiro-cli/src/fig_util/cli_context.rs
new file mode 100644
index 0000000000..f13382d389
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/cli_context.rs
@@ -0,0 +1,58 @@
+use std::sync::Arc;
+
+use crate::fig_os_shim::Context;
+use crate::fig_settings::{
+    Settings,
+    State,
+};
+
+#[derive(Debug, Clone)]
+pub struct CliContext {
+    settings: Settings,
+    state: State,
+    context: Arc<Context>,
+}
+
+impl Default for CliContext {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl CliContext {
+    pub fn new() -> Self {
+        let settings = Settings::new();
+        let state = State::new();
+        let context = Context::new();
+
+        Self {
+            settings,
+            state,
+            context,
+        }
+    }
+
+    pub fn new_fake() -> Self {
+        let settings = Settings::new_fake();
+        let state = State::new_fake();
+        let context = Context::new_fake();
+
+        Self {
+            settings,
+            state,
+            context,
+        }
+    }
+
+    pub fn settings(&self) -> &Settings {
+        &self.settings
+    }
+
+    pub fn state(&self) -> &State {
+        &self.state
+    }
+
+    pub fn context(&self) -> &Context {
+        &self.context
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/consts.rs b/crates/kiro-cli/src/fig_util/consts.rs
new file mode 100644
index 0000000000..86d26f5d53
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/consts.rs
@@ -0,0 +1,139 @@
+#[cfg(windows)]
+pub const APP_PROCESS_NAME: &str = "q_desktop.exe";
+
+/// The name configured under `"package.productName"` in the tauri.conf.json file.
+pub const TAURI_PRODUCT_NAME: &str = "q_desktop";
+
+pub const CLI_BINARY_NAME: &str = "q";
+pub const CLI_BINARY_NAME_MINIMAL: &str = "q-minimal";
+pub const PTY_BINARY_NAME: &str = "qterm";
+
+pub const CLI_CRATE_NAME: &str = "q_cli";
+
+pub const URL_SCHEMA: &str = "q";
+
+pub const PRODUCT_NAME: &str = "Amazon Q";
+
+pub const RUNTIME_DIR_NAME: &str = "cwrun";
+
+// These are the old "CodeWhisperer" branding, used anywhere we will not update to Amazon Q
+pub const OLD_CLI_BINARY_NAMES: &[&str] = &["cw"];
+pub const OLD_PTY_BINARY_NAMES: &[&str] = &["cwterm"];
+
+pub const GITHUB_REPO_NAME: &str = "aws/amazon-q-developer-cli";
+
+/// Build time env vars
+pub mod build {
+    /// The target of the current build, e.g. "aarch64-unknown-linux-musl"
+    pub const TARGET_TRIPLE: Option<&str> = option_env!("AMAZON_Q_BUILD_TARGET_TRIPLE");
+
+    /// The variant of the current build
+    pub const VARIANT: Option<&str> = option_env!("AMAZON_Q_BUILD_VARIANT");
+
+    /// A git full sha hash of the current build
+    pub const HASH: Option<&str> = option_env!("AMAZON_Q_BUILD_HASH");
+
+    /// The datetime in rfc3339 format of the current build
+    pub const DATETIME: Option<&str> = option_env!("AMAZON_Q_BUILD_DATETIME");
+
+    /// If `fish` tests should be skipped
+    pub const SKIP_FISH_TESTS: bool = option_env!("AMAZON_Q_BUILD_SKIP_FISH_TESTS").is_some();
+
+    /// If `shellcheck` tests should be skipped
+    pub const SKIP_SHELLCHECK_TESTS: bool = option_env!("AMAZON_Q_BUILD_SKIP_SHELLCHECK_TESTS").is_some();
+}
+
+/// macOS specific constants
+pub mod macos {
+    pub const BUNDLE_CONTENTS_MACOS_PATH: &str = "Contents/MacOS";
+    pub const BUNDLE_CONTENTS_RESOURCE_PATH: &str = "Contents/Resources";
+    pub const BUNDLE_CONTENTS_HELPERS_PATH: &str = "Contents/Helpers";
+    pub const BUNDLE_CONTENTS_INFO_PLIST_PATH: &str = "Contents/Info.plist";
+}
+
+pub mod linux {
+    pub const DESKTOP_ENTRY_NAME: &str = "amazon-q.desktop";
+
+    /// Name of the deb package.
+    pub const PACKAGE_NAME: &str = "amazon-q";
+
+    /// The wm_class used for the application windows.
+    pub const DESKTOP_APP_WM_CLASS: &str = "Amazon-q";
+}
+
+pub mod env_var {
+    macro_rules! define_env_vars {
+        ($($(#[$meta:meta])* $ident:ident = $name:expr),*) => {
+            $(
+                $(#[$meta])*
+                pub const $ident: &str = $name;
+            )*
+
+            pub const ALL: &[&str] = &[$($ident),*];
+        }
+    }
+
+    define_env_vars! {
+        /// The UUID of the current parent qterm instance
+        QTERM_SESSION_ID = "QTERM_SESSION_ID",
+
+        /// The current parent socket to connect to
+        Q_PARENT = "Q_PARENT",
+
+        /// Set the [`Q_PARENT`] parent socket to connect to
+        Q_SET_PARENT = "Q_SET_PARENT",
+
+        /// Guard for the [`Q_SET_PARENT`] check
+        Q_SET_PARENT_CHECK = "Q_SET_PARENT_CHECK",
+
+        /// Set if qterm is running, contains the version
+        Q_TERM = "Q_TERM",
+
+        /// Sets the current log level
+        Q_LOG_LEVEL = "Q_LOG_LEVEL",
+
+        /// Overrides the ZDOTDIR environment variable
+        Q_ZDOTDIR = "Q_ZDOTDIR",
+
+        /// Indicates a process was launched by Amazon Q
+        PROCESS_LAUNCHED_BY_Q = "PROCESS_LAUNCHED_BY_Q",
+
+        /// The shell to use in qterm
+        Q_SHELL = "Q_SHELL",
+
+        /// Indicates the user is debugging the shell
+        Q_DEBUG_SHELL = "Q_DEBUG_SHELL",
+
+        /// Indicates the user is using zsh autosuggestions which disables Inline
+        Q_USING_ZSH_AUTOSUGGESTIONS = "Q_USING_ZSH_AUTOSUGGESTIONS",
+
+        /// Overrides the path to the bundle metadata released with certain desktop builds.
+        Q_BUNDLE_METADATA_PATH = "Q_BUNDLE_METADATA_PATH"
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use time::OffsetDateTime;
+    use time::format_description::well_known::Rfc3339;
+
+    use super::*;
+
+    #[test]
+    fn test_build_envs() {
+        if let Some(build_variant) = build::VARIANT {
+            println!("build_variant: {build_variant}");
+            assert!(["full", "minimal"].contains(&&*build_variant.to_ascii_lowercase()));
+        }
+
+        if let Some(build_hash) = build::HASH {
+            println!("build_hash: {build_hash}");
+            assert!(!build_hash.is_empty());
+        }
+
+        if let Some(build_datetime) = build::DATETIME {
+            println!("build_datetime: {build_datetime}");
+            println!("{}", OffsetDateTime::parse(build_datetime, &Rfc3339).unwrap());
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/directories.rs b/crates/kiro-cli/src/fig_util/directories.rs
new file mode 100644
index 0000000000..ff15c5bb56
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/directories.rs
@@ -0,0 +1,304 @@
+use std::path::PathBuf;
+
+use thiserror::Error;
+
+use crate::fig_os_shim::{
+    EnvProvider,
+    FsProvider,
+    Os,
+    Shim,
+};
+use crate::fig_util::env_var::Q_PARENT;
+
+#[derive(Debug, Error)]
+pub enum DirectoryError {
+    #[error("home directory not found")]
+    NoHomeDirectory,
+    #[error("runtime directory not found: neither XDG_RUNTIME_DIR nor TMPDIR were found")]
+    NoRuntimeDirectory,
+    #[error("non absolute path: {0:?}")]
+    NonAbsolutePath(PathBuf),
+    #[error("unsupported platform: {0:?}")]
+    UnsupportedOs(Os),
+    #[error("IO Error: {0}")]
+    Io(#[from] std::io::Error),
+    #[error(transparent)]
+    TimeFormat(#[from] time::error::Format),
+    #[error(transparent)]
+    Utf8FromPath(#[from] camino::FromPathError),
+    #[error(transparent)]
+    Utf8FromPathBuf(#[from] camino::FromPathBufError),
+    #[error(transparent)]
+    FromVecWithNul(#[from] std::ffi::FromVecWithNulError),
+    #[error(transparent)]
+    IntoString(#[from] std::ffi::IntoStringError),
+    #[error("{Q_PARENT} env variable not set")]
+    QParentNotSet,
+    #[error("must be ran from an appimage executable")]
+    NotAppImage,
+}
+
+type Result<T, E = DirectoryError> = std::result::Result<T, E>;
+
+/// The directory of the users home
+///
+/// - Linux: /home/Alice
+/// - MacOS: /Users/Alice
+/// - Windows: C:\Users\Alice
+pub fn home_dir() -> Result<PathBuf> {
+    dirs::home_dir().ok_or(DirectoryError::NoHomeDirectory)
+}
+
+pub fn home_dir_ctx<Ctx: FsProvider + EnvProvider>(ctx: &Ctx) -> Result<PathBuf> {
+    if ctx.env().is_real() {
+        home_dir()
+    } else {
+        ctx.env()
+            .get("HOME")
+            .map_err(|_err| DirectoryError::NoHomeDirectory)
+            .and_then(|h| {
+                if h.is_empty() {
+                    Err(DirectoryError::NoHomeDirectory)
+                } else {
+                    Ok(h)
+                }
+            })
+            .map(PathBuf::from)
+            .map(|p| ctx.fs().chroot_path(p))
+    }
+}
+
+/// The directory of the users `$HOME/.local/bin` directory
+///
+/// MacOS and Linux path: `$HOME/.local/bin``
+#[cfg(unix)]
+pub fn home_local_bin() -> Result<PathBuf> {
+    let mut path = home_dir()?;
+    path.push(".local/bin");
+    Ok(path)
+}
+
+#[cfg(target_os = "linux")]
+pub fn home_local_bin_ctx(ctx: &Context) -> Result<PathBuf> {
+    let mut path = home_dir_ctx(ctx)?;
+    path.push(".local/bin");
+    Ok(path)
+}
+
+/// The q data directory
+///
+/// - Linux: `$XDG_DATA_HOME/amazon-q` or `$HOME/.local/share/amazon-q`
+/// - MacOS: `$HOME/Library/Application Support/amazon-q`
+pub fn fig_data_dir() -> Result<PathBuf> {
+    cfg_if::cfg_if! {
+        if #[cfg(unix)] {
+            Ok(dirs::data_local_dir()
+                .ok_or(DirectoryError::NoHomeDirectory)?
+                .join("amazon-q"))
+        } else if #[cfg(windows)] {
+            Ok(fig_dir()?.join("userdata"))
+        }
+    }
+}
+
+pub fn fig_data_dir_ctx(fs: &impl FsProvider) -> Result<PathBuf> {
+    Ok(fs.fs().chroot_path(fig_data_dir()?))
+}
+
+/// Get the macos tempdir from the `confstr` function
+///
+/// See: <https://man7.org/linux/man-pages/man3/confstr.3.html>
+#[cfg(target_os = "macos")]
+fn macos_tempdir() -> Result<PathBuf> {
+    let len = unsafe { libc::confstr(libc::_CS_DARWIN_USER_TEMP_DIR, std::ptr::null::<i8>().cast_mut(), 0) };
+    let mut buf: Vec<u8> = vec![0; len];
+    unsafe { libc::confstr(libc::_CS_DARWIN_USER_TEMP_DIR, buf.as_mut_ptr().cast(), buf.len()) };
+    let c_string = std::ffi::CString::from_vec_with_nul(buf)?;
+    let str = c_string.into_string()?;
+    Ok(PathBuf::from(str))
+}
+
+/// Runtime dir is used for runtime data that should not be persisted for a long time, e.g. socket
+/// files and logs
+///
+/// The XDG_RUNTIME_DIR is set by systemd <https://www.freedesktop.org/software/systemd/man/latest/file-hierarchy.html#/run/user/>,
+/// if this is not set such as on macOS it will fallback to TMPDIR which is secure on macOS
+#[cfg(unix)]
+pub fn runtime_dir() -> Result<PathBuf> {
+    let mut dir = dirs::runtime_dir();
+    dir = dir.or_else(|| std::env::var_os("TMPDIR").map(PathBuf::from));
+
+    cfg_if::cfg_if! {
+        if #[cfg(target_os = "macos")] {
+            let macos_tempdir = macos_tempdir()?;
+            dir = dir.or(Some(macos_tempdir));
+        } else {
+            dir = dir.or_else(|| Some(std::env::temp_dir()));
+        }
+    }
+
+    dir.ok_or(DirectoryError::NoRuntimeDirectory)
+}
+
+/// The directory to all the fig logs
+/// - Linux: `/tmp/fig/$USER/logs`
+/// - MacOS: `$TMPDIR/logs`
+/// - Windows: `%TEMP%\fig\logs`
+pub fn logs_dir() -> Result<PathBuf> {
+    cfg_if::cfg_if! {
+        if #[cfg(unix)] {
+            use crate::CLI_BINARY_NAME;
+            Ok(runtime_dir()?.join(format!("{CLI_BINARY_NAME}log")))
+        } else if #[cfg(windows)] {
+            Ok(std::env::temp_dir().join("amazon-q").join("logs"))
+        }
+    }
+}
+
+/// The directory to the directory containing config for the `/context` feature in `q chat`.
+pub fn chat_global_context_path<Ctx: FsProvider + EnvProvider>(ctx: &Ctx) -> Result<PathBuf> {
+    Ok(home_dir_ctx(ctx)?
+        .join(".aws")
+        .join("amazonq")
+        .join("global_context.json"))
+}
+
+/// The directory to the directory containing config for the `/context` feature in `q chat`.
+pub fn chat_profiles_dir<Ctx: FsProvider + EnvProvider>(ctx: &Ctx) -> Result<PathBuf> {
+    Ok(home_dir_ctx(ctx)?.join(".aws").join("amazonq").join("profiles"))
+}
+
+/// The path to the fig settings file
+pub fn settings_path() -> Result<PathBuf> {
+    Ok(fig_data_dir()?.join("settings.json"))
+}
+
+/// The path to the lock file used to indicate that the app is updating
+pub fn update_lock_path(ctx: &impl FsProvider) -> Result<PathBuf> {
+    Ok(fig_data_dir_ctx(ctx)?.join("update.lock"))
+}
+
+#[cfg(test)]
+mod linux_tests {
+    use super::*;
+
+    #[test]
+    fn all_paths() {
+        let ctx = crate::fig_os_shim::Context::new();
+        assert!(logs_dir().is_ok());
+        assert!(settings_path().is_ok());
+        assert!(update_lock_path(&ctx).is_ok());
+    }
+}
+
+// TODO(grant): Add back path tests on linux
+#[cfg(all(test, not(target_os = "linux")))]
+mod tests {
+    use insta;
+
+    use super::*;
+
+    macro_rules! assert_directory {
+        ($value:expr, @$snapshot:literal) => {
+            insta::assert_snapshot!(
+                sanitized_directory_path($value),
+                @$snapshot,
+            )
+        };
+    }
+
+    macro_rules! macos {
+        ($value:expr, @$snapshot:literal) => {
+            #[cfg(target_os = "macos")]
+            assert_directory!($value, @$snapshot)
+        };
+    }
+
+    macro_rules! linux {
+        ($value:expr, @$snapshot:literal) => {
+            #[cfg(target_os = "linux")]
+            assert_directory!($value, @$snapshot)
+        };
+    }
+
+    macro_rules! windows {
+        ($value:expr, @$snapshot:literal) => {
+            #[cfg(target_os = "windows")]
+            assert_directory!($value, @$snapshot)
+        };
+    }
+
+    fn sanitized_directory_path(path: Result<PathBuf>) -> String {
+        let mut path = path.unwrap().into_os_string().into_string().unwrap();
+
+        if let Ok(home) = std::env::var("HOME") {
+            let home = home.strip_suffix('/').unwrap_or(&home);
+            path = path.replace(home, "$HOME");
+        }
+
+        let user = whoami::username();
+        path = path.replace(&user, "$USER");
+
+        if let Ok(tmpdir) = std::env::var("TMPDIR") {
+            let tmpdir = tmpdir.strip_suffix('/').unwrap_or(&tmpdir);
+            path = path.replace(tmpdir, "$TMPDIR");
+        }
+
+        #[cfg(target_os = "macos")]
+        {
+            if let Ok(tmpdir) = macos_tempdir() {
+                let tmpdir = tmpdir.to_str().unwrap();
+                let tmpdir = tmpdir.strip_suffix('/').unwrap_or(tmpdir);
+                path = path.replace(tmpdir, "$TMPDIR");
+            };
+        }
+
+        if let Ok(xdg_runtime_dir) = std::env::var("XDG_RUNTIME_DIR") {
+            let xdg_runtime_dir = xdg_runtime_dir.strip_suffix('/').unwrap_or(&xdg_runtime_dir);
+            path = path.replace(xdg_runtime_dir, "$XDG_RUNTIME_DIR");
+        }
+
+        #[cfg(target_os = "linux")]
+        {
+            path = path.replace("/tmp", "$TMPDIR");
+        }
+
+        path
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn snapshot_home_local_bin() {
+        linux!(home_local_bin(), @"$HOME/.local/bin");
+        macos!(home_local_bin(), @"$HOME/.local/bin");
+    }
+
+    #[test]
+    fn snapshot_fig_data_dir() {
+        linux!(fig_data_dir(), @"$HOME/.local/share/amazon-q");
+        macos!(fig_data_dir(), @"$HOME/Library/Application Support/amazon-q");
+        windows!(fig_data_dir(), @r"C:\Users\$USER\AppData\Local\Fig\userdata");
+    }
+
+    #[test]
+    fn snapshot_settings_path() {
+        linux!(settings_path(), @"$HOME/.local/share/amazon-q/settings.json");
+        macos!(settings_path(), @"$HOME/Library/Application Support/amazon-q/settings.json");
+        windows!(settings_path(), @r"C:\Users\$USER\AppData\Lcoal\Fig\settings.json");
+    }
+
+    #[test]
+    fn snapshot_update_lock_path() {
+        let ctx = crate::fig_os_shim::Context::new();
+        linux!(update_lock_path(&ctx), @"$HOME/.local/share/amazon-q/update.lock");
+        macos!(update_lock_path(&ctx), @"$HOME/Library/Application Support/amazon-q/update.lock");
+        windows!(update_lock_path(&ctx), @r"C:\Users\$USER\AppData\Local\Fig\userdata\update.lock");
+    }
+
+    #[test]
+    #[cfg(target_os = "macos")]
+    fn macos_tempdir_test() {
+        let tmpdir = macos_tempdir().unwrap();
+        println!("{:?}", tmpdir);
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/error.rs b/crates/kiro-cli/src/fig_util/error.rs
new file mode 100644
index 0000000000..910e76bcdc
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/error.rs
@@ -0,0 +1,25 @@
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error("io operation error")]
+    IoError(#[from] std::io::Error),
+    #[error("unsupported platform")]
+    UnsupportedPlatform,
+    #[error("unsupported architecture")]
+    UnsupportedArch,
+    #[error(transparent)]
+    Directory(#[from] crate::directories::DirectoryError),
+    #[error("process has no parent")]
+    NoParentProcess,
+    #[error("could not find the os hwid")]
+    HwidNotFound,
+    #[error("the shell, `{0}`, isn't supported yet")]
+    UnknownShell(String),
+    #[error("missing environment variable `{0}`")]
+    MissingEnv(&'static str),
+    #[error("unknown display server `{0}`")]
+    UnknownDisplayServer(String),
+    #[error("unknown desktop `{0}`")]
+    UnknownDesktop(String),
+}
diff --git a/crates/kiro-cli/src/fig_util/manifest.rs b/crates/kiro-cli/src/fig_util/manifest.rs
new file mode 100644
index 0000000000..119627ef97
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/manifest.rs
@@ -0,0 +1,343 @@
+use std::fmt::Display;
+use std::str::FromStr;
+use std::sync::OnceLock;
+
+use cfg_if::cfg_if;
+use serde::{
+    Deserialize,
+    Deserializer,
+    Serialize,
+};
+use strum::{
+    Display,
+    EnumString,
+};
+
+use crate::fig_util::build::TARGET_TRIPLE;
+use crate::fig_util::consts::build::VARIANT;
+
+#[derive(Deserialize)]
+pub struct Manifest {
+    #[serde(deserialize_with = "deser_enum_other")]
+    pub managed_by: ManagedBy,
+    #[serde(deserialize_with = "deser_enum_other")]
+    pub target_triple: TargetTriple,
+    #[serde(deserialize_with = "deser_enum_other")]
+    pub variant: Variant,
+    #[serde(deserialize_with = "deser_enum_other")]
+    pub default_channel: Channel,
+    pub packaged_at: String,
+    pub packaged_by: String,
+}
+
+#[derive(EnumString, Display, Deserialize, Serialize, PartialEq, Eq, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
+pub enum ManagedBy {
+    None,
+    #[strum(default)]
+    Other(String),
+}
+
+/// The target triplet, describes a platform on which the project is build for. Note that this also
+/// includes "fake" targets like `universal-apple-darwin` as provided by [Tauri](https://tauri.app/v1/guides/building/macos/#binary-targets)
+#[derive(Deserialize, Serialize, PartialEq, Eq, EnumString, Debug, Display)]
+pub enum TargetTriple {
+    #[serde(rename = "universal-apple-darwin")]
+    #[strum(serialize = "universal-apple-darwin")]
+    UniversalAppleDarwin,
+    #[serde(rename = "x86_64-unknown-linux-gnu")]
+    #[strum(serialize = "x86_64-unknown-linux-gnu")]
+    X86_64UnknownLinuxGnu,
+    #[serde(rename = "x86_64-unknown-linux-musl")]
+    #[strum(serialize = "x86_64-unknown-linux-musl")]
+    X86_64UnknownLinuxMusl,
+    #[serde(rename = "aarch64-unknown-linux-gnu")]
+    #[strum(serialize = "aarch64-unknown-linux-gnu")]
+    AArch64UnknownLinuxGnu,
+    #[serde(rename = "aarch64-unknown-linux-musl")]
+    #[strum(serialize = "aarch64-unknown-linux-musl")]
+    AArch64UnknownLinuxMusl,
+    #[strum(default)]
+    Other(String),
+}
+
+impl TargetTriple {
+    const fn from_system() -> Self {
+        cfg_if! {
+            if #[cfg(target_os = "macos")] {
+                TargetTriple::UniversalAppleDarwin
+            } else if #[cfg(all(target_os = "linux", target_env = "gnu", target_arch = "x86_64"))] {
+                TargetTriple::X86_64UnknownLinuxGnu
+            } else if #[cfg(all(target_os = "linux", target_env = "gnu", target_arch = "aarch64"))] {
+                TargetTriple::AArch64UnknownLinuxGnu
+            } else if #[cfg(all(target_os = "linux", target_env = "musl", target_arch = "x86_64"))] {
+                TargetTriple::X86_64UnknownLinuxMusl
+            } else if #[cfg(all(target_os = "linux", target_env = "musl", target_arch = "aarch64"))] {
+                TargetTriple::AArch64UnknownLinuxMusl
+            } else {
+                compile_error!("unknown target")
+            }
+        }
+    }
+}
+
+#[derive(EnumString, Display, Deserialize, Serialize, PartialEq, Eq, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
+pub enum Variant {
+    Full,
+    #[serde(alias = "headless")]
+    #[strum(to_string = "minimal", serialize = "headless")]
+    Minimal,
+    #[strum(default)]
+    Other(String),
+}
+
+#[derive(EnumString, Display, Deserialize, Serialize, PartialEq, Eq, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
+pub enum Os {
+    Macos,
+    Linux,
+    #[strum(default)]
+    Other(String),
+}
+
+impl Os {
+    pub fn current() -> Self {
+        match std::env::consts::OS {
+            "macos" => Os::Macos,
+            "linux" => Os::Linux,
+            _ => panic!("Unsupported OS: {}", std::env::consts::OS),
+        }
+    }
+
+    pub fn is_current_os(&self) -> bool {
+        self == &Os::current()
+    }
+}
+
+#[derive(EnumString, Display, Deserialize, Serialize, PartialEq, Eq, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
+pub enum FileType {
+    Dmg,
+    TarGz,
+    TarXz,
+    TarZst,
+    Zip,
+    AppImage,
+    Deb,
+    #[strum(default)]
+    Other(String),
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, EnumString, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+#[strum(serialize_all = "camelCase")]
+pub enum Channel {
+    Stable,
+    Beta,
+    Qa,
+    Nightly,
+}
+
+impl Channel {
+    pub fn all() -> &'static [Self] {
+        &[Channel::Stable, Channel::Beta, Channel::Qa, Channel::Nightly]
+    }
+
+    pub fn id(&self) -> &'static str {
+        match self {
+            Channel::Stable => "stable",
+            Channel::Beta => "beta",
+            Channel::Qa => "qa",
+            Channel::Nightly => "nightly",
+        }
+    }
+
+    pub fn name(&self) -> &'static str {
+        match self {
+            Channel::Stable => "Stable",
+            Channel::Beta => "Beta",
+            Channel::Qa => "QA",
+            Channel::Nightly => "Nightly",
+        }
+    }
+}
+
+impl Display for Channel {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if f.alternate() {
+            f.write_str(self.name())
+        } else {
+            f.write_str(self.id())
+        }
+    }
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct BundleMetadata {
+    pub packaged_as: FileType,
+}
+
+fn deser_enum_other<'de, D, T>(deserializer: D) -> Result<T, D::Error>
+where
+    D: Deserializer<'de>,
+    T: FromStr,
+    T::Err: Display,
+{
+    match T::from_str(<&str as Deserialize<'de>>::deserialize(deserializer)?) {
+        Ok(s) => Ok(s),
+        Err(err) => Err(serde::de::Error::custom(err)),
+    }
+}
+
+/// Returns the manifest, reading and parsing it if necessary
+pub fn manifest() -> &'static Manifest {
+    static CACHED: OnceLock<Manifest> = OnceLock::new();
+    CACHED.get_or_init(|| Manifest {
+        managed_by: ManagedBy::None,
+        target_triple: match TARGET_TRIPLE {
+            Some(target) => TargetTriple::from_str(target).expect("parsing target triple should not fail"),
+            _ => TargetTriple::from_system(),
+        },
+        variant: match VARIANT.map(|s| s.to_ascii_lowercase()).as_deref() {
+            Some("minimal") => Variant::Minimal,
+            _ => Variant::Full,
+        },
+        default_channel: Channel::Stable,
+        packaged_at: "unknown".into(),
+        packaged_by: "unknown".into(),
+    })
+}
+
+/// Checks if this is a full build according to the manifest.
+/// Note that this does not guarantee the value of is_minimal
+pub fn is_full() -> bool {
+    cfg_if! {
+        if #[cfg(target_os = "macos")] {
+            true
+        } else if #[cfg(unix)] {
+            matches!(
+                manifest(),
+                Manifest {
+                    variant: Variant::Full,
+                    ..
+                }
+            )
+        } else if #[cfg(windows)] {
+            true
+        }
+    }
+}
+
+/// Checks if this is a minimal build according to the manifest.
+/// Note that this does not guarantee the value of is_full
+pub fn is_minimal() -> bool {
+    cfg_if! {
+        if #[cfg(target_os = "macos")] {
+            false
+        } else if #[cfg(unix)] {
+            matches!(
+                manifest(),
+                Manifest {
+                    variant: Variant::Minimal,
+                    ..
+                }
+            )
+        } else if #[cfg(windows)] {
+            false
+        }
+    }
+}
+
+/// Gets the version from the manifest
+#[deprecated = "versions are unified, use env!(\"CARGO_PKG_VERSION\")"]
+pub fn version() -> Option<&'static str> {
+    Some(env!("CARGO_PKG_VERSION"))
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{
+        from_str,
+        to_string,
+    };
+
+    use super::*;
+
+    macro_rules! test_ser_deser {
+        ($ty:ident, $variant:expr, $text:expr) => {
+            let quoted = format!("\"{}\"", $text);
+            assert_eq!(quoted, to_string(&$variant).unwrap());
+            assert_eq!($variant, from_str(&quoted).unwrap());
+            assert_eq!($variant, $ty::from_str($text).unwrap());
+            assert_eq!($text, $variant.to_string());
+        };
+    }
+
+    #[test]
+    fn test_target_triple_serialize_deserialize() {
+        test_ser_deser!(
+            TargetTriple,
+            TargetTriple::UniversalAppleDarwin,
+            "universal-apple-darwin"
+        );
+        test_ser_deser!(
+            TargetTriple,
+            TargetTriple::X86_64UnknownLinuxGnu,
+            "x86_64-unknown-linux-gnu"
+        );
+        test_ser_deser!(
+            TargetTriple,
+            TargetTriple::AArch64UnknownLinuxGnu,
+            "aarch64-unknown-linux-gnu"
+        );
+        test_ser_deser!(
+            TargetTriple,
+            TargetTriple::X86_64UnknownLinuxMusl,
+            "x86_64-unknown-linux-musl"
+        );
+        test_ser_deser!(
+            TargetTriple,
+            TargetTriple::AArch64UnknownLinuxMusl,
+            "aarch64-unknown-linux-musl"
+        );
+    }
+
+    #[test]
+    fn test_file_type_serialize_deserialize() {
+        test_ser_deser!(FileType, FileType::Dmg, "dmg");
+        test_ser_deser!(FileType, FileType::TarGz, "tarGz");
+        test_ser_deser!(FileType, FileType::TarXz, "tarXz");
+        test_ser_deser!(FileType, FileType::TarZst, "tarZst");
+        test_ser_deser!(FileType, FileType::Zip, "zip");
+        test_ser_deser!(FileType, FileType::AppImage, "appImage");
+        test_ser_deser!(FileType, FileType::Deb, "deb");
+    }
+
+    #[test]
+    fn test_managed_by_serialize_deserialize() {
+        test_ser_deser!(ManagedBy, ManagedBy::None, "none");
+    }
+
+    #[test]
+    fn test_variant_serialize_deserialize() {
+        test_ser_deser!(Variant, Variant::Full, "full");
+        test_ser_deser!(Variant, Variant::Minimal, "minimal");
+
+        // headless is a special case that should deserialize to Minimal
+        assert_eq!(Variant::Minimal, from_str("\"headless\"").unwrap());
+        assert_eq!(Variant::Minimal, Variant::from_str("headless").unwrap());
+    }
+
+    #[test]
+    fn test_channel_serialize_deserialize() {
+        test_ser_deser!(Channel, Channel::Stable, "stable");
+        test_ser_deser!(Channel, Channel::Beta, "beta");
+        test_ser_deser!(Channel, Channel::Qa, "qa");
+        test_ser_deser!(Channel, Channel::Nightly, "nightly");
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/mod.rs b/crates/kiro-cli/src/fig_util/mod.rs
new file mode 100644
index 0000000000..9c3044f6fd
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/mod.rs
@@ -0,0 +1,379 @@
+mod cli_context;
+pub mod directories;
+pub mod manifest;
+pub mod open;
+pub mod pid_file;
+pub mod process_info;
+mod region_check;
+pub mod spinner;
+pub mod system_info;
+
+pub mod consts;
+
+use std::cmp::Ordering;
+use std::env;
+use std::ffi::OsStr;
+use std::fmt::Display;
+use std::io::{
+    ErrorKind,
+    stdout,
+};
+use std::path::{
+    Path,
+    PathBuf,
+};
+use std::process::Command;
+
+use anstream::stream::IsTerminal;
+use cfg_if::cfg_if;
+pub use cli_context::CliContext;
+pub use consts::*;
+use crossterm::style::Stylize;
+use dialoguer::Select;
+use dialoguer::theme::ColorfulTheme;
+use eyre::{
+    Context,
+    ContextCompat,
+    Result,
+    bail,
+};
+use globset::{
+    Glob,
+    GlobSet,
+    GlobSetBuilder,
+};
+use rand::Rng;
+use regex::Regex;
+use thiserror::Error;
+use tracing::warn;
+
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error("io operation error")]
+    IoError(#[from] std::io::Error),
+    #[error("unsupported platform")]
+    UnsupportedPlatform,
+    #[error("unsupported architecture")]
+    UnsupportedArch,
+    #[error(transparent)]
+    Directory(#[from] directories::DirectoryError),
+    #[error("process has no parent")]
+    NoParentProcess,
+    #[error("could not find the os hwid")]
+    HwidNotFound,
+    #[error("the shell, `{0}`, isn't supported yet")]
+    UnknownShell(String),
+    #[error("missing environment variable `{0}`")]
+    MissingEnv(&'static str),
+    #[error("unknown display server `{0}`")]
+    UnknownDisplayServer(String),
+    #[error("unknown desktop, checked environment variables: {0}")]
+    UnknownDesktop(UnknownDesktopErrContext),
+    #[error(transparent)]
+    StrUtf8Error(#[from] std::str::Utf8Error),
+    #[error(transparent)]
+    Json(#[from] serde_json::Error),
+}
+
+#[derive(Debug, Clone)]
+pub struct UnknownDesktopErrContext {
+    xdg_current_desktop: String,
+    xdg_session_desktop: String,
+    gdm_session: String,
+}
+
+impl std::fmt::Display for UnknownDesktopErrContext {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "XDG_CURRENT_DESKTOP: `{}`, ", self.xdg_current_desktop)?;
+        write!(f, "XDG_SESSION_DESKTOP: `{}`, ", self.xdg_session_desktop)?;
+        write!(f, "GDMSESSION: `{}`", self.gdm_session)
+    }
+}
+
+/// Returns a random 64 character hex string
+///
+/// # Example
+///
+/// ```
+/// use crate::fig_util::gen_hex_string;
+///
+/// let hex = gen_hex_string();
+/// assert_eq!(hex.len(), 64);
+/// ```
+pub fn gen_hex_string() -> String {
+    let mut buf = [0u8; 32];
+    rand::rng().fill(&mut buf);
+    hex::encode(buf)
+}
+
+pub fn search_xdg_data_dirs(ext: impl AsRef<std::path::Path>) -> Option<PathBuf> {
+    let ext = ext.as_ref();
+    if let Ok(xdg_data_dirs) = std::env::var("XDG_DATA_DIRS") {
+        for base in xdg_data_dirs.split(':') {
+            let check = Path::new(base).join(ext);
+            if check.exists() {
+                return Some(check);
+            }
+        }
+    }
+    None
+}
+
+/// Returns the path to the original executable, not the symlink
+pub fn current_exe_origin() -> Result<PathBuf, Error> {
+    Ok(std::env::current_exe()?.canonicalize()?)
+}
+
+pub fn partitioned_compare(lhs: &str, rhs: &str, by: char) -> Ordering {
+    let sides = lhs
+        .split(by)
+        .filter(|x| !x.is_empty())
+        .zip(rhs.split(by).filter(|x| !x.is_empty()));
+
+    for (lhs, rhs) in sides {
+        match if lhs.chars().all(|x| x.is_numeric()) && rhs.chars().all(|x| x.is_numeric()) {
+            // perform a numerical comparison
+            let lhs: u64 = lhs.parse().unwrap();
+            let rhs: u64 = rhs.parse().unwrap();
+            lhs.cmp(&rhs)
+        } else {
+            // perform a lexical comparison
+            lhs.cmp(rhs)
+        } {
+            Ordering::Equal => continue,
+            s => return s,
+        }
+    }
+
+    lhs.len().cmp(&rhs.len())
+}
+
+/// Glob patterns against full paths
+pub fn glob_dir(glob: &GlobSet, directory: impl AsRef<Path>) -> Result<Vec<PathBuf>> {
+    let mut files = Vec::new();
+
+    // List files in the directory
+    let dir = std::fs::read_dir(directory)?;
+
+    for entry in dir {
+        let path = entry?.path();
+
+        // Check if the file matches the glob pattern
+        if glob.is_match(&path) {
+            files.push(path);
+        }
+    }
+
+    Ok(files)
+}
+
+/// Glob patterns against the file name
+pub fn glob_files(glob: &GlobSet, directory: impl AsRef<Path>) -> Result<Vec<PathBuf>> {
+    let mut files = Vec::new();
+
+    // List files in the directory
+    let dir = std::fs::read_dir(directory)?;
+
+    for entry in dir {
+        let entry = entry?;
+        let path = entry.path();
+        let file_name = path.file_name();
+
+        // Check if the file matches the glob pattern
+        if let Some(file_name) = file_name {
+            if glob.is_match(file_name) {
+                files.push(path);
+            }
+        }
+    }
+
+    Ok(files)
+}
+
+pub fn glob<I, S>(patterns: I) -> Result<GlobSet>
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<str>,
+{
+    let mut builder = GlobSetBuilder::new();
+    for pattern in patterns {
+        builder.add(Glob::new(pattern.as_ref())?);
+    }
+    Ok(builder.build()?)
+}
+
+pub fn app_path_from_bundle_id(bundle_id: impl AsRef<OsStr>) -> Option<String> {
+    cfg_if! {
+        if #[cfg(target_os = "macos")] {
+            let installed_apps = std::process::Command::new("mdfind")
+                .arg("kMDItemCFBundleIdentifier")
+                .arg("=")
+                .arg(bundle_id)
+                .output()
+                .ok()?;
+
+            let path = String::from_utf8_lossy(&installed_apps.stdout);
+            Some(path.trim().split('\n').next()?.into())
+        } else {
+            let _bundle_id = bundle_id;
+            None
+        }
+    }
+}
+
+pub fn is_executable_in_path(program: impl AsRef<Path>) -> bool {
+    match env::var_os("PATH") {
+        Some(path) => env::split_paths(&path).any(|p| p.join(&program).is_file()),
+        _ => false,
+    }
+}
+
+pub fn app_not_running_message() -> String {
+    format!(
+        "\n{}\n{PRODUCT_NAME} app might not be running, to launch {PRODUCT_NAME} run: {}\n",
+        format!("Unable to connect to {PRODUCT_NAME} app").bold(),
+        format!("{CLI_BINARY_NAME} launch").magenta()
+    )
+}
+
+pub fn login_message() -> String {
+    format!(
+        "{}\nLooks like you aren't logged in to {PRODUCT_NAME}, to login run: {}",
+        "Not logged in".bold(),
+        format!("{CLI_BINARY_NAME} login").magenta()
+    )
+}
+
+pub fn match_regex(regex: impl AsRef<str>, input: impl AsRef<str>) -> Option<String> {
+    Some(
+        Regex::new(regex.as_ref())
+            .unwrap()
+            .captures(input.as_ref())?
+            .get(1)?
+            .as_str()
+            .into(),
+    )
+}
+
+pub fn choose(prompt: impl Display, options: &[impl ToString]) -> Result<Option<usize>> {
+    if options.is_empty() {
+        bail!("no options passed to choose")
+    }
+
+    if !stdout().is_terminal() {
+        warn!("called choose while stdout is not a terminal");
+        return Ok(Some(0));
+    }
+
+    match Select::with_theme(&dialoguer_theme())
+        .items(options)
+        .default(0)
+        .with_prompt(prompt.to_string())
+        .interact_opt()
+    {
+        Ok(ok) => Ok(ok),
+        Err(dialoguer::Error::IO(io)) if io.kind() == ErrorKind::Interrupted => Ok(None),
+        Err(e) => Err(e).wrap_err("Failed to choose"),
+    }
+}
+
+pub fn input(prompt: &str, initial_text: Option<&str>) -> Result<String> {
+    if !stdout().is_terminal() {
+        warn!("called input while stdout is not a terminal");
+        return Ok(String::new());
+    }
+
+    let theme = dialoguer_theme();
+    let mut input = dialoguer::Input::with_theme(&theme).with_prompt(prompt);
+
+    if let Some(initial_text) = initial_text {
+        input = input.with_initial_text(initial_text);
+    }
+
+    Ok(input.interact_text()?)
+}
+
+pub fn get_running_app_info(bundle_id: impl AsRef<str>, field: impl AsRef<str>) -> Result<String> {
+    let info = Command::new("lsappinfo")
+        .args(["info", "-only", field.as_ref(), "-app", bundle_id.as_ref()])
+        .output()?;
+    let info = String::from_utf8(info.stdout)?;
+    let value = info
+        .split('=')
+        .nth(1)
+        .context(eyre::eyre!("Could not get field value for {}", field.as_ref()))?
+        .replace('"', "");
+    Ok(value.trim().into())
+}
+
+pub fn dialoguer_theme() -> ColorfulTheme {
+    ColorfulTheme {
+        prompt_prefix: dialoguer::console::style("?".into()).for_stderr().magenta(),
+        ..ColorfulTheme::default()
+    }
+}
+
+#[cfg(target_os = "macos")]
+pub async fn is_brew_reinstall() -> bool {
+    let regex = regex::bytes::Regex::new(r"brew(\.\w+)?\s+(upgrade|reinstall|install)").unwrap();
+
+    tokio::process::Command::new("ps")
+        .args(["aux", "-o", "args"])
+        .output()
+        .await
+        .is_ok_and(|output| regex.is_match(&output.stdout))
+}
+
+#[cfg(test)]
+mod tests {
+    use std::cmp::Ordering;
+
+    use super::*;
+
+    #[test]
+    fn regex() {
+        let regex_test = |regex: &str, input: &str, expected: Option<&str>| {
+            assert_eq!(match_regex(regex, input), expected.map(|s| s.into()));
+        };
+
+        regex_test(r"foo=(\S+)", "foo=bar", Some("bar"));
+        regex_test(r"foo=(\S+)", "bar=foo", None);
+        regex_test(r"foo=(\S+)", "foo=bar baz", Some("bar"));
+        regex_test(r"foo=(\S+)", "foo=", None);
+    }
+
+    #[test]
+    fn exe_path() {
+        #[cfg(unix)]
+        assert!(is_executable_in_path("cargo"));
+
+        #[cfg(windows)]
+        assert!(is_executable_in_path("cargo.exe"));
+    }
+
+    #[test]
+    fn globs() {
+        let set = glob(["*.txt", "*.md"]).unwrap();
+        assert!(set.is_match("README.md"));
+        assert!(set.is_match("LICENSE.txt"));
+    }
+
+    #[test]
+    fn test_partitioned_compare() {
+        assert_eq!(partitioned_compare("1.2.3", "1.2.3", '.'), Ordering::Equal);
+        assert_eq!(partitioned_compare("1.2.3", "1.2.2", '.'), Ordering::Greater);
+        assert_eq!(partitioned_compare("4-a-b", "4-a-c", '-'), Ordering::Less);
+        assert_eq!(partitioned_compare("0?0?0", "0?0", '?'), Ordering::Greater);
+    }
+
+    #[test]
+    fn test_gen_hex_string() {
+        let hex = gen_hex_string();
+        assert_eq!(hex.len(), 64);
+    }
+
+    #[test]
+    fn test_current_exe_origin() {
+        current_exe_origin().unwrap();
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/open.rs b/crates/kiro-cli/src/fig_util/open.rs
new file mode 100644
index 0000000000..6315adc118
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/open.rs
@@ -0,0 +1,101 @@
+use cfg_if::cfg_if;
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[error("Failed to open URL")]
+    Failed,
+}
+
+#[cfg(target_os = "macos")]
+#[allow(unexpected_cfgs)]
+fn open_macos(url_str: impl AsRef<str>) -> Result<(), Error> {
+    use objc2::ClassType;
+    use objc2_foundation::{
+        NSString,
+        NSURL,
+    };
+
+    let url_nsstring = NSString::from_str(url_str.as_ref());
+    let nsurl = unsafe { NSURL::initWithString(NSURL::alloc(), &url_nsstring) }.ok_or(Error::Failed)?;
+    let res = unsafe { objc2_app_kit::NSWorkspace::sharedWorkspace().openURL(&nsurl) };
+    res.then_some(()).ok_or(Error::Failed)
+}
+
+#[cfg(target_os = "windows")]
+fn open_command(url: impl AsRef<str>) -> std::process::Command {
+    use std::os::windows::process::CommandExt;
+
+    let detached = 0x8;
+    let mut command = std::process::Command::new("cmd");
+    command.creation_flags(detached);
+    command.args(["/c", "start", url.as_ref()]);
+    command
+}
+
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+fn open_command(url: impl AsRef<str>) -> std::process::Command {
+    let executable = if crate::system_info::in_wsl() {
+        "wslview"
+    } else {
+        "xdg-open"
+    };
+
+    let mut command = std::process::Command::new(executable);
+    command.arg(url.as_ref());
+    command
+}
+
+/// Returns bool indicating whether the URL was opened successfully
+pub fn open_url(url: impl AsRef<str>) -> Result<(), Error> {
+    cfg_if! {
+        if #[cfg(target_os = "macos")] {
+            open_macos(url)
+        } else {
+            match open_command(url).output() {
+                Ok(output) => {
+                    tracing::trace!(?output, "open_url output");
+                    if output.status.success() {
+                        Ok(())
+                    } else {
+                        Err(Error::Failed)
+                    }
+                },
+                Err(err) => Err(err.into()),
+            }
+        }
+    }
+}
+
+/// Returns bool indicating whether the URL was opened successfully
+pub async fn open_url_async(url: impl AsRef<str>) -> Result<(), Error> {
+    cfg_if! {
+        if #[cfg(target_os = "macos")] {
+            open_macos(url)
+        } else {
+            match tokio::process::Command::from(open_command(url)).output().await {
+                Ok(output) => {
+                    tracing::trace!(?output, "open_url_async output");
+                    if output.status.success() {
+                        Ok(())
+                    } else {
+                        Err(Error::Failed)
+                    }
+                },
+                Err(err) => Err(err.into()),
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[ignore]
+    #[test]
+    fn test_open_url() {
+        open_url("https://fig.io").unwrap();
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/pid_file.rs b/crates/kiro-cli/src/fig_util/pid_file.rs
new file mode 100644
index 0000000000..0f86ef5c66
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/pid_file.rs
@@ -0,0 +1,167 @@
+use std::fs::{
+    File,
+    OpenOptions,
+};
+use std::io::{
+    Error,
+    ErrorKind,
+    Seek,
+    SeekFrom,
+    Write,
+};
+use std::os::unix::fs::OpenOptionsExt;
+use std::path::PathBuf;
+
+use eyre::Result;
+use nix::fcntl::{
+    Flock,
+    FlockArg,
+};
+use nix::sys::signal::{
+    Signal,
+    kill,
+};
+use nix::unistd::Pid;
+use tokio::fs::read_to_string;
+use tokio::time::sleep;
+use tracing::{
+    debug,
+    error,
+    info,
+    instrument,
+    warn,
+};
+
+/// A file-based process lock that ensures only one instance of a process is running.
+///
+/// `PidLock` works by:
+/// 1. Creating/opening a PID file at the specified path
+/// 2. Attempting to acquire an exclusive lock on the file
+/// 3. Writing the current process ID to the file
+/// 4. If another process holds the lock, attempts to terminate that process first
+///
+/// The lock is automatically released when the `PidLock` instance is dropped.
+#[derive(Debug)]
+pub struct PidLock {
+    lock: Flock<File>,
+    pid_path: PathBuf,
+}
+
+impl PidLock {
+    #[instrument(name = "PidLock::new")]
+    pub async fn new(pid_path: PathBuf) -> Result<Self> {
+        let file = OpenOptions::new()
+            .read(true)
+            .write(true)
+            .create(true)
+            .truncate(false)
+            .mode(0o644)
+            .open(&pid_path)
+            .inspect_err(|err| error!(%err, "Failed to open pid file"))?;
+
+        // Try to get exclusive lock
+        let mut lock = match Flock::lock(file, FlockArg::LockExclusiveNonblock) {
+            Ok(lock) => lock,
+            Err((file, err)) => {
+                debug!(%err, "Failed to acquire lock, trying to handle existing process");
+
+                // Read existing PID
+                match read_to_string(&pid_path).await {
+                    Ok(content) => match content.trim().parse::<i32>() {
+                        Ok(pid) => {
+                            debug!(%pid, "Found existing process ID");
+                            if let Err(err) = kill_process(pid).await {
+                                error!(%err, %pid, "Failed to kill existing process");
+                            } else {
+                                info!(%pid, "Successfully killed existing process");
+                            }
+                        },
+                        Err(err) => {
+                            warn!(%err, %content, "Failed to parse PID from lockfile");
+                        },
+                    },
+                    Err(err) => warn!(%err, "Failed to read PID from lockfile"),
+                }
+
+                Flock::lock(file, FlockArg::LockExclusiveNonblock).map_err(|(_, err)| {
+                    error!(%err, "Failed to acquire lock after handling existing process");
+                    err
+                })?
+            },
+        };
+
+        // Write current PID
+        let current_pid = std::process::id();
+        lock.set_len(0)
+            .inspect_err(|err| error!(%err, "Failed to truncate lock file"))?;
+        lock.seek(SeekFrom::Start(0))
+            .inspect_err(|err| error!(%err, "Failed to seek to start of file"))?;
+        lock.write_all(current_pid.to_string().as_bytes())
+            .inspect_err(|err| error!(%err, "Failed to write PID to file"))?;
+        lock.flush()
+            .inspect_err(|err| error!(%err, "Failed to flush lock file"))?;
+
+        info!(%current_pid, "Successfully created and locked PID file");
+        Ok(PidLock { lock, pid_path })
+    }
+
+    #[instrument(name = "PidLock::release", skip(self), fields(pid_path =? self.pid_path))]
+    pub fn release(mut self) -> Result<(), Error> {
+        debug!("Releasing PID lock");
+        self.lock
+            .set_len(0)
+            .inspect_err(|err| error!(%err, "Failed to truncate lock file during release"))?;
+        self.lock
+            .flush()
+            .inspect_err(|err| error!(%err, "Failed to flush lock file during release"))?;
+        self.lock.unlock().map_err(|(_, err)| {
+            error!(%err, "Failed to unlock file during release");
+            err
+        })?;
+        Ok(())
+    }
+}
+
+#[instrument(level = "debug")]
+fn process_exists(pid: i32) -> bool {
+    let exists = kill(Pid::from_raw(pid), None).is_ok();
+    debug!(%pid, %exists, "Checked if process exists");
+    exists
+}
+
+#[instrument(level = "debug")]
+async fn kill_process(pid: i32) -> Result<()> {
+    if !process_exists(pid) {
+        error!(%pid, "Process not found");
+        return Err(Error::new(ErrorKind::NotFound, format!("Process already running with PID {pid}")).into());
+    }
+
+    info!(%pid, "Attempting to terminate process");
+    match kill(Pid::from_raw(pid), Signal::SIGINT) {
+        Ok(_) => {
+            debug!(%pid, "Sent SIGINT signal");
+
+            // Wait for the process to terminate
+            for i in 0..50 {
+                if !process_exists(pid) {
+                    info!(%pid, "Process terminated successfully");
+                    return Ok(());
+                }
+                debug!(%pid, attempt = i, "Process still running, waiting");
+                sleep(std::time::Duration::from_millis(100)).await;
+            }
+
+            if process_exists(pid) {
+                warn!(%pid, "Process didn't terminate gracefully, sending SIGKILL");
+                let _ = kill(Pid::from_raw(pid), Signal::SIGKILL)
+                    .inspect_err(|err| error!(%err, %pid, "Failed to send SIGKILL"));
+                sleep(std::time::Duration::from_millis(100)).await;
+            }
+            Ok(())
+        },
+        Err(err) => {
+            error!(%err, %pid, "Failed to send SIGINT");
+            Err(Error::new(ErrorKind::Other, format!("Failed to terminate existing process: {err}")).into())
+        },
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/process_info/freebsd.rs b/crates/kiro-cli/src/fig_util/process_info/freebsd.rs
new file mode 100644
index 0000000000..384d9ded68
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/process_info/freebsd.rs
@@ -0,0 +1,20 @@
+use std::path::PathBuf;
+
+use super::{
+    Pid,
+    PidExt,
+};
+
+impl PidExt for Pid {
+    fn current() -> Self {
+        nix::unistd::getpid().into()
+    }
+
+    fn parent(&self) -> Option<Pid> {
+        None
+    }
+
+    fn exe(&self) -> Option<PathBuf> {
+        None
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/process_info/linux.rs b/crates/kiro-cli/src/fig_util/process_info/linux.rs
new file mode 100644
index 0000000000..a013f31580
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/process_info/linux.rs
@@ -0,0 +1,41 @@
+use std::path::PathBuf;
+use std::str::FromStr;
+
+pub trait LinuxExt {
+    fn cmdline(&self) -> Option<String>;
+}
+
+use super::{
+    Pid,
+    PidExt,
+};
+
+impl PidExt for Pid {
+    fn current() -> Self {
+        nix::unistd::getpid().into()
+    }
+
+    fn parent(&self) -> Option<Pid> {
+        std::fs::read_to_string(format!("/proc/{self}/status"))
+            .ok()
+            .and_then(|s| {
+                s.lines()
+                    .find(|line| line.starts_with("PPid:"))
+                    .and_then(|line| line.strip_prefix("PPid:"))
+                    .map(|line| line.trim())
+                    .and_then(|pid_str| Pid::from_str(pid_str).ok())
+            })
+    }
+
+    fn exe(&self) -> Option<PathBuf> {
+        std::path::PathBuf::from(format!("/proc/{self}/exe")).read_link().ok()
+    }
+}
+
+impl LinuxExt for Pid {
+    fn cmdline(&self) -> Option<String> {
+        std::fs::read_to_string(format!("/proc/{self}/cmdline"))
+            .ok()
+            .map(|s| s.replace('\0', ""))
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/process_info/macos.rs b/crates/kiro-cli/src/fig_util/process_info/macos.rs
new file mode 100644
index 0000000000..d260c36456
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/process_info/macos.rs
@@ -0,0 +1,49 @@
+use std::ffi::OsStr;
+use std::mem::MaybeUninit;
+use std::os::unix::prelude::OsStrExt;
+use std::path::PathBuf;
+
+use super::{
+    Pid,
+    PidExt,
+};
+
+impl PidExt for Pid {
+    fn current() -> Self {
+        nix::unistd::getpid().into()
+    }
+
+    fn parent(&self) -> Option<Pid> {
+        let pid = self.0;
+        let mut info = MaybeUninit::<nix::libc::proc_bsdinfo>::zeroed();
+        let ret = unsafe {
+            nix::libc::proc_pidinfo(
+                pid,
+                nix::libc::PROC_PIDTBSDINFO,
+                0,
+                info.as_mut_ptr().cast(),
+                std::mem::size_of::<nix::libc::proc_bsdinfo>() as _,
+            )
+        };
+        if ret as usize != std::mem::size_of::<nix::libc::proc_bsdinfo>() {
+            return None;
+        }
+        let info = unsafe { info.assume_init() };
+        match info.pbi_ppid {
+            0 => None,
+            ppid => Some(Pid(ppid.try_into().ok()?)),
+        }
+    }
+
+    fn exe(&self) -> Option<PathBuf> {
+        let mut buffer = [0u8; 4096];
+        let pid = self.0;
+        let buffer_ptr = buffer.as_mut_ptr().cast::<std::ffi::c_void>();
+        let buffer_size = buffer.len() as u32;
+        let ret = unsafe { nix::libc::proc_pidpath(pid, buffer_ptr, buffer_size) };
+        match ret {
+            0 => None,
+            len => Some(PathBuf::from(OsStr::from_bytes(&buffer[..len as usize]))),
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/process_info/mod.rs b/crates/kiro-cli/src/fig_util/process_info/mod.rs
new file mode 100644
index 0000000000..cc415a785c
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/process_info/mod.rs
@@ -0,0 +1,118 @@
+use std::path::PathBuf;
+use std::{
+    fmt,
+    str,
+};
+
+use cfg_if::cfg_if;
+
+#[cfg(target_os = "linux")]
+mod linux;
+#[cfg(target_os = "linux")]
+pub use linux::*;
+
+#[cfg(target_os = "macos")]
+mod macos;
+// #[cfg(target_os = "macos")]
+// pub use macos::*;
+
+#[cfg(target_os = "windows")]
+mod windows;
+#[cfg(target_os = "windows")]
+pub use self::windows::*;
+
+#[cfg(target_os = "freebsd")]
+mod freebsd;
+#[cfg(target_os = "freebsd")]
+pub use self::freebsd::*;
+
+macro_rules! pid_decl {
+    ($typ:ty) => {
+        #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
+        #[repr(transparent)]
+        pub struct Pid(pub(crate) $typ);
+
+        impl From<$typ> for Pid {
+            fn from(v: $typ) -> Self {
+                Self(v)
+            }
+        }
+        impl From<Pid> for $typ {
+            fn from(v: Pid) -> Self {
+                v.0
+            }
+        }
+        impl str::FromStr for Pid {
+            type Err = <$typ as str::FromStr>::Err;
+
+            fn from_str(s: &str) -> Result<Self, Self::Err> {
+                Ok(Self(<$typ>::from_str(s)?))
+            }
+        }
+        impl fmt::Display for Pid {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                write!(f, "{}", self.0)
+            }
+        }
+    };
+}
+
+cfg_if! {
+    if #[cfg(unix)] {
+        use nix::libc::pid_t;
+
+        pid_decl!(pid_t);
+
+        impl From<nix::unistd::Pid> for Pid {
+            fn from(pid: nix::unistd::Pid) -> Self {
+                Pid(pid.as_raw())
+            }
+        }
+
+        impl From<Pid> for nix::unistd::Pid {
+            fn from(pid: Pid) -> Self {
+                nix::unistd::Pid::from_raw(pid.0)
+            }
+        }
+    } else if #[cfg(windows)] {
+        pid_decl!(u32);
+    }
+}
+
+pub trait PidExt {
+    fn current() -> Self;
+    fn parent(&self) -> Option<Pid>;
+    fn exe(&self) -> Option<PathBuf>;
+}
+
+pub fn get_parent_process_exe() -> Option<PathBuf> {
+    let mut pid = Pid::current();
+    loop {
+        pid = pid.parent()?;
+        match pid.exe() {
+            // We ignore toolbox-exec since we never want to know if that is the parent process
+            Some(pid) if pid.file_name().is_some_and(|s| s == "toolbox-exec") => {},
+            other => return other,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parent_name() {
+        let process_pid = Pid::current();
+        let parent_pid = process_pid.parent().unwrap();
+        let parent_exe = parent_pid.exe().unwrap();
+        let parent_name = parent_exe.file_name().unwrap().to_str().unwrap();
+
+        assert!(parent_name.contains("cargo"));
+    }
+
+    #[test]
+    fn test_get_parent_process_exe() {
+        get_parent_process_exe();
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/process_info/windows.rs b/crates/kiro-cli/src/fig_util/process_info/windows.rs
new file mode 100644
index 0000000000..5ecfa6615e
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/process_info/windows.rs
@@ -0,0 +1,136 @@
+use std::ffi::CStr;
+use std::mem::{
+    MaybeUninit,
+    size_of,
+};
+use std::ops::Deref;
+use std::path::PathBuf;
+
+use windows::Win32::Foundation::{
+    CloseHandle,
+    HANDLE,
+    MAX_PATH,
+};
+use windows::Win32::System::Threading::{
+    GetCurrentProcessId,
+    NtQueryInformationProcess,
+    OpenProcess,
+    PROCESS_BASIC_INFORMATION,
+    PROCESS_NAME_FORMAT,
+    PROCESS_QUERY_INFORMATION,
+    PROCESS_QUERY_LIMITED_INFORMATION,
+    PROCESS_VM_READ,
+    ProcessBasicInformation,
+    QueryFullProcessImageNameA,
+};
+use windows::core::PSTR;
+
+use super::{
+    Pid,
+    PidExt,
+};
+
+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 {
+            CloseHandle(self.0);
+        }
+    }
+}
+
+impl Deref for SafeHandle {
+    type Target = HANDLE;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+fn get_process_handle(pid: &Pid) -> Option<SafeHandle> {
+    if pid.0 == 0 {
+        return None;
+    }
+
+    let handle = unsafe {
+        match OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, false, pid.0) {
+            Ok(handle) => handle,
+            Err(_) => match OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, false, pid.0) {
+                Ok(handle) => handle,
+                Err(_) => return None,
+            },
+        }
+    };
+
+    SafeHandle::new(handle)
+}
+
+impl PidExt for Pid {
+    fn current() -> Self {
+        unsafe { Pid(GetCurrentProcessId()) }
+    }
+
+    fn parent(&self) -> Option<Pid> {
+        let handle = get_process_handle(self)?;
+
+        unsafe {
+            let mut info: MaybeUninit<PROCESS_BASIC_INFORMATION> = MaybeUninit::uninit();
+            let mut len = 0;
+            if NtQueryInformationProcess(
+                *handle,
+                ProcessBasicInformation,
+                info.as_mut_ptr() as *mut _,
+                size_of::<PROCESS_BASIC_INFORMATION>() as _,
+                &mut len,
+            )
+            .is_err()
+            {
+                return None;
+            }
+
+            let info = info.assume_init();
+
+            if info.InheritedFromUniqueProcessId as usize != 0 {
+                Some(Pid(info.InheritedFromUniqueProcessId as u32))
+            } else {
+                None
+            }
+        }
+    }
+
+    fn exe(&self) -> Option<PathBuf> {
+        unsafe {
+            let handle = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, false, self.0).ok()?;
+
+            // Get the terminal name
+            let mut len = MAX_PATH;
+            let mut process_name = [0; MAX_PATH as usize + 1];
+            process_name[MAX_PATH as usize] = u8::try_from('\0').unwrap();
+
+            if !QueryFullProcessImageNameA(
+                handle,
+                PROCESS_NAME_FORMAT(0),
+                PSTR(process_name.as_mut_ptr()),
+                &mut len,
+            )
+            .as_bool()
+            {
+                return None;
+            }
+
+            let title = CStr::from_bytes_with_nul(&process_name[0..=len as usize])
+                .ok()?
+                .to_str()
+                .ok()?;
+
+            Some(PathBuf::from(title))
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/region_check.rs b/crates/kiro-cli/src/fig_util/region_check.rs
new file mode 100644
index 0000000000..0a9f18d8a2
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/region_check.rs
@@ -0,0 +1,15 @@
+use super::system_info::in_cloudshell;
+
+const GOV_REGIONS: &[&str] = &["us-gov-east-1", "us-gov-west-1"];
+
+pub fn region_check(capability: &'static str) -> eyre::Result<()> {
+    let Ok(region) = std::env::var("AWS_REGION") else {
+        return Ok(());
+    };
+
+    if in_cloudshell() && GOV_REGIONS.contains(&region.as_str()) {
+        eyre::bail!("AWS GovCloud ({region}) is not supported for {capability}.");
+    }
+
+    Ok(())
+}
diff --git a/crates/kiro-cli/src/fig_util/spinner.rs b/crates/kiro-cli/src/fig_util/spinner.rs
new file mode 100644
index 0000000000..2a38859dac
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/spinner.rs
@@ -0,0 +1,126 @@
+use std::io::{
+    Write,
+    stdout,
+};
+use std::sync::mpsc::{
+    Sender,
+    TryRecvError,
+    channel,
+};
+use std::thread;
+use std::thread::JoinHandle;
+use std::time::Duration;
+
+use anstream::{
+    print,
+    println,
+};
+use crossterm::ExecutableCommand;
+
+const FRAMES: &[&str] = &[
+    "▰▱▱▱▱▱▱",
+    "▰▰▱▱▱▱▱",
+    "▰▰▰▱▱▱▱",
+    "▰▰▰▰▱▱▱",
+    "▰▰▰▰▰▱▱",
+    "▰▰▰▰▰▰▱",
+    "▰▰▰▰▰▰▰",
+    "▰▱▱▱▱▱▱",
+];
+const INTERVAL: Duration = Duration::from_millis(100);
+
+pub struct Spinner {
+    sender: Sender<Option<String>>,
+    join: Option<JoinHandle<()>>,
+}
+
+impl Drop for Spinner {
+    fn drop(&mut self) {
+        if self.join.is_some() {
+            self.sender.send(Some("\x1b[2K\r".into())).unwrap();
+            self.join.take().unwrap().join().unwrap();
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum SpinnerComponent {
+    Text(String),
+    Spinner,
+}
+
+impl Spinner {
+    pub fn new(components: Vec<SpinnerComponent>) -> Self {
+        let (sender, recv) = channel::<Option<String>>();
+
+        stdout().execute(crossterm::cursor::Hide).ok();
+
+        let join = thread::spawn(move || {
+            'outer: loop {
+                let mut stdout = stdout();
+                for frame in FRAMES.iter() {
+                    let (do_stop, stop_symbol) = match recv.try_recv() {
+                        Ok(stop_symbol) => (true, stop_symbol),
+                        Err(TryRecvError::Disconnected) => (true, None),
+                        Err(TryRecvError::Empty) => (false, None),
+                    };
+
+                    let frame = stop_symbol.unwrap_or_else(|| (*frame).to_string());
+
+                    let line = components.iter().fold(String::new(), |mut acc, elem| {
+                        acc.push_str(match elem {
+                            SpinnerComponent::Text(ref t) => t,
+                            SpinnerComponent::Spinner => &frame,
+                        });
+                        acc
+                    });
+
+                    print!("\r{line}");
+
+                    stdout.flush().unwrap();
+
+                    if do_stop {
+                        stdout.execute(crossterm::cursor::Show).ok();
+                        break 'outer;
+                    }
+
+                    thread::sleep(INTERVAL);
+                }
+            }
+        });
+
+        Self {
+            sender,
+            join: Some(join),
+        }
+    }
+
+    fn stop_inner(&mut self, stop_symbol: Option<String>) {
+        self.sender.send(stop_symbol).expect("Could not stop spinner thread.");
+        self.join.take().unwrap().join().unwrap();
+    }
+
+    pub fn stop(&mut self) {
+        self.stop_inner(None);
+    }
+
+    pub fn stop_with_message(&mut self, msg: String) {
+        self.stop();
+        println!("\x1b[2K\r{msg}");
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_spinner() {
+        let mut spinner = Spinner::new(vec![
+            SpinnerComponent::Spinner,
+            SpinnerComponent::Text("Loading".into()),
+        ]);
+        thread::sleep(Duration::from_secs(1));
+        spinner.stop_with_message("Done".into());
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/system_info/linux.rs b/crates/kiro-cli/src/fig_util/system_info/linux.rs
new file mode 100644
index 0000000000..d611fe9293
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/system_info/linux.rs
@@ -0,0 +1,285 @@
+use std::io;
+use std::path::Path;
+use std::sync::OnceLock;
+
+use regex::Regex;
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+use crate::fig_os_shim::EnvProvider;
+use crate::fig_util::{
+    Error,
+    UnknownDesktopErrContext,
+};
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DisplayServer {
+    X11,
+    Wayland,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DesktopEnvironment {
+    Gnome,
+    Plasma,
+    I3,
+    Sway,
+}
+
+pub fn get_display_server(env: &impl EnvProvider) -> Result<DisplayServer, Error> {
+    match env.env().get("XDG_SESSION_TYPE") {
+        Ok(session) => match session.as_str() {
+            "x11" => Ok(DisplayServer::X11),
+            "wayland" => Ok(DisplayServer::Wayland),
+            _ => Err(Error::UnknownDisplayServer(session)),
+        },
+        // x11 is not guarantee this var is set, so we just assume x11 if it is not set
+        _ => Ok(DisplayServer::X11),
+    }
+}
+
+pub fn get_desktop_environment(env: &impl EnvProvider) -> Result<DesktopEnvironment, Error> {
+    let env = env.env();
+
+    // Prioritize XDG_CURRENT_DESKTOP and check other common env vars as fallback.
+    // https://superuser.com/a/1643180
+    let xdg_current_desktop = match env.get("XDG_CURRENT_DESKTOP") {
+        Ok(current) => {
+            let current_lower = current.to_lowercase();
+            let (_, desktop) = current_lower.split_once(':').unwrap_or(("", current_lower.as_str()));
+            match desktop.to_lowercase().as_str() {
+                "gnome" | "gnome-xorg" | "ubuntu" | "pop" => return Ok(DesktopEnvironment::Gnome),
+                "kde" | "plasma" => return Ok(DesktopEnvironment::Plasma),
+                "i3" => return Ok(DesktopEnvironment::I3),
+                "sway" => return Ok(DesktopEnvironment::Sway),
+                _ => current,
+            }
+        },
+        _ => "".into(),
+    };
+
+    let xdg_session_desktop = match env.get("XDG_SESSION_DESKTOP") {
+        Ok(session) => {
+            let session_lower = session.to_lowercase();
+            match session_lower.as_str() {
+                "gnome" | "ubuntu" => return Ok(DesktopEnvironment::Gnome),
+                "kde" => return Ok(DesktopEnvironment::Plasma),
+                _ => session,
+            }
+        },
+        _ => "".into(),
+    };
+
+    let gdm_session = match env.get("GDMSESSION") {
+        Ok(session) if session.to_lowercase().starts_with("ubuntu") => return Ok(DesktopEnvironment::Gnome),
+        Ok(session) => session,
+        _ => "".into(),
+    };
+
+    Err(Error::UnknownDesktop(UnknownDesktopErrContext {
+        xdg_current_desktop,
+        xdg_session_desktop,
+        gdm_session,
+    }))
+}
+
+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()
+}
+
+/// 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>,
+}
+
+impl OsRelease {
+    fn path() -> &'static Path {
+        Path::new("/etc/os-release")
+    }
+
+    pub(crate) fn load() -> io::Result<OsRelease> {
+        let os_release_str = std::fs::read_to_string(Self::path())?;
+        Ok(OsRelease::from_str(&os_release_str))
+    }
+
+    pub(crate) fn from_str(s: &str) -> OsRelease {
+        // Remove the starting and ending quotes from a string if they match
+        let strip_quotes = |s: &str| -> Option<String> {
+            if s.starts_with('"') && s.ends_with('"') {
+                Some(s[1..s.len() - 1].into())
+            } else {
+                Some(s.into())
+            }
+        };
+
+        let mut os_release = OsRelease::default();
+        for line in s.lines() {
+            if let Some((key, value)) = line.split_once('=') {
+                match key {
+                    "ID" => os_release.id = strip_quotes(value),
+                    "NAME" => os_release.name = strip_quotes(value),
+                    "PRETTY_NAME" => os_release.pretty_name = strip_quotes(value),
+                    "VERSION" => os_release.version = strip_quotes(value),
+                    "VERSION_ID" => os_release.version_id = strip_quotes(value),
+                    "BUILD_ID" => os_release.build_id = strip_quotes(value),
+                    "VARIANT" => os_release.variant = strip_quotes(value),
+                    "VARIANT_ID" => os_release.variant_id = strip_quotes(value),
+                    _ => {},
+                }
+            }
+        }
+        os_release
+    }
+}
+
+fn containerenv_engine_re() -> &'static Regex {
+    static CONTAINERENV_ENGINE_RE: OnceLock<Regex> = OnceLock::new();
+    CONTAINERENV_ENGINE_RE.get_or_init(|| Regex::new(r#"engine="([^"\s]+)""#).unwrap())
+}
+
+pub enum SandboxKind {
+    None,
+    Flatpak,
+    Snap,
+    Docker,
+    Container(Option<String>),
+}
+
+pub fn detect_sandbox() -> SandboxKind {
+    if Path::new("/.flatpak-info").exists() {
+        return SandboxKind::Flatpak;
+    }
+    if std::env::var("SNAP").is_ok() {
+        return SandboxKind::Snap;
+    }
+    if Path::new("/.dockerenv").exists() {
+        return SandboxKind::Docker;
+    }
+    if let Ok(env) = std::fs::read_to_string("/var/run/.containerenv") {
+        return SandboxKind::Container(
+            containerenv_engine_re()
+                .captures(&env)
+                .and_then(|x| x.get(1))
+                .map(|x| x.as_str().to_string()),
+        );
+    }
+
+    SandboxKind::None
+}
+
+impl SandboxKind {
+    pub fn is_container(&self) -> bool {
+        matches!(self, SandboxKind::Docker | SandboxKind::Container(_))
+    }
+
+    pub fn is_app_runtime(&self) -> bool {
+        matches!(self, SandboxKind::Flatpak | SandboxKind::Snap)
+    }
+
+    pub fn is_none(&self) -> bool {
+        matches!(self, SandboxKind::None)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::fig_os_shim::Env;
+
+    #[cfg(target_os = "linux")]
+    #[test]
+    fn os_release() {
+        if OsRelease::path().exists() {
+            OsRelease::load().unwrap();
+        } else {
+            println!("Skipping os-release test as /etc/os-release does not exist");
+        }
+    }
+
+    #[test]
+    fn os_release_parse() {
+        let os_release_str = indoc::indoc! {r#"
+            NAME="Amazon Linux"
+            VERSION="2023"
+            ID="amzn"
+            ID_LIKE="fedora"
+            VERSION_ID="2023"
+            PLATFORM_ID="platform:al2023"
+            PRETTY_NAME="Amazon Linux 2023.4.20240416"
+            ANSI_COLOR="0;33"
+            CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2023"
+            HOME_URL="https://aws.amazon.com/linux/amazon-linux-2023/"
+            DOCUMENTATION_URL="https://docs.aws.amazon.com/linux/"
+            SUPPORT_URL="https://aws.amazon.com/premiumsupport/"
+            BUG_REPORT_URL="https://github.com/amazonlinux/amazon-linux-2023"
+            VENDOR_NAME="AWS"
+            VENDOR_URL="https://aws.amazon.com/"
+            SUPPORT_END="2028-03-15"
+        "#};
+
+        let os_release = OsRelease::from_str(os_release_str);
+
+        assert_eq!(os_release.id, Some("amzn".into()));
+
+        assert_eq!(os_release.name, Some("Amazon Linux".into()));
+        assert_eq!(os_release.pretty_name, Some("Amazon Linux 2023.4.20240416".into()));
+
+        assert_eq!(os_release.version_id, Some("2023".into()));
+        assert_eq!(os_release.version, Some("2023".into()));
+
+        assert_eq!(os_release.build_id, None);
+
+        assert_eq!(os_release.variant_id, None);
+        assert_eq!(os_release.variant, None);
+    }
+
+    #[test]
+    fn test_get_desktop_environment() {
+        let tests = [
+            (vec![("XDG_CURRENT_DESKTOP", "UBUNTU:gnome")], DesktopEnvironment::Gnome),
+            (
+                vec![("XDG_CURRENT_DESKTOP", "Unity"), ("XDG_SESSION_DESKTOP", "ubuntu")],
+                DesktopEnvironment::Gnome,
+            ),
+            (
+                vec![("XDG_CURRENT_DESKTOP", "Unity"), ("XDG_SESSION_DESKTOP", "GNOME")],
+                DesktopEnvironment::Gnome,
+            ),
+            (vec![("GDMSESSION", "ubuntu")], DesktopEnvironment::Gnome),
+        ];
+
+        for (env, expected_desktop_env) in tests {
+            let env = Env::from_slice(&env);
+            assert_eq!(
+                get_desktop_environment(&env).unwrap(),
+                expected_desktop_env,
+                "expected: {:?} from env: {:?}",
+                expected_desktop_env,
+                env
+            );
+        }
+    }
+
+    #[test]
+    fn test_get_desktop_environment_err() {
+        let env = Env::from_slice(&[("XDG_CURRENT_DESKTOP", "Unity"), ("XDG_SESSION_DESKTOP", "")]);
+        let res = get_desktop_environment(&env);
+        println!("{}", res.as_ref().unwrap_err());
+        assert!(matches!(res, Err(Error::UnknownDesktop(_))));
+    }
+}
diff --git a/crates/kiro-cli/src/fig_util/system_info/mod.rs b/crates/kiro-cli/src/fig_util/system_info/mod.rs
new file mode 100644
index 0000000000..ae6cb65da0
--- /dev/null
+++ b/crates/kiro-cli/src/fig_util/system_info/mod.rs
@@ -0,0 +1,382 @@
+pub mod linux;
+
+use std::borrow::Cow;
+use std::sync::OnceLock;
+
+use cfg_if::cfg_if;
+use serde::{
+    Deserialize,
+    Serialize,
+};
+use sha2::{
+    Digest,
+    Sha256,
+};
+
+use crate::fig_os_shim::Env;
+use crate::fig_util::Error;
+use crate::fig_util::env_var::Q_PARENT;
+use crate::fig_util::manifest::is_minimal;
+
+/// The support level for different platforms
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum SupportLevel {
+    /// A fully supported platform
+    Supported,
+    /// Supported, but with a caveat
+    SupportedWithCaveat { info: Cow<'static, str> },
+    /// A platform that is currently in development
+    InDevelopment { info: Option<Cow<'static, str>> },
+    /// A platform that is not supported
+    Unsupported,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum OSVersion {
+    MacOS {
+        major: i32,
+        minor: i32,
+        patch: Option<i32>,
+        build: String,
+    },
+    Linux {
+        kernel_version: String,
+        #[serde(flatten)]
+        os_release: Option<linux::OsRelease>,
+    },
+    Windows {
+        name: String,
+        build: u32,
+    },
+    FreeBsd {
+        version: String,
+    },
+}
+
+impl OSVersion {
+    pub fn support_level(&self) -> SupportLevel {
+        match self {
+            OSVersion::MacOS { major, minor, .. } => {
+                // Minimum supported macOS version is 10.14.0
+                if *major > 10 || (*major == 10 && *minor >= 14) {
+                    SupportLevel::Supported
+                } else {
+                    SupportLevel::Unsupported
+                }
+            },
+            OSVersion::Linux { .. } => match (is_remote(), is_minimal()) {
+                (true, true) => SupportLevel::Supported,
+                (false, true) => SupportLevel::SupportedWithCaveat {
+                    info: "Autocomplete is not yet available on Linux, but other products should work as expected."
+                        .into(),
+                },
+                (_, _) => SupportLevel::Supported,
+            },
+            OSVersion::Windows { build, .. } => match build {
+                // Only Windows 11 is fully supported at the moment
+                build if *build >= 22000 => SupportLevel::Supported,
+                // Windows 10 development has known issues
+                build if *build >= 10240 => SupportLevel::InDevelopment {
+                    info: Some(
+                        "Since support for Windows 10 is still in progress,\
+Autocomplete only works in Git Bash with the default prompt.\
+Please upgrade to Windows 11 or wait for a fix while we work this issue out."
+                            .into(),
+                    ),
+                },
+                // Earlier versions of Windows are not supported
+                _ => SupportLevel::Unsupported,
+            },
+            OSVersion::FreeBsd { .. } => SupportLevel::InDevelopment { info: None },
+        }
+    }
+
+    pub fn user_readable(&self) -> Vec<String> {
+        match self {
+            OSVersion::Linux {
+                kernel_version,
+                os_release,
+            } => {
+                let mut v = vec![format!("kernel: {kernel_version}")];
+
+                if let Some(os_release) = os_release {
+                    if let Some(name) = &os_release.name {
+                        v.push(format!("distro: {name}"));
+                    }
+
+                    if let Some(version) = &os_release.version {
+                        v.push(format!("distro-version: {version}"));
+                    } else if let Some(version) = &os_release.version_id {
+                        v.push(format!("distro-version: {version}"));
+                    }
+
+                    if let Some(variant) = &os_release.variant {
+                        v.push(format!("distro-variant: {variant}"));
+                    } else if let Some(variant) = &os_release.variant_id {
+                        v.push(format!("distro-variant: {variant}"));
+                    }
+
+                    if let Some(build) = &os_release.build_id {
+                        v.push(format!("distro-build: {build}"));
+                    }
+                }
+
+                v
+            },
+            other => vec![format!("{other}")],
+        }
+    }
+}
+
+impl std::fmt::Display for OSVersion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            OSVersion::MacOS {
+                major,
+                minor,
+                patch,
+                build,
+            } => {
+                let patch = patch.unwrap_or(0);
+                write!(f, "macOS {major}.{minor}.{patch} ({build})")
+            },
+            OSVersion::Linux {
+                kernel_version,
+                os_release,
+            } => match os_release
+                .as_ref()
+                .and_then(|r| r.pretty_name.as_ref().or(r.name.as_ref()))
+            {
+                Some(distro_name) => write!(f, "Linux {kernel_version} - {distro_name}"),
+                None => write!(f, "Linux {kernel_version}"),
+            },
+            OSVersion::Windows { name, build } => write!(f, "{name} (or newer) - build {build}"),
+            OSVersion::FreeBsd { version } => write!(f, "FreeBSD {version}"),
+        }
+    }
+}
+
+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,
+                })
+
+            }
+        }
+    }).as_ref()
+}
+
+pub fn in_ssh() -> bool {
+    static IN_SSH: OnceLock<bool> = OnceLock::new();
+    *IN_SSH.get_or_init(|| Env::new().in_ssh())
+}
+
+/// Test if the program is running under WSL
+pub fn in_wsl() -> bool {
+    cfg_if! {
+        if #[cfg(target_os = "linux")] {
+            static IN_WSL: OnceLock<bool> = OnceLock::new();
+            *IN_WSL.get_or_init(|| {
+                if let Ok(b) = std::fs::read("/proc/sys/kernel/osrelease") {
+                    if let Ok(s) = std::str::from_utf8(&b) {
+                        let a = s.to_ascii_lowercase();
+                        return a.contains("microsoft") || a.contains("wsl");
+                    }
+                }
+                false
+            })
+        } else {
+            false
+        }
+    }
+}
+
+/// Is the calling binary running on a remote instance
+pub fn is_remote() -> bool {
+    // TODO(chay): Add detection for inside docker container
+    in_ssh() || in_cloudshell() || in_wsl() || std::env::var_os("Q_FAKE_IS_REMOTE").is_some()
+}
+
+/// Determines if we have an IPC path to a Desktop app from a remote environment
+pub fn has_parent() -> bool {
+    static HAS_PARENT: OnceLock<bool> = OnceLock::new();
+    *HAS_PARENT.get_or_init(|| std::env::var_os(Q_PARENT).is_some())
+}
+
+/// This true if the env var `AWS_EXECUTION_ENV=CloudShell`
+pub fn in_cloudshell() -> bool {
+    static IN_CLOUDSHELL: OnceLock<bool> = OnceLock::new();
+    *IN_CLOUDSHELL.get_or_init(|| Env::new().in_cloudshell())
+}
+
+pub fn in_codespaces() -> bool {
+    static IN_CODESPACES: OnceLock<bool> = OnceLock::new();
+    *IN_CODESPACES
+        .get_or_init(|| std::env::var_os("CODESPACES").is_some() || std::env::var_os("Q_CODESPACES").is_some())
+}
+
+pub fn in_ci() -> bool {
+    static IN_CI: OnceLock<bool> = OnceLock::new();
+    *IN_CI.get_or_init(|| std::env::var_os("CI").is_some() || std::env::var_os("Q_CI").is_some())
+}
+
+#[cfg(target_os = "macos")]
+fn raw_system_id() -> Result<String, Error> {
+    let output = std::process::Command::new("ioreg")
+        .args(["-rd1", "-c", "IOPlatformExpertDevice"])
+        .output()?;
+
+    let output = String::from_utf8_lossy(&output.stdout);
+
+    let machine_id: String = output
+        .lines()
+        .find(|line| line.contains("IOPlatformUUID"))
+        .ok_or(Error::HwidNotFound)?
+        .split('=')
+        .nth(1)
+        .ok_or(Error::HwidNotFound)?
+        .trim()
+        .trim_start_matches('"')
+        .trim_end_matches('"')
+        .into();
+
+    Ok(machine_id)
+}
+
+#[cfg(target_os = "linux")]
+fn raw_system_id() -> Result<String, Error> {
+    for path in ["/var/lib/dbus/machine-id", "/etc/machine-id"] {
+        if std::path::Path::new(path).exists() {
+            return Ok(std::fs::read_to_string(path)?);
+        }
+    }
+    Err(Error::HwidNotFound)
+}
+
+#[cfg(target_os = "windows")]
+fn raw_system_id() -> Result<String, Error> {
+    use winreg::RegKey;
+    use winreg::enums::HKEY_LOCAL_MACHINE;
+
+    let rkey = RegKey::predef(HKEY_LOCAL_MACHINE).open_subkey(r"SOFTWARE\Microsoft\Cryptography")?;
+    let id: String = rkey.get_value("MachineGuid")?;
+
+    Ok(id)
+}
+
+#[cfg(target_os = "freebsd")]
+fn raw_system_id() -> Result<String, Error> {
+    Err(Error::HwidNotFound)
+}
+
+pub fn get_system_id() -> Option<&'static str> {
+    static SYSTEM_ID: OnceLock<Option<String>> = OnceLock::new();
+    SYSTEM_ID
+        .get_or_init(|| {
+            let hwid = raw_system_id().ok()?;
+            let mut hasher = Sha256::new();
+            hasher.update(hwid);
+            Some(format!("{:x}", hasher.finalize()))
+        })
+        .as_deref()
+}
+
+pub fn get_platform() -> &'static str {
+    if let Some(over_ride) = option_env!("Q_OVERRIDE_PLATFORM") {
+        over_ride
+    } else {
+        std::env::consts::OS
+    }
+}
+
+pub fn get_arch() -> &'static str {
+    if let Some(over_ride) = option_env!("Q_OVERRIDE_ARCH") {
+        over_ride
+    } else {
+        std::env::consts::ARCH
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_get_system_id() {
+        let id = get_system_id();
+        assert!(id.is_some());
+        assert_eq!(id.unwrap().len(), 64);
+    }
+}
diff --git a/crates/kiro-cli/src/main.rs b/crates/kiro-cli/src/main.rs
new file mode 100644
index 0000000000..ff4ee3a97e
--- /dev/null
+++ b/crates/kiro-cli/src/main.rs
@@ -0,0 +1,102 @@
+mod cli;
+mod diagnostics;
+mod fig_api_client;
+mod fig_auth;
+mod fig_aws_common;
+mod fig_install;
+mod fig_log;
+mod fig_os_shim;
+mod fig_settings;
+mod fig_telemetry;
+mod fig_telemetry_core;
+mod fig_util;
+mod mcp_client;
+mod request;
+
+use std::process::ExitCode;
+
+use anstream::eprintln;
+use clap::Parser;
+use clap::error::{
+    ContextKind,
+    ErrorKind,
+};
+use crossterm::style::Stylize;
+use eyre::Result;
+use fig_log::get_log_level_max;
+use tracing::metadata::LevelFilter;
+
+use crate::fig_telemetry::{
+    finish_telemetry,
+    init_global_telemetry_emitter,
+};
+use crate::fig_util::{
+    CLI_BINARY_NAME,
+    PRODUCT_NAME,
+};
+
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
+fn main() -> Result<ExitCode> {
+    color_eyre::install()?;
+    init_global_telemetry_emitter();
+
+    let multithread = matches!(
+        std::env::args().nth(1).as_deref(),
+        Some("init" | "_" | "internal" | "completion" | "hook")
+    );
+
+    let parsed = match cli::Cli::try_parse() {
+        Ok(cli) => cli,
+        Err(err) => {
+            let _ = err.print();
+
+            let unknown_arg = matches!(err.kind(), ErrorKind::UnknownArgument | ErrorKind::InvalidSubcommand)
+                && !err.context().any(|(context_kind, _)| {
+                    matches!(
+                        context_kind,
+                        ContextKind::SuggestedSubcommand | ContextKind::SuggestedArg
+                    )
+                });
+
+            if unknown_arg {
+                eprintln!(
+                    "\nThis command may be valid in newer versions of the {PRODUCT_NAME} CLI. Try running {} {}.",
+                    CLI_BINARY_NAME.magenta(),
+                    "update".magenta()
+                );
+            }
+
+            return Ok(ExitCode::from(err.exit_code().try_into().unwrap_or(2)));
+        },
+    };
+
+    let verbose = parsed.verbose > 0;
+
+    let runtime = if multithread {
+        tokio::runtime::Builder::new_multi_thread()
+    } else {
+        tokio::runtime::Builder::new_current_thread()
+    }
+    .enable_all()
+    .build()?;
+
+    let result = runtime.block_on(async {
+        let result = parsed.execute().await;
+        finish_telemetry().await;
+        result
+    });
+
+    match result {
+        Ok(exit_code) => Ok(exit_code),
+        Err(err) => {
+            if verbose || get_log_level_max() > LevelFilter::INFO {
+                eprintln!("{} {err:?}", "error:".bold().red());
+            } else {
+                eprintln!("{} {err}", "error:".bold().red());
+            }
+            Ok(ExitCode::FAILURE)
+        },
+    }
+}
diff --git a/crates/kiro-cli/src/mcp_client/client.rs b/crates/kiro-cli/src/mcp_client/client.rs
new file mode 100644
index 0000000000..5f87cc25f9
--- /dev/null
+++ b/crates/kiro-cli/src/mcp_client/client.rs
@@ -0,0 +1,764 @@
+use std::collections::HashMap;
+use std::process::Stdio;
+use std::sync::atomic::{
+    AtomicBool,
+    AtomicU64,
+    Ordering,
+};
+use std::sync::{
+    Arc,
+    RwLock as SyncRwLock,
+};
+use std::time::Duration;
+
+use nix::sys::signal::Signal;
+use nix::unistd::Pid;
+use serde::{
+    Deserialize,
+    Serialize,
+};
+use thiserror::Error;
+use tokio::time;
+use tokio::time::error::Elapsed;
+
+use crate::mcp_client::transport::base_protocol::{
+    JsonRpcMessage,
+    JsonRpcNotification,
+    JsonRpcRequest,
+    JsonRpcVersion,
+};
+use crate::mcp_client::transport::stdio::JsonRpcStdioTransport;
+use crate::mcp_client::transport::{
+    self,
+    Transport,
+    TransportError,
+};
+use crate::mcp_client::{
+    JsonRpcResponse,
+    Listener as _,
+    LogListener,
+    PaginationSupportedOps,
+    PromptGet,
+    PromptsListResult,
+    ResourceTemplatesListResult,
+    ResourcesListResult,
+    ToolsListResult,
+};
+
+pub type ServerCapabilities = serde_json::Value;
+pub type ClientInfo = serde_json::Value;
+pub type StdioTransport = JsonRpcStdioTransport;
+
+/// Represents the capabilities of a client in the Model Context Protocol.
+/// This structure is sent to the server during initialization to communicate
+/// what features the client supports and provide information about the client.
+/// When features are added to the client, these should be declared in the [From] trait implemented
+/// for the struct.
+#[derive(Default, Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct ClientCapabilities {
+    protocol_version: JsonRpcVersion,
+    capabilities: HashMap<String, serde_json::Value>,
+    client_info: serde_json::Value,
+}
+
+impl From<ClientInfo> for ClientCapabilities {
+    fn from(client_info: ClientInfo) -> Self {
+        ClientCapabilities {
+            client_info,
+            ..Default::default()
+        }
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ClientConfig {
+    pub server_name: String,
+    pub bin_path: String,
+    pub args: Vec<String>,
+    pub timeout: u64,
+    pub client_info: serde_json::Value,
+    pub env: Option<HashMap<String, String>>,
+}
+
+#[derive(Debug, Error)]
+pub enum ClientError {
+    #[error(transparent)]
+    TransportError(#[from] TransportError),
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[error(transparent)]
+    Serialization(#[from] serde_json::Error),
+    #[error("Operation timed out: {context}")]
+    RuntimeError {
+        #[source]
+        source: tokio::time::error::Elapsed,
+        context: String,
+    },
+    #[error("{0}")]
+    NegotiationError(String),
+    #[error("Failed to obtain process id")]
+    MissingProcessId,
+}
+
+impl From<(tokio::time::error::Elapsed, String)> for ClientError {
+    fn from((error, context): (tokio::time::error::Elapsed, String)) -> Self {
+        ClientError::RuntimeError { source: error, context }
+    }
+}
+
+#[derive(Debug)]
+pub struct Client<T: Transport> {
+    server_name: String,
+    transport: Arc<T>,
+    timeout: u64,
+    server_process_id: Option<Pid>,
+    client_info: serde_json::Value,
+    current_id: Arc<AtomicU64>,
+    pub prompt_gets: Arc<SyncRwLock<HashMap<String, PromptGet>>>,
+    pub is_prompts_out_of_date: Arc<AtomicBool>,
+}
+
+impl<T: Transport> Clone for Client<T> {
+    fn clone(&self) -> Self {
+        Self {
+            server_name: self.server_name.clone(),
+            transport: self.transport.clone(),
+            timeout: self.timeout,
+            // Note that we cannot have an id for the clone because we would kill the original
+            // process when we drop the clone
+            server_process_id: None,
+            client_info: self.client_info.clone(),
+            current_id: self.current_id.clone(),
+            prompt_gets: self.prompt_gets.clone(),
+            is_prompts_out_of_date: self.is_prompts_out_of_date.clone(),
+        }
+    }
+}
+
+impl Client<StdioTransport> {
+    pub fn from_config(config: ClientConfig) -> Result<Self, ClientError> {
+        let ClientConfig {
+            server_name,
+            bin_path,
+            args,
+            timeout,
+            client_info,
+            env,
+        } = config;
+        let child = {
+            let mut command = tokio::process::Command::new(bin_path);
+            command
+                .stdin(Stdio::piped())
+                .stdout(Stdio::piped())
+                .stderr(Stdio::piped())
+                .process_group(0)
+                .envs(std::env::vars());
+            if let Some(env) = env {
+                for (env_name, env_value) in env {
+                    command.env(env_name, env_value);
+                }
+            }
+            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 transport = Arc::new(transport::stdio::JsonRpcStdioTransport::client(child)?);
+        Ok(Self {
+            server_name,
+            transport,
+            timeout,
+            server_process_id,
+            client_info,
+            current_id: Arc::new(AtomicU64::new(0)),
+            prompt_gets: Arc::new(SyncRwLock::new(HashMap::new())),
+            is_prompts_out_of_date: Arc::new(AtomicBool::new(false)),
+        })
+    }
+}
+
+impl<T> Drop for Client<T>
+where
+    T: Transport,
+{
+    // IF the servers are implemented well, they will shutdown once the pipe closes.
+    // 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);
+        }
+    }
+}
+
+impl<T> Client<T>
+where
+    T: Transport,
+{
+    /// Exchange of information specified as per https://spec.modelcontextprotocol.io/specification/2024-11-05/basic/lifecycle/#initialization
+    ///
+    /// Also done is the spawn of a background task that constantly listens for incoming messages
+    /// from the server.
+    pub async fn init(&self) -> Result<ServerCapabilities, ClientError> {
+        let transport_ref = self.transport.clone();
+        let server_name = self.server_name.clone();
+
+        tokio::spawn(async move {
+            let mut listener = transport_ref.get_listener();
+            loop {
+                match listener.recv().await {
+                    Ok(msg) => {
+                        match msg {
+                            JsonRpcMessage::Request(_req) => {},
+                            JsonRpcMessage::Notification(notif) => {
+                                let JsonRpcNotification { method, params, .. } = notif;
+                                if method.as_str() == "notifications/message" || method.as_str() == "message" {
+                                    let level = params
+                                        .as_ref()
+                                        .and_then(|p| p.get("level"))
+                                        .and_then(|v| serde_json::to_string(v).ok());
+                                    let data = params
+                                        .as_ref()
+                                        .and_then(|p| p.get("data"))
+                                        .and_then(|v| serde_json::to_string(v).ok());
+                                    if let (Some(level), Some(data)) = (level, data) {
+                                        match level.to_lowercase().as_str() {
+                                            "error" => {
+                                                tracing::error!(target: "mcp", "{}: {}", server_name, data);
+                                            },
+                                            "warn" => {
+                                                tracing::warn!(target: "mcp", "{}: {}", server_name, data);
+                                            },
+                                            "info" => {
+                                                tracing::info!(target: "mcp", "{}: {}", server_name, data);
+                                            },
+                                            "debug" => {
+                                                tracing::debug!(target: "mcp", "{}: {}", server_name, data);
+                                            },
+                                            "trace" => {
+                                                tracing::trace!(target: "mcp", "{}: {}", server_name, data);
+                                            },
+                                            _ => {},
+                                        }
+                                    }
+                                }
+                            },
+                            JsonRpcMessage::Response(_resp) => { /* noop since direct response is handled inside the request api */
+                            },
+                        }
+                    },
+                    Err(e) => {
+                        tracing::error!("Background listening thread for client {}: {:?}", server_name, e);
+                    },
+                }
+            }
+        });
+
+        let transport_ref = self.transport.clone();
+        let server_name = self.server_name.clone();
+
+        // Spawning a task to listen and log stderr output
+        tokio::spawn(async move {
+            let mut log_listener = transport_ref.get_log_listener();
+            loop {
+                match log_listener.recv().await {
+                    Ok(msg) => {
+                        tracing::trace!(target: "mcp", "{server_name} logged {}", msg);
+                    },
+                    Err(e) => {
+                        tracing::error!(
+                            "Error encountered while reading from stderr for {server_name}: {:?}\nEnding stderr listening task.",
+                            e
+                        );
+                        break;
+                    },
+                }
+            }
+        });
+
+        let init_params = Some({
+            let client_cap = ClientCapabilities::from(self.client_info.clone());
+            serde_json::json!(client_cap)
+        });
+        let server_capabilities = self.request("initialize", init_params).await?;
+        if let Err(e) = examine_server_capabilities(&server_capabilities) {
+            return Err(ClientError::NegotiationError(format!(
+                "Client {} has failed to negotiate server capabilities with server: {:?}",
+                self.server_name, e
+            )));
+        }
+        self.notify("initialized", None).await?;
+
+        // TODO: group this into examine_server_capabilities
+        // Prefetch prompts in the background. We should only do this after the server has been
+        // initialized
+        if let Some(res) = &server_capabilities.result {
+            if let Some(cap) = res.get("capabilities") {
+                if cap.get("prompts").is_some() {
+                    self.is_prompts_out_of_date.store(true, Ordering::Relaxed);
+                    let client_ref = (*self).clone();
+                    tokio::spawn(async move {
+                        let Ok(resp) = client_ref.request("prompts/list", None).await else {
+                            tracing::error!("Prompt list query failed for {0}", client_ref.server_name);
+                            return;
+                        };
+                        let Some(result) = resp.result else {
+                            tracing::warn!("Prompt list query returned no result for {0}", client_ref.server_name);
+                            return;
+                        };
+                        let Some(prompts) = result.get("prompts") else {
+                            tracing::warn!(
+                                "Prompt list query result contained no field named prompts for {0}",
+                                client_ref.server_name
+                            );
+                            return;
+                        };
+                        let Ok(prompts) = serde_json::from_value::<Vec<PromptGet>>(prompts.clone()) else {
+                            tracing::error!(
+                                "Prompt list query deserialization failed for {0}",
+                                client_ref.server_name
+                            );
+                            return;
+                        };
+                        let Ok(mut lock) = client_ref.prompt_gets.write() else {
+                            tracing::error!(
+                                "Failed to obtain write lock for prompt list query for {0}",
+                                client_ref.server_name
+                            );
+                            return;
+                        };
+                        for prompt in prompts {
+                            let name = prompt.name.clone();
+                            lock.insert(name, prompt);
+                        }
+                    });
+                }
+            }
+        }
+
+        Ok(serde_json::to_value(server_capabilities)?)
+    }
+
+    /// Sends a request to the server associated.
+    /// This call will yield until a response is received.
+    pub async fn request(
+        &self,
+        method: &str,
+        params: Option<serde_json::Value>,
+    ) -> Result<JsonRpcResponse, ClientError> {
+        let send_map_err = |e: Elapsed| (e, method.to_string());
+        let recv_map_err = |e: Elapsed| (e, format!("recv for {method}"));
+        let mut id = self.get_id();
+        let request = JsonRpcRequest {
+            jsonrpc: JsonRpcVersion::default(),
+            id,
+            method: method.to_owned(),
+            params,
+        };
+        tracing::trace!(target: "mcp", "To {}:\n{:#?}", self.server_name, request);
+        let msg = JsonRpcMessage::Request(request);
+        time::timeout(Duration::from_millis(self.timeout), self.transport.send(&msg))
+            .await
+            .map_err(send_map_err)??;
+        let mut listener = self.transport.get_listener();
+        let mut resp = time::timeout(Duration::from_millis(self.timeout), async {
+            // we want to ignore all other messages sent by the server at this point and let the
+            // background loop handle them
+            loop {
+                if let JsonRpcMessage::Response(resp) = listener.recv().await? {
+                    if resp.id == id {
+                        break Ok::<JsonRpcResponse, TransportError>(resp);
+                    }
+                }
+            }
+        })
+        .await
+        .map_err(recv_map_err)??;
+        // Pagination support: https://spec.modelcontextprotocol.io/specification/2024-11-05/server/utilities/pagination/#pagination-model
+        let mut next_cursor = resp.result.as_ref().and_then(|v| v.get("nextCursor"));
+        if next_cursor.is_some() {
+            let mut current_resp = resp.clone();
+            let mut results = Vec::<serde_json::Value>::new();
+            let pagination_supported_ops = {
+                let maybe_pagination_supported_op: Result<PaginationSupportedOps, _> = method.try_into();
+                maybe_pagination_supported_op.ok()
+            };
+            if let Some(ops) = pagination_supported_ops {
+                loop {
+                    let result = current_resp.result.as_ref().cloned().unwrap();
+                    let mut list: Vec<serde_json::Value> = match ops {
+                        PaginationSupportedOps::Resources => {
+                            let ResourcesListResult { resources: list, .. } =
+                                serde_json::from_value::<ResourcesListResult>(result)
+                                    .map_err(ClientError::Serialization)?;
+                            list
+                        },
+                        PaginationSupportedOps::ResourceTemplates => {
+                            let ResourceTemplatesListResult {
+                                resource_templates: list,
+                                ..
+                            } = serde_json::from_value::<ResourceTemplatesListResult>(result)
+                                .map_err(ClientError::Serialization)?;
+                            list
+                        },
+                        PaginationSupportedOps::Prompts => {
+                            let PromptsListResult { prompts: list, .. } =
+                                serde_json::from_value::<PromptsListResult>(result)
+                                    .map_err(ClientError::Serialization)?;
+                            list
+                        },
+                        PaginationSupportedOps::Tools => {
+                            let ToolsListResult { tools: list, .. } = serde_json::from_value::<ToolsListResult>(result)
+                                .map_err(ClientError::Serialization)?;
+                            list
+                        },
+                    };
+                    results.append(&mut list);
+                    if next_cursor.is_none() {
+                        break;
+                    }
+                    id = self.get_id();
+                    let next_request = JsonRpcRequest {
+                        jsonrpc: JsonRpcVersion::default(),
+                        id,
+                        method: method.to_owned(),
+                        params: Some(serde_json::json!({
+                            "cursor": next_cursor,
+                        })),
+                    };
+                    let msg = JsonRpcMessage::Request(next_request);
+                    time::timeout(Duration::from_millis(self.timeout), self.transport.send(&msg))
+                        .await
+                        .map_err(send_map_err)??;
+                    let resp = time::timeout(Duration::from_millis(self.timeout), async {
+                        // we want to ignore all other messages sent by the server at this point and let the
+                        // background loop handle them
+                        loop {
+                            if let JsonRpcMessage::Response(resp) = listener.recv().await? {
+                                if resp.id == id {
+                                    break Ok::<JsonRpcResponse, TransportError>(resp);
+                                }
+                            }
+                        }
+                    })
+                    .await
+                    .map_err(recv_map_err)??;
+                    current_resp = resp;
+                    next_cursor = current_resp.result.as_ref().and_then(|v| v.get("nextCursor"));
+                }
+                resp.result = Some({
+                    let mut map = serde_json::Map::new();
+                    map.insert(ops.as_key().to_owned(), serde_json::to_value(results)?);
+                    serde_json::to_value(map)?
+                });
+            }
+        }
+        tracing::trace!(target: "mcp", "From {}:\n{:#?}", self.server_name, resp);
+        Ok(resp)
+    }
+
+    /// Sends a notification to the server associated.
+    /// Notifications are requests that expect no responses.
+    pub async fn notify(&self, method: &str, params: Option<serde_json::Value>) -> Result<(), ClientError> {
+        let send_map_err = |e: Elapsed| (e, method.to_string());
+        let notification = JsonRpcNotification {
+            jsonrpc: JsonRpcVersion::default(),
+            method: format!("notifications/{}", method),
+            params,
+        };
+        let msg = JsonRpcMessage::Notification(notification);
+        Ok(
+            time::timeout(Duration::from_millis(self.timeout), self.transport.send(&msg))
+                .await
+                .map_err(send_map_err)??,
+        )
+    }
+
+    pub async fn shutdown(&self) -> Result<(), ClientError> {
+        Ok(self.transport.shutdown().await?)
+    }
+
+    fn get_id(&self) -> u64 {
+        self.current_id.fetch_add(1, Ordering::SeqCst)
+    }
+}
+
+fn examine_server_capabilities(ser_cap: &JsonRpcResponse) -> Result<(), ClientError> {
+    // Check the jrpc version.
+    // Currently we are only proceeding if the versions are EXACTLY the same.
+    let jrpc_version = ser_cap.jsonrpc.as_u32_vec();
+    let client_jrpc_version = JsonRpcVersion::default().as_u32_vec();
+    for (sv, cv) in jrpc_version.iter().zip(client_jrpc_version.iter()) {
+        if sv != cv {
+            return Err(ClientError::NegotiationError(
+                "Incompatible jrpc version between server and client".to_owned(),
+            ));
+        }
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+
+    use serde_json::Value;
+
+    use super::*;
+    const TEST_BIN_OUT_DIR: &str = "target/debug";
+    const TEST_SERVER_NAME: &str = "test_mcp_server";
+
+    fn get_workspace_root() -> PathBuf {
+        let output = std::process::Command::new("cargo")
+            .args(["metadata", "--format-version=1", "--no-deps"])
+            .output()
+            .expect("Failed to execute cargo metadata");
+
+        let metadata: serde_json::Value =
+            serde_json::from_slice(&output.stdout).expect("Failed to parse cargo metadata");
+
+        let workspace_root = metadata["workspace_root"]
+            .as_str()
+            .expect("Failed to find workspace_root in metadata");
+
+        PathBuf::from(workspace_root)
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_client_stdio() {
+        std::process::Command::new("cargo")
+            .args(["build", "--bin", TEST_SERVER_NAME])
+            .status()
+            .expect("Failed to build binary");
+        let workspace_root = get_workspace_root();
+        let bin_path = workspace_root.join(TEST_BIN_OUT_DIR).join(TEST_SERVER_NAME);
+        println!("bin path: {}", bin_path.to_str().unwrap_or("no path found"));
+
+        // Testing 2 concurrent sessions to make sure transport layer does not overlap.
+        let client_info_one = serde_json::json!({
+          "name": "TestClientOne",
+          "version": "1.0.0"
+        });
+        let client_config_one = ClientConfig {
+            server_name: "test_tool".to_owned(),
+            bin_path: bin_path.to_str().unwrap().to_string(),
+            args: ["1".to_owned()].to_vec(),
+            timeout: 120 * 1000,
+            client_info: client_info_one.clone(),
+            env: {
+                let mut map = HashMap::<String, String>::new();
+                map.insert("ENV_ONE".to_owned(), "1".to_owned());
+                map.insert("ENV_TWO".to_owned(), "2".to_owned());
+                Some(map)
+            },
+        };
+        let client_info_two = serde_json::json!({
+          "name": "TestClientTwo",
+          "version": "1.0.0"
+        });
+        let client_config_two = ClientConfig {
+            server_name: "test_tool".to_owned(),
+            bin_path: bin_path.to_str().unwrap().to_string(),
+            args: ["2".to_owned()].to_vec(),
+            timeout: 120 * 1000,
+            client_info: client_info_two.clone(),
+            env: {
+                let mut map = HashMap::<String, String>::new();
+                map.insert("ENV_ONE".to_owned(), "1".to_owned());
+                map.insert("ENV_TWO".to_owned(), "2".to_owned());
+                Some(map)
+            },
+        };
+        let mut client_one = Client::<StdioTransport>::from_config(client_config_one).expect("Failed to create client");
+        let mut client_two = Client::<StdioTransport>::from_config(client_config_two).expect("Failed to create client");
+        let client_one_cap = ClientCapabilities::from(client_info_one);
+        let client_two_cap = ClientCapabilities::from(client_info_two);
+
+        let (res_one, res_two) = tokio::join!(
+            time::timeout(
+                time::Duration::from_secs(5),
+                test_client_routine(&mut client_one, serde_json::json!(client_one_cap))
+            ),
+            time::timeout(
+                time::Duration::from_secs(5),
+                test_client_routine(&mut client_two, serde_json::json!(client_two_cap))
+            )
+        );
+        let res_one = res_one.expect("Client one timed out");
+        let res_two = res_two.expect("Client two timed out");
+        assert!(res_one.is_ok());
+        assert!(res_two.is_ok());
+    }
+
+    async fn test_client_routine<T: Transport>(
+        client: &mut Client<T>,
+        cap_sent: serde_json::Value,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        // Test init
+        let _ = client.init().await.expect("Client init failed");
+        tokio::time::sleep(time::Duration::from_millis(1500)).await;
+        let client_capabilities_sent = client
+            .request("verify_init_ack_sent", None)
+            .await
+            .expect("Verify init ack mock request failed");
+        let has_server_recvd_init_ack = client_capabilities_sent
+            .result
+            .expect("Failed to retrieve client capabilities sent.");
+        assert_eq!(has_server_recvd_init_ack.to_string(), "true");
+        let cap_recvd = client
+            .request("verify_init_params_sent", None)
+            .await
+            .expect("Verify init params mock request failed");
+        let cap_recvd = cap_recvd
+            .result
+            .expect("Verify init params mock request does not contain required field (result)");
+        assert!(are_json_values_equal(&cap_sent, &cap_recvd));
+
+        // test list tools
+        let fake_tool_names = ["get_weather_one", "get_weather_two", "get_weather_three"];
+        let mock_result_spec = fake_tool_names.map(create_fake_tool_spec);
+        let mock_tool_specs_for_verify = serde_json::json!(mock_result_spec.clone());
+        let mock_tool_specs_prep_param = mock_result_spec
+            .iter()
+            .zip(fake_tool_names.iter())
+            .map(|(v, n)| {
+                serde_json::json!({
+                    "key": (*n).to_string(),
+                    "value": v
+                })
+            })
+            .collect::<Vec<serde_json::Value>>();
+        let mock_tool_specs_prep_param =
+            serde_json::to_value(mock_tool_specs_prep_param).expect("Failed to create mock tool specs prep param");
+        let _ = client
+            .request("store_mock_tool_spec", Some(mock_tool_specs_prep_param))
+            .await
+            .expect("Mock tool spec prep failed");
+        let tool_spec_recvd = client.request("tools/list", None).await.expect("List tools failed");
+        assert!(are_json_values_equal(
+            tool_spec_recvd
+                .result
+                .as_ref()
+                .and_then(|v| v.get("tools"))
+                .expect("Failed to retrieve tool specs from result received"),
+            &mock_tool_specs_for_verify
+        ));
+
+        // Test list prompts directly
+        let fake_prompt_names = ["code_review_one", "code_review_two", "code_review_three"];
+        let mock_result_prompts = fake_prompt_names.map(create_fake_prompts);
+        let mock_prompts_for_verify = serde_json::json!(mock_result_prompts.clone());
+        let mock_prompts_prep_param = mock_result_prompts
+            .iter()
+            .zip(fake_prompt_names.iter())
+            .map(|(v, n)| {
+                serde_json::json!({
+                    "key": (*n).to_string(),
+                    "value": v
+                })
+            })
+            .collect::<Vec<serde_json::Value>>();
+        let mock_prompts_prep_param =
+            serde_json::to_value(mock_prompts_prep_param).expect("Failed to create mock prompts prep param");
+        let _ = client
+            .request("store_mock_prompts", Some(mock_prompts_prep_param))
+            .await
+            .expect("Mock prompt prep failed");
+        let prompts_recvd = client.request("prompts/list", None).await.expect("List prompts failed");
+        assert!(are_json_values_equal(
+            prompts_recvd
+                .result
+                .as_ref()
+                .and_then(|v| v.get("prompts"))
+                .expect("Failed to retrieve prompts from results received"),
+            &mock_prompts_for_verify
+        ));
+
+        // Test env var inclusion
+        let env_vars = client.request("get_env_vars", None).await.expect("Get env vars failed");
+        let env_one = env_vars
+            .result
+            .as_ref()
+            .expect("Failed to retrieve results from env var request")
+            .get("ENV_ONE")
+            .expect("Failed to retrieve env one from env var request");
+        let env_two = env_vars
+            .result
+            .as_ref()
+            .expect("Failed to retrieve results from env var request")
+            .get("ENV_TWO")
+            .expect("Failed to retrieve env two from env var request");
+        let env_one_as_str = serde_json::to_string(env_one).expect("Failed to convert env one to string");
+        let env_two_as_str = serde_json::to_string(env_two).expect("Failed to convert env two to string");
+        assert_eq!(env_one_as_str, "\"1\"".to_string());
+        assert_eq!(env_two_as_str, "\"2\"".to_string());
+
+        let shutdown_result = client.shutdown().await;
+        assert!(shutdown_result.is_ok());
+        Ok(())
+    }
+
+    fn are_json_values_equal(a: &Value, b: &Value) -> bool {
+        match (a, b) {
+            (Value::Null, Value::Null) => true,
+            (Value::Bool(a_val), Value::Bool(b_val)) => a_val == b_val,
+            (Value::Number(a_val), Value::Number(b_val)) => a_val == b_val,
+            (Value::String(a_val), Value::String(b_val)) => a_val == b_val,
+            (Value::Array(a_arr), Value::Array(b_arr)) => {
+                if a_arr.len() != b_arr.len() {
+                    return false;
+                }
+                a_arr
+                    .iter()
+                    .zip(b_arr.iter())
+                    .all(|(a_item, b_item)| are_json_values_equal(a_item, b_item))
+            },
+            (Value::Object(a_obj), Value::Object(b_obj)) => {
+                if a_obj.len() != b_obj.len() {
+                    return false;
+                }
+                a_obj.iter().all(|(key, a_value)| match b_obj.get(key) {
+                    Some(b_value) => are_json_values_equal(a_value, b_value),
+                    None => false,
+                })
+            },
+            _ => false,
+        }
+    }
+
+    fn create_fake_tool_spec(name: &str) -> serde_json::Value {
+        serde_json::json!({
+            "name": name,
+            "description": "Get current weather information for a location",
+            "inputSchema": {
+              "type": "object",
+              "properties": {
+                "location": {
+                  "type": "string",
+                  "description": "City name or zip code"
+                }
+              },
+              "required": ["location"]
+            }
+        })
+    }
+
+    fn create_fake_prompts(name: &str) -> serde_json::Value {
+        serde_json::json!({
+            "name": name,
+            "description": "Asks the LLM to analyze code quality and suggest improvements",
+            "arguments": [
+              {
+                "name": "code",
+                "description": "The code to review",
+                "required": true
+              }
+            ]
+        })
+    }
+}
diff --git a/crates/kiro-cli/src/mcp_client/error.rs b/crates/kiro-cli/src/mcp_client/error.rs
new file mode 100644
index 0000000000..d05e7efa4d
--- /dev/null
+++ b/crates/kiro-cli/src/mcp_client/error.rs
@@ -0,0 +1,66 @@
+/// Error codes as defined in the MCP protocol.
+///
+/// These error codes are based on the JSON-RPC 2.0 specification with additional
+/// MCP-specific error codes in the -32000 to -32099 range.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(i32)]
+pub enum ErrorCode {
+    /// Invalid JSON was received by the server.
+    /// An error occurred on the server while parsing the JSON text.
+    ParseError           = -32700,
+
+    /// The JSON sent is not a valid Request object.
+    InvalidRequest       = -32600,
+
+    /// The method does not exist / is not available.
+    MethodNotFound       = -32601,
+
+    /// Invalid method parameter(s).
+    InvalidParams        = -32602,
+
+    /// Internal JSON-RPC error.
+    InternalError        = -32603,
+
+    /// Server has not been initialized.
+    /// This error is returned when a request is made before the server
+    /// has been properly initialized.
+    ServerNotInitialized = -32002,
+
+    /// Unknown error code.
+    /// This error is returned when an error code is received that is not
+    /// recognized by the implementation.
+    UnknownErrorCode     = -32001,
+
+    /// Request failed.
+    /// This error is returned when a request fails for a reason not covered
+    /// by other error codes.
+    RequestFailed        = -32000,
+}
+
+impl From<i32> for ErrorCode {
+    fn from(code: i32) -> Self {
+        match code {
+            -32700 => ErrorCode::ParseError,
+            -32600 => ErrorCode::InvalidRequest,
+            -32601 => ErrorCode::MethodNotFound,
+            -32602 => ErrorCode::InvalidParams,
+            -32603 => ErrorCode::InternalError,
+            -32002 => ErrorCode::ServerNotInitialized,
+            -32001 => ErrorCode::UnknownErrorCode,
+            -32000 => ErrorCode::RequestFailed,
+            _ => ErrorCode::UnknownErrorCode,
+        }
+    }
+}
+
+impl From<ErrorCode> for i32 {
+    fn from(code: ErrorCode) -> Self {
+        code as i32
+    }
+}
+
+impl std::fmt::Display for ErrorCode {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
diff --git a/crates/kiro-cli/src/mcp_client/facilitator_types.rs b/crates/kiro-cli/src/mcp_client/facilitator_types.rs
new file mode 100644
index 0000000000..38d4aca280
--- /dev/null
+++ b/crates/kiro-cli/src/mcp_client/facilitator_types.rs
@@ -0,0 +1,229 @@
+use serde::{
+    Deserialize,
+    Serialize,
+};
+use thiserror::Error;
+
+/// https://spec.modelcontextprotocol.io/specification/2024-11-05/server/utilities/pagination/#operations-supporting-pagination
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum PaginationSupportedOps {
+    Resources,
+    ResourceTemplates,
+    Prompts,
+    Tools,
+}
+
+impl PaginationSupportedOps {
+    pub fn as_key(&self) -> &str {
+        match self {
+            PaginationSupportedOps::Resources => "resources",
+            PaginationSupportedOps::ResourceTemplates => "resourceTemplates",
+            PaginationSupportedOps::Prompts => "prompts",
+            PaginationSupportedOps::Tools => "tools",
+        }
+    }
+}
+
+impl TryFrom<&str> for PaginationSupportedOps {
+    type Error = OpsConversionError;
+
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        match value {
+            "resources/list" => Ok(PaginationSupportedOps::Resources),
+            "resources/templates/list" => Ok(PaginationSupportedOps::ResourceTemplates),
+            "prompts/list" => Ok(PaginationSupportedOps::Prompts),
+            "tools/list" => Ok(PaginationSupportedOps::Tools),
+            _ => Err(OpsConversionError::InvalidMethod),
+        }
+    }
+}
+
+#[derive(Error, Debug)]
+pub enum OpsConversionError {
+    #[error("Invalid method encountered")]
+    InvalidMethod,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
+#[serde(rename_all = "camelCase")]
+/// Role assumed for a particular message
+pub enum Role {
+    User,
+    Assistant,
+}
+
+impl std::fmt::Display for Role {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Role::User => write!(f, "user"),
+            Role::Assistant => write!(f, "assistant"),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+/// Result of listing resources operation
+pub struct ResourcesListResult {
+    /// List of resources
+    pub resources: Vec<serde_json::Value>,
+    /// Optional cursor for pagination
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub next_cursor: Option<String>,
+}
+
+/// Result of listing resource templates operation
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ResourceTemplatesListResult {
+    /// List of resource templates
+    pub resource_templates: Vec<serde_json::Value>,
+    /// Optional cursor for pagination
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub next_cursor: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+/// Result of prompt listing query
+pub struct PromptsListResult {
+    /// List of prompts
+    pub prompts: Vec<serde_json::Value>,
+    /// Optional cursor for pagination
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub next_cursor: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+/// Represents an argument to be supplied to a [PromptGet]
+pub struct PromptGetArg {
+    /// The name identifier of the prompt
+    pub name: String,
+    /// Optional description providing context about the prompt
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Indicates whether a response to this prompt is required
+    /// If not specified, defaults to false
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub required: Option<bool>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+/// Represents a request to get a prompt from a mcp server
+pub struct PromptGet {
+    /// Unique identifier for the prompt
+    pub name: String,
+    /// Optional description providing context about the prompt's purpose
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Optional list of arguments that define the structure of information to be collected
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub arguments: Option<Vec<PromptGetArg>>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+/// `result` field in [JsonRpcResponse] from a `prompts/get` request
+pub struct PromptGetResult {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    pub messages: Vec<Prompt>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+/// Completed prompt from `prompts/get` to be returned by a mcp server
+pub struct Prompt {
+    pub role: Role,
+    pub content: MessageContent,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+/// Result of listing tools operation
+pub struct ToolsListResult {
+    /// List of tools
+    pub tools: Vec<serde_json::Value>,
+    /// Optional cursor for pagination
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub next_cursor: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ToolCallResult {
+    pub content: Vec<MessageContent>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_error: Option<bool>,
+}
+
+/// Content of a message
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum MessageContent {
+    /// Text content
+    Text {
+        /// The text content
+        text: String,
+    },
+    /// Image content
+    #[serde(rename_all = "camelCase")]
+    Image {
+        /// base64-encoded-data
+        data: String,
+        mime_type: String,
+    },
+    /// Resource content
+    Resource {
+        /// The resource
+        resource: Resource,
+    },
+}
+
+impl From<MessageContent> for String {
+    fn from(val: MessageContent) -> Self {
+        match val {
+            MessageContent::Text { text } => text,
+            MessageContent::Image { data, mime_type } => serde_json::json!({
+                "data": data,
+                "mime_type": mime_type
+            })
+            .to_string(),
+            MessageContent::Resource { resource } => serde_json::json!(resource).to_string(),
+        }
+    }
+}
+
+impl std::fmt::Display for MessageContent {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            MessageContent::Text { text } => write!(f, "{}", text),
+            MessageContent::Image { data: _, mime_type } => write!(f, "Image [base64-encoded-string] ({})", mime_type),
+            MessageContent::Resource { resource } => write!(f, "Resource: {} ({})", resource.title, resource.uri),
+        }
+    }
+}
+
+/// Resource contents
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum ResourceContents {
+    Text { text: String },
+    Blob { data: Vec<u8> },
+}
+
+/// A resource in the system
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Resource {
+    /// Unique identifier for the resource
+    pub uri: String,
+    /// Human-readable title
+    pub title: String,
+    /// Optional description
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Resource contents
+    pub contents: ResourceContents,
+}
diff --git a/crates/kiro-cli/src/mcp_client/mod.rs b/crates/kiro-cli/src/mcp_client/mod.rs
new file mode 100644
index 0000000000..199fb0aeea
--- /dev/null
+++ b/crates/kiro-cli/src/mcp_client/mod.rs
@@ -0,0 +1,9 @@
+mod client;
+mod error;
+mod facilitator_types;
+mod server;
+mod transport;
+
+pub use client::*;
+pub use facilitator_types::*;
+pub use transport::*;
diff --git a/crates/kiro-cli/src/mcp_client/server.rs b/crates/kiro-cli/src/mcp_client/server.rs
new file mode 100644
index 0000000000..a2e4767e6d
--- /dev/null
+++ b/crates/kiro-cli/src/mcp_client/server.rs
@@ -0,0 +1,293 @@
+use std::collections::HashMap;
+use std::sync::atomic::{
+    AtomicBool,
+    AtomicU64,
+    Ordering,
+};
+use std::sync::{
+    Arc,
+    Mutex,
+};
+
+use tokio::io::{
+    Stdin,
+    Stdout,
+};
+use tokio::task::JoinHandle;
+
+use crate::mcp_client::Listener as _;
+use crate::mcp_client::client::StdioTransport;
+use crate::mcp_client::error::ErrorCode;
+use crate::mcp_client::transport::base_protocol::{
+    JsonRpcError,
+    JsonRpcMessage,
+    JsonRpcNotification,
+    JsonRpcRequest,
+    JsonRpcResponse,
+};
+use crate::mcp_client::transport::stdio::JsonRpcStdioTransport;
+use crate::mcp_client::transport::{
+    JsonRpcVersion,
+    Transport,
+    TransportError,
+};
+
+pub type Request = serde_json::Value;
+pub type Response = Option<serde_json::Value>;
+pub type InitializedServer = JoinHandle<Result<(), ServerError>>;
+
+pub trait PreServerRequestHandler {
+    fn register_pending_request_callback(&mut self, cb: impl Fn(u64) -> Option<JsonRpcRequest> + Send + Sync + 'static);
+    fn register_send_request_callback(
+        &mut self,
+        cb: impl Fn(&str, Option<serde_json::Value>) -> Result<(), ServerError> + Send + Sync + 'static,
+    );
+}
+
+#[async_trait::async_trait]
+pub trait ServerRequestHandler: PreServerRequestHandler + Send + Sync + 'static {
+    async fn handle_initialize(&self, params: Option<serde_json::Value>) -> Result<Response, ServerError>;
+    async fn handle_incoming(&self, method: &str, params: Option<serde_json::Value>) -> Result<Response, ServerError>;
+    async fn handle_response(&self, resp: JsonRpcResponse) -> Result<(), ServerError>;
+    async fn handle_shutdown(&self) -> Result<(), ServerError>;
+}
+
+pub struct Server<T: Transport, H: ServerRequestHandler> {
+    transport: Option<Arc<T>>,
+    handler: Option<H>,
+    #[allow(dead_code)]
+    pending_requests: Arc<Mutex<HashMap<u64, JsonRpcRequest>>>,
+    #[allow(dead_code)]
+    current_id: Arc<AtomicU64>,
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ServerError {
+    #[error(transparent)]
+    TransportError(#[from] TransportError),
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[error(transparent)]
+    Serialization(#[from] serde_json::Error),
+    #[error("Unexpected msg type encountered")]
+    UnexpectedMsgType,
+    #[error("{0}")]
+    NegotiationError(String),
+    #[error(transparent)]
+    TokioJoinError(#[from] tokio::task::JoinError),
+    #[error("Failed to obtain mutex lock")]
+    MutexError,
+    #[error("Failed to obtain request method")]
+    MissingMethod,
+    #[error("Failed to obtain request id")]
+    MissingId,
+    #[error("Failed to initialize server. Missing transport")]
+    MissingTransport,
+    #[error("Failed to initialize server. Missing handler")]
+    MissingHandler,
+}
+
+impl<H> Server<StdioTransport, H>
+where
+    H: ServerRequestHandler,
+{
+    pub fn new(mut handler: H, stdin: Stdin, stdout: Stdout) -> Result<Self, ServerError> {
+        let transport = Arc::new(JsonRpcStdioTransport::server(stdin, stdout)?);
+        let pending_requests = Arc::new(Mutex::new(HashMap::<u64, JsonRpcRequest>::new()));
+        let pending_requests_clone_one = pending_requests.clone();
+        let current_id = Arc::new(AtomicU64::new(0));
+        let pending_request_getter = move |id: u64| -> Option<JsonRpcRequest> {
+            match pending_requests_clone_one.lock() {
+                Ok(mut p) => p.remove(&id),
+                Err(_) => None,
+            }
+        };
+        handler.register_pending_request_callback(pending_request_getter);
+        let transport_clone = transport.clone();
+        let pending_request_clone_two = pending_requests.clone();
+        let current_id_clone = current_id.clone();
+        let request_sender = move |method: &str, params: Option<serde_json::Value>| -> Result<(), ServerError> {
+            let id = current_id_clone.fetch_add(1, Ordering::SeqCst);
+            let request = JsonRpcRequest {
+                jsonrpc: JsonRpcVersion::default(),
+                id,
+                method: method.to_owned(),
+                params,
+            };
+            let msg = JsonRpcMessage::Request(request.clone());
+            let transport = transport_clone.clone();
+            tokio::task::spawn(async move {
+                let _ = transport.send(&msg).await;
+            });
+            #[allow(clippy::map_err_ignore)]
+            let mut pending_request = pending_request_clone_two.lock().map_err(|_| ServerError::MutexError)?;
+            pending_request.insert(id, request);
+            Ok(())
+        };
+        handler.register_send_request_callback(request_sender);
+        let server = Self {
+            transport: Some(transport),
+            handler: Some(handler),
+            pending_requests,
+            current_id,
+        };
+        Ok(server)
+    }
+}
+
+impl<T, H> Server<T, H>
+where
+    T: Transport,
+    H: ServerRequestHandler,
+{
+    pub fn init(mut self) -> Result<InitializedServer, ServerError> {
+        let transport = self.transport.take().ok_or(ServerError::MissingTransport)?;
+        let handler = Arc::new(self.handler.take().ok_or(ServerError::MissingHandler)?);
+        let has_initialized = Arc::new(AtomicBool::new(false));
+        let listener = tokio::spawn(async move {
+            let mut listener = transport.get_listener();
+            loop {
+                let request = listener.recv().await;
+                let transport_clone = transport.clone();
+                let has_init_clone = has_initialized.clone();
+                let handler_clone = handler.clone();
+                tokio::task::spawn(async move {
+                    process_request(has_init_clone, transport_clone, handler_clone, request).await;
+                });
+            }
+        });
+        Ok(listener)
+    }
+}
+
+async fn process_request<T, H>(
+    has_initialized: Arc<AtomicBool>,
+    transport: Arc<T>,
+    handler: Arc<H>,
+    request: Result<JsonRpcMessage, TransportError>,
+) where
+    T: Transport,
+    H: ServerRequestHandler,
+{
+    match request {
+        Ok(msg) if msg.is_initialize() => {
+            let id = msg.id().unwrap_or_default();
+            if has_initialized.load(Ordering::SeqCst) {
+                let resp = JsonRpcMessage::Response(JsonRpcResponse {
+                    jsonrpc: JsonRpcVersion::default(),
+                    id,
+                    error: Some(JsonRpcError {
+                        code: ErrorCode::InvalidRequest.into(),
+                        message: "Server has already been initialized".to_owned(),
+                        data: None,
+                    }),
+                    ..Default::default()
+                });
+                let _ = transport.send(&resp).await;
+                return;
+            }
+            let JsonRpcMessage::Request(req) = msg else {
+                let resp = JsonRpcMessage::Response(JsonRpcResponse {
+                    jsonrpc: JsonRpcVersion::default(),
+                    id,
+                    error: Some(JsonRpcError {
+                        code: ErrorCode::InvalidRequest.into(),
+                        message: "Invalid method for initialization (use request)".to_owned(),
+                        data: None,
+                    }),
+                    ..Default::default()
+                });
+                let _ = transport.send(&resp).await;
+                return;
+            };
+            let JsonRpcRequest { params, .. } = req;
+            match handler.handle_initialize(params).await {
+                Ok(result) => {
+                    let resp = JsonRpcMessage::Response(JsonRpcResponse {
+                        id,
+                        result,
+                        ..Default::default()
+                    });
+                    let _ = transport.send(&resp).await;
+                    has_initialized.store(true, Ordering::SeqCst);
+                },
+                Err(_e) => {
+                    let resp = JsonRpcMessage::Response(JsonRpcResponse {
+                        jsonrpc: JsonRpcVersion::default(),
+                        id,
+                        error: Some(JsonRpcError {
+                            code: ErrorCode::InternalError.into(),
+                            message: "Error producing initialization response".to_owned(),
+                            data: None,
+                        }),
+                        ..Default::default()
+                    });
+                    let _ = transport.send(&resp).await;
+                },
+            }
+        },
+        Ok(msg) if msg.is_shutdown() => {
+            // TODO: add shutdown routine
+        },
+        Ok(msg) if has_initialized.load(Ordering::SeqCst) => match msg {
+            JsonRpcMessage::Request(req) => {
+                let JsonRpcRequest {
+                    id,
+                    jsonrpc,
+                    params,
+                    ref method,
+                } = req;
+                let resp = handler.handle_incoming(method, params).await.map_or_else(
+                    |error| {
+                        let err = JsonRpcError {
+                            code: ErrorCode::InternalError.into(),
+                            message: error.to_string(),
+                            data: None,
+                        };
+                        let resp = JsonRpcResponse {
+                            jsonrpc: jsonrpc.clone(),
+                            id,
+                            result: None,
+                            error: Some(err),
+                        };
+                        JsonRpcMessage::Response(resp)
+                    },
+                    |result| {
+                        let resp = JsonRpcResponse {
+                            jsonrpc: jsonrpc.clone(),
+                            id,
+                            result,
+                            error: None,
+                        };
+                        JsonRpcMessage::Response(resp)
+                    },
+                );
+                let _ = transport.send(&resp).await;
+            },
+            JsonRpcMessage::Notification(notif) => {
+                let JsonRpcNotification { ref method, params, .. } = notif;
+                let _ = handler.handle_incoming(method, params).await;
+            },
+            JsonRpcMessage::Response(resp) => {
+                let _ = handler.handle_response(resp).await;
+            },
+        },
+        Ok(msg) => {
+            let id = msg.id().unwrap_or_default();
+            let resp = JsonRpcMessage::Response(JsonRpcResponse {
+                jsonrpc: JsonRpcVersion::default(),
+                id,
+                error: Some(JsonRpcError {
+                    code: ErrorCode::ServerNotInitialized.into(),
+                    message: "Server has not been initialized".to_owned(),
+                    data: None,
+                }),
+                ..Default::default()
+            });
+            let _ = transport.send(&resp).await;
+        },
+        Err(_e) => {
+            // TODO: error handling
+        },
+    }
+}
diff --git a/crates/kiro-cli/src/mcp_client/transport/base_protocol.rs b/crates/kiro-cli/src/mcp_client/transport/base_protocol.rs
new file mode 100644
index 0000000000..b0394e6e0c
--- /dev/null
+++ b/crates/kiro-cli/src/mcp_client/transport/base_protocol.rs
@@ -0,0 +1,108 @@
+//! Referencing https://spec.modelcontextprotocol.io/specification/2024-11-05/basic/messages/
+//! Protocol Revision 2024-11-05
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+pub type RequestId = u64;
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct JsonRpcVersion(String);
+
+impl Default for JsonRpcVersion {
+    fn default() -> Self {
+        JsonRpcVersion("2.0".to_owned())
+    }
+}
+
+impl JsonRpcVersion {
+    pub fn as_u32_vec(&self) -> Vec<u32> {
+        self.0
+            .split(".")
+            .map(|n| n.parse::<u32>().unwrap())
+            .collect::<Vec<u32>>()
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(untagged)]
+#[serde(deny_unknown_fields)]
+// DO NOT change the order of these variants. This body of json is [untagged](https://serde.rs/enum-representations.html#untagged)
+// The categorization of the deserialization depends on the order in which the variants are
+// declared.
+pub enum JsonRpcMessage {
+    Response(JsonRpcResponse),
+    Notification(JsonRpcNotification),
+    Request(JsonRpcRequest),
+}
+
+impl JsonRpcMessage {
+    pub fn is_initialize(&self) -> bool {
+        match self {
+            JsonRpcMessage::Request(req) => req.method == "initialize",
+            _ => false,
+        }
+    }
+
+    pub fn is_shutdown(&self) -> bool {
+        match self {
+            JsonRpcMessage::Notification(notif) => notif.method == "notification/shutdown",
+            _ => false,
+        }
+    }
+
+    pub fn id(&self) -> Option<u64> {
+        match self {
+            JsonRpcMessage::Request(req) => Some(req.id),
+            JsonRpcMessage::Response(resp) => Some(resp.id),
+            JsonRpcMessage::Notification(_) => None,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
+#[serde(default, deny_unknown_fields)]
+pub struct JsonRpcRequest {
+    pub jsonrpc: JsonRpcVersion,
+    pub id: RequestId,
+    pub method: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub params: Option<serde_json::Value>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
+#[serde(default, deny_unknown_fields)]
+pub struct JsonRpcResponse {
+    pub jsonrpc: JsonRpcVersion,
+    pub id: RequestId,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<serde_json::Value>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<JsonRpcError>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
+#[serde(default, deny_unknown_fields)]
+pub struct JsonRpcNotification {
+    pub jsonrpc: JsonRpcVersion,
+    pub method: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub params: Option<serde_json::Value>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
+#[serde(default, deny_unknown_fields)]
+pub struct JsonRpcError {
+    pub code: i32,
+    pub message: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub data: Option<serde_json::Value>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
+pub enum TransportType {
+    #[default]
+    Stdio,
+    Websocket,
+}
diff --git a/crates/kiro-cli/src/mcp_client/transport/mod.rs b/crates/kiro-cli/src/mcp_client/transport/mod.rs
new file mode 100644
index 0000000000..f86fc498f3
--- /dev/null
+++ b/crates/kiro-cli/src/mcp_client/transport/mod.rs
@@ -0,0 +1,56 @@
+pub mod base_protocol;
+pub mod stdio;
+
+use std::fmt::Debug;
+
+pub use base_protocol::*;
+pub use stdio::JsonRpcStdioTransport;
+use thiserror::Error;
+
+#[derive(Clone, Debug, Error)]
+pub enum TransportError {
+    #[error("Serialization error: {0}")]
+    Serialization(String),
+    #[error("IO error: {0}")]
+    Stdio(String),
+    #[error("{0}")]
+    Custom(String),
+    #[error(transparent)]
+    RecvError(#[from] tokio::sync::broadcast::error::RecvError),
+}
+
+impl From<serde_json::Error> for TransportError {
+    fn from(err: serde_json::Error) -> Self {
+        TransportError::Serialization(err.to_string())
+    }
+}
+
+impl From<std::io::Error> for TransportError {
+    fn from(err: std::io::Error) -> Self {
+        TransportError::Stdio(err.to_string())
+    }
+}
+
+#[async_trait::async_trait]
+pub trait Transport: Send + Sync + Debug + 'static {
+    /// Sends a message over the transport layer.
+    async fn send(&self, msg: &JsonRpcMessage) -> Result<(), TransportError>;
+    /// Listens to awaits for a response. This is a call that should be used after `send` is called
+    /// to listen for a response from the message recipient.
+    fn get_listener(&self) -> impl Listener;
+    /// Gracefully terminates the transport connection, cleaning up any resources.
+    /// This should be called when the transport is no longer needed to ensure proper cleanup.
+    async fn shutdown(&self) -> Result<(), TransportError>;
+    /// Listener that listens for logging messages.
+    fn get_log_listener(&self) -> impl LogListener;
+}
+
+#[async_trait::async_trait]
+pub trait Listener: Send + Sync + 'static {
+    async fn recv(&mut self) -> Result<JsonRpcMessage, TransportError>;
+}
+
+#[async_trait::async_trait]
+pub trait LogListener: Send + Sync + 'static {
+    async fn recv(&mut self) -> Result<String, TransportError>;
+}
diff --git a/crates/kiro-cli/src/mcp_client/transport/stdio.rs b/crates/kiro-cli/src/mcp_client/transport/stdio.rs
new file mode 100644
index 0000000000..270756f2d9
--- /dev/null
+++ b/crates/kiro-cli/src/mcp_client/transport/stdio.rs
@@ -0,0 +1,272 @@
+use std::sync::Arc;
+
+use tokio::io::{
+    AsyncBufReadExt,
+    AsyncRead,
+    AsyncWriteExt as _,
+    BufReader,
+    Stdin,
+    Stdout,
+};
+use tokio::process::{
+    Child,
+    ChildStdin,
+};
+use tokio::sync::{
+    Mutex,
+    broadcast,
+};
+
+use super::base_protocol::JsonRpcMessage;
+use super::{
+    Listener,
+    LogListener,
+    Transport,
+    TransportError,
+};
+
+#[derive(Debug)]
+pub enum JsonRpcStdioTransport {
+    Client {
+        stdin: Arc<Mutex<ChildStdin>>,
+        receiver: broadcast::Receiver<Result<JsonRpcMessage, TransportError>>,
+        log_receiver: broadcast::Receiver<String>,
+    },
+    Server {
+        stdout: Arc<Mutex<Stdout>>,
+        receiver: broadcast::Receiver<Result<JsonRpcMessage, TransportError>>,
+    },
+}
+
+impl JsonRpcStdioTransport {
+    fn spawn_reader<R: AsyncRead + Unpin + Send + 'static>(
+        reader: R,
+        tx: broadcast::Sender<Result<JsonRpcMessage, TransportError>>,
+    ) {
+        tokio::spawn(async move {
+            let mut buffer = Vec::<u8>::new();
+            let mut buf_reader = BufReader::new(reader);
+            loop {
+                buffer.clear();
+                // Messages are delimited by newlines and assumed to contain no embedded newlines
+                // See https://spec.modelcontextprotocol.io/specification/2024-11-05/basic/transports/#stdio
+                match buf_reader.read_until(b'\n', &mut buffer).await {
+                    Ok(0) => continue,
+                    Ok(_) => match serde_json::from_slice::<JsonRpcMessage>(buffer.as_slice()) {
+                        Ok(msg) => {
+                            let _ = tx.send(Ok(msg));
+                        },
+                        Err(e) => {
+                            let _ = tx.send(Err(e.into()));
+                        },
+                    },
+                    Err(e) => {
+                        let _ = tx.send(Err(e.into()));
+                    },
+                }
+            }
+        });
+    }
+
+    pub fn client(child_process: Child) -> Result<Self, TransportError> {
+        let (tx, receiver) = broadcast::channel::<Result<JsonRpcMessage, TransportError>>(100);
+        let Some(stdout) = child_process.stdout else {
+            return Err(TransportError::Custom("No stdout found on child process".to_owned()));
+        };
+        let Some(stdin) = child_process.stdin else {
+            return Err(TransportError::Custom("No stdin found on child process".to_owned()));
+        };
+        let Some(stderr) = child_process.stderr else {
+            return Err(TransportError::Custom("No stderr found on child process".to_owned()));
+        };
+        let (log_tx, log_receiver) = broadcast::channel::<String>(100);
+        tokio::task::spawn(async move {
+            let stderr = tokio::io::BufReader::new(stderr);
+            let mut lines = stderr.lines();
+            while let Ok(Some(line)) = lines.next_line().await {
+                let _ = log_tx.send(line);
+            }
+        });
+        let stdin = Arc::new(Mutex::new(stdin));
+        Self::spawn_reader(stdout, tx);
+        Ok(JsonRpcStdioTransport::Client {
+            stdin,
+            receiver,
+            log_receiver,
+        })
+    }
+
+    pub fn server(stdin: Stdin, stdout: Stdout) -> Result<Self, TransportError> {
+        let (tx, receiver) = broadcast::channel::<Result<JsonRpcMessage, TransportError>>(100);
+        Self::spawn_reader(stdin, tx);
+        let stdout = Arc::new(Mutex::new(stdout));
+        Ok(JsonRpcStdioTransport::Server { stdout, receiver })
+    }
+}
+
+#[async_trait::async_trait]
+impl Transport for JsonRpcStdioTransport {
+    async fn send(&self, msg: &JsonRpcMessage) -> Result<(), TransportError> {
+        match self {
+            JsonRpcStdioTransport::Client { stdin, .. } => {
+                let mut serialized = serde_json::to_vec(msg)?;
+                serialized.push(b'\n');
+                let mut stdin = stdin.lock().await;
+                stdin
+                    .write_all(&serialized)
+                    .await
+                    .map_err(|e| TransportError::Custom(format!("Error writing to server: {:?}", e)))?;
+                stdin
+                    .flush()
+                    .await
+                    .map_err(|e| TransportError::Custom(format!("Error writing to server: {:?}", e)))?;
+                Ok(())
+            },
+            JsonRpcStdioTransport::Server { stdout, .. } => {
+                let mut serialized = serde_json::to_vec(msg)?;
+                serialized.push(b'\n');
+                let mut stdout = stdout.lock().await;
+                stdout
+                    .write_all(&serialized)
+                    .await
+                    .map_err(|e| TransportError::Custom(format!("Error writing to client: {:?}", e)))?;
+                stdout
+                    .flush()
+                    .await
+                    .map_err(|e| TransportError::Custom(format!("Error writing to client: {:?}", e)))?;
+                Ok(())
+            },
+        }
+    }
+
+    fn get_listener(&self) -> impl Listener {
+        match self {
+            JsonRpcStdioTransport::Client { receiver, .. } | JsonRpcStdioTransport::Server { receiver, .. } => {
+                StdioListener {
+                    receiver: receiver.resubscribe(),
+                }
+            },
+        }
+    }
+
+    async fn shutdown(&self) -> Result<(), TransportError> {
+        match self {
+            JsonRpcStdioTransport::Client { stdin, .. } => {
+                let mut stdin = stdin.lock().await;
+                Ok(stdin.shutdown().await?)
+            },
+            JsonRpcStdioTransport::Server { stdout, .. } => {
+                let mut stdout = stdout.lock().await;
+                Ok(stdout.shutdown().await?)
+            },
+        }
+    }
+
+    fn get_log_listener(&self) -> impl LogListener {
+        match self {
+            JsonRpcStdioTransport::Client { log_receiver, .. } => StdioLogListener {
+                receiver: log_receiver.resubscribe(),
+            },
+            JsonRpcStdioTransport::Server { .. } => unreachable!("server does not need a log listener"),
+        }
+    }
+}
+
+pub struct StdioListener {
+    pub receiver: broadcast::Receiver<Result<JsonRpcMessage, TransportError>>,
+}
+
+#[async_trait::async_trait]
+impl Listener for StdioListener {
+    async fn recv(&mut self) -> Result<JsonRpcMessage, TransportError> {
+        self.receiver.recv().await?
+    }
+}
+
+pub struct StdioLogListener {
+    pub receiver: broadcast::Receiver<String>,
+}
+
+#[async_trait::async_trait]
+impl LogListener for StdioLogListener {
+    async fn recv(&mut self) -> Result<String, TransportError> {
+        Ok(self.receiver.recv().await?)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::process::Stdio;
+
+    use serde_json::{
+        Value,
+        json,
+    };
+    use tokio::process::Command;
+
+    use super::*;
+
+    // Helpers for testing
+    fn create_test_message() -> JsonRpcMessage {
+        serde_json::from_value(json!({
+            "jsonrpc": "2.0",
+            "id": 1,
+            "method": "test_method",
+            "params": {
+                "test_param": "test_value"
+            }
+        }))
+        .unwrap()
+    }
+
+    #[tokio::test]
+    async fn test_client_transport() {
+        let mut cmd = Command::new("cat");
+        cmd.stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::piped());
+
+        // Inject our mock transport instead
+        let child = cmd.spawn().expect("Failed to spawn command");
+        let transport = JsonRpcStdioTransport::client(child).expect("Failed to create client transport");
+
+        let message = create_test_message();
+        let result = transport.send(&message).await;
+        assert!(result.is_ok(), "Failed to send message: {:?}", result);
+
+        let echo = transport
+            .get_listener()
+            .recv()
+            .await
+            .expect("Failed to receive message");
+        let echo_value = serde_json::to_value(&echo).expect("Failed to convert echo to value");
+        let message_value = serde_json::to_value(&message).expect("Failed to convert message to value");
+        assert!(are_json_values_equal(&echo_value, &message_value));
+    }
+
+    fn are_json_values_equal(a: &Value, b: &Value) -> bool {
+        match (a, b) {
+            (Value::Null, Value::Null) => true,
+            (Value::Bool(a_val), Value::Bool(b_val)) => a_val == b_val,
+            (Value::Number(a_val), Value::Number(b_val)) => a_val == b_val,
+            (Value::String(a_val), Value::String(b_val)) => a_val == b_val,
+            (Value::Array(a_arr), Value::Array(b_arr)) => {
+                if a_arr.len() != b_arr.len() {
+                    return false;
+                }
+                a_arr
+                    .iter()
+                    .zip(b_arr.iter())
+                    .all(|(a_item, b_item)| are_json_values_equal(a_item, b_item))
+            },
+            (Value::Object(a_obj), Value::Object(b_obj)) => {
+                if a_obj.len() != b_obj.len() {
+                    return false;
+                }
+                a_obj.iter().all(|(key, a_value)| match b_obj.get(key) {
+                    Some(b_value) => are_json_values_equal(a_value, b_value),
+                    None => false,
+                })
+            },
+            _ => false,
+        }
+    }
+}
diff --git a/crates/kiro-cli/src/mcp_client/transport/websocket.rs b/crates/kiro-cli/src/mcp_client/transport/websocket.rs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/crates/kiro-cli/src/request.rs b/crates/kiro-cli/src/request.rs
new file mode 100644
index 0000000000..0da105efd1
--- /dev/null
+++ b/crates/kiro-cli/src/request.rs
@@ -0,0 +1,188 @@
+use std::env::current_exe;
+use std::fs::File;
+use std::io::BufReader;
+use std::path::Path;
+use std::sync::{
+    Arc,
+    LazyLock,
+};
+
+use reqwest::Client;
+use rustls::{
+    ClientConfig,
+    RootCertStore,
+};
+use url::ParseError;
+
+#[derive(Debug)]
+pub enum RequestError {
+    Reqwest(reqwest::Error),
+    Serde(serde_json::Error),
+    Io(std::io::Error),
+    Dir(crate::fig_util::directories::DirectoryError),
+    Settings(crate::fig_settings::Error),
+    UrlParseError(ParseError),
+}
+
+impl std::fmt::Display for RequestError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            RequestError::Reqwest(err) => write!(f, "Reqwest error: {err}"),
+            RequestError::Serde(err) => write!(f, "Serde error: {err}"),
+            RequestError::Io(err) => write!(f, "Io error: {err}"),
+            RequestError::Dir(err) => write!(f, "Dir error: {err}"),
+            RequestError::Settings(err) => write!(f, "Settings error: {err}"),
+            RequestError::UrlParseError(err) => write!(f, "Url parse error: {err}"),
+        }
+    }
+}
+
+impl std::error::Error for RequestError {}
+
+impl From<reqwest::Error> for RequestError {
+    fn from(e: reqwest::Error) -> Self {
+        RequestError::Reqwest(e)
+    }
+}
+
+impl From<serde_json::Error> for RequestError {
+    fn from(e: serde_json::Error) -> Self {
+        RequestError::Serde(e)
+    }
+}
+
+impl From<std::io::Error> for RequestError {
+    fn from(e: std::io::Error) -> Self {
+        RequestError::Io(e)
+    }
+}
+
+impl From<crate::fig_util::directories::DirectoryError> for RequestError {
+    fn from(e: crate::fig_util::directories::DirectoryError) -> Self {
+        RequestError::Dir(e)
+    }
+}
+
+impl From<crate::fig_settings::Error> for RequestError {
+    fn from(e: crate::fig_settings::Error) -> Self {
+        RequestError::Settings(e)
+    }
+}
+
+impl From<ParseError> for RequestError {
+    fn from(e: ParseError) -> Self {
+        RequestError::UrlParseError(e)
+    }
+}
+
+pub fn client() -> Option<&'static Client> {
+    CLIENT_NATIVE_CERTS.as_ref()
+}
+
+pub fn create_default_root_cert_store() -> RootCertStore {
+    let mut root_cert_store: RootCertStore = webpki_roots::TLS_SERVER_ROOTS.iter().cloned().collect();
+
+    // The errors are ignored because root certificates often include
+    // ancient or syntactically invalid certificates
+    let rustls_native_certs::CertificateResult { certs, errors: _, .. } = rustls_native_certs::load_native_certs();
+    for cert in certs {
+        let _ = root_cert_store.add(cert);
+    }
+
+    let custom_cert = std::env::var("Q_CUSTOM_CERT")
+        .ok()
+        .or_else(|| crate::fig_settings::state::get_string("Q_CUSTOM_CERT").ok().flatten());
+
+    if let Some(custom_cert) = custom_cert {
+        match File::open(Path::new(&custom_cert)) {
+            Ok(file) => {
+                let reader = &mut BufReader::new(file);
+                for cert in rustls_pemfile::certs(reader) {
+                    match cert {
+                        Ok(cert) => {
+                            if let Err(err) = root_cert_store.add(cert) {
+                                tracing::error!(path =% custom_cert, %err, "Failed to add custom cert");
+                            };
+                        },
+                        Err(err) => tracing::error!(path =% custom_cert, %err, "Failed to parse cert"),
+                    }
+                }
+            },
+            Err(err) => tracing::error!(path =% custom_cert, %err, "Failed to open cert at"),
+        }
+    }
+
+    root_cert_store
+}
+
+fn client_config() -> ClientConfig {
+    let provider = rustls::crypto::CryptoProvider::get_default()
+        .cloned()
+        .unwrap_or_else(|| Arc::new(rustls::crypto::ring::default_provider()));
+
+    ClientConfig::builder_with_provider(provider)
+        .with_protocol_versions(rustls::DEFAULT_VERSIONS)
+        .expect("Failed to set supported TLS versions")
+        .with_root_certificates(create_default_root_cert_store())
+        .with_no_client_auth()
+}
+
+static CLIENT_CONFIG_NATIVE_CERTS: LazyLock<Arc<ClientConfig>> = LazyLock::new(|| Arc::new(client_config()));
+
+pub fn client_config_cached() -> Arc<ClientConfig> {
+    CLIENT_CONFIG_NATIVE_CERTS.clone()
+}
+
+static USER_AGENT: LazyLock<String> = LazyLock::new(|| {
+    let name = current_exe()
+        .ok()
+        .and_then(|exe| exe.file_stem().and_then(|name| name.to_str().map(String::from)))
+        .unwrap_or_else(|| "unknown-rust-client".into());
+
+    let os = std::env::consts::OS;
+    let arch = std::env::consts::ARCH;
+    let version = env!("CARGO_PKG_VERSION");
+
+    format!("{name}-{os}-{arch}-{version}")
+});
+
+pub static CLIENT_NATIVE_CERTS: LazyLock<Option<Client>> = LazyLock::new(|| {
+    Some(
+        Client::builder()
+            .use_preconfigured_tls((*client_config_cached()).clone())
+            .user_agent(USER_AGENT.chars().filter(|c| c.is_ascii_graphic()).collect::<String>())
+            .cookie_store(true)
+            .build()
+            .unwrap(),
+    )
+});
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn get_client() {
+        client().unwrap();
+    }
+
+    #[tokio::test]
+    async fn request_test() {
+        let mut server = mockito::Server::new_async().await;
+        let mock = server
+            .mock("GET", "/hello")
+            .with_status(200)
+            .with_header("content-type", "text/plain")
+            .with_body("world")
+            .create();
+        let url = server.url();
+
+        let client = client().unwrap();
+        let res = client.get(format!("{url}/hello")).send().await.unwrap();
+        assert_eq!(res.status(), 200);
+        assert_eq!(res.headers()["content-type"], "text/plain");
+        assert_eq!(res.text().await.unwrap(), "world");
+
+        mock.expect(1).assert();
+    }
+}
diff --git a/crates/kiro-cli/telemetry_definitions.json b/crates/kiro-cli/telemetry_definitions.json
new file mode 100644
index 0000000000..55254d38dc
--- /dev/null
+++ b/crates/kiro-cli/telemetry_definitions.json
@@ -0,0 +1,265 @@
+{
+  "types": [
+    {
+      "name": "amazonQProfileRegion",
+      "type": "string",
+      "description": "Region of the Q Profile associated with a metric\n- \"n/a\" if metric is not associated with a profile or region.\n- \"not-set\" if metric is associated with a profile, but profile is unknown."
+    },
+    {
+      "name": "ssoRegion",
+      "type": "string",
+      "description": "Region of the current SSO connection. Typically associated with credentialStartUrl\n- \"n/a\" if metric is not associated with a region.\n- \"not-set\" if metric is associated with a region, but region is unknown."
+    },
+    {
+      "name": "profileCount",
+      "type": "int",
+      "description": "The number of profiles that were available to choose from"
+    },
+    {
+      "name": "source",
+      "type": "string",
+      "description": "Identifies the source component where the telemetry event originated."
+    },
+    {
+      "name": "amazonqConversationId",
+      "type": "string",
+      "description": "Uniquely identifies a message with which the user interacts."
+    },
+    {
+      "name": "codewhispererterminal_command",
+      "type": "string",
+      "description": "The CLI tool a completion was for"
+    },
+    {
+      "name": "codewhispererterminal_subcommand",
+      "type": "string",
+      "description": "A codewhisperer CLI subcommand"
+    },
+    {
+      "name": "codewhispererterminal_inCloudshell",
+      "type": "boolean",
+      "description": "Whether the CLI is running in the AWS CloudShell environment"
+    },
+    {
+      "name": "credentialStartUrl",
+      "type": "string",
+      "description": "The start URL of current SSO connection"
+    },
+    {
+      "name": "requestId",
+      "type": "string",
+      "description": "The id assigned to an AWS request"
+    },
+    {
+      "name": "oauthFlow",
+      "type": "string",
+      "description": "The oauth authentication flow executed by the user, e.g. device code or PKCE"
+    },
+    {
+      "name": "result",
+      "type": "string",
+      "description": "Whether or not the operation succeeded"
+    },
+    {
+      "name": "reason",
+      "type": "string",
+      "description": "Description of what caused an error, if any"
+    },
+    {
+      "name": "codewhispererterminal_toolUseId",
+      "type": "string",
+      "description": "The id assigned to the client by the model representing a tool use event"
+    },
+    {
+      "name": "codewhispererterminal_toolName",
+      "type": "string",
+      "description": "The name associated with a tool"
+    },
+    {
+      "name": "codewhispererterminal_isToolUseAccepted",
+      "type": "boolean",
+      "description": "Denotes if a tool use event has been fulfilled"
+    },
+    {
+      "name": "codewhispererterminal_toolUseIsSuccess",
+      "type": "boolean",
+      "description": "The outcome of a tool use"
+    },
+    {
+      "name": "codewhispererterminal_utteranceId",
+      "type": "string",
+      "description": "Id associated with a given response from the model"
+    },
+    {
+      "name": "codewhispererterminal_userInputId",
+      "type": "string",
+      "description": "Id associated with a given user input. This is used to differentiate responses to user input and that of retries from tool uses. This id is the utterance id of the first response following an user input"
+    },
+    {
+      "name": "codewhispererterminal_isToolValid",
+      "type": "boolean",
+      "description": "If the use of tool as instructed by the model is valid"
+    },
+    {
+      "name": "codewhispererterminal_contextFileLength",
+      "type": "int",
+      "description": "The length of the files included as part of context management"
+    },
+    {
+      "name": "codewhispererterminal_mcpServerInitFailureReason",
+      "type": "string",
+      "description": "Reason for which a mcp server has failed to be initialized"
+    },
+    {
+      "name": "codewhispererterminal_toolsPerMcpServer",
+      "type": "int",
+      "description": "The number of tools provided by a mcp server"
+    },
+    {
+      "name": "codewhispererterminal_isCustomTool",
+      "type": "boolean",
+      "description": "Denoting whether or not the tool is a custom tool"
+    },
+    {
+      "name": "codewhispererterminal_customToolInputTokenSize",
+      "type": "int",
+      "description": "Number of tokens used on invoking the custom tool"
+    },
+    {
+      "name": "codewhispererterminal_customToolOutputTokenSize",
+      "type": "int",
+      "description": "Number of tokens received from invoking the custom tool"
+    },
+    {
+      "name": "codewhispererterminal_customToolLatency",
+      "type": "int",
+      "description": "Custom tool call latency in seconds"
+    }
+  ],
+  "metrics": [
+    {
+      "name": "amazonq_startChat",
+      "description": "Captures start of the conversation with amazonq /dev",
+      "metadata": [
+        { "type": "amazonqConversationId" },
+        { "type": "credentialStartUrl", "required": false },
+        { "type": "codewhispererterminal_inCloudshell" }
+      ]
+    },
+    {
+      "name": "codewhispererterminal_addChatMessage",
+      "description": "Captures active usage with Q Chat in shell",
+      "metadata": [
+        { "type": "amazonqConversationId" },
+        { "type": "credentialStartUrl", "required": false },
+        { "type": "codewhispererterminal_inCloudshell" },
+        { "type": "codewhispererterminal_contextFileLength", "required": false }
+      ]
+    },
+    {
+      "name": "amazonq_endChat",
+      "description": "Captures end of the conversation with amazonq /dev",
+      "metadata": [
+        { "type": "amazonqConversationId" },
+        { "type": "credentialStartUrl", "required": false },
+        { "type": "codewhispererterminal_inCloudshell" }
+      ]
+    },
+    {
+      "name": "codewhispererterminal_userLoggedIn",
+      "description": "Emitted when users log in",
+      "passive": false,
+      "metadata": [
+        { "type": "credentialStartUrl" },
+        { "type": "codewhispererterminal_inCloudshell" }
+      ]
+    },
+    {
+      "name": "codewhispererterminal_refreshCredentials",
+      "description": "Emitted when users refresh their credentials",
+      "passive": false,
+      "metadata": [
+        { "type": "credentialStartUrl" },
+        { "type": "requestId" },
+        { "type": "oauthFlow" },
+        { "type": "result" },
+        { "type": "reason", "required": false },
+        { "type": "codewhispererterminal_inCloudshell" }
+      ]
+    },
+    {
+      "name": "codewhispererterminal_cliSubcommandExecuted",
+      "description": "Emitted on CW CLI subcommand executed",
+      "passive": false,
+      "metadata": [
+        { "type": "credentialStartUrl" },
+        { "type": "codewhispererterminal_subcommand" },
+        { "type": "codewhispererterminal_inCloudshell" }
+      ]
+    },
+    {
+      "name": "codewhispererterminal_toolUseSuggested",
+      "description": "Emitted once per tool use to report outcome of tool use suggested",
+      "passive": false,
+      "metadata": [
+        { "type": "credentialStartUrl" },
+        { "type": "amazonqConversationId" },
+        { "type": "codewhispererterminal_utteranceId" },
+        { "type": "codewhispererterminal_userInputId" },
+        { "type": "codewhispererterminal_toolUseId" },
+        { "type": "codewhispererterminal_toolName" },
+        { "type": "codewhispererterminal_isToolUseAccepted" },
+        { "type": "codewhispererterminal_isToolValid" },
+        { "type": "codewhispererterminal_toolUseIsSuccess", "required": false },
+        { "type": "codewhispererterminal_isCustomTool" },
+        {
+          "type": "codewhispererterminal_customToolInputTokenSize",
+          "required": false
+        },
+        {
+          "type": "codewhispererterminal_customToolOutputTokenSize",
+          "required": false
+        },
+        { "type": "codewhispererterminal_customToolLatency", "required": false }
+      ]
+    },
+    {
+      "name": "codewhispererterminal_mcpServerInit",
+      "description": "Emitted once per mcp server on start up",
+      "passive": false,
+      "metadata": [
+        { "type": "amazonqConversationId" },
+        {
+          "type": "codewhispererterminal_mcpServerInitFailureReason",
+          "required": false
+        },
+        { "type": "codewhispererterminal_toolsPerMcpServer" }
+      ]
+    },
+    {
+      "name": "amazonq_didSelectProfile",
+      "description": "Emitted after the user's Q Profile has been set, whether the user was prompted with a dialog, or a profile was automatically assigned after signing in.",
+      "metadata": [
+        { "type": "source" },
+        { "type": "amazonQProfileRegion" },
+        { "type": "result" },
+        { "type": "ssoRegion", "required": false },
+        { "type": "credentialStartUrl", "required": false },
+        { "type": "profileCount", "required": false }
+      ],
+      "passive": true
+    },
+    {
+      "name": "amazonq_profileState",
+      "description": "Indicates a change in the user's Q Profile state",
+      "metadata": [
+        { "type": "source" },
+        { "type": "amazonQProfileRegion" },
+        { "type": "result" },
+        { "type": "ssoRegion", "required": false },
+        { "type": "credentialStartUrl", "required": false }
+      ],
+      "passive": true
+    }
+  ]
+}
diff --git a/crates/q_chat/Cargo.toml b/crates/q_chat/Cargo.toml
deleted file mode 100644
index 8997a1b37f..0000000000
--- a/crates/q_chat/Cargo.toml
+++ /dev/null
@@ -1,59 +0,0 @@
-[package]
-name = "q_chat"
-authors.workspace = true
-edition.workspace = true
-homepage.workspace = true
-publish.workspace = true
-version.workspace = true
-license.workspace = true
-
-[dependencies]
-anstream.workspace = true
-aws-smithy-types = "1.2.10"
-bstr.workspace = true
-clap.workspace = true
-color-print.workspace = true
-convert_case.workspace = true
-crossterm.workspace = true
-semver.workspace = true
-eyre.workspace = true
-fig_api_client.workspace = true
-fig_auth.workspace = true
-fig_diagnostic.workspace = true
-fig_os_shim.workspace = true
-fig_install.workspace = true
-fig_settings.workspace = true
-fig_telemetry.workspace = true
-fig_util.workspace = true
-futures.workspace = true
-glob.workspace = true
-mcp_client.workspace = true
-rand.workspace = true
-regex.workspace = true
-rustyline = { version = "15.0.0", features = ["derive", "custom-bindings"] }
-serde.workspace = true
-serde_json.workspace = true
-shell-color.workspace = true
-shell-words = "1.1"
-shellexpand.workspace = true
-shlex.workspace = true
-similar.workspace = true
-skim = "0.16.2"
-spinners.workspace = true
-syntect = { version = "5.2.0", features = [ "default-syntaxes", "default-themes" ]}
-tempfile.workspace = true
-thiserror.workspace = true
-time.workspace = true
-tokio.workspace = true
-tracing.workspace = true
-unicode-width.workspace = true
-url.workspace = true
-uuid.workspace = true
-winnow.workspace = true
-strip-ansi-escapes = "0.2.1"
-
-[dev-dependencies]
-tracing-subscriber.workspace = true
-
-[lints]
-workspace = true
diff --git a/crates/q_chat/src/util/ui.rs b/crates/q_chat/src/util/ui.rs
deleted file mode 100644
index 1c5bfd5da9..0000000000
--- a/crates/q_chat/src/util/ui.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-use crossterm::style::{
-    Color,
-    Stylize,
-};
-use crossterm::terminal::{
-    self,
-    ClearType,
-};
-use crossterm::{
-    cursor,
-    execute,
-    style,
-};
-use eyre::Result;
-use strip_ansi_escapes::strip_str;
-
-use super::shared_writer::SharedWriter;
-
-pub fn draw_box(
-    mut output: SharedWriter,
-    title: &str,
-    content: &str,
-    box_width: usize,
-    border_color: Color,
-) -> Result<()> {
-    let inner_width = box_width - 4; // account for │ and padding
-
-    // wrap the single line into multiple lines respecting inner width
-    // Manually wrap the text by splitting at word boundaries
-    let mut wrapped_lines = Vec::new();
-    let mut line = String::new();
-
-    for word in content.split_whitespace() {
-        if line.len() + word.len() < inner_width {
-            if !line.is_empty() {
-                line.push(' ');
-            }
-            line.push_str(word);
-        } else {
-            // Here we need to account for words that are too long as well
-            if word.len() >= inner_width {
-                let mut start = 0_usize;
-                for (i, _) in word.chars().enumerate() {
-                    if i - start >= inner_width {
-                        wrapped_lines.push(word[start..i].to_string());
-                        start = i;
-                    }
-                }
-                wrapped_lines.push(word[start..].to_string());
-                line = String::new();
-            } else {
-                wrapped_lines.push(line);
-                line = word.to_string();
-            }
-        }
-    }
-
-    if !line.is_empty() {
-        wrapped_lines.push(line);
-    }
-
-    let side_len = (box_width.saturating_sub(title.len())) / 2;
-    let top_border = format!(
-        "{} {} {}",
-        style::style(format!("╭{}", "─".repeat(side_len - 2))).with(border_color),
-        title,
-        style::style(format!("{}╮", "─".repeat(box_width - side_len - title.len() - 2))).with(border_color)
-    );
-
-    execute!(
-        output,
-        terminal::Clear(ClearType::CurrentLine),
-        cursor::MoveToColumn(0),
-        style::Print(format!("{top_border}\n")),
-    )?;
-
-    // Top vertical padding
-    let top_vertical_border = format!(
-        "{}",
-        style::style(format!("│{: <width$}│\n", "", width = box_width - 2)).with(border_color)
-    );
-    execute!(output, style::Print(top_vertical_border))?;
-
-    // Centered wrapped content
-    for line in wrapped_lines {
-        let visible_line_len = strip_str(&line).len();
-        let left_pad = box_width.saturating_sub(4).saturating_sub(visible_line_len) / 2;
-
-        let content = format!(
-            "{} {: <pad$}{}{: <rem$} {}",
-            style::style("│").with(border_color),
-            "",
-            line,
-            "",
-            style::style("│").with(border_color),
-            pad = left_pad,
-            rem = box_width
-                .saturating_sub(4)
-                .saturating_sub(left_pad)
-                .saturating_sub(visible_line_len),
-        );
-        execute!(output, style::Print(format!("{}\n", content)))?;
-    }
-
-    // Bottom vertical padding
-    execute!(
-        output,
-        style::Print(format!("│{: <width$}│\n", "", width = box_width - 2).with(border_color))
-    )?;
-
-    // Bottom rounded corner line: ╰────────────╯
-    let bottom = format!("╰{}╯", "─".repeat(box_width - 2)).with(border_color);
-    execute!(output, style::Print(format!("{}\n", bottom)))?;
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use bstr::ByteSlice;
-    use crossterm::style::Color;
-    use shared_writer::TestWriterWithSink;
-
-    use crate::GREETING_BREAK_POINT;
-    use crate::util::shared_writer::{
-        self,
-        SharedWriter,
-    };
-    use crate::util::ui::draw_box;
-
-    #[tokio::test]
-    async fn test_draw_tip_box() {
-        let buf = Arc::new(std::sync::Mutex::new(Vec::<u8>::new()));
-        let test_writer = TestWriterWithSink { sink: buf.clone() };
-        let output = SharedWriter::new(test_writer.clone());
-
-        // Test with a short tip
-        let short_tip = "This is a short tip";
-        draw_box(
-            output.clone(),
-            "Did you know?",
-            short_tip,
-            GREETING_BREAK_POINT,
-            Color::DarkGrey,
-        )
-        .expect("Failed to draw tip box");
-
-        // Test with a longer tip that should wrap
-        let long_tip = "This is a much longer tip that should wrap to multiple lines because it exceeds the inner width of the tip box which is calculated based on the GREETING_BREAK_POINT constant";
-        draw_box(
-            output.clone(),
-            "Did you know?",
-            long_tip,
-            GREETING_BREAK_POINT,
-            Color::DarkGrey,
-        )
-        .expect("Failed to draw tip box");
-
-        // Test with a long tip with two long words that should wrap
-        let long_tip_with_one_long_word = {
-            let mut s = "a".repeat(200);
-            s.push(' ');
-            s.push_str(&"a".repeat(200));
-            s
-        };
-        draw_box(
-            output.clone(),
-            "Did you know?",
-            long_tip_with_one_long_word.as_str(),
-            GREETING_BREAK_POINT,
-            Color::DarkGrey,
-        )
-        .expect("Failed to draw tip box");
-        // Test with a long tip with two long words that should wrap
-        let long_tip_with_two_long_words = "a".repeat(200);
-        draw_box(
-            output.clone(),
-            "Did you know?",
-            long_tip_with_two_long_words.as_str(),
-            GREETING_BREAK_POINT,
-            Color::DarkGrey,
-        )
-        .expect("Failed to draw tip box");
-
-        // Get the output and verify it contains expected formatting elements
-        let content = test_writer.get_content();
-        let output_str = content.to_str_lossy();
-
-        // Check for box drawing characters
-        assert!(output_str.contains("╭"), "Output should contain top-left corner");
-        assert!(output_str.contains("╮"), "Output should contain top-right corner");
-        assert!(output_str.contains("│"), "Output should contain vertical lines");
-        assert!(output_str.contains("╰"), "Output should contain bottom-left corner");
-        assert!(output_str.contains("╯"), "Output should contain bottom-right corner");
-
-        // Check for the label
-        assert!(
-            output_str.contains("Did you know?"),
-            "Output should contain the 'Did you know?' label"
-        );
-
-        // Check that both tips are present
-        assert!(output_str.contains(short_tip), "Output should contain the short tip");
-
-        // For the long tip, we check for substrings since it will be wrapped
-        let long_tip_parts: Vec<&str> = long_tip.split_whitespace().collect();
-        for part in long_tip_parts.iter().take(3) {
-            assert!(output_str.contains(part), "Output should contain parts of the long tip");
-        }
-    }
-}
diff --git a/crates/q_cli/Cargo.toml b/crates/q_cli/Cargo.toml
index fe1d00008e..4460fa8ce0 100644
--- a/crates/q_cli/Cargo.toml
+++ b/crates/q_cli/Cargo.toml
@@ -60,7 +60,6 @@ mcp_client.workspace = true
 mimalloc.workspace = true
 owo-colors = "4.2.0"
 parking_lot.workspace = true
-q_chat.workspace = true
 rand.workspace = true
 regex.workspace = true
 semver.workspace = true
diff --git a/crates/q_cli/src/cli/issue.rs b/crates/q_cli/src/cli/issue.rs
index 028d7eec68..3974951e7a 100644
--- a/crates/q_cli/src/cli/issue.rs
+++ b/crates/q_cli/src/cli/issue.rs
@@ -41,15 +41,7 @@ impl IssueArgs {
             _ => joined_description,
         };
 
-        let _ = q_chat::util::issue::IssueCreator {
-            title: Some(issue_title),
-            expected_behavior: None,
-            actual_behavior: None,
-            steps_to_reproduce: None,
-            additional_environment: None,
-        }
-        .create_url()
-        .await;
+        todo!();
 
         Ok(ExitCode::SUCCESS)
     }
diff --git a/crates/q_cli/src/cli/mod.rs b/crates/q_cli/src/cli/mod.rs
index fc6244b28a..a0b407f34b 100644
--- a/crates/q_cli/src/cli/mod.rs
+++ b/crates/q_cli/src/cli/mod.rs
@@ -60,7 +60,6 @@ use fig_util::{
     system_info,
 };
 use internal::InternalSubcommand;
-use q_chat::cli::Chat;
 use serde::Serialize;
 use tracing::{
     Level,
@@ -187,8 +186,11 @@ pub enum CliRootCommands {
     /// Open the dashboard
     Dashboard,
     /// AI assistant in your terminal
-    #[command(alias("q"))]
-    Chat(Chat),
+    Chat {
+        /// Args for the chat command
+        #[arg(trailing_var_arg = true, allow_hyphen_values = true)]
+        args: Vec<String>,
+    },
     /// Inline shell completions
     #[command(subcommand)]
     Inline(inline::InlineSubcommand),
@@ -333,11 +335,11 @@ impl Cli {
                 CliRootCommands::Telemetry(subcommand) => subcommand.execute().await,
                 CliRootCommands::Version { changelog } => Self::print_version(changelog),
                 CliRootCommands::Dashboard => launch_dashboard(false).await,
-                CliRootCommands::Chat(args) => q_chat::launch_chat(args).await,
+                CliRootCommands::Chat { args } => todo!(),
                 CliRootCommands::Inline(subcommand) => subcommand.execute(&cli_context).await,
             },
             // Root command
-            None => q_chat::launch_chat(q_chat::cli::Chat::default()).await,
+            None => todo!(),
         }
     }
 
@@ -521,19 +523,6 @@ mod test {
             verbose: 0,
             help_all: true,
         });
-
-        assert_eq!(Cli::parse_from([CLI_BINARY_NAME, "chat", "-vv"]), Cli {
-            subcommand: Some(CliRootCommands::Chat(Chat {
-                accept_all: false,
-                no_interactive: false,
-                input: None,
-                profile: None,
-                trust_all_tools: false,
-                trust_tools: None,
-            })),
-            verbose: 2,
-            help_all: false,
-        });
     }
 
     /// This test validates that the restart command maintains the same CLI facing definition
@@ -673,109 +662,4 @@ mod test {
             changelog: Some("1.8.0".to_string()),
         });
     }
-
-    #[test]
-    fn test_chat_with_context_profile() {
-        assert_parse!(
-            ["chat", "--profile", "my-profile"],
-            CliRootCommands::Chat(Chat {
-                accept_all: false,
-                no_interactive: false,
-                input: None,
-                profile: Some("my-profile".to_string()),
-                trust_all_tools: false,
-                trust_tools: None,
-            })
-        );
-    }
-
-    #[test]
-    fn test_chat_with_context_profile_and_input() {
-        assert_parse!(
-            ["chat", "--profile", "my-profile", "Hello"],
-            CliRootCommands::Chat(Chat {
-                accept_all: false,
-                no_interactive: false,
-                input: Some("Hello".to_string()),
-                profile: Some("my-profile".to_string()),
-                trust_all_tools: false,
-                trust_tools: None,
-            })
-        );
-    }
-
-    #[test]
-    fn test_chat_with_context_profile_and_accept_all() {
-        assert_parse!(
-            ["chat", "--profile", "my-profile", "--accept-all"],
-            CliRootCommands::Chat(Chat {
-                accept_all: true,
-                no_interactive: false,
-                input: None,
-                profile: Some("my-profile".to_string()),
-                trust_all_tools: false,
-                trust_tools: None,
-            })
-        );
-    }
-
-    #[test]
-    fn test_chat_with_no_interactive() {
-        assert_parse!(
-            ["chat", "--no-interactive"],
-            CliRootCommands::Chat(Chat {
-                accept_all: false,
-                no_interactive: true,
-                input: None,
-                profile: None,
-                trust_all_tools: false,
-                trust_tools: None,
-            })
-        );
-    }
-
-    #[test]
-    fn test_chat_with_tool_trust_all() {
-        assert_parse!(
-            ["chat", "--trust-all-tools"],
-            CliRootCommands::Chat(Chat {
-                accept_all: false,
-                no_interactive: false,
-                input: None,
-                profile: None,
-                trust_all_tools: true,
-                trust_tools: None,
-            })
-        );
-    }
-
-    #[test]
-    fn test_chat_with_tool_trust_none() {
-        assert_parse!(
-            ["chat", "--trust-tools="],
-            CliRootCommands::Chat(Chat {
-                accept_all: false,
-                no_interactive: false,
-                input: None,
-                profile: None,
-                trust_all_tools: false,
-                trust_tools: Some(vec!["".to_string()]),
-            })
-        );
-    }
-
-    #[test]
-    fn test_chat_with_tool_trust_some() {
-        assert_parse!(
-            ["chat", "--trust-tools=fs_read,fs_write"],
-            CliRootCommands::Chat(Chat {
-                accept_all: false,
-                no_interactive: false,
-                input: None,
-                profile: None,
-                trust_all_tools: false,
-                trust_tools: Some(vec!["fs_read".to_string(), "fs_write".to_string()]),
-            })
-        );
-    }
 }
diff --git a/typos.toml b/typos.toml
index 40b3547a2b..4a2d6eada0 100644
--- a/typos.toml
+++ b/typos.toml
@@ -4,7 +4,7 @@ extend-exclude = [
   "crates/amzn-codewhisperer-client",
   "crates/amzn-codewhisperer-streaming-client",
   "crates/amzn-consolas-client",
-  "crates/amzn-toolkit-telemetry",
+  "crates/amzn-toolkit-telemetry-client",
   "crates/amzn-qdeveloper-client",
   "crates/amzn-qdeveloper-streaming-client",
   "crates/aws-toolkit-telemetry-definitions/def.json",
@@ -12,7 +12,7 @@ extend-exclude = [
   "crates/zbus_names",
   "packages/fuzzysort",
   "packages/dashboard-app/public/license/NOTICE.txt",
-  "pnpm-lock.yaml"
+  "pnpm-lock.yaml",
 ]
 
 [default]