sigit-code 1.7.2__tar.gz → 1.7.3__tar.gz

{sigit_code-1.7.2 → sigit_code-1.7.3}/Cargo.lock

@@ -5945,7 +5945,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "sigit"
-version = "1.7.2"
+version = "1.7.3"
 dependencies = [
  "agent-client-protocol",
  "anyhow",
@@ -5976,7 +5976,7 @@ dependencies = [
 
 [[package]]
 name = "sigit-agent"
-version = "1.7.2"
+version = "1.7.3"
 dependencies = [
  "agent-client-protocol",
  "anyhow",

{sigit_code-1.7.2 → sigit_code-1.7.3}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "3"
 members = ["crates/cli", "crates/sigit-*"]
 
 [workspace.package]
-version = "1.7.2"
+version = "1.7.3"
 edition = "2024"
 license = "Apache-2.0"
 repository = "https://github.com/getsigit/sigit"
@@ -16,7 +16,7 @@ authors = ["Seto Elkahfi <seto@sigit.si>", "paydii <193906237+paydii@users.norep
 # crates.io, so this resolves from the registry rather than the onde-ed checkout next door.
 ed-acp = { version = "1.3.0", default-features = false }
 ed-acp-testkit = "1.3.0"
-sigit-agent = { version = "1.7.2", default-features = false, path = "crates/sigit-agent" }
+sigit-agent = { version = "1.7.3", default-features = false, path = "crates/sigit-agent" }
 
 # ACP protocol SDK
 agent-client-protocol = { version = "2.2", features = ["unstable_session_fork"] }

{sigit_code-1.7.2 → sigit_code-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sigit-code
-Version: 1.7.2
+Version: 1.7.3
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{sigit_code-1.7.2 → sigit_code-1.7.3}/crates/cli/src/main.rs

@@ -2587,7 +2587,7 @@ impl SiGitAgent {
         cancellation: &PromptCancellation,
     ) {
         if workspace.reacquire().await
-            && let Err(error) = self.activate_session(session_id).await
+            && let Err(error) = self.reinstall_for_tools(session_id).await
         {
             log::warn!(
                 "session({session_id}): could not reinstall mid-turn, cancelling the turn: {}",
@@ -2598,6 +2598,30 @@ impl SiGitAgent {
         }
     }
 
+    /// Make `session_id` the live session and check that its directory is still
+    /// there. Tools resolve relative paths against the process directory, and
+    /// `install_session` leaves that alone when the session's `cwd` is gone, so
+    /// a prompt or a tool run on such a session would act in the previous
+    /// session's directory. Load, resume and fork do not call this: they
+    /// succeed for a deleted project so a client can still show its history.
+    async fn reinstall_for_tools(
+        &self,
+        session_id: &SessionId,
+    ) -> agent_client_protocol::Result<()> {
+        self.activate_session(session_id).await?;
+        let cwd = self.session_cwd.lock().unwrap().clone();
+        match cwd {
+            Some(cwd) if !cwd.is_dir() => Err(agent_client_protocol::Error::new(
+                ErrorCode::ResourceNotFound.into(),
+                format!(
+                    "the working directory of session {session_id} no longer exists: {}",
+                    cwd.display()
+                ),
+            )),
+            _ => Ok(()),
+        }
+    }
+
     /// Point the process at `state`'s roots and load its conversation.
     ///
     /// The process follows `cwd` because tool calls may use relative paths; the
@@ -2619,9 +2643,12 @@ impl SiGitAgent {
         }
         workspace::replace_additional_roots(additional_roots.clone());
         mcp::set_session_servers(mcp_servers);
-        if cwd.is_dir()
-            && let Err(err) = std::env::set_current_dir(&cwd)
-        {
+        if !cwd.is_dir() {
+            log::warn!(
+                "session({key}): cwd {} no longer exists, prompts and tools on it will fail",
+                cwd.display()
+            );
+        } else if let Err(err) = std::env::set_current_dir(&cwd) {
             log::warn!("could not set cwd to {}: {err}", cwd.display());
         }
         *self.active_session.lock().unwrap() = Some(key.to_string());
@@ -3270,7 +3297,7 @@ impl SiGitAgent {
         if cancellation.cancelled.load(Ordering::Acquire) {
             return Ok(PromptResponse::new(StopReason::Cancelled));
         }
-        self.activate_session(&session_id).await?;
+        self.reinstall_for_tools(&session_id).await?;
         if cancellation.cancelled.load(Ordering::Acquire) {
             return Ok(PromptResponse::new(StopReason::Cancelled));
         }
@@ -7609,6 +7636,50 @@ mod tests {
         assert!(agent.active_session.lock().unwrap().is_none());
     }
 
+    #[tokio::test]
+    #[allow(clippy::await_holding_lock)] // the lock guards process-global env for the whole test
+    async fn a_session_whose_directory_is_gone_loads_but_refuses_tools() {
+        let _guard = crate::ENV_TEST_LOCK
+            .lock()
+            .unwrap_or_else(|poisoned| poisoned.into_inner());
+        let agent = SiGitAgent::new(
+            Arc::new(ChatEngine::new()),
+            GgufModelConfig::qwen25_3b(),
+            Arc::new(AtomicBool::new(true)),
+            Arc::new(AtomicBool::new(false)),
+            Arc::new(std::sync::Mutex::new(None)),
+            false,
+            false,
+        );
+        let dir = std::env::temp_dir().join(format!("sigit_gone_cwd_{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        let thread = SessionId::new("gone-cwd-thread");
+        agent
+            .sessions
+            .lock()
+            .unwrap()
+            .insert("gone-cwd-thread".into(), agent.session_state(&dir, &[]));
+        std::fs::remove_dir_all(&dir).unwrap();
+
+        // Load, resume and fork only activate, so they still succeed.
+        agent.activate_session(&thread).await.unwrap();
+
+        // A prompt or a tool run does not.
+        *agent.active_session.lock().unwrap() = None;
+        let error = agent.reinstall_for_tools(&thread).await.unwrap_err();
+        assert_eq!(error.code, ErrorCode::ResourceNotFound);
+        assert!(error.message.contains("no longer exists"));
+
+        let cancellation = PromptCancellation::default();
+        let mut workspace = WorkspaceHold::acquire(&agent.workspace_lock).await;
+        workspace.release();
+        *agent.active_session.lock().unwrap() = None;
+        agent
+            .resume_workspace(&mut workspace, &thread, &cancellation)
+            .await;
+        assert!(cancellation.cancelled.load(Ordering::Acquire));
+    }
+
     #[test]
     fn session_context_message_lists_every_root_of_a_multi_root_project() {
         let primary = PathBuf::from("/tmp/primary");