From ded2be0c8b49bfd8a6d57470844a2347efc812cf Mon Sep 17 00:00:00 2001
From: dieriba <dieriba.pro@gmail.com>
Date: Sun, 5 Oct 2025 22:50:24 +0200
Subject: [PATCH] fix

---
 backend/windmill-api/src/jobs.rs           | 3 ++-
 backend/windmill-worker/src/ai_executor.rs | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 96381ff3f5..f820e87503 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -14,6 +14,7 @@ use deno_core::{op2, serde_v8, v8, JsRuntime, OpState};
 use futures::future::join_all;
 use futures::{StreamExt, TryFutureExt};
 use http::{HeaderMap, HeaderName};
+use indexmap::IndexMap;
 use itertools::Itertools;
 use quick_cache::sync::Cache;
 use serde_json::value::RawValue;
@@ -6439,7 +6440,7 @@ async fn add_batch_jobs(
         };
 
         let mut uuid_per_db = {
-            let mut store = HashMap::with_capacity(num_shards_to_use);
+            let mut store = IndexMap::with_capacity(num_shards_to_use);
             for shard_id in 0..num_shards_to_use {
                 store.insert(shard_id, Vec::new());
             }
diff --git a/backend/windmill-worker/src/ai_executor.rs b/backend/windmill-worker/src/ai_executor.rs
index ad6cfb0325..3d1ab085c4 100644
--- a/backend/windmill-worker/src/ai_executor.rs
+++ b/backend/windmill-worker/src/ai_executor.rs
@@ -897,7 +897,7 @@ pub async fn run_agent(
                                 let inner_job_completed_tx_spawn = inner_job_completed_tx.clone();
                                 let mut occupancy_metrics_spawn = occupancy_metrics.clone();
                                 let mut killpill_rx_spawn = killpill_rx.resubscribe();
-
+                                let queue_db = job_queue_db.clone();
                                 // Spawn on separate tokio task with fresh stack
                                 let join_handle = tokio::task::spawn(async move {
                                     #[cfg(feature = "benchmark")]
@@ -911,7 +911,7 @@ pub async fn run_agent(
                                         None,
                                         None,
                                         &conn_spawn,
-                                        Some(job_queue_db),
+                                        Some(&queue_db),
                                         &client_spawn,
                                         &hostname_spawn,
                                         &worker_name_spawn,
@@ -953,7 +953,7 @@ pub async fn run_agent(
                                         let err_json = error_to_value(&err);
                                         let _ = handle_non_flow_job_error(
                                             db,
-                                            job_queue_db,
+                                            &job_queue_db,
                                             &tool_job,
                                             0,
                                             None,