feat(#2346): request_merge_config_pr — submission path for the PR-based config flow

MergeConfigPr approvals had a fully-implemented approve handler
(run_merge_config_pr, ff_push_to_main, mark_pr_merged) and dashboard
display, but no way to submit one.  An agent with the `approvals` tool
group calling request_merge_config_pr(agent, pr_number) is the missing
piece.

What this adds:
- RequestMergeConfigPr variant in hive-sh4re AgentRequest + ToolGroup::Approvals
- submit_merge_config_pr: fetches PR head sha (the drift-gate reviewed sha),
  queues a MergeConfigPr row, sets fetched_sha, emits approval_added with
  pr_number so the dashboard card links to the forge PR
- handle_request_merge_config_pr: topology (require_descendant) +
  tool-group (require_group(approvals)) guards before submit
- socket_server/mod.rs: dispatch arm for RequestMergeConfigPr
- hive-ag3nt MCP tool: request_merge_config_pr with full description
- docs/tools/lifecycle.md: documents the new tool + boundary table row

Unlike submit_apply_commit, no flake pre-flight at submission time (eval-
verify happens at approval time inside run_merge_config_pr, same as the
rest of the merge pipeline).  Applied repo must already exist (guard added
with a clear error message pointing at request_apply_commit for first-spawn).
This commit is contained in:
atlas 2026-07-11 09:55:05 +02:00 committed by mara
commit 97edd6baac
6 changed files with 201 additions and 9 deletions

View file

@ -1,7 +1,8 @@
//! Config-approval request handlers: `RequestInitConfig` /
//! `RequestApplyCommit` / `RequestUpdateMetaInputs`, plus the shared
//! submit helpers (`submit_init_config` / `submit_apply_commit`) and the
//! commit-sha shape check (`validate_commit_ref`).
//! `RequestApplyCommit` / `RequestMergeConfigPr` / `RequestUpdateMetaInputs`,
//! plus the shared submit helpers (`submit_init_config` / `submit_apply_commit`
//! / `submit_merge_config_pr`) and the commit-sha shape check
//! (`validate_commit_ref`).
use std::sync::Arc;
@ -105,6 +106,93 @@ pub(super) fn handle_request_update_meta_inputs(
AgentResponse::Ok
}
/// `RequestMergeConfigPr` — queue a `MergeConfigPr` approval for a PR on an
/// agent's `agent-configs/<agent>` forge repo. The target must be in the
/// caller's subtree. hive-c0re fetches the PR head sha at submission time;
/// that sha is stored as `fetched_sha` and forms the drift gate in the
/// approve handler: if the PR head moves between submission and approval,
/// the approve handler aborts without making any changes.
pub(super) async fn handle_request_merge_config_pr(
coord: &Arc<Coordinator>,
agent: &str,
target_agent: &str,
pr_number: u64,
description: Option<&str>,
) -> AgentResponse {
if let Some(err) = super::require_descendant(agent, target_agent, "request_merge_config_pr for")
{
return err;
}
tracing::info!(%agent, %target_agent, %pr_number, "request_merge_config_pr");
match submit_merge_config_pr(coord, target_agent, pr_number, description, agent).await {
Ok(id) => {
tracing::info!(%id, %target_agent, %pr_number, "merge_config_pr approval queued");
AgentResponse::Ok
}
Err(e) => AgentResponse::Err {
message: format!("{e:#}"),
},
}
}
/// Submit-time half of the PR-merge flow: fetch the PR head sha from the
/// forge, queue the approval row, and emit the `approval_added` event so the
/// dashboard shows the pending card immediately.
///
/// The PR head sha is stored as `fetched_sha` on the approval row — the
/// "reviewed sha" the approve handler (`run_merge_config_pr`) drift-gates
/// against before doing anything irreversible. Unlike `submit_apply_commit`
/// this does NOT fetch the commit into the applied repo at submission time
/// (that happens inside the approve handler, step 2, after the drift check).
/// No flake pre-flight either — eval-verify happens at approval time too.
async fn submit_merge_config_pr(
coord: &Arc<Coordinator>,
agent: &str,
pr_number: u64,
description: Option<&str>,
submitter: &str,
) -> anyhow::Result<i64> {
let applied_dir = crate::paths::applied_dir(agent);
if !applied_dir.join(".git").exists() {
anyhow::bail!(
"applied repo missing for agent '{agent}' (expected at {}) — \
merge_config_pr requires the agent to be fully provisioned; \
use request_apply_commit for the first config deploy",
applied_dir.display()
);
}
let repo = crate::forge::config_repo(agent);
// Fetch the current PR head sha — becomes the "reviewed" sha.
let sha = crate::forge::pr_head_sha(&repo, pr_number)
.await
.map_err(|e| anyhow::anyhow!("fetch PR head sha for {agent} PR #{pr_number}: {e}"))?;
let id = coord
.approvals
.submit_kind(
agent,
hive_sh4re::ApprovalKind::MergeConfigPr,
&pr_number.to_string(),
description,
submitter,
)
.map_err(|e| anyhow::anyhow!("queue merge_config_pr approval row: {e:#}"))?;
coord
.approvals
.set_fetched_sha(id, &sha)
.map_err(|e| anyhow::anyhow!("persist fetched_sha: {e:#}"))?;
let sha_short = sha[..sha.len().min(12)].to_owned();
coord.emit_approval_added(crate::coordinator::ApprovalAdded {
id,
agent,
approval_kind: "merge_config_pr",
sha_short: Some(sha_short),
diff: None, // diff is not pre-computed; the dashboard fetches it on demand
description: description.map(str::to_owned),
pr_number: Some(pr_number),
});
Ok(id)
}
/// `request_apply_commit` takes a commit SHA only — not a branch or
/// tag name. A branch is mutable; pinning the proposal to a concrete
/// sha keeps "what the manager asked to deploy" unambiguous and means

View file

@ -29,7 +29,8 @@ pub(crate) use schedules::filter_ghost_schedule_targets;
pub use schedules::schedule_to_wire_public;
use config_approvals::{
handle_request_apply_commit, handle_request_init_config, handle_request_update_meta_inputs,
handle_request_apply_commit, handle_request_init_config, handle_request_merge_config_pr,
handle_request_update_meta_inputs,
};
use lifecycle_handlers::{
handle_kill, handle_list_descendants, handle_restart, handle_start, handle_update,
@ -578,6 +579,23 @@ async fn dispatch(req: &AgentRequest, agent: &str, coord: &Arc<Coordinator>) ->
)
.await
}
AgentRequest::RequestMergeConfigPr {
agent: target_agent,
pr_number,
description,
} => {
if let Some(err) = require_group(agent, "approvals", "request merge_config_pr") {
return err;
}
handle_request_merge_config_pr(
coord,
agent,
target_agent,
*pr_number,
description.as_deref(),
)
.await
}
// Agent-state queries: own subtree is free; other agents + the
// hive-wide `"*"` sweep require `QueryAgentState`.
AgentRequest::GetLooseEnds { agent: target } => {