fix: subchat using same app capture, get threads for subchat filter by tool call id

Author: humbertoyusta

refact-agent/engine/src/cloud/subchat.rs

@@ -2,6 +2,7 @@ use std::sync::Arc;
 use std::sync::atomic::Ordering;
 use futures::StreamExt;
 use crate::at_commands::at_commands::AtCommandsContext;
+use crate::global_context::APP_CAPTURE_ID;
 use tokio::sync::Mutex as AMutex;
 use crate::call_validation::{ChatMessage, ReasoningEffort};
 use crate::cloud::{threads_req, messages_req};
@@ -71,7 +72,8 @@ pub async fn subchat(
         &api_key,
         &located_fgroup_id,
         &app_searchable_id,
-        tool_call_id
+        APP_CAPTURE_ID,
+        Some(tool_call_id),
     ).await?;
     let thread = if !existing_threads.is_empty() {
         info!("There are already existing threads for this tool_id: {:?}", existing_threads);
@@ -83,14 +85,13 @@ pub async fn subchat(
             &located_fgroup_id,
             ft_fexp_id,
             &format!("subchat_{}", ft_fexp_id),
-            &tool_call_id,
+            APP_CAPTURE_ID,
             &app_searchable_id,
             serde_json::json!({
-            "tool_call_id": tool_call_id,
-            "ft_fexp_id": ft_fexp_id,
-        }),
+                "tool_call_id": tool_call_id,
+                "ft_fexp_id": ft_fexp_id,
+            }),
             None,
-            Some(parent_thread_id)
         ).await?;
         let thread_messages = messages_req::convert_messages_to_thread_messages(
             messages, 100, 100, 1, &thread.ft_id, Some(preferences)

refact-agent/engine/src/cloud/threads_req.rs

@@ -32,10 +32,9 @@ pub async fn create_thread(
     ft_app_searchable: &str,
     ft_app_specific: Value,
     ft_toolset: Option<Vec<Value>>,
-    parent_ft_id: Option<String>,
 ) -> Result<Thread, String> {
     use crate::cloud::graphql_client::{execute_graphql, GraphQLRequestConfig};
-    
+
     let mutation = r#"
     mutation CreateThread($input: FThreadInput!) {
         thread_create(input: $input) {
@@ -64,8 +63,8 @@ pub async fn create_thread(
         Some(toolset) => serde_json::to_string(&toolset).map_err(|e| format!("Failed to serialize toolset: {}", e))?,
         None => "null".to_string(),
     };
-    
-    let mut input = json!({
+
+    let input = json!({
         "owner_shared": false,
         "located_fgroup_id": located_fgroup_id,
         "ft_fexp_id": ft_fexp_id,
@@ -76,10 +75,6 @@ pub async fn create_thread(
         "ft_app_specific": serde_json::to_string(&ft_app_specific).unwrap(),
     });
 
-    if let Some(parent_id) = parent_ft_id {
-        input["parent_ft_id"] = json!(parent_id);
-    }
-
     let config = GraphQLRequestConfig {
         address: cmd_address_url.to_string(),
         api_key: api_key.to_string(),
@@ -104,7 +99,7 @@ pub async fn get_thread(
     thread_id: &str,
 ) -> Result<Thread, String> {
     use crate::cloud::graphql_client::{execute_graphql, GraphQLRequestConfig};
-    
+
     let query = r#"
     query GetThread($id: String!) {
         thread_get(id: $id) {
@@ -151,12 +146,18 @@ pub async fn get_threads_app_captured(
     located_fgroup_id: &str,
     ft_app_searchable: &str,
     ft_app_capture: &str,
+    tool_call_id: Option<&str>,
 ) -> Result<Vec<Thread>, String> {
     use crate::cloud::graphql_client::{execute_graphql, GraphQLRequestConfig};
-    
+
     let query = r#"
-    query GetThread($located_fgroup_id: String!, $ft_app_capture: String!, $ft_app_searchable: String!) {
-        threads_app_captured(located_fgroup_id: $located_fgroup_id, ft_app_capture: $ft_app_capture, ft_app_searchable: $ft_app_searchable) {
+    query GetThread($located_fgroup_id: String!, $ft_app_capture: String!, $ft_app_searchable: String!, $ft_app_specific_filters: [FTAppSpecificFilter!]) {
+        threads_app_captured(
+            located_fgroup_id: $located_fgroup_id,
+            ft_app_capture: $ft_app_capture,
+            ft_app_searchable: $ft_app_searchable,
+            ft_app_specific_filters: $ft_app_specific_filters
+        ) {
             owner_fuser_id
             owner_shared
             located_fgroup_id
@@ -187,7 +188,11 @@ pub async fn get_threads_app_captured(
     let variables = json!({
         "located_fgroup_id": located_fgroup_id,
         "ft_app_capture": ft_app_capture,
-        "ft_app_searchable": ft_app_searchable
+        "ft_app_searchable": ft_app_searchable,
+        "ft_app_specific_filters": match tool_call_id {
+            Some(id) => vec![json!({ "path": "tool_call_id", "equals": id })],
+            None => Vec::new(),
+        },
     });
     tracing::info!("get_threads_app_captured: address={}, located_fgroup_id={}, ft_app_capture={}, ft_app_searchable={}",
         config.address, located_fgroup_id, ft_app_capture, ft_app_searchable
@@ -209,15 +214,15 @@ pub async fn set_thread_toolset(
     ft_toolset: Vec<Value>
 ) -> Result<Vec<Value>, String> {
     use crate::cloud::graphql_client::{execute_graphql, GraphQLRequestConfig};
-    
+
     let mutation = r#"
     mutation UpdateThread($thread_id: String!, $patch: FThreadPatch!) {
         thread_patch(id: $thread_id, patch: $patch) {
             ft_toolset
         }
     }
     "#;
-    
+
     let variables = json!({
         "thread_id": thread_id,
         "patch": {
@@ -258,12 +263,12 @@ pub async fn lock_thread(
     hash: &str,
 ) -> Result<(), String> {
     use crate::cloud::graphql_client::{execute_graphql_bool_result, GraphQLRequestConfig};
-    
+
     let worker_name = format!("refact-lsp:{hash}");
     let query = r#"
         mutation AdvanceLock($ft_id: String!, $worker_name: String!) {
             thread_lock(ft_id: $ft_id, worker_name: $worker_name)
-        } 
+        }
     "#;
 
     let config = GraphQLRequestConfig {
@@ -273,7 +278,7 @@ pub async fn lock_thread(
     };
 
     let variables = json!({
-        "ft_id": thread_id, 
+        "ft_id": thread_id,
         "worker_name": worker_name
     });
 
@@ -303,7 +308,7 @@ pub async fn unlock_thread(
     hash: &str,
 ) -> Result<(), String> {
     use crate::cloud::graphql_client::{execute_graphql_bool_result, GraphQLRequestConfig};
-    
+
     let worker_name = format!("refact-lsp:{hash}");
     let query = r#"
         mutation AdvanceUnlock($ft_id: String!, $worker_name: String!) {
@@ -318,7 +323,7 @@ pub async fn unlock_thread(
     };
 
     let variables = json!({
-        "ft_id": thread_id, 
+        "ft_id": thread_id,
         "worker_name": worker_name
     });
 
@@ -348,15 +353,15 @@ pub async fn set_error_thread(
     error: &str,
 ) -> Result<(), String> {
     use crate::cloud::graphql_client::{execute_graphql_no_result, GraphQLRequestConfig};
-    
+
     let mutation = r#"
     mutation SetThreadError($thread_id: String!, $patch: FThreadPatch!) {
         thread_patch(id: $thread_id, patch: $patch) {
             ft_error
         }
     }
     "#;
-    
+
     let variables = json!({
         "thread_id": thread_id,
         "patch": {
@@ -369,7 +374,7 @@ pub async fn set_error_thread(
         api_key: api_key.to_string(),
         ..Default::default()
     };
-    
+
     tracing::info!("unlock_thread: address={}, thread_id={}, ft_error={}",
         config.address, thread_id, error
     );
@@ -390,16 +395,16 @@ pub async fn set_thread_confirmation_request(
     confirmation_request: Value,
 ) -> Result<bool, String> {
     use crate::cloud::graphql_client::{execute_graphql_bool_result, GraphQLRequestConfig};
-    
+
     let mutation = r#"
     mutation SetThreadConfirmationRequest($ft_id: String!, $confirmation_request: String!) {
         thread_set_confirmation_request(ft_id: $ft_id, confirmation_request: $confirmation_request)
     }
     "#;
-    
+
     let confirmation_request_str = serde_json::to_string(&confirmation_request)
         .map_err(|e| format!("Failed to serialize confirmation request: {}", e))?;
-    
+
     let variables = json!({
         "ft_id": thread_id,
         "confirmation_request": confirmation_request_str