alex/g3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(cli): extract execute_user_input() to eliminate duplication

Browse Source 
Both multiline and single-line input paths in interactive.rs had identical
code for:
- Template processing (process_template)
- Task execution (execute_task_with_retry)
- Auto-memory reminder with error handling

Extracted to a single execute_user_input() helper function that handles
all three steps. This eliminates code-path aliasing where the two paths
could drift over time.

File reduced from 401 to 393 lines (-2%).
All 106 g3-cli tests pass.

Agent: fowler
This commit is contained in:
Dhanji R. Prasanna
2026-01-26 15:59:55 +11:00
parent 57f04a77aa
commit d6a986ce0f
1 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
crates/g3-cli/src/interactive.rs
View File

@@ -44,6 +44,28 @@ pub fn build_prompt(in_multiline: bool, agent_name: Option<&str>, active_project
}
}
/// Execute user input with template processing and auto-memory reminder.
///
/// This is the common path for both single-line and multiline input.
async fn execute_user_input<W: UiWriter>(
agent: &mut Agent<W>,
input: &str,
show_prompt: bool,
show_code: bool,
output: &SimpleOutput,
skip_auto_memory: bool,
) {
let processed_input = process_template(input);
execute_task_with_retry(agent, &processed_input, show_prompt, show_code, output).await;
// Send auto-memory reminder if enabled and tools were called
if !skip_auto_memory {
if let Err(e) = agent.send_auto_memory_reminder().await {
debug!("Auto-memory reminder failed: {}", e);
}
}
}
/// Run interactive mode with console output.
/// If `agent_name` is Some, we're in agent+chat mode: skip session resume/verbose welcome,
/// and use the agent name as the prompt (e.g., "butler>").
@@ -210,24 +232,9 @@ pub async fn run_interactive<W: UiWriter>(
break;
}
// Process the multiline input (with template expansion)
let processed_input = process_template(&input);
execute_task_with_retry(
&mut agent,
&processed_input,
show_prompt,
show_code,
&output,
)
.await;
// Send auto-memory reminder if enabled and tools were called
// Skip per-turn reminders when from_agent_mode - we'll send once on exit
if !from_agent_mode {
if let Err(e) = agent.send_auto_memory_reminder().await {
debug!("Auto-memory reminder failed: {}", e);
}
}
execute_user_input(
&mut agent, &input, show_prompt, show_code, &output, from_agent_mode
).await;
} else {
// Single line input
let input = line.trim().to_string();
@@ -250,24 +257,9 @@ pub async fn run_interactive<W: UiWriter>(
}
}
// Process the single line input (with template expansion)
let processed_input = process_template(&input);
execute_task_with_retry(
&mut agent,
&processed_input,
show_prompt,
show_code,
&output,
)
.await;
// Send auto-memory reminder if enabled and tools were called
// Skip per-turn reminders when from_agent_mode - we'll send once on exit
if !from_agent_mode {
if let Err(e) = agent.send_auto_memory_reminder().await {
debug!("Auto-memory reminder failed: {}", e);
}
}
execute_user_input(
&mut agent, &input, show_prompt, show_code, &output, from_agent_mode
).await;
}
}
Err(ReadlineError::Interrupted) => {