delete all flag, add summry when fs read

Author: evanliu048

crates/chat-cli/src/cli/chat/capture.rs

@@ -227,29 +227,6 @@ impl CaptureManager {
         Ok(())
     }
 
-    /// Delete the captures root (all sessions) and recreate it empty.
-    pub async fn clean_all_sessions(&self, os: &Os) -> Result<()> {
-        let root = self
-            .shadow_repo_path
-            .parent()
-            .ok_or_else(|| eyre!("Could not determine captures root"))?;
-
-        // Safety guard: ensure last component contains "captures"
-        if root
-            .file_name()
-            .and_then(|s| s.to_str())
-            .map(|s| s.contains("captures"))
-            != Some(true)
-        {
-            bail!("Refusing to delete unexpected parent directory: {}", root.display());
-        }
-
-        println!("Deleting captures root: {}", root.display());
-        os.fs.remove_dir_all(root).await?;
-        os.fs.create_dir_all(root).await?;
-        Ok(())
-    }
-
     /// Produce a user-friendly diff between two tags, including `--stat`.
     pub fn diff_detailed(&self, tag1: &str, tag2: &str) -> Result<String> {
         let out = run_git(&self.shadow_repo_path, false, &["diff", "--name-status", tag1, tag2])?;

crates/chat-cli/src/cli/chat/cli/capture.rs

@@ -30,10 +30,28 @@ pub enum CaptureSubcommand {
     /// Manually initialize captures
     Init,
 
-    /// Revert to a specified checkpoint or the most recent if none specified
-    /// --hard: reset all files and delete any created since the checkpoint
+    /// Restore workspace to a checkpoint
+    #[command(
+        about = "Restore workspace to a checkpoint",
+        long_about = r#"Restore files to a checkpoint <tag>. If <tag> is omitted, you'll pick one interactively.
+
+Default:
+  • Revert tracked changes and restore tracked deletions.
+  • Do NOT delete files created after the checkpoint.
+
+--hard:
+  • Make workspace exactly match the checkpoint.
+  • Delete tracked files created after the checkpoint.
+
+Notes:
+  • Also rolls back conversation history to the checkpoint.
+  • Tags: turn (e.g., 3) or tool (e.g., 3.1)."#
+    )]
     Restore {
+        /// Checkpoint tag (e.g., 3 or 3.1). Omit to choose interactively.
         tag: Option<String>,
+
+        /// Match checkpoint exactly; deletes tracked files created after it.
         #[arg(long)]
         hard: bool,
     },
@@ -44,12 +62,8 @@ pub enum CaptureSubcommand {
         limit: Option<usize>,
     },
 
-    /// Delete shadow repository or the whole captures root (--all)
-    Clean {
-        /// Delete the entire captures root (all sessions)
-        #[arg(long)]
-        all: bool,
-    },
+    /// Delete shadow repository
+    Clean,
 
     /// Display more information about a turn-level checkpoint
     Expand { tag: String },
@@ -157,32 +171,15 @@ impl CaptureSubcommand {
                     return Err(ChatError::Custom(format!("Could not display all captures: {e}").into()));
                 },
             },
-            Self::Clean { all } => {
-                let res = if all {
-                    manager.clean_all_sessions(os).await
-                } else {
-                    manager.clean(os).await
-                };
-                match res {
+            Self::Clean {} => {
+                match manager.clean(os).await {
                     Ok(()) => execute!(
                         session.stderr,
-                        style::Print(
-                            if all {
-                                "Deleted all session captures under the captures root.\n"
-                            } else {
-                                "Deleted shadow repository for this session.\n"
-                            }
-                            .blue()
-                            .bold()
-                        )
+                        style::Print("Deleted shadow repository for this session.\n".bold())
                     )?,
                     Err(e) => {
                         session.conversation.capture_manager = None;
-                        return Err(ChatError::Custom(if all {
-                            format!("Could not delete captures root: {e}").into()
-                        } else {
-                            format!("Could not delete shadow repo: {e}").into()
-                        }));
+                        return Err(ChatError::Custom(format!("Could not delete shadow repo: {e}").into()));
                     },
                 }
                 session.conversation.capture_manager = None;

crates/chat-cli/src/cli/chat/mod.rs

@@ -2357,9 +2357,14 @@ impl ChatSession {
                     };
                     let tag = if has_uncommitted {
                         let mut tag = format!("{}.{}", manager.num_turns + 1, manager.num_tools_this_turn + 1);
-                        let commit_message = match tool.tool.get_summary() {
-                            Some(summary) => summary,
-                            None => tool.tool.display_name(),
+                        let is_fs_read = matches!(&tool.tool, Tool::FsRead(_));
+                        let commit_message = if is_fs_read {
+                            "External edits detected (likely manual change)".to_string()
+                        } else {
+                            match tool.tool.get_summary() {
+                                Some(summary) => summary,
+                                None => tool.tool.display_name(),
+                            }
                         };
 
                         match manager.create_capture_with_stats(

crates/chat-cli/src/cli/chat/tools/mod.rs

@@ -193,6 +193,7 @@ impl Tool {
         match self {
             Tool::FsWrite(fs_write) => fs_write.get_summary().cloned(),
             Tool::ExecuteCommand(execute_cmd) => execute_cmd.summary.clone(),
+            Tool::FsRead(fs_read) => fs_read.summary.clone(),
             _ => None,
         }
     }