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
13 changes: 8 additions & 5 deletions crates/jp_cli/src/cmd/conversation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,35 @@ impl Conversation {
#[derive(Debug, clap::Subcommand)]
enum Commands {
/// Remove conversations.
#[command(name = "rm")]
#[command(name = "rm", aliases = ["remove", "rem", "delete", "del"])]
Remove(rm::Rm),

/// List conversations.
#[command(name = "ls")]
#[command(name = "ls", alias = "list", visible_alias = "l")]
List(ls::Ls),

/// Show conversation details.
#[command(name = "show")]
#[command(name = "show", visible_alias = "s")]
Show(show::Show),

/// Set the active conversation.
#[command(name = "use")]
#[command(name = "use", visible_alias = "u")]
Use(use_::Use),

/// Edit conversation details.
#[command(name = "edit")]
#[command(name = "edit", visible_alias = "e")]
Edit(edit::Edit),

/// Fork a conversation.
#[command(name = "fork", visible_alias = "f")]
Fork(fork::Fork),

/// Search through conversation history.
#[command(name = "grep", alias = "rg", visible_alias = "g")]
Grep(grep::Grep),

/// Print conversation history to the terminal.
#[command(name = "print", visible_alias = "p")]
Print(print::Print),
// /// Merge a conversation.
// Merge(merge::Merge),
Expand Down
2 changes: 1 addition & 1 deletion crates/jp_cli/src/cmd/query/tool/coordinator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ impl ToolCoordinator {
"Tool question received, routing to target",
);

if is_tty && target == QuestionTarget::User {
if is_tty && target.is_user() {
if *prompt_active {
pending_prompts.push_back(PendingPrompt::Question { index, question });
} else {
Expand Down
Loading