Merge pull request #20 from Ghvstcode/worktree-engine

Worktree engine: parallel tasks, live output, PR import, all comments

Author: Ghvstcode

src-tauri/src/engine/budget.rs

@@ -149,13 +149,24 @@ pub fn get_weekly_usage() -> Result<(i64, String), String> {
 /// usage earlier in the week from falsely exhausting the budget for remaining days —
 /// the actual subscription resets on rolling windows, not as a rigid weekly lump sum.
 pub fn calculate_budget_status(config: &BudgetConfig) -> BudgetStatus {
+    calculate_budget_status_with_reservation(config, 0)
+}
+
+/// Calculate budget status accounting for tokens already reserved by
+/// in-flight tasks. Used to prevent over-commit when multiple tasks
+/// start concurrently.
+pub fn calculate_budget_status_with_reservation(
+    config: &BudgetConfig,
+    tokens_reserved: i64,
+) -> BudgetStatus {
     let (tokens_today, _) = get_today_usage().unwrap_or((0, "unavailable".to_string()));
     let (tokens_week, source) = get_weekly_usage().unwrap_or((0, "unavailable".to_string()));
 
     let daily_budget = config.weekly_token_budget / 7;
     let max_for_sustn = daily_budget * (config.max_usage_percent as i64) / 100;
     let reserve = daily_budget * (config.reserve_percent as i64) / 100;
-    let available = (max_for_sustn - tokens_today - reserve).max(0);
+    let available =
+        (max_for_sustn - tokens_today - reserve - tokens_reserved).max(0);
 
     BudgetStatus {
         weekly_token_budget: config.weekly_token_budget,

src-tauri/src/engine/git.rs

@@ -8,7 +8,7 @@ pub struct GitResult {
     pub error: Option<String>,
 }
 
-fn run_git(cwd: &str, args: &[&str]) -> GitResult {
+pub(crate) fn run_git(cwd: &str, args: &[&str]) -> GitResult {
     match Command::new("git").args(args).current_dir(cwd).output() {
         Ok(output) => {
             let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
@@ -257,6 +257,103 @@ pub fn detect_default_branch(cwd: &str) -> String {
     "main".to_string()
 }
 
+/// Clone a repository. Runs in the parent directory of `destination`.
+/// Uses GIT_TERMINAL_PROMPT=0 to prevent interactive credential prompts
+/// from hanging the process. Skips LFS to avoid downloading large
+/// binary files that aren't needed for code review.
+pub fn clone_repo(url: &str, destination: &str) -> GitResult {
+    let dest_path = std::path::Path::new(destination);
+
+    // Create parent directory if needed
+    if let Some(parent) = dest_path.parent() {
+        let _ = std::fs::create_dir_all(parent);
+    }
+
+    match Command::new("git")
+        .args(["clone", url, destination])
+        .env("GIT_TERMINAL_PROMPT", "0")
+        .env("GIT_LFS_SKIP_SMUDGE", "1")
+        .output()
+    {
+        Ok(output) => {
+            let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
+            let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
+            if output.status.success() {
+                GitResult {
+                    success: true,
+                    output: destination.to_string(),
+                    error: None,
+                }
+            } else {
+                GitResult {
+                    success: false,
+                    output: stdout,
+                    error: Some(stderr),
+                }
+            }
+        }
+        Err(e) => GitResult {
+            success: false,
+            output: String::new(),
+            error: Some(format!("Failed to execute git clone: {}", e)),
+        },
+    }
+}
+
+/// Fetch a specific branch from origin and create a local branch.
+/// Tries the branch name first, then falls back to `pull/<number>/head`
+/// for fork-based PRs where the branch doesn't exist on the upstream remote.
+pub fn fetch_branch(cwd: &str, branch_name: &str) -> GitResult {
+    fetch_branch_with_pr(cwd, branch_name, None)
+}
+
+/// Fetch a branch, with an optional PR number for fork-based PR fallback.
+pub fn fetch_branch_with_pr(cwd: &str, branch_name: &str, pr_number: Option<u32>) -> GitResult {
+    // Try fetching by branch name first (works for same-repo PRs)
+    let refspec = format!(
+        "refs/heads/{}:refs/remotes/origin/{}",
+        branch_name, branch_name
+    );
+    let fetch = run_git(cwd, &["fetch", "origin", &refspec]);
+
+    if !fetch.success {
+        if let Some(pr_num) = pr_number {
+            // Fallback: fetch via GitHub's PR ref (works for fork-based PRs)
+            println!(
+                "[git] branch {} not found on origin, trying pull/{}/head",
+                branch_name, pr_num
+            );
+            let pr_refspec = format!(
+                "refs/pull/{}/head:refs/remotes/origin/{}",
+                pr_num, branch_name
+            );
+            let pr_fetch = run_git(cwd, &["fetch", "origin", &pr_refspec]);
+            if !pr_fetch.success {
+                return pr_fetch;
+            }
+        } else {
+            return fetch;
+        }
+    }
+
+    // Delete stale local branch if it exists (may point to wrong commit)
+    let _ = run_git(cwd, &["branch", "-D", branch_name]);
+    // Create local branch from the fetched ref
+    run_git(
+        cwd,
+        &[
+            "branch",
+            branch_name,
+            &format!("origin/{}", branch_name),
+        ],
+    )
+}
+
+/// Get the remote URL for origin.
+pub fn get_remote_url(cwd: &str) -> GitResult {
+    run_git(cwd, &["remote", "get-url", "origin"])
+}
+
 /// Generate a branch name for a task.
 pub fn task_branch_name(task_id: &str) -> String {
     // Use first 8 chars of UUID for readability