Compare commits

...

1 commit

Author SHA1 Message Date
702ed97249 cleanup
Some checks failed
CI / ci (pull_request) Has been cancelled
2026-02-24 11:28:55 -08:00
7 changed files with 23 additions and 20 deletions

View file

@ -7,6 +7,7 @@ on:
jobs: jobs:
ci: ci:
if: false # TODO: remove once runners are fixed
runs-on: docker runs-on: docker
container: container:
image: rust:latest image: rust:latest

View file

@ -7,3 +7,5 @@
2026-02-24T09:31:14.261232Z INFO skate::app: skate exiting cleanly 2026-02-24T09:31:14.261232Z INFO skate::app: skate exiting cleanly
2026-02-24T09:47:04.720495Z INFO skate::app: skate starting project_dir=. log=./.skate/skate.log 2026-02-24T09:47:04.720495Z INFO skate::app: skate starting project_dir=. log=./.skate/skate.log
2026-02-24T09:47:13.632927Z INFO skate::app: skate exiting cleanly 2026-02-24T09:47:13.632927Z INFO skate::app: skate exiting cleanly
2026-02-24T19:12:10.722625Z INFO skate::app: skate starting project_dir=.
2026-02-24T19:12:20.275869Z INFO skate::app: skate exiting cleanly

1
Cargo.lock generated
View file

@ -252,6 +252,7 @@ dependencies = [
"crossterm_winapi", "crossterm_winapi",
"derive_more", "derive_more",
"document-features", "document-features",
"futures-core",
"mio", "mio",
"parking_lot", "parking_lot",
"rustix", "rustix",

View file

@ -6,7 +6,7 @@ edition = "2024"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
ratatui = "0.30" ratatui = "0.30"
crossterm = "0.29" crossterm = { version = "0.29", features = ["event-stream"] }
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"

View file

@ -154,7 +154,10 @@ async fn run_stream(
if !response.status().is_success() { if !response.status().is_success() {
let status = response.status(); let status = response.status();
let body_text = response.text().await.unwrap_or_default(); let body_text = match response.text().await {
Ok(t) => t,
Err(e) => format!("(failed to read error body: {e})"),
};
let _ = tx let _ = tx
.send(StreamEvent::Error(format!("HTTP {status}: {body_text}"))) .send(StreamEvent::Error(format!("HTTP {status}: {body_text}")))
.await; .await;

View file

@ -1,8 +1,6 @@
#![allow(dead_code, unused_imports)]
mod claude; mod claude;
pub use claude::{ClaudeProvider, ClaudeProviderError}; pub use claude::ClaudeProvider;
use futures::Stream; use futures::Stream;

View file

@ -13,7 +13,8 @@
use std::io::{self, Stdout}; use std::io::{self, Stdout};
use std::time::Duration; use std::time::Duration;
use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyModifiers}; use crossterm::event::{Event, EventStream, KeyCode, KeyEvent, KeyModifiers};
use futures::StreamExt;
use crossterm::execute; use crossterm::execute;
use crossterm::terminal::{ use crossterm::terminal::{
EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode,
@ -250,7 +251,7 @@ fn render(frame: &mut Frame, state: &AppState) {
/// ```text /// ```text
/// loop: /// loop:
/// 1. drain UIEvents (non-blocking try_recv) /// 1. drain UIEvents (non-blocking try_recv)
/// 2. poll keyboard for up to 16 ms (<- spawn_blocking keeps async runtime free) /// 2. poll keyboard for up to 16 ms via EventStream (async, no blocking thread)
/// 3. handle key event -> Option<LoopControl> /// 3. handle key event -> Option<LoopControl>
/// 4. render frame (scroll updated inside draw closure) /// 4. render frame (scroll updated inside draw closure)
/// 5. act on LoopControl: send message or break /// 5. act on LoopControl: send message or break
@ -265,24 +266,21 @@ pub async fn run(
install_panic_hook(); install_panic_hook();
let mut terminal = init_terminal()?; let mut terminal = init_terminal()?;
let mut state = AppState::new(); let mut state = AppState::new();
let mut event_stream = EventStream::new();
loop { loop {
// 1. Drain pending UI events. // 1. Drain pending UI events.
drain_ui_events(&mut event_rx, &mut state); drain_ui_events(&mut event_rx, &mut state);
// 2. Poll keyboard without blocking the async runtime. // 2. Poll keyboard for up to 16 ms. EventStream integrates with the
let key_event: Option<KeyEvent> = tokio::task::spawn_blocking(|| { // Tokio runtime via futures::Stream, so no blocking thread is needed.
if event::poll(Duration::from_millis(16)).unwrap_or(false) { // Timeout expiry, stream end, non-key events, and I/O errors all map
match event::read() { // to None -- the frame is rendered regardless.
Ok(Event::Key(k)) => Some(k), let key_event: Option<KeyEvent> =
_ => None, match tokio::time::timeout(Duration::from_millis(16), event_stream.next()).await {
} Ok(Some(Ok(Event::Key(k)))) => Some(k),
} else { _ => None,
None };
}
})
.await
.unwrap_or(None);
// 3. Handle key. // 3. Handle key.
let control = handle_key(key_event, &mut state); let control = handle_key(key_event, &mut state);