refactor(#2416): remove the non-pr config-change flow (request_apply_commit / applycommit)

hive-c0re/src/job_queue/exec.rs

@@ -500,11 +500,10 @@ async fn run_write_perm_file(
     Ok(NodeOutput::default())
 }
 
-/// Opaque approval deploy pipeline: `ApplyCommit` and `MergeConfigPr`
-/// both end in a container rebuild; branch on the approval row's kind
-/// (the authoritative source). The two-phase prepare/finalize/abort
-/// meta deploy — and the approval resolution — stay inside
-/// `actions.rs` in v1 (design doc §9).
+/// Opaque approval deploy pipeline for `MergeConfigPr`: verify + ff-merge the
+/// reviewed PR head, then the container rebuild. The two-phase
+/// prepare/finalize/abort meta deploy — and the approval resolution — stay
+/// inside `actions.rs` in v1 (design doc §9).
 async fn run_approval_deploy(coord: &Arc<Coordinator>, claim: &Claim) -> Result<NodeOutput> {
     let approval_id = claim
         .approval_id
@@ -514,18 +513,9 @@ async fn run_approval_deploy(coord: &Arc<Coordinator>, claim: &Claim) -> Result<
     // container build, and no other meta mutation may land inside that
     // window (it would sweep the staged lock and neuter `abort_deploy`).
     let _window = crate::meta::exclusive().await;
-    let kind = coord
-        .approvals
-        .get(approval_id)
-        .ok()
-        .flatten()
-        .map(|a| a.kind);
-    let result = if kind == Some(hive_sh4re::ApprovalKind::MergeConfigPr) {
-        crate::actions::run_approval_merge_config_pr(coord, Some(claim.dag_id), approval_id).await
-    } else {
-        crate::actions::run_approval_apply_commit(coord, Some(claim.dag_id), approval_id).await
-    };
-    result.map(|()| NodeOutput::default())
+    crate::actions::run_approval_merge_config_pr(coord, Some(claim.dag_id), approval_id)
+        .await
+        .map(|()| NodeOutput::default())
 }
 
 /// Terminal-roll-up hook, fired exactly once per DAG (node completion

hive-c0re/src/job_queue/model.rs

@@ -110,9 +110,9 @@ pub enum NodeKind {
     /// Commit `tool-groups.json` / `capabilities.json` per the DAG's
     /// `perm_payload` (commit fused under `META_LOCK`).
     WritePermFile,
-    /// Opaque approval deploy pipeline (`ApplyCommit` /
-    /// `MergeConfigPr`): the two-phase prepare/finalize/abort meta
-    /// deploy stays inside `actions.rs` in v1 — deliberately not
+    /// Opaque approval deploy pipeline (`MergeConfigPr`): the two-phase
+    /// prepare/finalize/abort meta deploy stays inside `actions.rs` in v1 —
+    /// deliberately not
     /// modeled as scheduler nodes (see the design doc §9).
     ApprovalDeploy,
     /// Write the agent's durable power intent (`wanted = Up` when `up`, else

hive-c0re/src/job_queue/templates.rs

@@ -96,9 +96,9 @@ pub fn rebuild(agent: &str, source: Source, reason: String, relock: bool) -> Dag
     }
 }
 
-/// Approval-driven deploy (`ApplyCommit` / `MergeConfigPr`): the whole
-/// two-phase pipeline stays one opaque node in v1 (design doc §9) —
-/// wire-visible as a `rebuild` card like today.
+/// Approval-driven deploy (`MergeConfigPr`): the whole two-phase pipeline
+/// stays one opaque node in v1 (design doc §9) — wire-visible as a `rebuild`
+/// card like today.
 pub fn approval_deploy(agent: &str, approval_id: i64, reason: String) -> DagSpec {
     DagSpec {
         template: Template::Rebuild,