fix: update conversation on each turn (tailcallhq#947)

laststylebender14 · autofix-ci[bot] · tusharmath · web-flow · commit b5e40fefa46e · 2025-06-13T15:38:09.000Z
Co-authored-by: autofix-ci[bot] &lt;114827586+autofix-ci[bot]@users.noreply.github.com&gt;
Co-authored-by: Tushar Mathur &lt;tusharmath@gmail.com&gt;
diff --git a/crates/forge_app/src/agent.rs b/crates/forge_app/src/agent.rs
@@ -1,12 +1,12 @@
 use std::sync::Arc;
 
 use forge_domain::{
-    Agent, ChatCompletionMessage, Context, ModelId, ResultStream, ToolCallContext, ToolCallFull,
-    ToolResult,
+    Agent, ChatCompletionMessage, Context, Conversation, ModelId, ResultStream, ToolCallContext,
+    ToolCallFull, ToolResult,
 };
 
 use crate::tool_registry::ToolRegistry;
-use crate::{ProviderService, Services};
+use crate::{ConversationService, ProviderService, Services};
 
 /// Agent service trait that provides core chat and tool call functionality.
 /// This trait abstracts the essential operations needed by the Orchestrator.
@@ -26,6 +26,9 @@ pub trait AgentService: Send + Sync + 'static {
         context: &mut ToolCallContext,
         call: ToolCallFull,
     ) -> ToolResult;
+
+    /// Synchronize the on-going conversation
+    async fn update(&self, conversation: Conversation) -> anyhow::Result<()>;
 }
 
 /// Blanket implementation of AgentService for any type that implements Services
@@ -51,4 +54,8 @@ where
         let registry = ToolRegistry::new(Arc::new(self.clone()));
         registry.call(agent, context, call).await
     }
+
+    async fn update(&self, conversation: Conversation) -> anyhow::Result<()> {
+        self.conversation_service().upsert(conversation).await
+    }
 }
diff --git a/crates/forge_app/src/orch.rs b/crates/forge_app/src/orch.rs
@@ -310,6 +310,7 @@ impl<S: AgentService> Orchestrator<S> {
         while !is_complete {
             // Set context for the current loop iteration
             self.conversation.context = Some(context.clone());
+            self.services.update(self.conversation.clone()).await?;
 
             let ChatCompletionMessageFull { tool_calls, content, mut usage } = self
                 .environment
@@ -403,6 +404,7 @@ impl<S: AgentService> Orchestrator<S> {
 
             // Update context in the conversation
             self.conversation.context = Some(context.clone());
+            self.services.update(self.conversation.clone()).await?;
         }
 
         Ok(())
