dgf1988/codewhale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: address review comments on engine.rs

Browse Source 
1. Replace let-else with if-let-Some to avoid compilation error
   - let-else with return would return from the entire function
   - if-let-Some correctly assigns to tool_registry and continues

2. Preserve original goal_objective_for_prompt behavior
   - Return None (not fallback) when objective exists but goal is inactive
   - Use state.is_active().then() to match original semantics
This commit is contained in:
huqiantao
2026-06-07 19:33:52 +08:00
parent ef4dc5ca61
commit eb3a989eeb
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/tui/src/core/engine.rs
+15 -14
View File
@@ -1708,18 +1708,19 @@ In {new} mode: {policy}\n\n\
} else {
None
};
let Some(subagent_runtime) = runtime else {
if let Some(subagent_runtime) = runtime {
Some(
builder
.with_subagent_tools(
self.subagent_manager.clone(),
subagent_runtime,
)
.build(tool_context),
)
} else {
tracing::warn!("Sub-agents enabled but no API client available, falling back to basic tool set");
return Some(builder.build(tool_context));
};
Some(
builder
.with_subagent_tools(
self.subagent_manager.clone(),
subagent_runtime,
)
.build(tool_context),
)
Some(builder.build(tool_context))
}
} else {
Some(builder.build(tool_context))
}
@@ -2537,9 +2538,9 @@ fn goal_objective_for_prompt(
match goal_state.lock() {
Ok(state) => {
if let Some(objective) = state.objective() {
if state.is_active() {
return Some(objective.to_string());
}
// Preserve original behavior: return None (not fallback) when
// objective exists but goal is inactive.
return state.is_active().then(|| objective.to_string());
}
}
Err(err) => tracing::warn!("goal state lock poisoned while building prompt: {err}"),