Use Project instead of Path for most handlers

Reduce repetitive Project::find_by_path calls by changing many command handler
signatures to accept a gitbutler_project::Project reference instead of a
&Path. The main entry points now call get_or_init_project(&args.current_dir)
once and pass the Project to downstream handlers. This centralizes project
initialization and avoids duplicating find_by_path logic across modules.

Affected handlers include base, branch, command, commit, describe, log,
mark, oplog, rub, status, and others called from main.rs. Subcommands under
Subcommands::Cursor and Subcommands::Claude were intentionally left
unchanged. Removed unused std::path::Path imports where appropriate.

Author: krlvi

crates/but/src/base/mod.rs

@@ -1,5 +1,3 @@
-use std::path::Path;
-
 use colored::Colorize;
 use gitbutler_branch_actions::upstream_integration::{
     BranchStatus::{Conflicted, Empty, Integrated, SaflyUpdatable},
@@ -21,8 +19,7 @@ pub enum Subcommands {
     Update,
 }
 
-pub fn handle(cmd: &Subcommands, repo_path: &Path, json: bool) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path)?;
+pub fn handle(cmd: &Subcommands, project: &Project, json: bool) -> anyhow::Result<()> {
     match cmd {
         Subcommands::Check => {
             if !json {

crates/but/src/branch/mod.rs

@@ -1,5 +1,3 @@
-use std::path::Path;
-
 use but_settings::AppSettings;
 use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
@@ -22,15 +20,14 @@ pub enum Subcommands {
     },
 }
 
-pub fn handle(cmd: &Subcommands, repo_path: &Path, _json: bool) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path)?;
+pub fn handle(cmd: &Subcommands, project: &Project, _json: bool) -> anyhow::Result<()> {
     match cmd {
         Subcommands::New {
             branch_name,
             anchor,
         } => {
             let ctx =
-                CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+                CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
             // Get branch name or use canned name
             let branch_name = if let Some(name) = branch_name {
                 let repo = ctx.gix_repo()?;

crates/but/src/command/mod.rs

@@ -1,19 +1,16 @@
-use std::path::Path;
-
 use but_action::Source;
 use but_settings::AppSettings;
 use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
 use serde::Serialize;
 
 pub(crate) fn handle_changes(
-    repo_path: &Path,
+    project: &Project,
     json: bool,
     handler: impl Into<but_action::ActionHandler>,
     change_description: &str,
 ) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path).expect("Failed to create project from path");
-    let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+    let ctx = &mut CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
     let response = but_action::handle_changes(
         ctx,
         change_description,
@@ -34,13 +31,12 @@ impl From<crate::args::actions::Handler> for but_action::ActionHandler {
 }
 
 pub(crate) fn list_actions(
-    repo_path: &Path,
+    project: &Project,
     json: bool,
     offset: i64,
     limit: i64,
 ) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path).expect("Failed to create project from path");
-    let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+    let ctx = &mut CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
 
     let response = but_action::list_actions(ctx, offset, limit)?;
     print(&response, json)

crates/but/src/commit/mod.rs

@@ -11,11 +11,9 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
 use std::collections::BTreeMap;
 use std::io::{self, Write};
-use std::path::Path;
 
-pub(crate) fn insert_blank_commit(repo_path: &Path, _json: bool, target: &str) -> Result<()> {
-    let project = Project::find_by_path(repo_path)?;
-    let mut ctx = CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+pub(crate) fn insert_blank_commit(project: &Project, _json: bool, target: &str) -> Result<()> {
+    let mut ctx = CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
 
     // Resolve the target ID
     let cli_ids = CliId::from_str(&mut ctx, target)?;
@@ -135,14 +133,13 @@ fn find_stack_containing_commit(
 }
 
 pub(crate) fn commit(
-    repo_path: &Path,
+    project: &Project,
     _json: bool,
     message: Option<&str>,
     branch_hint: Option<&str>,
     only: bool,
 ) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path)?;
-    let mut ctx = CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+    let mut ctx = CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
 
     // Get all stacks using but-api
     let project_id = project.id;

crates/but/src/describe/mod.rs

@@ -4,15 +4,13 @@ use but_settings::AppSettings;
 use gitbutler_command_context::CommandContext;
 use gitbutler_oxidize::ObjectIdExt;
 use gitbutler_project::Project;
-use std::path::Path;
 
 pub(crate) fn edit_commit_message(
-    repo_path: &Path,
+    project: &Project,
     _json: bool,
     commit_target: &str,
 ) -> Result<()> {
-    let project = Project::find_by_path(repo_path)?;
-    let mut ctx = CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+    let mut ctx = CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
 
     // Resolve the commit ID
     let cli_ids = CliId::from_str(&mut ctx, commit_target)?;
@@ -33,7 +31,7 @@ pub(crate) fn edit_commit_message(
 
     match cli_id {
         CliId::Commit { oid } => {
-            edit_commit_message_by_id(&ctx, &project, *oid)?;
+            edit_commit_message_by_id(&ctx, project, *oid)?;
         }
         _ => {
             anyhow::bail!("Target must be a commit ID, not {}", cli_id.kind());

crates/but/src/log/mod.rs

@@ -7,13 +7,11 @@ use but_workspace::{
 use colored::Colorize;
 use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
-use std::path::Path;
 
 use crate::id::CliId;
 
-pub(crate) fn commit_graph(repo_path: &Path, json: bool) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path).expect("Failed to create project from path");
-    let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+pub(crate) fn commit_graph(project: &Project, json: bool) -> anyhow::Result<()> {
+    let ctx = &mut CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
     but_rules::process_rules(ctx).ok(); // TODO: this is doing double work (dependencies can be reused)
     let stacks = stacks(ctx)?
         .iter()

crates/but/src/main.rs

@@ -54,9 +54,13 @@ async fn main() -> Result<()> {
                 handler,
             }) => {
                 let handler = *handler;
-                command::handle_changes(&args.current_dir, args.json, handler, description)
+                let project = get_or_init_project(&args.current_dir)?;
+                command::handle_changes(&project, args.json, handler, description)
+            }
+            None => {
+                let project = get_or_init_project(&args.current_dir)?;
+                command::list_actions(&project, args.json, 0, 10)
             }
-            None => command::list_actions(&args.current_dir, args.json, 0, 10),
         },
         Subcommands::Metrics {
             command_name,
@@ -112,7 +116,8 @@ async fn main() -> Result<()> {
             }
         },
         Subcommands::Base(base::Platform { cmd }) => {
-            let result = base::handle(cmd, &args.current_dir, args.json);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = base::handle(cmd, &project, args.json);
             metrics_if_configured(
                 app_settings,
                 match cmd {
@@ -125,39 +130,45 @@ async fn main() -> Result<()> {
             Ok(())
         }
         Subcommands::Branch(branch::Platform { cmd }) => {
-            let result = branch::handle(cmd, &args.current_dir, args.json);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = branch::handle(cmd, &project, args.json);
             metrics_if_configured(app_settings, CommandName::BranchNew, props(start, &result)).ok();
             Ok(())
         }
         Subcommands::Log => {
-            let result = log::commit_graph(&args.current_dir, args.json);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = log::commit_graph(&project, args.json);
             metrics_if_configured(app_settings, CommandName::Log, props(start, &result)).ok();
             Ok(())
         }
         Subcommands::Status {
             show_files,
             verbose,
         } => {
-            let result = status::worktree(&args.current_dir, args.json, *show_files, *verbose);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = status::worktree(&project, args.json, *show_files, *verbose);
             metrics_if_configured(app_settings, CommandName::Status, props(start, &result)).ok();
             Ok(())
         }
         Subcommands::Stf { verbose } => {
-            let result = status::worktree(&args.current_dir, args.json, true, *verbose);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = status::worktree(&project, args.json, true, *verbose);
             metrics_if_configured(app_settings, CommandName::Stf, props(start, &result)).ok();
             Ok(())
         }
         Subcommands::Rub { source, target } => {
-            let result = rub::handle(&args.current_dir, args.json, source, target)
-                .context("Rubbed the wrong way.");
+            let project = get_or_init_project(&args.current_dir)?;
+            let result =
+                rub::handle(&project, args.json, source, target).context("Rubbed the wrong way.");
             if let Err(e) = &result {
                 eprintln!("{} {}", e, e.root_cause());
             }
             metrics_if_configured(app_settings, CommandName::Rub, props(start, &result)).ok();
             Ok(())
         }
         Subcommands::Mark { target, delete } => {
-            let result = mark::handle(&args.current_dir, args.json, target, *delete)
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = mark::handle(&project, args.json, target, *delete)
                 .context("Can't mark this. Taaaa-na-na-na. Can't mark this.");
             if let Err(e) = &result {
                 eprintln!("{} {}", e, e.root_cause());
@@ -166,7 +177,8 @@ async fn main() -> Result<()> {
             Ok(())
         }
         Subcommands::Unmark => {
-            let result = mark::unmark(&args.current_dir, args.json)
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = mark::unmark(&project, args.json)
                 .context("Can't unmark this. Taaaa-na-na-na. Can't unmark this.");
             if let Err(e) = &result {
                 eprintln!("{} {}", e, e.root_cause());
@@ -179,8 +191,9 @@ async fn main() -> Result<()> {
             branch,
             only,
         } => {
+            let project = get_or_init_project(&args.current_dir)?;
             let result = commit::commit(
-                &args.current_dir,
+                &project,
                 args.json,
                 message.as_deref(),
                 branch.as_deref(),
@@ -190,27 +203,32 @@ async fn main() -> Result<()> {
             result
         }
         Subcommands::New { target } => {
-            let result = commit::insert_blank_commit(&args.current_dir, args.json, target);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = commit::insert_blank_commit(&project, args.json, target);
             metrics_if_configured(app_settings, CommandName::New, props(start, &result)).ok();
             result
         }
         Subcommands::Describe { commit } => {
-            let result = describe::edit_commit_message(&args.current_dir, args.json, commit);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = describe::edit_commit_message(&project, args.json, commit);
             metrics_if_configured(app_settings, CommandName::Describe, props(start, &result)).ok();
             result
         }
         Subcommands::Oplog { since } => {
-            let result = oplog::show_oplog(&args.current_dir, args.json, since.as_deref());
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = oplog::show_oplog(&project, args.json, since.as_deref());
             metrics_if_configured(app_settings, CommandName::Oplog, props(start, &result)).ok();
             result
         }
         Subcommands::Restore { oplog_sha } => {
-            let result = oplog::restore_to_oplog(&args.current_dir, args.json, oplog_sha);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = oplog::restore_to_oplog(&project, args.json, oplog_sha);
             metrics_if_configured(app_settings, CommandName::Restore, props(start, &result)).ok();
             result
         }
         Subcommands::Undo => {
-            let result = oplog::undo_last_operation(&args.current_dir, args.json);
+            let project = get_or_init_project(&args.current_dir)?;
+            let result = oplog::undo_last_operation(&project, args.json);
             metrics_if_configured(app_settings, CommandName::Undo, props(start, &result)).ok();
             result
         }

crates/but/src/mark/mod.rs

@@ -1,4 +1,4 @@
-use std::{path::Path, str::FromStr};
+use std::str::FromStr;
 
 use crate::rub::branch_name_to_stack_id;
 use anyhow::bail;
@@ -9,13 +9,12 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_commit::commit_ext::CommitExt;
 use gitbutler_project::Project;
 pub(crate) fn handle(
-    repo_path: &Path,
+    project: &Project,
     _json: bool,
     target_str: &str,
     delete: bool,
 ) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path).expect("Failed to create project from path");
-    let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+    let ctx = &mut CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
     let target_result = crate::id::CliId::from_str(ctx, target_str)?;
     if target_result.len() != 1 {
         return Err(anyhow::anyhow!(
@@ -115,9 +114,8 @@ pub(crate) fn commit_marked(ctx: &mut CommandContext, commit_id: String) -> anyh
     Ok(rules)
 }
 
-pub(crate) fn unmark(repo_path: &Path, _json: bool) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path).expect("Failed to create project from path");
-    let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+pub(crate) fn unmark(project: &Project, _json: bool) -> anyhow::Result<()> {
+    let ctx = &mut CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
 
     let rules = but_rules::list_rules(ctx)?;
     let rule_count = rules.len();

crates/but/src/oplog/mod.rs

@@ -1,11 +1,8 @@
 use colored::Colorize;
 use gitbutler_oplog::entry::OperationKind;
 use gitbutler_project::Project;
-use std::path::Path;
-
-pub(crate) fn show_oplog(repo_path: &Path, json: bool, since: Option<&str>) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path)?;
 
+pub(crate) fn show_oplog(project: &Project, json: bool, since: Option<&str>) -> anyhow::Result<()> {
     let snapshots = if let Some(since_sha) = since {
         // Get all snapshots first to find the starting point
         let all_snapshots = but_api::undo::list_snapshots(project.id, 1000, None, None)?; // Get a large number to find the SHA
@@ -117,11 +114,10 @@ pub(crate) fn show_oplog(repo_path: &Path, json: bool, since: Option<&str>) -> a
 }
 
 pub(crate) fn restore_to_oplog(
-    repo_path: &Path,
+    project: &Project,
     _json: bool,
     oplog_sha: &str,
 ) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path)?;
     let snapshots = but_api::undo::list_snapshots(project.id, 1000, None, None)?;
 
     // Parse the oplog SHA (support partial SHAs)
@@ -196,9 +192,7 @@ pub(crate) fn restore_to_oplog(
     Ok(())
 }
 
-pub(crate) fn undo_last_operation(repo_path: &Path, _json: bool) -> anyhow::Result<()> {
-    let project = Project::find_by_path(repo_path)?;
-
+pub(crate) fn undo_last_operation(project: &Project, _json: bool) -> anyhow::Result<()> {
     // Get the last two snapshots - restore to the second one back
     let snapshots = but_api::undo::list_snapshots(project.id, 2, None, None)?;