chore: resolve conflicts

2026-09-01 00:59:33 +00:00 · 2026-03-25 19:23:08 +08:00
parent e8e0379e14 6daa2f155f
commit e7786fa3aa
47 changed files with 2973 additions and 757 deletions
@@ -226,7 +226,8 @@ impl GatewayWorkflowHarness {
            job_manager: None,
            prompt_queue: None,
            scheduler: Some(scheduler_slot.clone()),
-            default_user_id: user_id.clone(),
+            owner_id: user_id.clone(),
+            default_sender_id: user_id.clone(),
            shutdown_tx: tokio::sync::RwLock::new(None),
            ws_tracker: Some(Arc::new(WsConnectionTracker::new())),
            llm_provider: Some(Arc::clone(&components.llm)),