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

* 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]>

src/channels/web/handlers/chat.rs

@@ -15,7 +15,9 @@ use crate::channels::IncomingMessage;
 use crate::channels::web::auth::AuthenticatedUser;
 use crate::channels::web::server::GatewayState;
 use crate::channels::web::types::*;
-use crate::channels::web::util::{build_turns_from_db_messages, truncate_preview};
+use crate::channels::web::util::{
+    build_turns_from_db_messages, tool_error_for_display, truncate_preview,
+};
 
 pub async fn chat_send_handler(
     State(state): State<Arc<GatewayState>>,
@@ -397,7 +399,7 @@ pub async fn chat_history_handler(
                                 };
                                 truncate_preview(&s, 500)
                             }),
-                            error: tc.error.clone(),
+                            error: tc.error.as_deref().map(tool_error_for_display),
                             rationale: tc.rationale.clone(),
                         })
                         .collect(),

src/channels/web/util.rs

@@ -4,6 +4,11 @@ use crate::channels::web::types::{ToolCallInfo, TurnInfo};
 
 pub use ironclaw_common::truncate_preview;
 
+/// Convert stored tool errors into plain text suitable for UI display.
+pub fn tool_error_for_display(error: &str) -> String {
+    ironclaw_safety::SafetyLayer::unwrap_tool_output(error).unwrap_or_else(|| error.to_string())
+}
+
 /// Parse tool call summary JSON objects into `ToolCallInfo` structs.
 fn parse_tool_call_infos(calls: &[serde_json::Value]) -> Vec<ToolCallInfo> {
     calls
@@ -13,7 +18,7 @@ fn parse_tool_call_infos(calls: &[serde_json::Value]) -> Vec<ToolCallInfo> {
             has_result: c.get("result_preview").is_some_and(|v| !v.is_null()),
             has_error: c.get("error").is_some_and(|v| !v.is_null()),
             result_preview: c["result_preview"].as_str().map(String::from),
-            error: c["error"].as_str().map(String::from),
+            error: c["error"].as_str().map(tool_error_for_display),
             rationale: c["rationale"].as_str().map(String::from),
         })
         .collect()
@@ -181,6 +186,29 @@ mod tests {
         assert_eq!(turns[0].response.as_deref(), Some("Done"));
     }
 
+    #[test]
+    fn test_build_turns_unwrap_wrapped_tool_error_for_display() {
+        let tc_json = serde_json::json!([
+            {
+                "name": "http",
+                "error": "<tool_output name=\"http\">\nTool 'http' failed: timeout\n</tool_output>"
+            }
+        ]);
+        let messages = vec![
+            make_msg("user", "Run it", 0),
+            make_msg("tool_calls", &tc_json.to_string(), 500),
+        ];
+
+        let turns = build_turns_from_db_messages(&messages);
+
+        assert_eq!(turns.len(), 1);
+        assert_eq!(turns[0].tool_calls.len(), 1);
+        assert_eq!(
+            turns[0].tool_calls[0].error.as_deref(),
+            Some("Tool 'http' failed: timeout")
+        );
+    }
+
     #[test]
     fn test_build_turns_malformed_tool_calls() {
         let messages = vec![