Skip to content

agent_ui: Fix panic in load/copy thread to/from clipboard (#49694) (cherry-pick to stable) #49696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zed-zippy merged 1 commit into from
Feb 20, 2026
Merged

agent_ui: Fix panic in load/copy thread to/from clipboard (#49694) (cherry-pick to stable) #49696

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 29 additions & 59 deletions crates/agent_ui/src/agent_panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,19 +1209,7 @@ impl AgentPanel {

fn copy_thread_to_clipboard(&mut self, window: &mut Window, cx: &mut Context<Self>) {
let Some(thread) = self.active_native_agent_thread(cx) else {
if let Some(workspace) = self.workspace.upgrade() {
workspace.update(cx, |workspace, cx| {
struct NoThreadToast;
workspace.show_toast(
workspace::Toast::new(
workspace::notifications::NotificationId::unique::<NoThreadToast>(),
"No active native thread to copy",
)
.autohide(),
cx,
);
});
}
Self::show_deferred_toast(&self.workspace, "No active native thread to copy", cx);
return;
};

Expand Down Expand Up @@ -1256,79 +1244,61 @@ impl AgentPanel {
.detach_and_log_err(cx);
}

fn load_thread_from_clipboard(&mut self, window: &mut Window, cx: &mut Context<Self>) {
let Some(clipboard) = cx.read_from_clipboard() else {
if let Some(workspace) = self.workspace.upgrade() {
fn show_deferred_toast(
workspace: &WeakEntity<workspace::Workspace>,
message: &'static str,
cx: &mut App,
) {
let workspace = workspace.clone();
cx.defer(move |cx| {
if let Some(workspace) = workspace.upgrade() {
workspace.update(cx, |workspace, cx| {
struct NoClipboardToast;
struct ClipboardToast;
workspace.show_toast(
workspace::Toast::new(
workspace::notifications::NotificationId::unique::<NoClipboardToast>(),
"No clipboard content available",
workspace::notifications::NotificationId::unique::<ClipboardToast>(),
message,
)
.autohide(),
cx,
);
});
}
});
}

fn load_thread_from_clipboard(&mut self, window: &mut Window, cx: &mut Context<Self>) {
let Some(clipboard) = cx.read_from_clipboard() else {
Self::show_deferred_toast(&self.workspace, "No clipboard content available", cx);
return;
};

let Some(encoded) = clipboard.text() else {
if let Some(workspace) = self.workspace.upgrade() {
workspace.update(cx, |workspace, cx| {
struct InvalidClipboardToast;
workspace.show_toast(
workspace::Toast::new(
workspace::notifications::NotificationId::unique::<InvalidClipboardToast>(),
"Clipboard does not contain text",
)
.autohide(),
cx,
);
});
}
Self::show_deferred_toast(&self.workspace, "Clipboard does not contain text", cx);
return;
};

let thread_data = match base64::Engine::decode(&base64::prelude::BASE64_STANDARD, &encoded)
{
Ok(data) => data,
Err(_) => {
if let Some(workspace) = self.workspace.upgrade() {
workspace.update(cx, |workspace, cx| {
struct DecodeErrorToast;
workspace.show_toast(
workspace::Toast::new(
workspace::notifications::NotificationId::unique::<DecodeErrorToast>(),
"Failed to decode clipboard content (expected base64)",
)
.autohide(),
cx,
);
});
}
Self::show_deferred_toast(
&self.workspace,
"Failed to decode clipboard content (expected base64)",
cx,
);
return;
}
};

let shared_thread = match SharedThread::from_bytes(&thread_data) {
Ok(thread) => thread,
Err(_) => {
if let Some(workspace) = self.workspace.upgrade() {
workspace.update(cx, |workspace, cx| {
struct ParseErrorToast;
workspace.show_toast(
workspace::Toast::new(
workspace::notifications::NotificationId::unique::<ParseErrorToast>(
),
"Failed to parse thread data from clipboard",
)
.autohide(),
cx,
);
});
}
Self::show_deferred_toast(
&self.workspace,
"Failed to parse thread data from clipboard",
cx,
);
return;
}
};
Expand Down