v1 of many gitbutler cli commands

crates/but-rules/Cargo.toml

@@ -14,6 +14,7 @@ anyhow = "1.0.99"
 itertools.workspace = true
 serde.workspace = true
 regex = "1.11.2"
+gix = { workspace = true }
 chrono = { version = "0.4.41", features = [] }
 serde_regex = "1.1.0"
 serde_json = "1.0.143"

crates/but-rules/src/handler.rs

@@ -1,7 +1,7 @@
 use but_graph::VirtualBranchesTomlMetadata;
 use but_hunk_assignment::{HunkAssignment, assign, assignments_to_requests};
 use but_hunk_dependency::ui::HunkDependencies;
-use but_workspace::{StackId, StacksFilter, ui::StackEntry};
+use but_workspace::{DiffSpec, StackId, StacksFilter, commit_engine, ui::StackEntry};
 use gitbutler_command_context::CommandContext;
 use itertools::Itertools;
 use std::str::FromStr;
@@ -26,6 +26,9 @@ pub fn process_workspace_rules(
             matches!(
                 &r.action,
                 super::Action::Explicit(super::Operation::Assign { .. })
+            ) || matches!(
+                &r.action,
+                super::Action::Explicit(super::Operation::Amend { .. })
             )
         })
         .collect_vec();
@@ -60,6 +63,10 @@ pub fn process_workspace_rules(
                         handle_assign(ctx, assignments, dependencies.as_ref()).unwrap_or_default();
                 }
             }
+            super::Action::Explicit(super::Operation::Amend { change_id }) => {
+                let assignments = matching(assignments, rule.filters.clone());
+                handle_amend(ctx, assignments, change_id).unwrap_or_default();
+            }
             _ => continue,
         };
     }
@@ -137,6 +144,60 @@ fn handle_assign(
     }
 }
 
+fn handle_amend(
+    ctx: &mut CommandContext,
+    assignments: Vec<HunkAssignment>,
+    change_id: String,
+) -> anyhow::Result<()> {
+    let changes: Vec<DiffSpec> = assignments.into_iter().map(|a| a.into()).collect();
+    let project = ctx.project();
+    let mut guard = project.exclusive_worktree_access();
+    let repo = but_core::open_repo_for_merging(project.worktree_path())?;
+
+    let meta = VirtualBranchesTomlMetadata::from_path(
+        ctx.project().gb_dir().join("virtual_branches.toml"),
+    )?;
+    let ref_info_options = but_workspace::ref_info::Options {
+        expensive_commit_info: true,
+        traversal: meta.graph_options(),
+    };
+    let info = but_workspace::head_info(&repo, &meta, ref_info_options)?;
+    let mut commit_id: Option<gix::ObjectId> = None;
+    'outer: for stack in info.stacks {
+        for segment in stack.segments {
+            for commit in segment.commits {
+                if Some(change_id.clone()) == commit.change_id.map(|c| c.to_string()) {
+                    commit_id = Some(commit.id);
+                    break 'outer;
+                }
+            }
+        }
+    }
+
+    let commit_id = commit_id.ok_or_else(|| {
+        anyhow::anyhow!(
+            "No commit with Change-Id {} found in the current workspace",
+            change_id
+        )
+    })?;
+
+    commit_engine::create_commit_and_update_refs_with_project(
+        &repo,
+        project,
+        None,
+        commit_engine::Destination::AmendCommit {
+            commit_id,
+            // TODO: Expose this in the UI for 'edit message' functionality.
+            new_message: None,
+        },
+        None,
+        changes,
+        ctx.app_settings().context_lines,
+        guard.write_permission(),
+    )?;
+    Ok(())
+}
+
 fn matching(wt_assignments: &[HunkAssignment], filters: Vec<Filter>) -> Vec<HunkAssignment> {
     if filters.is_empty() {
         return wt_assignments.to_vec();

crates/but-rules/src/lib.rs

@@ -46,6 +46,14 @@ impl WorkspaceRule {
         }
     }
 
+    pub fn target_commit_id(&self) -> Option<String> {
+        if let Action::Explicit(Operation::Amend { change_id }) = &self.action {
+            Some(change_id.clone())
+        } else {
+            None
+        }
+    }
+
     pub fn id(&self) -> String {
         self.id.clone()
     }
@@ -139,7 +147,7 @@ pub enum Operation {
     /// Assign the matched changes to a specific stack ID.
     Assign { target: StackTarget },
     /// Amend the matched changes into a specific commit.
-    Amend { commit_id: String },
+    Amend { change_id: String },
     /// Create a new commit with the matched changes on a specific branch.
     NewCommit { branch_name: String },
 }
@@ -292,7 +300,7 @@ pub fn list_rules(ctx: &mut CommandContext) -> anyhow::Result<Vec<WorkspaceRule>
     Ok(rules)
 }
 
-fn process_rules(ctx: &mut CommandContext) -> anyhow::Result<()> {
+pub fn process_rules(ctx: &mut CommandContext) -> anyhow::Result<()> {
     let wt_changes = but_core::diff::worktree_changes(&ctx.gix_repo()?)?;
 
     let dependencies = hunk_dependencies_for_workspace_changes_by_worktree_dir(

crates/but-workspace/src/stacks.rs

@@ -167,20 +167,20 @@ pub fn stacks_v3(
         applied_stacks: &[branch::Stack],
     ) -> anyhow::Result<Vec<ui::StackEntry>> {
         let mut out = Vec::new();
+        // Create a set of all ref names that are in applied stacks for efficient lookup
+        let applied_ref_names: std::collections::HashSet<_> = applied_stacks
+            .iter()
+            .flat_map(|stack| &stack.segments)
+            .filter_map(|segment| segment.ref_name.as_ref())
+            .collect();
+
         for item in meta.iter() {
             let (ref_name, ref_meta) = item?;
             if !ref_meta.is::<but_core::ref_metadata::Branch>() {
                 continue;
             };
-            let is_applied = applied_stacks.iter().any(|stack| {
-                stack.segments.iter().any(|segment| {
-                    segment
-                        .ref_name
-                        .as_ref()
-                        .is_some_and(|name| name == &ref_name)
-                })
-            });
-            if is_applied {
+            // Check if this ref_name is in our applied_ref_names set
+            if applied_ref_names.contains(&ref_name) {
                 continue;
             }
 
@@ -222,21 +222,41 @@ pub fn stacks_v3(
         stacks: Vec<branch::Stack>,
         meta: &VirtualBranchesTomlMetadata,
     ) -> Vec<ui::StackEntry> {
+        use std::collections::HashSet;
+        let mut seen_ids = HashSet::new();
+
         stacks
             .into_iter()
             .filter_map(|stack| try_from_stack_v3(repo, stack, meta).ok())
+            .filter(|entry| {
+                // Deduplicate by stack ID if present
+                match entry.id {
+                    Some(id) => seen_ids.insert(id),
+                    None => true, // Always include stacks without IDs
+                }
+            })
             .collect()
     }
 
-    let unapplied_stacks = unapplied_stacks(repo, meta, &info.stacks)?;
     Ok(match filter {
         StacksFilter::InWorkspace => into_ui_stacks(repo, info.stacks, meta),
         StacksFilter::All => {
+            let unapplied_stacks = unapplied_stacks(repo, meta, &info.stacks)?;
             let mut all_stacks = unapplied_stacks;
             all_stacks.extend(into_ui_stacks(repo, info.stacks, meta));
-            all_stacks
+
+            // Deduplicate by ID across both applied and unapplied stacks
+            use std::collections::HashMap;
+            let mut deduped: HashMap<Option<StackId>, ui::StackEntry> = HashMap::new();
+            for stack in all_stacks {
+                deduped.insert(stack.id, stack);
+            }
+            deduped.into_values().collect()
+        }
+        StacksFilter::Unapplied => {
+            let unapplied_stacks = unapplied_stacks(repo, meta, &info.stacks)?;
+            unapplied_stacks
         }
-        StacksFilter::Unapplied => unapplied_stacks,
     })
 }
 

crates/but/Cargo.toml

@@ -30,6 +30,7 @@ anyhow.workspace = true
 rmcp.workspace = true
 command-group = { version = "5.0.1", features = ["with-tokio"] }
 sysinfo = "0.37.0"
+regex = "1.11.1"
 gitbutler-project.workspace = true
 gix.workspace = true
 but-core.workspace = true
@@ -42,15 +43,24 @@ but-hunk-assignment.workspace = true
 but-hunk-dependency.workspace = true
 but-claude.workspace = true
 but-tools.workspace = true
+but-rules.workspace = true
 gitbutler-command-context.workspace = true
 gitbutler-serde.workspace = true
 gitbutler-stack.workspace = true
+gitbutler-commit.workspace = true
 gitbutler-branch-actions.workspace = true
 gitbutler-branch.workspace = true
+gitbutler-reference.workspace = true
 gitbutler-secret.workspace = true
 gitbutler-oxidize.workspace = true
+gitbutler-repo.workspace = true
+gitbutler-user.workspace = true
+gitbutler-oplog.workspace = true
+gitbutler-diff.workspace = true
+git2.workspace = true
 colored = "3.0.0"
 serde_json = "1.0.143"
+reqwest = { version = "0.12", default-features = false, features = ["blocking", "rustls-tls"] }
 tracing.workspace = true
 tracing-subscriber = { version = "0.3", features = [
     "env-filter",