From 737580bb87f3b1d2f040dd7a4ddacca3595915a0 Mon Sep 17 00:00:00 2001
From: sigoden <sigoden@gmail.com>
Date: Fri, 13 Dec 2024 19:43:38 +0800
Subject: fix: agent variables don't initialized if start session with last
 message (#1054)

---
 src/config/agent.rs | 2 +-
 src/config/mod.rs   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/config/agent.rs b/src/config/agent.rs
index 6418efa..d3f248e 100644
--- a/src/config/agent.rs
+++ b/src/config/agent.rs
@@ -281,7 +281,7 @@ impl Agent {
             None => &mut self.shared_variables,
         };
         let Some(old_value) = variables.get(key) else {
-            bail!("Unknown variable: '{key}'")
+            bail!("Unknown variable '{key}'")
         };
         if old_value == value {
             return Ok(());
diff --git a/src/config/mod.rs b/src/config/mod.rs
index f82cecc..48ca390 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -1047,8 +1047,10 @@ impl Config {
                 }
             }
         }
+        let mut new_session = false;
         if let Some(session) = session.as_mut() {
             if session.is_empty() {
+                new_session = true;
                 if let Some((input, output)) = &self.last_message {
                     if self.agent.is_some() == input.with_agent() {
                         let ans = Confirm::new(
@@ -1064,7 +1066,7 @@ impl Config {
             }
         }
         self.session = session;
-        self.init_agent_session_variables()?;
+        self.init_agent_session_variables(new_session)?;
         Ok(())
     }
 
@@ -2033,12 +2035,12 @@ impl Config {
         Ok(())
     }
 
-    fn init_agent_session_variables(&mut self) -> Result<()> {
+    fn init_agent_session_variables(&mut self, new_session: bool) -> Result<()> {
         let (agent, session) = match (self.agent.as_mut(), self.session.as_mut()) {
             (Some(agent), Some(session)) => (agent, session),
             _ => return Ok(()),
         };
-        if session.is_empty() {
+        if new_session {
             let shared_variables = agent.shared_variables().clone();
             let session_variables =
                 if !agent.defined_variables().is_empty() && shared_variables.is_empty() {
-- 
cgit v1.2.3