refactor: remove legacy bot thread navigation

Author: Pyiner

garyx-channels/src/telegram/tests.rs

@@ -793,36 +793,6 @@ mod dispatch_tests {
         }
     }
 
-    #[tokio::test]
-    async fn test_command_session_navigation() {
-        let router = make_router();
-
-        // Set up thread history
-        {
-            let mut r = router.lock().await;
-            let user_key = MessageRouter::build_binding_context_key("telegram", "bot1", "42");
-            r.switch_to_thread(&user_key, "session_a");
-            r.switch_to_thread(&user_key, "session_b");
-            r.switch_to_thread(&user_key, "session_c");
-        }
-
-        // Navigate backwards (/threadprev)
-        {
-            let mut r = router.lock().await;
-            let user_key = MessageRouter::build_binding_context_key("telegram", "bot1", "42");
-            let prev = r.navigate_thread(&user_key, -1);
-            assert_eq!(prev.as_deref(), Some("session_b"));
-        }
-
-        // Navigate forwards (/threadnext)
-        {
-            let mut r = router.lock().await;
-            let user_key = MessageRouter::build_binding_context_key("telegram", "bot1", "42");
-            let next = r.navigate_thread(&user_key, 1);
-            assert_eq!(next.as_deref(), Some("session_c"));
-        }
-    }
-
     #[tokio::test]
     async fn test_bridge_dispatch() {
         let router = make_router();

garyx-gateway/src/routes/tests.rs

@@ -5919,18 +5919,6 @@ async fn delete_thread_clears_in_memory_last_delivery() {
 async fn delete_thread_clears_switched_thread_references() {
     let (state, _logger, _dir) = test_state().await;
     let thread_id = "thread::switch-delete";
-    state
-        .threads
-        .thread_store
-        .set(
-            "thread::older",
-            serde_json::json!({
-                "thread_id": "thread::older",
-                "thread_id": "thread::older",
-                "label": "Older"
-            }),
-        )
-        .await;
     state
         .threads
         .thread_store
@@ -5946,7 +5934,6 @@ async fn delete_thread_clears_switched_thread_references() {
     {
         let mut router = state.threads.router.lock().await;
         let user_key = MessageRouter::build_account_user_key("telegram", "main", "u1", false, None);
-        router.switch_to_thread(&user_key, "thread::older");
         router.switch_to_thread(&user_key, thread_id);
         assert_eq!(
             router.get_current_thread_id_for_account("telegram", "main", "u1", false, None),
@@ -5966,7 +5953,7 @@ async fn delete_thread_clears_switched_thread_references() {
     let router = state.threads.router.lock().await;
     assert_eq!(
         router.get_current_thread_id_for_account("telegram", "main", "u1", false, None),
-        Some("thread::older")
+        None
     );
 }
 

garyx-router/src/lib.rs

@@ -21,7 +21,7 @@ pub mod inbound {
 pub mod routing {
     pub use crate::router::{
         AgentDispatcher, InboundRequest, InboundResult, InboundSink, MessageRouter, ThreadCreator,
-        ThreadListEntry, ThreadMessageRequest,
+        ThreadMessageRequest,
     };
 }
 
@@ -48,16 +48,15 @@ pub mod threading {
     pub use crate::threads::{
         ChannelBinding, KNOWN_CHANNEL_ENDPOINTS_KEY, KnownChannelEndpoint, ThreadEnsureOptions,
         ThreadIndexStats,
-        agent_id_from_value, bind_endpoint_to_thread, bindings_from_value, create_thread_record,
+        agent_id_from_value, bindings_from_value, create_thread_record,
         default_agent_for_channel_account, default_workspace_for_channel_account,
         default_workspace_mode_for_channel_account, delete_thread_record,
-        detach_endpoint_from_thread, endpoint_key, is_default_thread_list_hidden,
-        is_hidden_thread_value, is_thread_key, label_from_value, list_known_channel_endpoints,
-        list_registry_channel_endpoints, new_thread_key, normalize_workspace_dir,
-        remove_binding, thread_kind_from_value, thread_metadata_from_value, update_thread_record,
-        upsert_binding, upsert_known_channel_endpoint, upsert_thread_fields,
-        validate_thread_accepts_bot_binding, workspace_dir_from_value,
-        worktree_base_dir_for_config,
+        endpoint_key, is_default_thread_list_hidden, is_hidden_thread_value, is_thread_key,
+        label_from_value, list_known_channel_endpoints, list_registry_channel_endpoints,
+        new_thread_key, normalize_workspace_dir, remove_binding, thread_kind_from_value,
+        thread_metadata_from_value, update_thread_record, upsert_binding,
+        upsert_known_channel_endpoint, upsert_thread_fields, validate_thread_accepts_bot_binding,
+        workspace_dir_from_value, worktree_base_dir_for_config,
     };
 }
 
@@ -94,15 +93,14 @@ pub use thread_history::{
 pub use threads::{
     ChannelBinding, KNOWN_CHANNEL_ENDPOINTS_KEY, KnownChannelEndpoint, ThreadEnsureOptions,
     ThreadIndexStats,
-    agent_id_from_value, bind_endpoint_to_thread, bindings_from_value, create_thread_record,
+    agent_id_from_value, bindings_from_value, create_thread_record,
     default_agent_for_channel_account, default_workspace_for_channel_account,
-    default_workspace_mode_for_channel_account, delete_thread_record, detach_endpoint_from_thread,
-    endpoint_key, is_default_thread_list_hidden, is_hidden_thread_value, is_thread_key,
-    label_from_value, list_known_channel_endpoints, list_registry_channel_endpoints,
-    new_thread_key, normalize_workspace_dir, remove_binding, thread_kind_from_value,
-    thread_metadata_from_value, update_thread_record, upsert_binding,
-    upsert_known_channel_endpoint, upsert_thread_fields, validate_thread_accepts_bot_binding,
-    workspace_dir_from_value, worktree_base_dir_for_config,
+    default_workspace_mode_for_channel_account, delete_thread_record, endpoint_key,
+    is_default_thread_list_hidden, is_hidden_thread_value, is_thread_key, label_from_value,
+    list_known_channel_endpoints, list_registry_channel_endpoints, new_thread_key,
+    normalize_workspace_dir, remove_binding, thread_kind_from_value, thread_metadata_from_value,
+    update_thread_record, upsert_binding, upsert_known_channel_endpoint, upsert_thread_fields,
+    validate_thread_accepts_bot_binding, workspace_dir_from_value, worktree_base_dir_for_config,
 };
 pub use worktree::{
     PreparedWorktree, WorkspaceGitStatus, WorkspaceMode, prepare_thread_worktree,

garyx-router/src/router/contracts.rs

@@ -67,13 +67,6 @@ pub struct InboundResult {
     pub dispatch_outcome: Option<AgentDispatchOutcome>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ThreadListEntry {
-    pub thread_id: String,
-    pub label: Option<String>,
-    pub updated_at: Option<String>,
-}
-
 #[derive(Clone, Copy)]
 pub(crate) struct RouteContext<'a> {
     pub(crate) channel: &'a str,

garyx-router/src/router/mod.rs

@@ -24,17 +24,14 @@ mod threading;
 pub use command_catalog::{command_catalog_for_config, reserved_command_names};
 pub use contracts::ThreadCreator;
 pub use contracts::{
-    AgentDispatcher, InboundRequest, InboundResult, InboundSink, ThreadListEntry,
-    ThreadMessageRequest,
+    AgentDispatcher, InboundRequest, InboundResult, InboundSink, ThreadMessageRequest,
 };
 pub(crate) use contracts::{DispatchMetadataContext, NavigationContext, RouteContext};
 pub use inbound::is_native_command_text;
 
 #[cfg(test)]
 mod tests;
 
-/// Maximum number of threads kept in per-user navigation history.
-const MAX_HISTORY: usize = 20;
 /// Maximum number of outbound message records persisted per thread.
 const MAX_OUTBOUND_MESSAGE_IDS: usize = 100;
 pub const NATIVE_COMMAND_TEXT_METADATA_KEY: &str = "native_command_text";

garyx-router/src/router/tests/dispatch/route_and_dispatch.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::threads::is_thread_key;
 use crate::{
     ChannelBinding, ThreadCreator, ThreadEnsureOptions, ThreadStore, WorkspaceMode,
-    bind_endpoint_to_thread, bindings_from_value, create_thread_record,
+    bindings_from_value, create_thread_record,
 };
 
 struct FallbackOnlyThreadCreator;
@@ -2020,25 +2020,30 @@ async fn test_route_and_dispatch_reply_routing_falls_back_to_rebound_thread_when
     )
     .await
     .expect("thread should be created");
-    bind_endpoint_to_thread(
-        &store_dyn,
-        &new_thread,
-        ChannelBinding {
-            channel: "telegram".to_owned(),
-            account_id: "bot1".to_owned(),
-            binding_key: "user42".to_owned(),
-            chat_id: "user42".to_owned(),
-            delivery_target_type: "chat_id".to_owned(),
-            delivery_target_id: "user42".to_owned(),
-            display_label: "user42".to_owned(),
-            last_inbound_at: None,
-            last_delivery_at: None,
-        },
-    )
-    .await
-    .expect("bind should succeed");
+    let (mut router, mutator) = test_router(store.clone(), GaryxConfig::default());
+    let old_binding = bindings_from_value(&store.get("thread::old").await.unwrap())
+        .into_iter()
+        .next()
+        .unwrap();
+    mutator.seed_owner("thread::old", old_binding).await;
+    router
+        .bind_endpoint_runtime(
+            &new_thread,
+            ChannelBinding {
+                channel: "telegram".to_owned(),
+                account_id: "bot1".to_owned(),
+                binding_key: "user42".to_owned(),
+                chat_id: "user42".to_owned(),
+                delivery_target_type: "chat_id".to_owned(),
+                delivery_target_id: "user42".to_owned(),
+                display_label: "user42".to_owned(),
+                last_inbound_at: None,
+                last_delivery_at: None,
+            },
+        )
+        .await
+        .expect("bind should succeed");
 
-    let mut router = MessageRouter::new(store.clone(), GaryxConfig::default());
     router.record_outbound_message_for_chat(
         "thread::old",
         "telegram",
@@ -2086,7 +2091,7 @@ async fn test_route_and_dispatch_reply_routing_falls_back_to_rebound_thread_when
 async fn test_route_and_dispatch_reply_routing_falls_back_after_real_initial_dispatch_and_delete() {
     let store = Arc::new(InMemoryThreadStore::new());
     let store_dyn: Arc<dyn crate::ThreadStore> = store.clone();
-    let mut router = MessageRouter::new(store.clone(), GaryxConfig::default());
+    let (mut router, _) = test_router(store.clone(), GaryxConfig::default());
     let dispatcher = MockDispatcher::new();
 
     let initial = InboundRequest {
@@ -2125,23 +2130,23 @@ async fn test_route_and_dispatch_reply_routing_falls_back_after_real_initial_dis
     )
     .await
     .expect("thread should be created");
-    bind_endpoint_to_thread(
-        &store_dyn,
-        &new_thread,
-        ChannelBinding {
-            channel: "telegram".to_owned(),
-            account_id: "bot1".to_owned(),
-            binding_key: "user42".to_owned(),
-            chat_id: "user42".to_owned(),
-            delivery_target_type: "chat_id".to_owned(),
-            delivery_target_id: "user42".to_owned(),
-            display_label: "user42".to_owned(),
-            last_inbound_at: None,
-            last_delivery_at: None,
-        },
-    )
-    .await
-    .expect("bind should succeed");
+    router
+        .bind_endpoint_runtime(
+            &new_thread,
+            ChannelBinding {
+                channel: "telegram".to_owned(),
+                account_id: "bot1".to_owned(),
+                binding_key: "user42".to_owned(),
+                chat_id: "user42".to_owned(),
+                delivery_target_type: "chat_id".to_owned(),
+                delivery_target_id: "user42".to_owned(),
+                display_label: "user42".to_owned(),
+                last_inbound_at: None,
+                last_delivery_at: None,
+            },
+        )
+        .await
+        .expect("bind should succeed");
 
     assert!(store.delete(&initial_result.thread_id).await);
     router.rebuild_thread_indexes().await;