From ef5aa75e6b32bbf5ee23691659b19195bc06440e Mon Sep 17 00:00:00 2001 From: "Dhanji R. Prasanna" Date: Fri, 16 Jan 2026 07:08:55 +0530 Subject: [PATCH] style: simplify studio accept/discard output messages - Change verbose emoji messages to minimal format - Print '> session ...' first, then status after operation completes - 'merged' shown in bold green - 'discarded' shown in bold yellow --- crates/studio/src/main.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/crates/studio/src/main.rs b/crates/studio/src/main.rs index 24194c1..504fc34 100644 --- a/crates/studio/src/main.rs +++ b/crates/studio/src/main.rs @@ -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(()) }