feat: support $ARGUMENTS and positional argument substitution for prompts

.github/workflows/rust.yml

@@ -75,46 +75,46 @@ jobs:
       - name: Run tests
         run: cargo test --locked --workspace --lib --bins --test '*' --exclude fig_desktop-fuzz
 
-  cargo-clippy-windows-chat-cli:
-    name: Clippy Windows (chat_cli)
-    runs-on: windows-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/[email protected]
-        id: toolchain
-        with:
-          components: clippy
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: cargo-clippy-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
-      - run: cargo clippy --locked -p chat_cli --color always -- -D warnings
+  # cargo-clippy-windows-chat-cli:
+  #   name: Clippy Windows (chat_cli)
+  #   runs-on: windows-latest
+  #   timeout-minutes: 60
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: dtolnay/[email protected]
+  #       id: toolchain
+  #       with:
+  #         components: clippy
+  #     - uses: actions/cache@v4
+  #       with:
+  #         path: |
+  #           ~/.cargo/registry/index/
+  #           ~/.cargo/registry/cache/
+  #           ~/.cargo/git/db/
+  #           target/
+  #         key: cargo-clippy-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
+  #     - run: cargo clippy --locked -p chat_cli --color always -- -D warnings
 
-  cargo-test-windows-chat-cli:
-    name: Test Windows (chat_cli)
-    runs-on: windows-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
-        id: toolchain
-        with:
-          components: llvm-tools-preview
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: cargo-test-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
-      - name: Run tests
-        run: cargo test --locked -p chat_cli
+  # cargo-test-windows-chat-cli:
+  #   name: Test Windows (chat_cli)
+  #   runs-on: windows-latest
+  #   timeout-minutes: 60
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: dtolnay/rust-toolchain@nightly
+  #       id: toolchain
+  #       with:
+  #         components: llvm-tools-preview
+  #     - uses: actions/cache@v4
+  #       with:
+  #         path: |
+  #           ~/.cargo/registry/index/
+  #           ~/.cargo/registry/cache/
+  #           ~/.cargo/git/db/
+  #           target/
+  #         key: cargo-test-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
+  #     - name: Run tests
+  #       run: cargo test --locked -p chat_cli
 
   cargo-fmt:
     name: Fmt

.gitignore

@@ -49,3 +49,4 @@ book/
 .env*
 
 run-build.sh
+.amazonq/

Cargo.toml

@@ -1,17 +1,18 @@
 [workspace]
 resolver = "3"
-members = ["crates/amzn-codewhisperer-client", "crates/amzn-codewhisperer-streaming-client", "crates/amzn-consolas-client", "crates/amzn-qdeveloper-streaming-client", "crates/amzn-toolkit-telemetry-client", "crates/aws-toolkit-telemetry-definitions", "crates/chat-cli", "crates/semantic-search-client", "crates/chat-cli-ui"]
+members = ["crates/amzn-codewhisperer-client", "crates/amzn-codewhisperer-streaming-client", "crates/amzn-consolas-client", "crates/amzn-qdeveloper-streaming-client", "crates/amzn-toolkit-telemetry-client", "crates/aws-toolkit-telemetry-definitions", "crates/chat-cli", "crates/semantic-search-client", "crates/chat-cli-ui", "crates/agent"]
 default-members = ["crates/chat-cli"]
 
 [workspace.package]
 authors = ["Amazon Q CLI Team ([email protected])", "Chay Nabors ([email protected])", "Brandon Kiser ([email protected])", "Felix Ding ([email protected])"]
 edition = "2024"
 homepage = "https://aws.amazon.com/q/"
 publish = false
-version = "1.19.0"
+version = "1.19.3"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
+agent = { path = "crates/agent" }
 amzn-codewhisperer-client = { path = "crates/amzn-codewhisperer-client" }
 amzn-codewhisperer-streaming-client = { path = "crates/amzn-codewhisperer-streaming-client" }
 amzn-consolas-client = { path = "crates/amzn-consolas-client" }
@@ -112,6 +113,7 @@ tempfile = "3.18.0"
 thiserror = "2.0.12"
 time = { version = "0.3.39", features = ["parsing", "formatting", "local-offset", "macros", "serde"] }
 tokio = { version = "1.45.0", features = ["full"] }
+tokio-stream = { version = "0.1.17", features = ["io-util"] }
 tokio-tungstenite = "0.26.2"
 tokio-util = { version = "0.7.15", features = ["codec", "compat"] }
 toml = "0.8.12"
@@ -217,6 +219,3 @@ opt-level = 3
 
 [profile.dev.package.similar]
 opt-level = 3
-
-[profile.dev.package.backtrace]
-opt-level = 3

build-config/buildspec-linux.yml

@@ -22,7 +22,7 @@ phases:
       - . "$HOME/.cargo/env"
       - rustup toolchain install `cat rust-toolchain.toml | grep channel | cut -d '=' -f2 | tr -d ' "'`
       # Install cross only if the musl env var is set and not null
-      - if [ ! -z "${AMAZON_Q_BUILD_MUSL:+x}" ]; then cargo install cross --git https://github.com/cross-rs/cross; fi
+      - if [ ! -z "${AMAZON_Q_BUILD_MUSL:+x}" ]; then cargo install cross --git https://github.com/cross-rs/cross --locked; fi
       # Install python/node via mise (https://mise.jdx.dev/continuous-integration.html)
       - curl --retry 5 --proto '=https' --tlsv1.2 -sSf https://mise.run | sh
       - mise install

crates/agent/Cargo.toml

@@ -0,0 +1,98 @@
+[package]
+name = "agent"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+publish.workspace = true
+version.workspace = true
+license.workspace = true
+
+[dependencies]
+amzn-codewhisperer-client.workspace = true
+amzn-codewhisperer-streaming-client.workspace = true
+amzn-consolas-client.workspace = true
+amzn-qdeveloper-streaming-client.workspace = true
+anstream.workspace = true
+async-trait.workspace = true
+aws-config.workspace = true
+aws-credential-types.workspace = true
+aws-runtime.workspace = true
+aws-sdk-cognitoidentity.workspace = true
+aws-sdk-ssooidc.workspace = true
+aws-smithy-async.workspace = true
+aws-smithy-runtime-api.workspace = true
+aws-smithy-types.workspace = true
+aws-types.workspace = true
+base64.workspace = true
+bstr.workspace = true
+bytes.workspace = true
+cfg-if.workspace = true
+chrono.workspace = true
+clap = { workspace = true, features = ["derive"] }
+color-eyre = "0.6.5"
+color-print.workspace = true
+crossterm.workspace = true
+dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
+dirs.workspace = true
+eyre.workspace = true
+fd-lock = "4.0.4"
+futures.workspace = true
+glob.workspace = true
+globset.workspace = true
+http.workspace = true
+http-body-util.workspace = true
+hyper.workspace = true
+hyper-util.workspace = true
+libc.workspace = true
+percent-encoding.workspace = true
+pin-project-lite = "0.2.16"
+r2d2.workspace = true
+r2d2_sqlite.workspace = true
+rand.workspace = true
+regex.workspace = true
+reqwest.workspace = true
+rmcp = { version = "0.8.0", features = ["client", "transport-async-rw", "transport-child-process", "transport-io"] }
+rusqlite.workspace = true
+rustls.workspace = true
+rustls-native-certs.workspace = true
+schemars = "1.0.4"
+semver.workspace = true
+serde.workspace = true
+serde_bytes = "0.11.19"
+serde_json.workspace = true
+sha2.workspace = true
+shellexpand.workspace = true
+strum.workspace = true
+syntect = "5.2.0"
+sysinfo.workspace = true
+tempfile.workspace = true
+thiserror.workspace = true
+time.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tokio-util.workspace = true
+tracing.workspace = true
+tracing-appender = "0.2.3"
+tracing-subscriber.workspace = true
+url.workspace = true
+uuid.workspace = true
+webpki-roots.workspace = true
+whoami.workspace = true
+
+[target.'cfg(target_os = "macos")'.dependencies]
+objc2.workspace = true
+objc2-app-kit.workspace = true
+objc2-foundation.workspace = true
+
+[dev-dependencies]
+assert_cmd.workspace = true
+criterion.workspace = true
+insta.workspace = true
+mockito.workspace = true
+paste.workspace = true
+predicates.workspace = true
+tracing-test.workspace = true
+
+[lints]
+workspace = true
+