Skip to content

Commit 51d0245

Browse files
chore: move RTS code from agent crate to chat-cli (#3340)
1 parent b364bf0 commit 51d0245

File tree

20 files changed

+1249
-245
lines changed

20 files changed

+1249
-245
lines changed

.github/workflows/rust.yml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -75,46 +75,46 @@ jobs:
7575
- name: Run tests
7676
run: cargo test --locked --workspace --lib --bins --test '*' --exclude fig_desktop-fuzz
7777

78-
cargo-clippy-windows-chat-cli:
79-
name: Clippy Windows (chat_cli)
80-
runs-on: windows-latest
81-
timeout-minutes: 60
82-
steps:
83-
- uses: actions/checkout@v4
84-
- uses: dtolnay/[email protected]
85-
id: toolchain
86-
with:
87-
components: clippy
88-
- uses: actions/cache@v4
89-
with:
90-
path: |
91-
~/.cargo/registry/index/
92-
~/.cargo/registry/cache/
93-
~/.cargo/git/db/
94-
target/
95-
key: cargo-clippy-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
96-
- run: cargo clippy --locked -p chat_cli --color always -- -D warnings
78+
# cargo-clippy-windows-chat-cli:
79+
# name: Clippy Windows (chat_cli)
80+
# runs-on: windows-latest
81+
# timeout-minutes: 60
82+
# steps:
83+
# - uses: actions/checkout@v4
84+
# - uses: dtolnay/[email protected]
85+
# id: toolchain
86+
# with:
87+
# components: clippy
88+
# - uses: actions/cache@v4
89+
# with:
90+
# path: |
91+
# ~/.cargo/registry/index/
92+
# ~/.cargo/registry/cache/
93+
# ~/.cargo/git/db/
94+
# target/
95+
# key: cargo-clippy-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
96+
# - run: cargo clippy --locked -p chat_cli --color always -- -D warnings
9797

98-
cargo-test-windows-chat-cli:
99-
name: Test Windows (chat_cli)
100-
runs-on: windows-latest
101-
timeout-minutes: 60
102-
steps:
103-
- uses: actions/checkout@v4
104-
- uses: dtolnay/rust-toolchain@nightly
105-
id: toolchain
106-
with:
107-
components: llvm-tools-preview
108-
- uses: actions/cache@v4
109-
with:
110-
path: |
111-
~/.cargo/registry/index/
112-
~/.cargo/registry/cache/
113-
~/.cargo/git/db/
114-
target/
115-
key: cargo-test-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
116-
- name: Run tests
117-
run: cargo test --locked -p chat_cli
98+
# cargo-test-windows-chat-cli:
99+
# name: Test Windows (chat_cli)
100+
# runs-on: windows-latest
101+
# timeout-minutes: 60
102+
# steps:
103+
# - uses: actions/checkout@v4
104+
# - uses: dtolnay/rust-toolchain@nightly
105+
# id: toolchain
106+
# with:
107+
# components: llvm-tools-preview
108+
# - uses: actions/cache@v4
109+
# with:
110+
# path: |
111+
# ~/.cargo/registry/index/
112+
# ~/.cargo/registry/cache/
113+
# ~/.cargo/git/db/
114+
# target/
115+
# key: cargo-test-windows-chat-cli-${{ hashFiles('**/Cargo.lock') }}-${{ steps.toolchain.outputs.cachekey }}
116+
# - name: Run tests
117+
# run: cargo test --locked -p chat_cli
118118

119119
cargo-fmt:
120120
name: Fmt

Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ version = "1.19.3"
1212
license = "MIT OR Apache-2.0"
1313

1414
[workspace.dependencies]
15+
agent = { path = "crates/agent" }
1516
amzn-codewhisperer-client = { path = "crates/amzn-codewhisperer-client" }
1617
amzn-codewhisperer-streaming-client = { path = "crates/amzn-codewhisperer-streaming-client" }
1718
amzn-consolas-client = { path = "crates/amzn-consolas-client" }
@@ -112,6 +113,7 @@ tempfile = "3.18.0"
112113
thiserror = "2.0.12"
113114
time = { version = "0.3.39", features = ["parsing", "formatting", "local-offset", "macros", "serde"] }
114115
tokio = { version = "1.45.0", features = ["full"] }
116+
tokio-stream = { version = "0.1.17", features = ["io-util"] }
115117
tokio-tungstenite = "0.26.2"
116118
tokio-util = { version = "0.7.15", features = ["codec", "compat"] }
117119
toml = "0.8.12"

crates/agent/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ tempfile.workspace = true
6969
thiserror.workspace = true
7070
time.workspace = true
7171
tokio.workspace = true
72-
tokio-stream = { version = "0.1.17", features = ["io-util"] }
72+
tokio-stream.workspace = true
7373
tokio-util.workspace = true
7474
tracing.workspace = true
7575
tracing-appender = "0.2.3"

crates/chat-cli/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ default = []
1616
wayland = ["arboard/wayland-data-control"]
1717

1818
[dependencies]
19+
agent.workspace = true
1920
amzn-codewhisperer-client.workspace = true
2021
amzn-codewhisperer-streaming-client.workspace = true
2122
amzn-consolas-client.workspace = true
@@ -102,6 +103,7 @@ tempfile.workspace = true
102103
thiserror.workspace = true
103104
time.workspace = true
104105
tokio.workspace = true
106+
tokio-stream.workspace = true
105107
tokio-tungstenite.workspace = true
106108
tokio-util.workspace = true
107109
toml.workspace = true

crates/chat-cli/src/agent/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mod rts;

0 commit comments

Comments
 (0)