style: simplify studio accept/discard output messages

- Change verbose emoji messages to minimal format
- Print '> session <id> ...' first, then status after operation completes
- 'merged' shown in bold green
- 'discarded' shown in bold yellow
This commit is contained in:
Dhanji R. Prasanna
2026-01-16 07:08:55 +05:30
parent 01cb4f6691
commit ef5aa75e6b

View File

@@ -465,20 +465,21 @@ fn cmd_accept(session_id: &str) -> Result<()> {
let worktree = GitWorktree::new(&repo_root);
let branch_name = session.branch_name();
println!("🔀 Merging {} to main...", branch_name);
// Print status line without newline, then complete after operations
use std::io::Write;
print!("> session {} ... ", session_id);
std::io::stdout().flush().ok();
// Merge the branch to main
worktree.merge_to_main(&branch_name)?;
println!("🧹 Cleaning up worktree and branch...");
// Remove worktree and branch
worktree.remove(&session)?;
// Remove session metadata
session.delete(&repo_root)?;
println!("✅ Session {} accepted and merged to main", session_id);
println!("[\x1b[1;32mmerged\x1b[0m]");
Ok(())
}
@@ -499,7 +500,10 @@ fn cmd_discard(session_id: &str) -> Result<()> {
let worktree = GitWorktree::new(&repo_root);
println!("🗑️ Discarding session {}...", session_id);
// Print status line without newline, then complete after operations
use std::io::Write;
print!("> session {} ... ", session_id);
std::io::stdout().flush().ok();
// Remove worktree and branch
worktree.remove(&session)?;
@@ -507,7 +511,7 @@ fn cmd_discard(session_id: &str) -> Result<()> {
// Remove session metadata
session.delete(&repo_root)?;
println!("✅ Session {} discarded", session_id);
println!("[\x1b[1;33mdiscarded\x1b[0m]");
Ok(())
}