merge main

Author: evanliu048

Cargo.lock

@@ -87,7 +87,6 @@ indicatif = "0.17.11"
 indoc = "2.0.6"
 insta = "1.43.1"
 libc = "0.2.172"
-mcp_client = { path = "crates/mcp_client" }
 mimalloc = "0.1.46"
 nix = { version = "0.29.0", features = [
     "feature",
@@ -106,7 +105,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"
@@ -146,7 +144,7 @@ time = { version = "0.3.39", features = [
     "macros",
     "serde",
 ] }
-tokio = { version = "1.44.2", features = ["full"] }
+tokio = { version = "1.45.0", features = ["full"] }
 tokio-tungstenite = "0.26.2"
 tokio-util = { version = "0.7.15", features = ["codec", "compat"] }
 toml = "0.8.12"
@@ -169,7 +167,7 @@ winnow = "0.6.2"
 # https://github.com/seanmonstar/reqwest/blob/v0.12.12/Cargo.toml
 rustls = "0.23.23"
 rustls-native-certs = "0.8.1"
-webpki-roots = "0.26.8"
+webpki-roots = "=0.26.8"
 
 
 [workspace.lints.rust]

Cargo.toml

@@ -155,14 +155,14 @@ pnpm install --ignore-scripts
 ### 3. Start Local Development
 To compile and view changes made to `q chat`:
 ```shell
-cargo run --bin q_cli -- chat
+cargo run --bin chat_cli
 ```
 
-> If you are working on other q commands, just replace `chat` with the command name 
+> If you are working on other q commands, just append `-- <command name>`. For example, to run `q login`, you can run `cargo run --bin chat_cli -- login`
 
 To run tests for the Q CLI crate:
 ```shell
-cargo test -p q_cli
+cargo test -p chat_cli
 ```
 
 To format Rust files:

README.md

@@ -33,6 +33,8 @@
 from importlib import import_module
 from const import (
     APP_NAME,
+    CHAT_BINARY_NAME,
+    CHAT_PACKAGE_NAME,
     CLI_BINARY_NAME,
     CLI_PACKAGE_NAME,
     DESKTOP_BINARY_NAME,
@@ -208,12 +210,13 @@ def build_macos_ime(
     return input_method_app
 
 
-def macos_tauri_config(cli_path: pathlib.Path, pty_path: pathlib.Path, target: str) -> str:
+def macos_tauri_config(cli_path: pathlib.Path, chat_path: pathlib.Path, pty_path: pathlib.Path, target: str) -> str:
     config = {
         "tauri": {
             "bundle": {
                 "externalBin": [
                     str(cli_path).removesuffix(f"-{target}"),
+                    str(chat_path).removesuffix(f"-{target}"),
                     str(pty_path).removesuffix(f"-{target}"),
                 ],
                 "resources": ["manifest.json"],
@@ -227,6 +230,7 @@ def build_macos_desktop_app(
     release: bool,
     pty_path: pathlib.Path,
     cli_path: pathlib.Path,
+    chat_path: pathlib.Path,
     npm_packages: NpmBuildOutput,
     is_prod: bool,
     signing_data: CdSigningData | None,
@@ -244,7 +248,7 @@ def build_macos_desktop_app(
 
     info("Building tauri config")
     tauri_config_path = pathlib.Path(DESKTOP_PACKAGE_PATH) / "build-config.json"
-    tauri_config_path.write_text(macos_tauri_config(cli_path=cli_path, pty_path=pty_path, target=target))
+    tauri_config_path.write_text(macos_tauri_config(cli_path=cli_path, chat_path=chat_path, pty_path=pty_path, target=target))
 
     info("Building", DESKTOP_PACKAGE_NAME)
 
@@ -467,6 +471,7 @@ def build_linux_minimal(cli_path: pathlib.Path, pty_path: pathlib.Path):
 def linux_tauri_config(
     cli_path: pathlib.Path,
     pty_path: pathlib.Path,
+    chat_path: pathlib.Path,
     dashboard_path: pathlib.Path,
     autocomplete_path: pathlib.Path,
     vscode_path: pathlib.Path,
@@ -483,6 +488,7 @@ def linux_tauri_config(
                 "externalBin": [
                     str(cli_path).removesuffix(f"-{target}"),
                     str(pty_path).removesuffix(f"-{target}"),
+                    str(chat_path).removesuffix(f"-{target}"),
                 ],
                 "targets": ["appimage"],
                 "icon": ["icons/128x128.png"],
@@ -535,6 +541,7 @@ def make_linux_bundle_metadata(packaged_as: Package) -> pathlib.Path:
 class LinuxDebResources:
     cli_path: pathlib.Path
     pty_path: pathlib.Path
+    chat_path: pathlib.Path
     desktop_path: pathlib.Path
     themes_path: pathlib.Path
     legacy_extension_dir_path: pathlib.Path
@@ -573,6 +580,7 @@ def build_linux_deb(
     bin_path.mkdir(parents=True)
     shutil.copy(resources.cli_path, bin_path / CLI_BINARY_NAME)
     shutil.copy(resources.pty_path, bin_path / PTY_BINARY_NAME)
+    shutil.copy(resources.chat_path, bin_path / CHAT_BINARY_NAME)
     shutil.copy(resources.desktop_path, bin_path / DESKTOP_BINARY_NAME)
 
     info("Copying /usr/share resources")
@@ -629,6 +637,7 @@ def build_linux_full(
     release: bool,
     cli_path: pathlib.Path,
     pty_path: pathlib.Path,
+    chat_path: pathlib.Path,
     npm_packages: NpmBuildOutput,
     features: Mapping[str, Sequence[str]] | None = None,
 ):
@@ -668,6 +677,7 @@ def copy_extension(extension_uuid, extension_dir_name):
         linux_tauri_config(
             cli_path=cli_path,
             pty_path=pty_path,
+            chat_path=chat_path,
             dashboard_path=npm_packages.dashboard_path,
             autocomplete_path=npm_packages.autocomplete_path,
             vscode_path=npm_packages.vscode_path,
@@ -703,6 +713,7 @@ def copy_extension(extension_uuid, extension_dir_name):
     deb_resources = LinuxDebResources(
         cli_path=cli_path,
         pty_path=pty_path,
+        chat_path=chat_path,
         desktop_path=desktop_path,
         themes_path=themes_path,
         legacy_extension_dir_path=legacy_extension_dir_path,
@@ -846,6 +857,16 @@ def build(
             targets=targets,
         )
 
+        info("Building", CHAT_PACKAGE_NAME)
+        chat_path = build_cargo_bin(
+            variant=variant,
+            release=release,
+            package=CHAT_PACKAGE_NAME,
+            output_name=CHAT_BINARY_NAME,
+            features=cargo_features,
+            targets=targets,
+        )
+
         info("Building", PTY_PACKAGE_NAME)
         pty_path = build_cargo_bin(
             variant=variant,
@@ -864,6 +885,7 @@ def build(
             build_paths = build_macos_desktop_app(
                 release=release,
                 cli_path=cli_path,
+                chat_path=chat_path,
                 pty_path=pty_path,
                 npm_packages=npm_packages,
                 signing_data=signing_data,
@@ -889,6 +911,7 @@ def build(
                     release=release,
                     cli_path=cli_path,
                     pty_path=pty_path,
+                    chat_path=chat_path,
                     npm_packages=npm_packages,
                     features=cargo_features,
                 )

build-scripts/build.py

@@ -3,6 +3,7 @@
 
 APP_NAME = "Amazon Q"
 CLI_BINARY_NAME = "q"
+CHAT_BINARY_NAME = "qchat"
 PTY_BINARY_NAME = "qterm"
 DESKTOP_BINARY_NAME = "q-desktop"
 URL_SCHEMA = "q"
@@ -20,6 +21,7 @@
 
 # cargo packages
 CLI_PACKAGE_NAME = "q_cli"
+CHAT_PACKAGE_NAME = "chat_cli"
 PTY_PACKAGE_NAME = "figterm"
 DESKTOP_PACKAGE_NAME = "fig_desktop"
 DESKTOP_FUZZ_PACKAGE_NAME = "fig_desktop-fuzz"

build-scripts/const.py

@@ -64,6 +64,10 @@ def app_manifest():
                 path="Contents/MacOS/qterm",
                 identifier="com.amazon.qterm",
             ),
+            EmbeddedRequirement(
+                path="Contents/MacOS/qchat",
+                identifier="com.amazon.qchat",
+            ),
         ],
     )
 

build-scripts/manifest.py

@@ -137,6 +137,7 @@ fi
 
 if [ -n "${Q_INSTALL_GLOBAL:-}" ]; then
     install -m 755 "$SCRIPT_DIR/bin/q" /usr/local/bin/
+    install -m 755 "$SCRIPT_DIR/bin/qchat" /usr/local/bin/
     install -m 755 "$SCRIPT_DIR/bin/qterm" /usr/local/bin/
 
     /usr/local/bin/q integrations install dotfiles
@@ -145,6 +146,7 @@ else
     mkdir -p "$HOME/.local/bin"
 
     install -m 755 "$SCRIPT_DIR/bin/q" "$HOME/.local/bin/"
+    install -m 755 "$SCRIPT_DIR/bin/qchat" "$HOME/.local/bin/"
     install -m 755 "$SCRIPT_DIR/bin/qterm" "$HOME/.local/bin/"
 
     "$HOME/.local/bin/q" setup "$@"

bundle/linux/install.sh

@@ -11,14 +11,10 @@
 
 [package]
 edition = "2021"
-name = "amzn-toolkit-telemetry"
+name = "amzn-toolkit-telemetry-client"
 version = "1.0.0"
 authors = ["Grant Gurvis <[email protected]>"]
-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"]