mirror of
https://github.com/instructkr/claw-code.git
synced 2026-11-21 00:00:00 +08:00
fix(runtime): keep tool-use/tool-result pairs paired in Trident compaction (#3367)
Trident stage 1 dropped the assistant message that carried a file tool
use while keeping the tool result that answered it, so the compacted
session ended up with orphaned `tool_result` blocks. Providers reject
such requests with HTTP 400 ("tool_result blocks must be a response to
a preceding tool_use"), which breaks the auto-compact retry path that
runs Trident before resending a request.
Stage 1 also counted a tool result as an independent file operation,
which pushed `last_write` past the write the result belonged to and made
the newest write look obsolete.
Only tool uses count as file operations now, and a tool result is
dropped together with the tool use that produced it.
This commit is contained in:
1 parent
8aab1d4e54
commit
8523d59a84
1 file changed
+131
-12
@@ -216,6 +216,48 @@ fn stage1_supersede(messages: &[ConversationMessage]) -> (Vec<ConversationMessag
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A tool result is only meaningful together with the tool use that
|
||||||
|
// produced it. Dropping the tool use while keeping its result leaves an
|
||||||
|
// orphaned `tool_result` block, which providers reject with
|
||||||
|
// "tool_result blocks must be a response to a preceding tool_use".
|
||||||
|
let dropped_tool_use_ids: BTreeSet<&str> = obsolete_indices
|
||||||
|
.iter()
|
||||||
|
.filter_map(|index| messages.get(*index))
|
||||||
|
.flat_map(|message| message.blocks.iter())
|
||||||
|
.filter_map(|block| match block {
|
||||||
|
ContentBlock::ToolUse { id, .. } => Some(id.as_str()),
|
||||||
|
_ => None,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
for (index, message) in messages.iter().enumerate() {
|
||||||
|
if obsolete_indices.contains(&index) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let answers_dropped_tool_use = message.blocks.iter().any(|block| {
|
||||||
|
matches!(
|
||||||
|
block,
|
||||||
|
ContentBlock::ToolResult { tool_use_id, .. }
|
||||||
|
if dropped_tool_use_ids.contains(tool_use_id.as_str())
|
||||||
|
)
|
||||||
|
});
|
||||||
|
if !answers_dropped_tool_use {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// Keep a message that still carries a surviving tool use: dropping it
|
||||||
|
// would orphan that tool use instead.
|
||||||
|
let keeps_surviving_tool_use = message.blocks.iter().any(|block| {
|
||||||
|
matches!(
|
||||||
|
block,
|
||||||
|
ContentBlock::ToolUse { id, .. }
|
||||||
|
if !dropped_tool_use_ids.contains(id.as_str())
|
||||||
|
)
|
||||||
|
});
|
||||||
|
if !keeps_surviving_tool_use {
|
||||||
|
obsolete_indices.insert(index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let superseded_count = obsolete_indices.len();
|
let superseded_count = obsolete_indices.len();
|
||||||
let kept: Vec<ConversationMessage> = messages
|
let kept: Vec<ConversationMessage> = messages
|
||||||
.iter()
|
.iter()
|
||||||
@@ -239,18 +281,11 @@ fn extract_file_operation(block: &ContentBlock) -> Option<(String, FileOp)> {
|
|||||||
};
|
};
|
||||||
Some((path, op_type))
|
Some((path, op_type))
|
||||||
}
|
}
|
||||||
ContentBlock::ToolResult {
|
// A tool result is the answer half of a tool use, not an independent
|
||||||
tool_name, output, ..
|
// file operation. Counting it as one shifts `last_write` past the
|
||||||
} => {
|
// write it belongs to, which makes the newest write look obsolete
|
||||||
let path = extract_path_from_tool_output(tool_name, output)?;
|
// and splits its tool-use/tool-result pair.
|
||||||
let op_type = match tool_name.as_str() {
|
ContentBlock::ToolResult { .. } => None,
|
||||||
"read_file" | "Read" => FileOp::Read,
|
|
||||||
"write_file" | "Write" => FileOp::Write,
|
|
||||||
"edit_file" | "Edit" => FileOp::Edit,
|
|
||||||
_ => return None,
|
|
||||||
};
|
|
||||||
Some((path, op_type))
|
|
||||||
}
|
|
||||||
ContentBlock::Text { .. } => None,
|
ContentBlock::Text { .. } => None,
|
||||||
ContentBlock::Thinking { .. } => None,
|
ContentBlock::Thinking { .. } => None,
|
||||||
}
|
}
|
||||||
@@ -732,6 +767,90 @@ mod tests {
|
|||||||
assert_eq!(kept.len(), messages.len());
|
assert_eq!(kept.len(), messages.len());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn stage1_keeps_tool_use_and_result_paired() {
|
||||||
|
// Realistic transcript: the model reads the same file twice and then
|
||||||
|
// rewrites it. Stage 1 must drop the obsolete reads *and* their tool
|
||||||
|
// results, but it must never leave a `tool_result` behind without the
|
||||||
|
// `tool_use` that produced it: providers reject such requests with
|
||||||
|
// "tool_result blocks must be a response to a preceding tool_use".
|
||||||
|
let messages = vec![
|
||||||
|
ConversationMessage::assistant(vec![ContentBlock::ToolUse {
|
||||||
|
id: "1".to_string(),
|
||||||
|
name: "read_file".to_string(),
|
||||||
|
input: r#"{"path":"src/main.rs"}"#.to_string(),
|
||||||
|
}]),
|
||||||
|
ConversationMessage::tool_result(
|
||||||
|
"1",
|
||||||
|
"read_file",
|
||||||
|
r#"{"type":"text","file":{"filePath":"/ws/src/main.rs","content":"old"}}"#,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
ConversationMessage::assistant(vec![ContentBlock::ToolUse {
|
||||||
|
id: "2".to_string(),
|
||||||
|
name: "read_file".to_string(),
|
||||||
|
input: r#"{"path":"src/main.rs"}"#.to_string(),
|
||||||
|
}]),
|
||||||
|
ConversationMessage::tool_result(
|
||||||
|
"2",
|
||||||
|
"read_file",
|
||||||
|
r#"{"type":"text","file":{"filePath":"/ws/src/main.rs","content":"old"}}"#,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
ConversationMessage::assistant(vec![ContentBlock::ToolUse {
|
||||||
|
id: "3".to_string(),
|
||||||
|
name: "write_file".to_string(),
|
||||||
|
input: r#"{"path":"src/main.rs","content":"new"}"#.to_string(),
|
||||||
|
}]),
|
||||||
|
ConversationMessage::tool_result(
|
||||||
|
"3",
|
||||||
|
"write_file",
|
||||||
|
r#"{"type":"update","filePath":"/ws/src/main.rs","content":"new"}"#,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
];
|
||||||
|
|
||||||
|
let (kept, superseded) = stage1_supersede(&messages);
|
||||||
|
assert!(superseded > 0, "obsolete reads should be superseded");
|
||||||
|
|
||||||
|
let tool_use_ids: BTreeSet<&str> = kept
|
||||||
|
.iter()
|
||||||
|
.flat_map(|message| message.blocks.iter())
|
||||||
|
.filter_map(|block| match block {
|
||||||
|
ContentBlock::ToolUse { id, .. } => Some(id.as_str()),
|
||||||
|
_ => None,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
for message in &kept {
|
||||||
|
for block in &message.blocks {
|
||||||
|
if let ContentBlock::ToolResult { tool_use_id, .. } = block {
|
||||||
|
assert!(
|
||||||
|
tool_use_ids.contains(tool_use_id.as_str()),
|
||||||
|
"orphaned tool_result for tool_use {tool_use_id}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The most recent write survives, together with its tool result.
|
||||||
|
let has_tool_use = |id: &str| {
|
||||||
|
kept.iter().any(|message| {
|
||||||
|
message.blocks.iter().any(
|
||||||
|
|block| matches!(block, ContentBlock::ToolUse { id: tool_use_id, .. } if tool_use_id == id),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
};
|
||||||
|
let has_tool_result = |id: &str| {
|
||||||
|
kept.iter().any(|message| {
|
||||||
|
message.blocks.iter().any(
|
||||||
|
|block| matches!(block, ContentBlock::ToolResult { tool_use_id, .. } if tool_use_id == id),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
};
|
||||||
|
assert!(has_tool_use("3"), "the newest write must survive");
|
||||||
|
assert!(has_tool_result("3"), "its tool result must survive too");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn stage2_collapses_chatty_messages() {
|
fn stage2_collapses_chatty_messages() {
|
||||||
let mut messages = vec![];
|
let mut messages = vec![];
|
||||||
|
|||||||
Reference in new issue
Block a user