mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-09-01 09:09:19 +00:00
perf: build system prompt once per turn, skip tools on force-text (#583)
* perf: build system prompt once per turn, skip tools on force-text, fix nudge role (#565) Three fixes to agentic loop prompt handling: 1. Build system prompt once per turn instead of every tool iteration. `build_system_prompt_with_tools` is now pub; callers pass the result via `ReasoningContext::system_prompt` to avoid rebuilding ~1,500 tokens per iteration. 2. Skip `## Available Tools` section when `force_text = true`. The dispatcher passes a no-tools prompt variant on the final iteration, saving ~460 tokens and removing misleading instructions. 3. Change nudge message from `Role::System` to `Role::User`. A second system message mid-conversation is unsupported by most providers. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> * fix: revert nudge role change to keep ChatMessage::system Copilot review correctly identified that using Role::User for the nudge breaks compact_messages_for_retry, which uses rposition for Role::User to find the last real user message. Role::Assistant would cause back-to-back assistant messages. Since no production issues were reported with the original system role, revert to ChatMessage::system. [skip-regression-check] Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> * fix: address PR review — omit tool guidance when tools empty, rename shadowed var - Conditionalize "Call tools…" guidelines and "## Tool Call Style" section in the system prompt so they are only included when tools are non-empty. Previously the force-text (no-tools) prompt still contained misleading tool-calling instructions. (Copilot review comment) - Rename `system_prompt` → `cached_prompt` in dispatcher to avoid shadowing the earlier workspace identity `system_prompt` variable. (Copilot review) - Add regression tests: `test_system_prompt_with_tools_contains_tool_guidance` and extended assertions in `test_system_prompt_without_tools_omits_tools_section`. Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]> Co-authored-by: [email protected] <[email protected]>
This commit is contained in:
+19
-19
@@ -10,9 +10,19 @@ mod support;
|
||||
mod tests {
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::support::cleanup::CleanupGuard;
|
||||
use crate::support::test_rig::TestRigBuilder;
|
||||
use crate::support::trace_llm::LlmTrace;
|
||||
|
||||
const TEST_DIR_BASE: &str = "/tmp/ironclaw_coverage_test";
|
||||
|
||||
fn setup_test_dir(suffix: &str) -> String {
|
||||
let dir = format!("{TEST_DIR_BASE}_{suffix}");
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
std::fs::create_dir_all(&dir).expect("failed to create test directory");
|
||||
dir
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// json tool
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -84,21 +94,16 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_list_dir() {
|
||||
let tmp = tempfile::tempdir().expect("failed to create tempdir");
|
||||
let test_dir = tmp.path().join("test_dir");
|
||||
std::fs::create_dir_all(&test_dir).unwrap();
|
||||
std::fs::write(test_dir.join("file_a.txt"), "content a").unwrap();
|
||||
std::fs::write(test_dir.join("file_b.txt"), "content b").unwrap();
|
||||
let test_dir = setup_test_dir("list_dir");
|
||||
let _cleanup = CleanupGuard::new().dir(&test_dir);
|
||||
std::fs::write(format!("{test_dir}/file_a.txt"), "content a").unwrap();
|
||||
std::fs::write(format!("{test_dir}/file_b.txt"), "content b").unwrap();
|
||||
|
||||
let mut trace = LlmTrace::from_file(concat!(
|
||||
let trace = LlmTrace::from_file(concat!(
|
||||
env!("CARGO_MANIFEST_DIR"),
|
||||
"/tests/fixtures/llm_traces/coverage/list_dir.json"
|
||||
))
|
||||
.expect("failed to load list_dir.json");
|
||||
trace.replace_paths(
|
||||
"/tmp/ironclaw_coverage_test_list_dir",
|
||||
test_dir.to_str().unwrap(),
|
||||
);
|
||||
|
||||
let rig = TestRigBuilder::new()
|
||||
.with_trace(trace.clone())
|
||||
@@ -118,19 +123,14 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_apply_patch_chain() {
|
||||
let tmp = tempfile::tempdir().expect("failed to create tempdir");
|
||||
let test_dir = tmp.path().join("test_dir");
|
||||
std::fs::create_dir_all(&test_dir).unwrap();
|
||||
let test_dir = setup_test_dir("apply_patch");
|
||||
let _cleanup = CleanupGuard::new().dir(&test_dir);
|
||||
|
||||
let mut trace = LlmTrace::from_file(concat!(
|
||||
let trace = LlmTrace::from_file(concat!(
|
||||
env!("CARGO_MANIFEST_DIR"),
|
||||
"/tests/fixtures/llm_traces/coverage/apply_patch_chain.json"
|
||||
))
|
||||
.expect("failed to load apply_patch_chain.json");
|
||||
trace.replace_paths(
|
||||
"/tmp/ironclaw_coverage_test_apply_patch",
|
||||
test_dir.to_str().unwrap(),
|
||||
);
|
||||
|
||||
let rig = TestRigBuilder::new()
|
||||
.with_trace(trace.clone())
|
||||
@@ -143,7 +143,7 @@ mod tests {
|
||||
rig.verify_trace_expects(&trace, &responses);
|
||||
|
||||
// Extra: verify the patch was applied on disk.
|
||||
let content = std::fs::read_to_string(test_dir.join("patch_target.txt"))
|
||||
let content = std::fs::read_to_string(format!("{test_dir}/patch_target.txt"))
|
||||
.expect("patch_target.txt should exist");
|
||||
assert!(
|
||||
content.contains("PATCHED"),
|
||||
|
||||
Reference in New Issue
Block a user