feat: interactive rewind command to truncate conversations and revert file changes

crates/forge_api/src/api.rs

@@ -260,4 +260,8 @@ pub trait API: Sync + Send {
 
     /// Check the OAuth authentication status of an MCP server
     async fn mcp_auth_status(&self, server_url: &str) -> Result<String>;
+
+    /// Undoes the most recent snapshot for the given file path.
+    /// Used by the rewind command to revert file changes.
+    async fn undo_snapshot(&self, path: &str) -> Result<()>;
 }

crates/forge_api/src/forge_api.rs

@@ -67,7 +67,8 @@ impl<
     F: CommandInfra
         + EnvironmentInfra<Config = forge_config::ForgeConfig>
         + SkillRepository
-        + GrpcInfra,
+        + GrpcInfra
+        + SnapshotRepository,
 > API for ForgeAPI<A, F>
 {
     async fn discover(&self) -> Result<Vec<File>> {
@@ -435,6 +436,11 @@ impl<
         Ok(forge_infra::mcp_auth_status(server_url, &env).await)
     }
 
+    async fn undo_snapshot(&self, path: &str) -> Result<()> {
+        self.infra.undo_snapshot(std::path::Path::new(path)).await?;
+        Ok(())
+    }
+
     fn hydrate_channel(&self) -> Result<()> {
         self.infra.hydrate();
         Ok(())

crates/forge_app/src/tool_registry.rs

@@ -218,9 +218,25 @@ impl<S: Services + EnvironmentInfra<Config = forge_config::ForgeConfig>> ToolReg
     ) -> ToolResult {
         let call_id = call.call_id.clone();
         let tool_name = call.name.clone();
-        let output = self.call_inner(agent, call, context).await;
+        let output = self.call_inner(agent, call.clone(), context).await;
 
-        ToolResult::new(tool_name).call_id(call_id).output(output)
+        let mut modified_files = Vec::new();
+        if let Ok(output) = &output {
+            if let Some(text) = output.as_str() {
+                modified_files = forge_domain::extract_modified_files_from_output(text);
+            }
+
+            // Fallback to extraction from arguments if output didn't yield anything
+            // This is important for relative paths provided in tool arguments
+            if modified_files.is_empty() {
+                modified_files = Self::extract_modified_files(&call);
+            }
+        }
+
+        ToolResult::new(tool_name)
+            .call_id(call_id)
+            .output(output)
+            .modified_files(modified_files)
     }
 
     pub async fn list(&self) -> anyhow::Result<Vec<ToolDefinition>> {
@@ -381,6 +397,26 @@ impl<S> ToolRegistry<S> {
         IMAGE_EXTENSIONS.iter().any(|ext| path_lower.ends_with(ext))
     }
 
+    /// Extracts the file path from a tool call's arguments if it's a
+    /// file-modifying tool (write, patch, remove). Returns an empty vec
+    /// for non-modifying tools or if the path cannot be parsed.
+    fn extract_modified_files(call: &ToolCallFull) -> Vec<String> {
+        match call.name.as_str() {
+            "write" | "patch" | "multi_patch" | "remove" => {
+                if let Ok(args) = call.arguments.parse() {
+                    if let Some(file_path) = args.get("file_path").and_then(|v| v.as_str()) {
+                        return vec![file_path.to_string()];
+                    }
+                    if let Some(path) = args.get("path").and_then(|v| v.as_str()) {
+                        return vec![path.to_string()];
+                    }
+                }
+                vec![]
+            }
+            _ => vec![],
+        }
+    }
+
     /// Validates if a tool's modality requirements are supported by the current
     /// model.
     ///

crates/forge_domain/src/compact/summary.rs

@@ -451,6 +451,7 @@ mod tests {
             name: ToolName::new(name),
             call_id: Some(ToolCallId::new(call_id)),
             output: ToolOutput::text("result").is_error(is_error),
+            modified_files: vec![],
         })
     }
 
@@ -805,6 +806,7 @@ mod tests {
                 name: ToolName::new("read"),
                 call_id: None,
                 output: ToolOutput::text("result"),
+                modified_files: vec![],
             }),
         ]);