Watch

atlas d5a81f9195 feat(#2377 ): forge-webhook-triggered config-PR merge flow

Replace the request_merge_config_pr MCP tool with a Forgejo
pull_request webhook on the agent-configs org. Agents now open a
config PR normally; hive-c0re auto-queues the MergeConfigPr approval
from the webhook event — no extra tool call needed.

Changes:
- dashboard/webhook.rs: add POST /webhook/config-pr handler
  - parses Forgejo pull_request payload (opened/synchronize)
  - strips agent-configs/<agent> prefix to extract agent name
  - calls submit_merge_config_pr → queues dashboard approval card
  - always 200 to prevent Forgejo retries; errors logged at warn
- dashboard/mod.rs: wire /webhook/config-pr route
- forge/mod.rs: add ensure_config_pr_webhook() — idempotent org-level
  hook registration on agent-configs at startup; CONFIG_ORG now
  pub(crate) for webhook handler
- main.rs: call ensure_config_pr_webhook alongside knowledge webhook
- socket_server/config_approvals.rs: drop handle_request_merge_config_pr;
  make submit_merge_config_pr pub(crate) for webhook handler
- socket_server/mod.rs: re-export submit_merge_config_pr; drop dispatch arm
- hive-sh4re/src/lib.rs: remove AgentRequest::RequestMergeConfigPr
  wire type; drop from ToolGroup::Approvals tool list
- hive-ag3nt/src/mcp/: drop request_merge_config_pr tool + args struct
- docs: update approvals.md (webhook trigger), conventions.md (tool
  group), agent-hierarchy.md, tools/lifecycle.md

Hardening from #2375-merge-config-pr-hardening branch preserved:
- pr_is_open check at queue time (rejects closed/merged PRs)
- atomic fetched_sha INSERT via submit_kind(fetched_sha: Some(&sha))

Approve-handler machinery unchanged (run_merge_config_pr,
ff_push_to_main, fetch_pr_head_into_applied, mark_pr_merged).

2026-07-11 12:19:52 +02:00

3.4 KiB

Raw Blame History

Lifecycle and approvals tools

Two tool groups govern agent lifecycle management and config changes. Both are scoped to direct children only (topology-enforced: the server rejects any name that is not a direct child of the calling agent per topology.json). Privileged agents (e.g. ruth) may operate on any sub-agent — the topology scope applies to all others.

`lifecycle` tool group

No operator approval required. Direct children only.

`kill(name)`

Graceful stop. Container state is preserved; recreating the agent reuses prior config and credentials.

`start(name)`

Start a stopped sub-agent.

`restart(name)`

Stop + start in one call.

`update(name)`

Rebuild: re-applies the current hyperhive flake + agent.nix, then restarts. Idempotent — safe to call repeatedly. Used in response to needs_update system events.

`list_containers()`

List all descendant containers (children + their subtrees) with running status. Topology-scoped to descendants only.

`approvals` tool group

Config changes and new-agent spawns route through the operator approval queue. Direct children only (topology-enforced).

`request_init_config(name, description?)`

Step 1 of spawning a new direct child agent. Queues an InitConfig approval; on operator approve, hive-c0re seeds the proposed config repo at /agents/<name>/config/agent.nix with a default template and delivers a config_ready system event. Then edit agent.nix, commit, and call request_apply_commit with the commit sha — the first ApplyCommit on a freshly-init'd config creates the container.

Fails if a proposed config repo for name already exists. name is ≤ 9 characters. The operator can also spawn an empty agent via the dashboard ◆ R3QU3ST SP4WN button, which routes via HostRequest::RequestSpawn.

`request_apply_commit(agent, commit_ref, description?)`

Step 2 of spawning (or updating an existing child's config). Submit a commit sha from the child's proposed config repo for operator approval. On approve, hive-c0re rebuilds the container with the pinned commit.

commit_ref must be a 7-40 char hex sha (branch/tag names are rejected — the approval pins the exact commit). agent must be a direct child. Topology-enforced.

`request_update_meta_inputs(inputs?, description?)`

Queue an approval to run nix flake update [inputs...] on the meta flake. Pass specific input names (e.g. ["bitburner-agent"]) or omit / pass [] for all inputs. Returns immediately; the lock update runs on operator approval.

Does NOT trigger container rebuilds — call update(name) on affected agents after the approval resolves.

Boundary summary

Operation	Requires approval?	Scope
`kill` / `start` / `restart` / `update`	No	Direct children
`list_containers`	No	All descendants
`request_init_config`	Yes (InitConfig)	New direct child only
`request_apply_commit`	Yes (ApplyCommit)	Direct children
`request_update_meta_inputs`	Yes (MetaUpdate)	Meta flake (global)

3.4 KiB Raw Blame History

Lifecycle and approvals tools

lifecycle tool group

kill(name)

start(name)

restart(name)

update(name)

list_containers()

approvals tool group

request_init_config(name, description?)

request_apply_commit(agent, commit_ref, description?)

request_update_meta_inputs(inputs?, description?)