From 86637516508a2858356d8b0c095f777960f4b65a Mon Sep 17 00:00:00 2001 From: YeonGyu-Kim Date: Tue, 7 Apr 2026 14:53:46 +0900 Subject: [PATCH] fix: resolve merge conflicts from batch 5 cherry-picks (compact field, run_turn_with_output arity) --- rust/crates/rusty-claude-cli/src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rust/crates/rusty-claude-cli/src/main.rs b/rust/crates/rusty-claude-cli/src/main.rs index 2593679..447c45c 100644 --- a/rust/crates/rusty-claude-cli/src/main.rs +++ b/rust/crates/rusty-claude-cli/src/main.rs @@ -196,11 +196,12 @@ fn run() -> Result<(), Box> { output_format, allowed_tools, permission_mode, + compact: _, } => { let stdin_context = read_piped_stdin(); let effective_prompt = merge_prompt_with_stdin(&prompt, stdin_context.as_deref()); LiveCli::new(model, true, allowed_tools, permission_mode)? - .run_turn_with_output(&effective_prompt, output_format)?; + .run_turn_with_output(&effective_prompt, output_format, false)?; } CliAction::Login { output_format } => run_login(output_format)?, CliAction::Logout { output_format } => run_logout(output_format)?,