gitops/optimclaw
1
0
Fork 0
mirror of https://github.com/outbackdingo/optimclaw.git synced 2026-09-01 00:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sanitize tool error results before llm injection (#1639)

Browse Source 
* fix: sanitize tool error results before llm injection

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <[email protected]>

* fix: wrap preflight tool rejection errors for llm safety

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <[email protected]>

* style: apply rustfmt to error-path regressions

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <[email protected]>

* fix: preserve wrapped tool errors in history replay

* fix: address review findings on PR #1639

- Simplify legacy error handling in rebuild_chat_messages_from_db:
  remove redundant "Error: " prefix since legacy errors already contain
  descriptive text (e.g. "Tool 'http' failed: timeout"). Both wrapped
  (new) and plain (legacy) errors now pass through as-is.
- Update existing test assertion to match simplified format.
- Restore error-path doc line on process_tool_result.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* fix: satisfy clippy on builder tool safety helper

---------

Co-authored-by: Sisyphus <[email protected]>
Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
This commit is contained in:
firat.sertgoz
2026-03-27 10:49:28 +03:00
committed by GitHub
co-authored by Sisyphus Claude Opus 4.6
parent 30db07c58e
commit 2f4eb08613
6 changed files with 211 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agent/thread_ops.rs
+30 -2
View File
@@ -1907,7 +1907,10 @@ fn rebuild_chat_messages_from_db(
let name = c["name"].as_str().unwrap_or("unknown").to_string();
let content = if let Some(err) = c.get("error").and_then(|v| v.as_str())
{
format!("Error: {}", err)
// Both wrapped (new) and legacy (plain) errors pass
// through as-is. Legacy errors are already descriptive
// (e.g. "Tool 'http' failed: timeout"), so no prefix needed.
err.to_string()
} else if let Some(res) = c.get("result").and_then(|v| v.as_str()) {
res.to_string()
} else if let Some(preview) =
@@ -1993,13 +1996,38 @@ mod tests {
assert_eq!(result[3].role, crate::llm::Role::Tool);
assert_eq!(result[3].tool_call_id, Some("call_1".to_string()));
assert!(result[3].content.contains("Error: timeout"));
assert!(result[3].content.contains("timeout"));
// final assistant
assert_eq!(result[4].role, crate::llm::Role::Assistant);
assert_eq!(result[4].content, "I found some results.");
}
#[test]
fn test_rebuild_chat_messages_preserves_wrapped_tool_error() {
let wrapped_error =
"<tool_output name=\"http\">\nTool 'http' failed: timeout\n</tool_output>";
let tool_json = serde_json::json!([
{
"name": "http",
"call_id": "call_1",
"parameters": {"url": "https://example.com"},
"error": wrapped_error
}
]);
let messages = vec![
make_db_msg("user", "Fetch example"),
make_db_msg("tool_calls", &tool_json.to_string()),
];
let result = rebuild_chat_messages_from_db(&messages);
assert_eq!(result.len(), 3);
assert_eq!(result[2].role, crate::llm::Role::Tool);
assert_eq!(result[2].tool_call_id, Some("call_1".to_string()));
assert_eq!(result[2].content, wrapped_error);
}
#[test]
fn test_rebuild_chat_messages_legacy_tool_calls_skipped() {
// Legacy format: no call_id field