Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

agent_ui: Fix panic when multiple rewrite tool uses share a char offset counter (#52458)

Matthias Endler064a17fd124b
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
index 8be5aa52bc6..9848a78bc2d 100644
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -1,7 +1,7 @@
use crate::{context::LoadedContext, inline_prompt_editor::CodegenStatus};
use agent_settings::AgentSettings;
use anyhow::{Context as _, Result};
-use collections::HashSet;
+use collections::{HashMap, HashSet};
use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
use futures::FutureExt;
use futures::{
@@ -17,7 +17,7 @@ use language_model::{
CompletionIntent, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
LanguageModelRequestTool, LanguageModelTextStream, LanguageModelToolChoice,
- LanguageModelToolUse, Role, TokenUsage,
+ LanguageModelToolUse, LanguageModelToolUseId, Role, TokenUsage,
};
use language_models::provider::anthropic::telemetry::{
AnthropicCompletionType, AnthropicEventData, AnthropicEventReporter, AnthropicEventType,
@@ -1169,9 +1169,10 @@ impl CodegenAlternative {
Failure(String),
}
- let chars_read_so_far = Arc::new(Mutex::new(0usize));
+ let chars_read_by_tool_id: Arc<Mutex<HashMap<LanguageModelToolUseId, usize>>> =
+ Arc::new(Mutex::new(HashMap::default()));
let process_tool_use = move |tool_use: LanguageModelToolUse| -> Option<ToolUseOutput> {
- let mut chars_read_so_far = chars_read_so_far.lock();
+ let mut chars_read_by_tool_id = chars_read_by_tool_id.lock();
match tool_use.name.as_ref() {
REWRITE_SECTION_TOOL_NAME => {
let Ok(input) =
@@ -1179,7 +1180,13 @@ impl CodegenAlternative {
else {
return None;
};
- let text = input.replacement_text[*chars_read_so_far..].to_string();
+ let chars_read_so_far =
+ chars_read_by_tool_id.entry(tool_use.id).or_insert(0);
+ let Some(text_slice) = input.replacement_text.get(*chars_read_so_far..)
+ else {
+ return None;
+ };
+ let text = text_slice.to_string();
*chars_read_so_far = input.replacement_text.len();
Some(ToolUseOutput::Rewrite {
text,
@@ -1845,7 +1852,7 @@ mod tests {
.unbounded_send(rewrite_tool_use("tool_1", &text[..chunk_len], false))
.unwrap();
events_tx
- .unbounded_send(rewrite_tool_use("tool_2", &text, true))
+ .unbounded_send(rewrite_tool_use("tool_1", &text, true))
.unwrap();
events_tx
.unbounded_send(LanguageModelCompletionEvent::Stop(StopReason::EndTurn))
@@ -1859,6 +1866,52 @@ mod tests {
);
}
+ // Regression test: a second rewrite tool use with a *shorter* replacement_text
+ // than the first would cause an index-out-of-bounds panic because the
+ // chars_read_so_far counter was shared across all tool use IDs.
+ #[gpui::test]
+ async fn test_separate_tool_uses_have_independent_char_counters(cx: &mut TestAppContext) {
+ init_test(cx);
+ let buffer = cx.new(|cx| Buffer::local("", cx));
+ let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+ let range = buffer.read_with(cx, |buffer, cx| {
+ let snapshot = buffer.snapshot(cx);
+ snapshot.anchor_before(Point::new(0, 0))..snapshot.anchor_after(Point::new(0, 0))
+ });
+ let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+ let codegen = cx.new(|cx| {
+ CodegenAlternative::new(
+ buffer.clone(),
+ range.clone(),
+ true,
+ prompt_builder,
+ Uuid::new_v4(),
+ cx,
+ )
+ });
+
+ let events_tx = simulate_tool_based_completion(&codegen, cx);
+ // tool_1 has longer text; tool_2 has shorter text. With the old shared
+ // counter, processing tool_2 would attempt replacement_text[N..] where
+ // N > replacement_text.len(), panicking with index out of bounds.
+ events_tx
+ .unbounded_send(rewrite_tool_use("tool_1", "longer replacement text", true))
+ .unwrap();
+ events_tx
+ .unbounded_send(rewrite_tool_use("tool_2", "short", true))
+ .unwrap();
+ events_tx
+ .unbounded_send(LanguageModelCompletionEvent::Stop(StopReason::EndTurn))
+ .unwrap();
+ drop(events_tx);
+ cx.run_until_parked();
+
+ assert_eq!(
+ buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
+ "longer replacement textshort"
+ );
+ }
+
#[gpui::test]
async fn test_strip_invalid_spans_from_codeblock() {
assert_chunks("Lorem ipsum dolor", "Lorem ipsum dolor").await;