eeymoo/claw-code
1
0
Fork 0
mirror of https://github.com/instructkr/claw-code.git synced 2026-04-09 09:34:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve merge conflicts from batch 5 cherry-picks (compact field, run_turn_with_output arity)

Browse Source
This commit is contained in:
YeonGyu-Kim
2026-04-07 14:53:46 +09:00
parent 90f2461f75
commit 8663751650
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rust/crates/rusty-claude-cli/src/main.rs
View File

@@ -196,11 +196,12 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
output_format, output_format,
allowed_tools, allowed_tools,
permission_mode, permission_mode,
compact: _,
} => { } => {
let stdin_context = read_piped_stdin(); let stdin_context = read_piped_stdin();
let effective_prompt = merge_prompt_with_stdin(&prompt, stdin_context.as_deref()); let effective_prompt = merge_prompt_with_stdin(&prompt, stdin_context.as_deref());
LiveCli::new(model, true, allowed_tools, permission_mode)? 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::Login { output_format } => run_login(output_format)?,
CliAction::Logout { output_format } => run_logout(output_format)?, CliAction::Logout { output_format } => run_logout(output_format)?,