fix(loop): gate path-listing tool results from vision routing

crates/zeroclaw-api/src/model_provider.rs

@@ -166,6 +166,16 @@ pub struct ChatRequest<'a> {
 pub struct ToolResultMessage {
     pub tool_call_id: String,
     pub content: String,
+    /// Name of the tool that produced this result, retained so downstream
+    /// media-marker canonicalization stays provenance-aware: path-listing
+    /// tools (`content_search`, `glob_search`) must not have incidental image
+    /// paths promoted to routable `[IMAGE:...]` markers (PR #7345). Empty when
+    /// the producing tool is unknown (e.g. results reconstructed from a
+    /// provider-wire `tool` message that never carried the name), in which case
+    /// the blind canonicalizer runs exactly as before (PR #6183).
+    /// `#[serde(default)]` keeps older serialized session records readable.
+    #[serde(default)]
+    pub tool_name: String,
 }
 
 /// A message in a multi-turn conversation, including tool interactions.

crates/zeroclaw-infra/src/acp_session_store.rs

@@ -386,6 +386,11 @@ impl AcpSessionStore {
                     "out" => outs.push(ToolResultMessage {
                         tool_call_id,
                         content: payload,
+                        // Carry the producing tool name (looked up from the
+                        // matching 'in' row on write) so a resumed session
+                        // stays provenance-aware for media-marker
+                        // canonicalization (PR #7345).
+                        tool_name,
                     }),
                     other => {
                         ::zeroclaw_log::record!(
@@ -925,6 +930,7 @@ mod tests {
             ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc-1".into(),
                 content: "file.txt\n".into(),
+                tool_name: String::new(),
             }]),
             ConversationMessage::Chat(ChatMessage::assistant("done")),
         ];
@@ -1076,6 +1082,7 @@ mod tests {
                     ConversationMessage::ToolResults(vec![ToolResultMessage {
                         tool_call_id: "tc-1".into(),
                         content: "ok".into(),
+                        tool_name: String::new(),
                     }]),
                 ],
             )

crates/zeroclaw-runtime/src/agent/agent.rs

@@ -1776,6 +1776,10 @@ impl Agent {
                                     .and_then(|c| c.as_str())
                                     .unwrap_or_default()
                                     .to_string(),
+                                // Provider-wire tool messages do not carry the
+                                // producing tool name; replayed results fall back
+                                // to blind canonicalization (PR #6183, #7345).
+                                tool_name: String::new(),
                             })
                         })
                         .collect();
@@ -1796,6 +1800,9 @@ impl Agent {
                             .and_then(|c| c.as_str())
                             .unwrap_or_default()
                             .to_string(),
+                        // No provenance on the provider-wire shape; blind canon
+                        // applies as before (PR #6183, #7345).
+                        tool_name: String::new(),
                     };
                     push_tool_results(&mut replayed, vec![result]);
                     continue;
@@ -3958,6 +3965,7 @@ mod tests {
             ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc-1".into(),
                 content: "ok".into(),
+                tool_name: String::new(),
             }]),
             ConversationMessage::Chat(ChatMessage::assistant("done")),
         ];
@@ -4700,6 +4708,7 @@ mod tests {
                     .push(ConversationMessage::ToolResults(vec![ToolResultMessage {
                         tool_call_id: format!("tc{i}"),
                         content: format!("result{i}"),
+                        tool_name: String::new(),
                     }]));
             }
         }
@@ -4805,6 +4814,7 @@ mod tests {
             .push(ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc1".into(),
                 content: "result1".into(),
+                tool_name: String::new(),
             }]));
         // AC2, TR2
         agent.history.push(ConversationMessage::AssistantToolCalls {
@@ -4822,6 +4832,7 @@ mod tests {
             .push(ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc2".into(),
                 content: "result2".into(),
+                tool_name: String::new(),
             }]));
         // AC3, TR3
         agent.history.push(ConversationMessage::AssistantToolCalls {
@@ -4839,6 +4850,7 @@ mod tests {
             .push(ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc3".into(),
                 content: "result3".into(),
+                tool_name: String::new(),
             }]));
 
         assert_eq!(agent.history.len(), 7);
@@ -4957,6 +4969,7 @@ mod tests {
             .push(ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc1".into(),
                 content: "result1".into(),
+                tool_name: String::new(),
             }]));
         // AC2, TR2
         agent.history.push(ConversationMessage::AssistantToolCalls {
@@ -4974,6 +4987,7 @@ mod tests {
             .push(ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc2".into(),
                 content: "result2".into(),
+                tool_name: String::new(),
             }]));
 
         assert_eq!(agent.history.len(), 5);
@@ -5089,6 +5103,7 @@ mod tests {
             .push(ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc1".into(),
                 content: "result1".into(),
+                tool_name: String::new(),
             }]));
         // AC2, TR2
         agent.history.push(ConversationMessage::AssistantToolCalls {
@@ -5106,6 +5121,7 @@ mod tests {
             .push(ConversationMessage::ToolResults(vec![ToolResultMessage {
                 tool_call_id: "tc2".into(),
                 content: "result2".into(),
+                tool_name: String::new(),
             }]));
 
         assert_eq!(agent.history.len(), 6);