Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Move CLI-specific `Repository` methods to `RepositoryCliExt`
Maximilian Roosfb6c43ef25fe
diff --git a/src/commands/commit.rs b/src/commands/commit.rsindex 991bd4fbb..03e05cc82 100644--- a/src/commands/commit.rs+++ b/src/commands/commit.rs@@ -1,11 +1,11 @@use worktrunk::HookType;use worktrunk::config::{CommandPhase, CommitGenerationConfig, ProjectConfig};use worktrunk::git::{GitError, GitResultExt, Repository};-use worktrunk::styling::{AnstyleStyle, CYAN, GREEN, HINT, WARNING, format_with_gutter};+use worktrunk::styling::{AnstyleStyle, CYAN, GREEN, HINT, format_with_gutter};use super::command_executor::CommandContext;use super::hooks::{HookFailureStrategy, HookPipeline};-use super::project_config::ProjectConfigRepoExt;+use super::repository_ext::RepositoryCliExt;/// Options for committing current changes.pub struct CommitOptions<'a> {@@ -66,37 +66,6 @@ pub fn show_llm_config_hint_if_needed(Ok(())}-fn get_untracked_files(status_output: &str) -> Vec<String> {- status_output- .lines()- .filter_map(|line| line.strip_prefix("?? "))- .map(|filename| filename.to_string())- .collect()-}--/// Warn about untracked files being auto-staged.-pub fn warn_untracked_auto_stage(repo: &Repository) -> Result<(), GitError> {- let status = repo- .run_command(&["status", "--porcelain"])- .git_context("Failed to get status")?;- let untracked = get_untracked_files(&status);-- if untracked.is_empty() {- return Ok(());- }-- let count = untracked.len();- let file_word = if count == 1 { "file" } else { "files" };- crate::output::warning(format!(- "{WARNING}Auto-staging {count} untracked {file_word}:{WARNING:#}"- ))?;-- let joined_files = untracked.join("\n");- crate::output::gutter(format_with_gutter(&joined_files, "", None))?;-- Ok(())-}-/// Commit already-staged changes with LLM-generated or fallback message.pub fn commit_staged_changes(commit_generation_config: &CommitGenerationConfig,@@ -164,7 +133,7 @@ pub fn commit_changes(options: CommitOptions<'_>) -> Result<(), GitError> {}if options.warn_about_untracked && !options.tracked_only {- warn_untracked_auto_stage(options.ctx.repo)?;+ options.ctx.repo.warn_if_auto_staging_untracked()?;}if options.tracked_only {diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex af248127e..428e738d0 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -8,7 +8,8 @@ use super::command_executor::CommandContext;use super::commit::{CommitOptions, commit_changes};use super::context::CommandEnv;use super::hooks::{HookFailureStrategy, HookPipeline};-use super::project_config::{ProjectConfigRepoExt, collect_commands_for_hooks};+use super::project_config::collect_commands_for_hooks;+use super::repository_ext::RepositoryCliExt;use super::worktree::{RemoveResult, handle_push};/// Context for collecting merge commandsdiff --git a/src/commands/mod.rs b/src/commands/mod.rsindex 99df33740..87d04047a 100644--- a/src/commands/mod.rs+++ b/src/commands/mod.rs@@ -11,6 +11,7 @@ pub mod list;pub mod merge;pub mod process;pub mod project_config;+pub mod repository_ext;#[cfg(unix)]pub mod select;pub mod standalone;diff --git a/src/commands/project_config.rs b/src/commands/project_config.rsindex 6483d7e7b..1004fe81c 100644--- a/src/commands/project_config.rs+++ b/src/commands/project_config.rs@@ -1,49 +1,5 @@-use std::path::Path;use worktrunk::config::{Command, ProjectConfig};-use worktrunk::git::{GitError, GitResultExt, HookType, Repository};--fn load_project_config_at(repo_root: &Path) -> Result<Option<ProjectConfig>, GitError> {- ProjectConfig::load(repo_root).git_context("Failed to load project config")-}--/// Extension methods for accessing project config data via Repository instances.-pub trait ProjectConfigRepoExt {- /// Load the project configuration if it exists.- fn load_project_config(&self) -> Result<Option<ProjectConfig>, GitError>;-- /// Load the project configuration, emitting a helpful hint if missing.- fn require_project_config(&self) -> Result<ProjectConfig, GitError>;-}--impl ProjectConfigRepoExt for Repository {- fn load_project_config(&self) -> Result<Option<ProjectConfig>, GitError> {- let repo_root = self.worktree_root()?;- load_project_config_at(&repo_root)- }-- fn require_project_config(&self) -> Result<ProjectConfig, GitError> {- let repo_root = self.worktree_root()?;- let config_path = repo_root.join(".config").join("wt.toml");-- match load_project_config_at(&repo_root)? {- Some(cfg) => Ok(cfg),- None => {- use worktrunk::styling::{- ERROR, ERROR_EMOJI, HINT, HINT_BOLD, HINT_EMOJI, eprintln,- };-- eprintln!("{ERROR_EMOJI} {ERROR}No project configuration found{ERROR:#}");- eprintln!(- "{HINT_EMOJI} {HINT}Create a config file at: {HINT_BOLD}{}{HINT_BOLD:#}{HINT:#}",- config_path.display()- );- Err(GitError::CommandFailed(- "No project configuration found".to_string(),- ))- }- }- }-}+use worktrunk::git::HookType;/// Collect commands for the given hook types, preserving order of the provided hooks.pub fn collect_commands_for_hooks(diff --git a/src/commands/repository_ext.rs b/src/commands/repository_ext.rsnew file mode 100644index 000000000..49f8c9b25--- /dev/null+++ b/src/commands/repository_ext.rs@@ -0,0 +1,79 @@+use std::path::Path;+use worktrunk::config::ProjectConfig;+use worktrunk::git::{GitError, GitResultExt, Repository};+use worktrunk::styling::{+ ERROR, ERROR_EMOJI, HINT, HINT_BOLD, HINT_EMOJI, WARNING, format_with_gutter,+};++/// CLI-specific helpers that operate on `Repository` but live in the binary crate due to orphan rules.+pub trait RepositoryCliExt {+ /// Load the project configuration if it exists.+ fn load_project_config(&self) -> Result<Option<ProjectConfig>, GitError>;++ /// Load the project configuration, emitting a helpful hint if missing.+ fn require_project_config(&self) -> Result<ProjectConfig, GitError>;++ /// Warn about untracked files being auto-staged.+ fn warn_if_auto_staging_untracked(&self) -> Result<(), GitError>;+}++impl RepositoryCliExt for Repository {+ fn load_project_config(&self) -> Result<Option<ProjectConfig>, GitError> {+ let repo_root = self.worktree_root()?;+ load_project_config_at(&repo_root)+ }++ fn require_project_config(&self) -> Result<ProjectConfig, GitError> {+ let repo_root = self.worktree_root()?;+ let config_path = repo_root.join(".config").join("wt.toml");++ match load_project_config_at(&repo_root)? {+ Some(cfg) => Ok(cfg),+ None => {+ use worktrunk::styling::eprintln;+ eprintln!("{ERROR_EMOJI} {ERROR}No project configuration found{ERROR:#}");+ eprintln!(+ "{HINT_EMOJI} {HINT}Create a config file at: {HINT_BOLD}{}{HINT_BOLD:#}{HINT:#}",+ config_path.display()+ );+ Err(GitError::CommandFailed(+ "No project configuration found".to_string(),+ ))+ }+ }+ }++ fn warn_if_auto_staging_untracked(&self) -> Result<(), GitError> {+ let status = self+ .run_command(&["status", "--porcelain"])+ .git_context("Failed to get status")?;+ let untracked = get_untracked_files(&status);++ if untracked.is_empty() {+ return Ok(());+ }++ let count = untracked.len();+ let file_word = if count == 1 { "file" } else { "files" };+ crate::output::warning(format!(+ "{WARNING}Auto-staging {count} untracked {file_word}:{WARNING:#}"+ ))?;++ let joined_files = untracked.join("\n");+ crate::output::gutter(format_with_gutter(&joined_files, "", None))?;++ Ok(())+ }+}++fn load_project_config_at(repo_root: &Path) -> Result<Option<ProjectConfig>, GitError> {+ ProjectConfig::load(repo_root).git_context("Failed to load project config")+}++fn get_untracked_files(status_output: &str) -> Vec<String> {+ status_output+ .lines()+ .filter_map(|line| line.strip_prefix("?? "))+ .map(|filename| filename.to_string())+ .collect()+}diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex 40a069f00..9083119ce 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -6,12 +6,12 @@ use worktrunk::styling::{use super::commit::{CommitOptions, commit_changes, commit_staged_changes, format_commit_message_for_display,- run_pre_commit_commands, show_llm_config_hint_if_needed, warn_untracked_auto_stage,+ run_pre_commit_commands, show_llm_config_hint_if_needed,};use super::context::CommandEnv;use super::merge::{execute_post_merge_commands, run_pre_merge_commands};-use super::project_config::{ProjectConfigRepoExt, collect_commands_for_hooks};-use super::worktree::{execute_post_create_commands, execute_post_start_commands_sequential};+use super::project_config::collect_commands_for_hooks;+use super::repository_ext::RepositoryCliExt;/// Handle `wt beta run-hook` commandpub fn handle_standalone_run_hook(hook_type: HookType, force: bool) -> Result<(), GitError> {@@ -30,11 +30,11 @@ pub fn handle_standalone_run_hook(hook_type: HookType, force: bool) -> Result<()match hook_type {HookType::PostCreate => {check_hook_configured(&project_config.post_create_command, hook_type)?;- execute_post_create_commands(&ctx)+ ctx.execute_post_create_commands()}HookType::PostStart => {check_hook_configured(&project_config.post_start_command, hook_type)?;- execute_post_start_commands_sequential(&ctx)+ ctx.execute_post_start_commands_sequential()}HookType::PreCommit => {check_hook_configured(&project_config.pre_commit_command, hook_type)?;@@ -110,7 +110,7 @@ pub fn handle_squash(// Auto-stage changes before running pre-commit hooks so both beta and merge paths behave identicallyif warn_about_untracked && !tracked_only {- warn_untracked_auto_stage(repo)?;+ repo.warn_if_auto_staging_untracked()?;}if tracked_only {diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 6f2dbcca5..ddcd10652 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -108,7 +108,7 @@ use worktrunk::styling::{use super::command_executor::CommandContext;use super::hooks::{HookFailureStrategy, HookPipeline};-use super::project_config::ProjectConfigRepoExt;+use super::repository_ext::RepositoryCliExt;/// Result of a worktree switch operationpub enum SwitchResult {@@ -288,7 +288,7 @@ pub fn handle_switch(&repo_root,force,);- if let Err(e) = execute_post_create_commands(&ctx) {+ if let Err(e) = ctx.execute_post_create_commands() {// Only treat CommandNotApproved as non-fatal (user declined)// Other errors should still failif !matches!(e, GitError::CommandNotApproved) {@@ -574,69 +574,71 @@ impl TargetWorktreeStash {}}-/// Execute post-create commands sequentially (blocking)-pub fn execute_post_create_commands(ctx: &CommandContext) -> Result<(), GitError> {- let project_config = match ctx.repo.load_project_config()? {- Some(cfg) => cfg,- None => return Ok(()),- };+impl<'a> CommandContext<'a> {+ /// Execute post-create commands sequentially (blocking)+ pub fn execute_post_create_commands(&self) -> Result<(), GitError> {+ let project_config = match self.repo.load_project_config()? {+ Some(cfg) => cfg,+ None => return Ok(()),+ };- let Some(post_create_config) = &project_config.post_create_command else {- return Ok(());- };+ let Some(post_create_config) = &project_config.post_create_command else {+ return Ok(());+ };- let pipeline = HookPipeline::new(*ctx);- pipeline.run_sequential(- post_create_config,- CommandPhase::PostCreate,- false,- &[],- "post-create",- HookFailureStrategy::Warn,- )-}+ let pipeline = HookPipeline::new(*self);+ pipeline.run_sequential(+ post_create_config,+ CommandPhase::PostCreate,+ false,+ &[],+ "post-create",+ HookFailureStrategy::Warn,+ )+ }-/// Spawn post-start commands in parallel as background processes (non-blocking)-pub fn spawn_post_start_commands(ctx: &CommandContext) -> Result<(), GitError> {- let project_config = match ctx.repo.load_project_config()? {- Some(cfg) => cfg,- None => return Ok(()),- };+ /// Spawn post-start commands in parallel as background processes (non-blocking)+ pub fn spawn_post_start_commands(&self) -> Result<(), GitError> {+ let project_config = match self.repo.load_project_config()? {+ Some(cfg) => cfg,+ None => return Ok(()),+ };- let Some(post_start_config) = &project_config.post_start_command else {- return Ok(());- };+ let Some(post_start_config) = &project_config.post_start_command else {+ return Ok(());+ };- let pipeline = HookPipeline::new(*ctx);- pipeline.spawn_detached(- post_start_config,- CommandPhase::PostStart,- false,- &[],- "post-start",- )-}+ let pipeline = HookPipeline::new(*self);+ pipeline.spawn_detached(+ post_start_config,+ CommandPhase::PostStart,+ false,+ &[],+ "post-start",+ )+ }-/// Execute post-start commands sequentially (blocking) - for testing-pub fn execute_post_start_commands_sequential(ctx: &CommandContext) -> Result<(), GitError> {- let project_config = match ctx.repo.load_project_config()? {- Some(cfg) => cfg,- None => return Ok(()),- };+ /// Execute post-start commands sequentially (blocking) - for testing+ pub fn execute_post_start_commands_sequential(&self) -> Result<(), GitError> {+ let project_config = match self.repo.load_project_config()? {+ Some(cfg) => cfg,+ None => return Ok(()),+ };- let Some(post_start_config) = &project_config.post_start_command else {- return Ok(());- };+ let Some(post_start_config) = &project_config.post_start_command else {+ return Ok(());+ };- let pipeline = HookPipeline::new(*ctx);- pipeline.run_sequential(- post_start_config,- CommandPhase::PostStart,- false,- &[],- "post-start",- HookFailureStrategy::Warn,- )+ let pipeline = HookPipeline::new(*self);+ pipeline.run_sequential(+ post_start_config,+ CommandPhase::PostStart,+ false,+ &[],+ "post-start",+ HookFailureStrategy::Warn,+ )+ }}/// Push changes to target branchdiff --git a/src/main.rs b/src/main.rsindex 25d8776be..8d0d505a9 100644--- a/src/main.rs+++ b/src/main.rs@@ -222,7 +222,7 @@ fn main() {&repo_root,force,);- if let Err(e) = commands::worktree::spawn_post_start_commands(&ctx) {+ if let Err(e) = ctx.spawn_post_start_commands() {// Only treat CommandNotApproved as non-fatal (user declined)// Other errors should still failif !matches!(e, GitError::CommandNotApproved) {