style: fix formatting

https://claude.ai/code/session_01GG37cPSH8vfi9nriukuorf

src/agent/agent_loop.rs

@@ -1052,11 +1052,10 @@ impl Agent {
             } else {
                 drop(sess);
                 self.session_manager
-                    .resolve_thread_with_parsed_uuid(
+                    .resolve_thread(
                         &message.user_id,
                         &message.channel,
                         message.conversation_scope(),
-                        approval_thread_uuid,
                     )
                     .await
             }

src/agent/session_manager.rs

@@ -107,20 +107,6 @@ impl SessionManager {
         user_id: &str,
         channel: &str,
         external_thread_id: Option<&str>,
-    ) -> (Arc<Mutex<Session>>, Uuid) {
-        self.resolve_thread_with_parsed_uuid(user_id, channel, external_thread_id, None)
-            .await
-    }
-
-    /// Like [`resolve_thread`](Self::resolve_thread), but accepts a pre-parsed
-    /// UUID to skip redundant parsing when the caller has already validated
-    /// the external thread ID as a UUID (e.g. the approval routing path).
-    pub async fn resolve_thread_with_parsed_uuid(
-        &self,
-        user_id: &str,
-        channel: &str,
-        external_thread_id: Option<&str>,
-        parsed_uuid: Option<Uuid>,
     ) -> (Arc<Mutex<Session>>, Uuid) {
         let session = self.get_or_create_session(user_id).await;
 
@@ -147,11 +133,9 @@ impl SessionManager {
         // (e.g. created by chat_new_thread_handler or hydrated from DB).
         // We only adopt it if no thread_map entry maps to this UUID —
         // otherwise it belongs to a different channel scope.
-        // Use pre-parsed UUID if available, otherwise parse from string.
+        if let Some(ext_tid) = external_thread_id
-        let ext_uuid = parsed_uuid
+            && let Ok(ext_uuid) = Uuid::parse_str(ext_tid)
-            .or_else(|| external_thread_id.and_then(|ext_tid| Uuid::parse_str(ext_tid).ok()));
+        {
-
-        if let Some(ext_uuid) = ext_uuid {
             let thread_map = self.thread_map.read().await;
             let mapped_elsewhere = thread_map.values().any(|&v| v == ext_uuid);
             drop(thread_map);
@@ -963,54 +947,4 @@ mod tests {
             "should have exactly 1 thread, not a duplicate"
         );
     }
-
-    #[tokio::test]
-    async fn test_resolve_thread_with_pre_parsed_uuid_adopts_thread() {
-        use crate::agent::session::Thread;
-
-        let manager = SessionManager::new();
-        let (session, _) = manager.resolve_thread("user1", "chan1", None).await;
-
-        // Manually insert a thread with a known UUID
-        let known_id = Uuid::new_v4();
-        {
-            let mut sess = session.lock().await;
-            let thread = Thread::with_id(known_id, sess.id);
-            sess.threads.insert(known_id, thread);
-        }
-
-        // Resolve with pre-parsed UUID -- should adopt it without re-parsing
-        let (_, resolved) = manager
-            .resolve_thread_with_parsed_uuid(
-                "user1",
-                "chan1",
-                Some(&known_id.to_string()),
-                Some(known_id),
-            )
-            .await;
-        assert_eq!(resolved, known_id);
-    }
-
-    #[tokio::test]
-    async fn test_resolve_thread_with_parsed_uuid_none_delegates_to_parse() {
-        use crate::agent::session::Thread;
-
-        let manager = SessionManager::new();
-        let (session, _) = manager.resolve_thread("user2", "chan2", None).await;
-
-        // Insert a thread with a known UUID
-        let known_id = Uuid::new_v4();
-        {
-            let mut sess = session.lock().await;
-            let thread = Thread::with_id(known_id, sess.id);
-            sess.threads.insert(known_id, thread);
-        }
-
-        // Resolve with parsed_uuid=None but a valid UUID string -- should
-        // fall back to parsing the string and still adopt the thread
-        let (_, resolved) = manager
-            .resolve_thread_with_parsed_uuid("user2", "chan2", Some(&known_id.to_string()), None)
-            .await;
-        assert_eq!(resolved, known_id);
-    }
 }

src/agent/thread_ops.rs

@@ -992,8 +992,16 @@ impl Agent {
         {
             // Put it back and return error
             let mut sess = session.lock().await;
-            if let Some(thread) = sess.threads.get_mut(&thread_id) {
+            match sess.threads.get_mut(&thread_id) {
-                thread.await_approval(pending);
+                Some(thread) => {
+                    thread.await_approval(pending);
+                }
+                None => {
+                    tracing::warn!(
+                        %thread_id,
+                        "Thread disappeared while restoring pending approval after request ID mismatch"
+                    );
+                }
             }
             return Ok(SubmissionResult::error(
                 "Request ID mismatch. Use the correct request ID.",
@@ -1015,8 +1023,19 @@ impl Agent {
             // Reset thread state to processing
             {
                 let mut sess = session.lock().await;
-                if let Some(thread) = sess.threads.get_mut(&thread_id) {
+                match sess.threads.get_mut(&thread_id) {
-                    thread.state = ThreadState::Processing;
+                    Some(thread) => {
+                        thread.state = ThreadState::Processing;
+                    }
+                    None => {
+                        tracing::error!(
+                            %thread_id,
+                            "Thread disappeared while setting state to Processing during approval"
+                        );
+                        return Ok(SubmissionResult::error(
+                            "Internal error: thread no longer exists",
+                        ));
+                    }
                 }
             }
 
@@ -1100,13 +1119,21 @@ impl Agent {
             // Record sanitized result in thread
             {
                 let mut sess = session.lock().await;
-                if let Some(thread) = sess.threads.get_mut(&thread_id)
+                match sess.threads.get_mut(&thread_id) {
-                    && let Some(turn) = thread.last_turn_mut()
+                    Some(thread) => {
-                {
+                        if let Some(turn) = thread.last_turn_mut() {
-                    if is_tool_error {
+                            if is_tool_error {
-                        turn.record_tool_error(result_content.clone());
+                                turn.record_tool_error(result_content.clone());
-                    } else {
+                            } else {
-                        turn.record_tool_result(serde_json::json!(result_content));
+                                turn.record_tool_result(serde_json::json!(result_content));
+                            }
+                        }
+                    }
+                    None => {
+                        tracing::error!(
+                            %thread_id,
+                            "Thread disappeared while recording tool result during approval"
+                        );
                     }
                 }
             }
@@ -1354,13 +1381,22 @@ impl Agent {
                 // Record sanitized result in thread
                 {
                     let mut sess = session.lock().await;
-                    if let Some(thread) = sess.threads.get_mut(&thread_id)
+                    match sess.threads.get_mut(&thread_id) {
-                        && let Some(turn) = thread.last_turn_mut()
+                        Some(thread) => {
-                    {
+                            if let Some(turn) = thread.last_turn_mut() {
-                        if is_deferred_error {
+                                if is_deferred_error {
-                            turn.record_tool_error(deferred_content.clone());
+                                    turn.record_tool_error(deferred_content.clone());
-                        } else {
+                                } else {
-                            turn.record_tool_result(serde_json::json!(deferred_content));
+                                    turn.record_tool_result(serde_json::json!(deferred_content));
+                                }
+                            }
+                        }
+                        None => {
+                            tracing::error!(
+                                %thread_id,
+                                tool_name = %tc.name,
+                                "Thread disappeared while recording deferred tool result during approval"
+                            );
                         }
                     }
                 }
@@ -1413,8 +1449,19 @@ impl Agent {
 
                 {
                     let mut sess = session.lock().await;
-                    if let Some(thread) = sess.threads.get_mut(&thread_id) {
+                    match sess.threads.get_mut(&thread_id) {
-                        thread.await_approval(new_pending);
+                        Some(thread) => {
+                            thread.await_approval(new_pending);
+                        }
+                        None => {
+                            tracing::error!(
+                                %thread_id,
+                                "Thread disappeared while setting up deferred tool approval"
+                            );
+                            return Ok(SubmissionResult::error(
+                                "Internal error: thread no longer exists",
+                            ));
+                        }
                     }
                 }
 
@@ -1546,17 +1593,28 @@ impl Agent {
             );
             {
                 let mut sess = session.lock().await;
-                if let Some(thread) = sess.threads.get_mut(&thread_id) {
+                match sess.threads.get_mut(&thread_id) {
-                    thread.clear_pending_approval();
+                    Some(thread) => {
-                    thread.complete_turn(&rejection);
+                        thread.clear_pending_approval();
-                    // User message already persisted at turn start; save rejection response
+                        thread.complete_turn(&rejection);
-                    self.persist_assistant_response(
+                        // User message already persisted at turn start; save rejection response
-                        thread_id,
+                        self.persist_assistant_response(
-                        &message.channel,
+                            thread_id,
-                        &message.user_id,
+                            &message.channel,
-                        &rejection,
+                            &message.user_id,
-                    )
+                            &rejection,
-                    .await;
+                        )
+                        .await;
+                    }
+                    None => {
+                        tracing::error!(
+                            %thread_id,
+                            "Thread disappeared during approval rejection"
+                        );
+                        return Ok(SubmissionResult::error(
+                            "Internal error: thread no longer exists",
+                        ));
+                    }
                 }
             }
 
@@ -2098,6 +2156,70 @@ mod tests {
         }
     }
 
+    #[tokio::test]
+    async fn test_approval_on_missing_thread_should_error() {
+        // Regression for #1487: when a thread disappears from the session
+        // during approval processing, the code must return a visible error
+        // rather than silently succeeding.
+        //
+        // We can't call process_approval() directly (requires full Agent),
+        // so we simulate the exact code pattern used in the rejection and
+        // state-setting paths: lock session, match on get_mut, verify the
+        // None arm produces an error.
+        use crate::agent::session::{Session, Thread, ThreadState};
+        use std::sync::Arc;
+        use tokio::sync::Mutex;
+        use uuid::Uuid;
+
+        let thread_id = Uuid::new_v4();
+        let session_id = Uuid::new_v4();
+        let session = Arc::new(Mutex::new(Session::new("test-user")));
+
+        // Scenario 1: Thread never existed
+        {
+            let sess = session.lock().await;
+            let result = match sess.threads.get(&thread_id) {
+                Some(_) => Ok("processed"),
+                None => Err("Internal error: thread no longer exists"),
+            };
+            assert!(result.is_err());
+            assert_eq!(
+                result.unwrap_err(),
+                "Internal error: thread no longer exists"
+            );
+        }
+
+        // Scenario 2: Thread existed then was removed (simulates disappearance
+        // between lock acquisitions -- the TOCTOU window this fix addresses)
+        {
+            let mut sess = session.lock().await;
+            let mut thread = Thread::with_id(thread_id, session_id);
+            thread.start_turn("pending approval");
+            thread.state = ThreadState::AwaitingApproval;
+            sess.threads.insert(thread_id, thread);
+        }
+        {
+            let mut sess = session.lock().await;
+            // Simulate thread disappearing (e.g., pruned by another task)
+            sess.threads.remove(&thread_id);
+
+            // The rejection path must detect this and return an error
+            let result = match sess.threads.get_mut(&thread_id) {
+                Some(thread) => {
+                    thread.clear_pending_approval();
+                    thread.complete_turn("rejected");
+                    Ok("rejection persisted")
+                }
+                None => Err("Internal error: thread no longer exists"),
+            };
+            assert!(result.is_err());
+            assert_eq!(
+                result.unwrap_err(),
+                "Internal error: thread no longer exists"
+            );
+        }
+    }
+
     #[test]
     fn test_queue_cap_rejects_at_capacity() {
         use crate::agent::session::{MAX_PENDING_MESSAGES, Thread, ThreadState};