diff options
Diffstat (limited to 'makima/src')
| -rw-r--r-- | makima/src/daemon/worktree/manager.rs | 59 | ||||
| -rw-r--r-- | makima/src/server/handlers/mesh_supervisor.rs | 41 |
2 files changed, 9 insertions, 91 deletions
diff --git a/makima/src/daemon/worktree/manager.rs b/makima/src/daemon/worktree/manager.rs index 489c488..ea26767 100644 --- a/makima/src/daemon/worktree/manager.rs +++ b/makima/src/daemon/worktree/manager.rs @@ -491,64 +491,7 @@ impl WorktreeManager { .output() .await; - // Prefer origin/{base_branch} to get latest remote state. - // If neither origin/{base_branch} nor {base_branch} exist (e.g. PR branch - // was deleted after merge), fall back to the repo's default branch. - let origin_ref = format!("origin/{}", base_branch); - let has_origin_ref = Command::new("git") - .args(["rev-parse", "--verify", &format!("refs/remotes/{}", origin_ref)]) - .current_dir(source_repo) - .output() - .await - .map(|o| o.status.success()) - .unwrap_or(false); - - let has_local_ref = if !has_origin_ref { - Command::new("git") - .args(["rev-parse", "--verify", &format!("refs/heads/{}", base_branch)]) - .current_dir(source_repo) - .output() - .await - .map(|o| o.status.success()) - .unwrap_or(false) - } else { - false // don't need to check — we already have origin ref - }; - - let start_point: String = if has_origin_ref { - origin_ref - } else if has_local_ref { - base_branch.to_string() - } else { - // Branch doesn't exist (likely deleted after PR merge) — use default branch - tracing::warn!( - task_id = %task_id, - base_branch = %base_branch, - "Base branch ref not found, falling back to default branch" - ); - let default_branch = self.detect_default_branch(source_repo).await?; - let default_origin = format!("origin/{}", default_branch); - let has_default_origin = Command::new("git") - .args(["rev-parse", "--verify", &format!("refs/remotes/{}", default_origin)]) - .current_dir(source_repo) - .output() - .await - .map(|o| o.status.success()) - .unwrap_or(false); - if has_default_origin { - default_origin - } else { - default_branch - } - }; - - tracing::info!( - task_id = %task_id, - start_point = %start_point, - "Using start point for new worktree branch" - ); - - // Create the worktree with a new branch based on the start point + // Create the worktree with a new branch based on the local base_branch let output = Command::new("git") .args([ "worktree", diff --git a/makima/src/server/handlers/mesh_supervisor.rs b/makima/src/server/handlers/mesh_supervisor.rs index 90c6dc7..0ea1a57 100644 --- a/makima/src/server/handlers/mesh_supervisor.rs +++ b/makima/src/server/handlers/mesh_supervisor.rs @@ -1807,42 +1807,17 @@ pub async fn ask_question( ).into_response(); } - // If phaseguard is enabled (or directive reconcile mode), pause the supervisor task and return - // The task will be auto-resumed when a message is sent to it (e.g., when user answers) + // Determine if we should block indefinitely (phaseguard or directive reconcile mode) let use_phaseguard = request.phaseguard || (is_directive_context && directive_reconcile_mode); - if use_phaseguard { - // Pause the supervisor task - if let Some(daemon_id) = supervisor.daemon_id { - let cmd = DaemonCommand::PauseTask { task_id: supervisor_id }; - if let Err(e) = state.send_daemon_command(daemon_id, cmd).await { - tracing::warn!(supervisor_id = %supervisor_id, error = %e, "Failed to pause supervisor for phaseguard"); - } else { - tracing::info!(supervisor_id = %supervisor_id, "Paused supervisor for phaseguard question"); - } - } - - // Update task status to paused in DB - let update = crate::db::models::UpdateTaskRequest { - status: Some("paused".to_string()), - ..Default::default() - }; - if let Err(e) = repository::update_task_for_owner(pool, supervisor_id, owner_id, update).await { - tracing::warn!(supervisor_id = %supervisor_id, error = %e, "Failed to update task status to paused"); - } - - return ( - StatusCode::OK, - Json(AskQuestionResponse { - question_id, - response: None, - timed_out: false, - }), - ).into_response(); - } // Poll for response with timeout - // For directive tasks without reconcile mode, use 30s default timeout - let timeout_secs = if is_directive_context && !directive_reconcile_mode { + // - Phaseguard: block indefinitely until user responds + // - Directive tasks without reconcile mode: 30s default timeout + // - Contract tasks: use requested timeout_seconds + let timeout_secs = if use_phaseguard { + // Block indefinitely until user responds + u64::MAX / 2 + } else if is_directive_context && !directive_reconcile_mode { 30 } else { request.timeout_seconds.max(1) as u64 |