Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
target/
.env
logs.claude/worktrees/
logs
.claude/worktrees/
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resolver = "2"

[package]
name = "sheesh-rs"
version = "1.0.5"
version = "1.0.6"
edition = "2024"

[dependencies]
Expand All @@ -25,4 +25,4 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
toml = "0.8"

sheesh-tools = { path = "crates/sheesh-tools" }
sheesh-tools = { path = "crates/sheesh-tools" }
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,9 @@ fn main() -> anyhow::Result<()> {
}
let silence = now.duration_since(cap.last_change);
let has_output = cap.last_line_count > cap.snapshot;
// Wait for output to appear, then stabilise for 300 ms.
// Wait for output to appear, then stabilise for 1100 ms.
// If the command produces no output at all, fire after 5 s.
(has_output && silence >= Duration::from_millis(300))
(has_output && silence >= Duration::from_millis(1100))
|| (!has_output && silence >= Duration::from_secs(5))
} else {
false
Expand Down
6 changes: 5 additions & 1 deletion src/tabs/llm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,12 @@ impl LLMTab {
/// Cancel any in-progress tool call and return to an idle state so the
/// user can type a new message.
pub fn cancel_tool_call(&mut self) {
// If the tool call was already confirmed (assistant blocks pushed to rich_history),
// we must add a tool_result to avoid sending an orphaned tool_use to the API.
if let Some(id) = self.awaiting_output_id.take() {
self.rich_history.push(RichMessage::tool_result(&id, "User cancelled the command before output was captured."));
}
self.pending_tool_call = None;
self.awaiting_output_id = None;
self.waiting = false;
self.status = "Tool call cancelled.".into();
self.history.push(Message::assistant("[tool call cancelled by user]".to_string()));
Expand Down
Loading