Skip to content

fix(desktop): avoid Tauri state TypeId collision between Ollama and Cloud streams #301

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
matiaspalmac merged 1 commit into from
Apr 29, 2026
Merged

fix(desktop): avoid Tauri state TypeId collision between Ollama and Cloud streams #301

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
13 changes: 10 additions & 3 deletions apps/desktop/src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2113,10 +2113,15 @@ async fn ollama_proxy_cancel(
/// `cloud_proxy_stream` task registers a oneshot sender keyed by the
/// caller-supplied `streamId` so a follow-up `cloud_proxy_cancel` can
/// terminate it from the renderer.
type CloudStreams = Arc<Mutex<HashMap<String, tokio::sync::oneshot::Sender<()>>>>;
// Newtype wrapper (not a type alias) so Tauri's TypeId-keyed state map
// can distinguish this from `OllamaStreams`, which has identical shape.
// Two aliases of the same `Arc<Mutex<...>>` collapse to the same TypeId
// and `.manage()` panics with "state for type ... is already being managed".
#[derive(Clone)]
struct CloudStreams(Arc<Mutex<HashMap<String, tokio::sync::oneshot::Sender<()>>>>);

fn new_cloud_streams() -> CloudStreams {
Arc::new(Mutex::new(HashMap::new()))
CloudStreams(Arc::new(Mutex::new(HashMap::new())))
}

/// Payload for the `cloud-stream` event. Mirror of `OllamaStreamPayload`'s
Expand Down Expand Up @@ -2212,6 +2217,7 @@ async fn cloud_proxy_stream(
let (cancel_tx, mut cancel_rx) = tokio::sync::oneshot::channel::<()>();
{
let mut guard = streams
.0
.lock()
.map_err(|e| format!("cloud streams mutex poisoned: {}", e))?;
guard.insert(stream_id.clone(), cancel_tx);
Expand Down Expand Up @@ -2389,7 +2395,7 @@ async fn cloud_proxy_stream(
}

fn remove_cloud_stream(streams: &CloudStreams, stream_id: &str) {
if let Ok(mut guard) = streams.lock() {
if let Ok(mut guard) = streams.0.lock() {
guard.remove(stream_id);
}
}
Expand All @@ -2402,6 +2408,7 @@ async fn cloud_proxy_cancel(
) -> Result<(), String> {
let sender = {
let mut guard = streams
.0
.lock()
.map_err(|e| format!("cloud streams mutex poisoned: {}", e))?;
guard.remove(&stream_id)
Expand Down