summaryrefslogtreecommitdiff
path: root/makima/src/daemon/worktree/manager.rs
diff options
context:
space:
mode:
authorsoryu <soryu@soryu.co>2026-01-22 13:17:17 +0000
committerGitHub <noreply@github.com>2026-01-22 13:17:17 +0000
commit265f8cf14fec9d7116d09af49e4b48b357faceda (patch)
treec98ff8be7dd5f01692446e01c7b568279b0635ac /makima/src/daemon/worktree/manager.rs
parenta363bfdd7a3e81b75bf230e45d001b80f759ca57 (diff)
downloadsoryu-265f8cf14fec9d7116d09af49e4b48b357faceda.tar.gz
soryu-265f8cf14fec9d7116d09af49e4b48b357faceda.zip
Fix completion actions: default to PR and support remote repos (#21)
* Fix completion actions: default to PR and support remote repos - Change default completion action from 'branch' to 'pr' for tasks using daemon working directory - Allow PR completion action to work without target_repo_path if the worktree already has an origin remote configured (e.g., when cloned from a remote URL) - Update create_pull_request to accept optional target_repo parameter Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Add dismiss functionality for completed standalone tasks ## Changes ### Backend - Add 'hidden' field to Task model (models.rs) - Add database migration for hidden column (20250122000000_add_task_hidden.sql) - Update task listing queries to include hidden field and filter out hidden tasks - Update update_task_for_owner to handle hidden field ### Frontend - Add hidden field to TaskSummary interface (api.ts) - Add dismissTask API function (api.ts) - Add hideTask function to useTasks hook - Add Dismiss button to TaskList for completed standalone tasks - Wire up onDismiss handler in mesh.tsx route ## Behavior - Completed standalone tasks (tasks without a contract) show a "Dismiss" button - Dismissing a task sets hidden=true and removes it from the task list - Hidden tasks are filtered out by default in all task listing queries Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'makima/src/daemon/worktree/manager.rs')
-rw-r--r--makima/src/daemon/worktree/manager.rs131
1 files changed, 84 insertions, 47 deletions
diff --git a/makima/src/daemon/worktree/manager.rs b/makima/src/daemon/worktree/manager.rs
index d370828..5edd7b1 100644
--- a/makima/src/daemon/worktree/manager.rs
+++ b/makima/src/daemon/worktree/manager.rs
@@ -1470,10 +1470,11 @@ impl WorktreeManager {
/// Create a GitHub pull request using the gh CLI.
///
/// This pushes the branch first, then creates a PR.
+ /// If target_repo is None, uses the worktree's origin remote directly (for repos already cloned from remote).
pub async fn create_pull_request(
&self,
worktree_path: &Path,
- target_repo: &Path,
+ target_repo: Option<&Path>,
source_branch: &str,
target_branch: &str,
title: &str,
@@ -1481,7 +1482,7 @@ impl WorktreeManager {
) -> Result<String, WorktreeError> {
tracing::info!(
worktree = %worktree_path.display(),
- target_repo = %target_repo.display(),
+ target_repo = ?target_repo.map(|p| p.display().to_string()),
source_branch = %source_branch,
target_branch = %target_branch,
title = %title,
@@ -1504,60 +1505,96 @@ impl WorktreeManager {
source_branch.to_string()
};
- // Push to the target repo's origin
- // First, check if target_repo has an origin remote
- let output = Command::new("git")
- .args(["remote", "get-url", "origin"])
- .current_dir(target_repo)
- .output()
- .await?;
+ // Get the origin URL - either from target_repo or from worktree directly
+ let (origin_url, gh_working_dir) = if let Some(target_repo) = target_repo {
+ // Use target_repo's origin
+ let output = Command::new("git")
+ .args(["remote", "get-url", "origin"])
+ .current_dir(target_repo)
+ .output()
+ .await?;
- if !output.status.success() {
- return Err(WorktreeError::GitCommand(
- "Target repository has no origin remote configured".to_string(),
- ));
- }
+ if !output.status.success() {
+ return Err(WorktreeError::GitCommand(
+ "Target repository has no origin remote configured".to_string(),
+ ));
+ }
+
+ let url = String::from_utf8_lossy(&output.stdout).trim().to_string();
+ (url, target_repo.to_path_buf())
+ } else {
+ // Check if worktree has an origin remote directly
+ let output = Command::new("git")
+ .args(["remote", "get-url", "origin"])
+ .current_dir(worktree_path)
+ .output()
+ .await?;
- let origin_url = String::from_utf8_lossy(&output.stdout).trim().to_string();
+ if !output.status.success() {
+ return Err(WorktreeError::GitCommand(
+ "Repository has no origin remote configured. Either set target_repo_path or ensure the worktree was cloned from a remote repository.".to_string(),
+ ));
+ }
+
+ let url = String::from_utf8_lossy(&output.stdout).trim().to_string();
+ (url, worktree_path.to_path_buf())
+ };
// Push the branch from worktree to the remote
- // First add the remote to worktree
- let _ = Command::new("git")
- .args(["remote", "remove", "pr-origin"])
- .current_dir(worktree_path)
- .output()
- .await;
+ // First add the remote to worktree (if not using worktree's origin directly)
+ if target_repo.is_some() {
+ let _ = Command::new("git")
+ .args(["remote", "remove", "pr-origin"])
+ .current_dir(worktree_path)
+ .output()
+ .await;
- let output = Command::new("git")
- .args(["remote", "add", "pr-origin", &origin_url])
- .current_dir(worktree_path)
- .output()
- .await?;
+ let output = Command::new("git")
+ .args(["remote", "add", "pr-origin", &origin_url])
+ .current_dir(worktree_path)
+ .output()
+ .await?;
- if !output.status.success() {
- let stderr = String::from_utf8_lossy(&output.stderr);
- return Err(WorktreeError::GitCommand(format!(
- "Failed to add remote: {}",
- stderr
- )));
- }
+ if !output.status.success() {
+ let stderr = String::from_utf8_lossy(&output.stderr);
+ return Err(WorktreeError::GitCommand(format!(
+ "Failed to add remote: {}",
+ stderr
+ )));
+ }
- // Push to the remote
- let output = Command::new("git")
- .args(["push", "-u", "pr-origin", &format!("{}:{}", current_branch, source_branch)])
- .current_dir(worktree_path)
- .output()
- .await?;
+ // Push to the remote
+ let output = Command::new("git")
+ .args(["push", "-u", "pr-origin", &format!("{}:{}", current_branch, source_branch)])
+ .current_dir(worktree_path)
+ .output()
+ .await?;
- if !output.status.success() {
- let stderr = String::from_utf8_lossy(&output.stderr);
- return Err(WorktreeError::GitCommand(format!(
- "Failed to push branch: {}",
- stderr
- )));
+ if !output.status.success() {
+ let stderr = String::from_utf8_lossy(&output.stderr);
+ return Err(WorktreeError::GitCommand(format!(
+ "Failed to push branch: {}",
+ stderr
+ )));
+ }
+ } else {
+ // Push directly to origin
+ let output = Command::new("git")
+ .args(["push", "-u", "origin", &format!("{}:{}", current_branch, source_branch)])
+ .current_dir(worktree_path)
+ .output()
+ .await?;
+
+ if !output.status.success() {
+ let stderr = String::from_utf8_lossy(&output.stderr);
+ return Err(WorktreeError::GitCommand(format!(
+ "Failed to push branch: {}",
+ stderr
+ )));
+ }
}
- // Create PR using gh CLI in the target repo
+ // Create PR using gh CLI
let output = Command::new("gh")
.args([
"pr",
@@ -1567,7 +1604,7 @@ impl WorktreeManager {
"--head", source_branch,
"--base", target_branch,
])
- .current_dir(target_repo)
+ .current_dir(&gh_working_dir)
.output()
.await?;