vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: replace bash_tasks.rs with generic mcp_loose_ends scanner

Browse source 
- hive-ag3nt: remove bash_tasks.rs entirely; add mcp_loose_ends.rs that
  scans harness/mcp-loose-ends/*.json generically (no bash knowledge)
- hive-bash-mcp: daemon writes mcp-loose-ends/bash.json on every task
  state transition (pending/running/done/interrupted/timed_out)
- get_loose_ends: reads mcp_loose_ends::collect() instead of bash-specific code
- implements the generic mechanism from #1162
This commit is contained in:
damocles 2026-06-03 17:23:40 +02:00 • committed by mara
commit 8731474104
6 changed files with 119 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

78
hive-ag3nt/src/bash_tasks.rs
View file

@ -1,78 +0,0 @@
//! Read-only view of bash task state files for `get_loose_ends`.
//!
//! The task runner and MCP tools live in `hive-bash-mcp`. This module
//! only reads the JSON task files that the daemon writes — no subprocess
//! logic, no wake signals, no dep on the hive-bash-mcp crate.
//!
//! Task files live under `harness_dir/bash-tasks/<id>.json`. The JSON
//! schema is owned by `hive-bash-mcp::protocol::TaskFile`; this module
//! duplicates only the fields the harness needs for `get_loose_ends`.
use std::path::PathBuf;
use serde::{Deserialize, Serialize};
/// Lifecycle state of a bash task (mirrors `hive_bash_mcp::protocol::TaskStatus`).
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub enum TaskStatus {
Pending,
Running,
Done,
TimedOut,
Interrupted,
}
/// Minimal task metadata (mirrors `hive_bash_mcp::protocol::TaskFile`).
#[derive(Debug, Clone, Deserialize)]
pub struct TaskFile {
pub id: String,
pub cmd: String,
pub status: TaskStatus,
pub created_at: i64,
}
fn tasks_dir() -> PathBuf {
let base = if let Some(p) = std::env::var_os("HYPERHIVE_HARNESS_DIR") {
PathBuf::from(p)
} else {
let state = std::env::var("HYPERHIVE_STATE_DIR").unwrap_or_default();
let state_path = PathBuf::from(&state);
state_path
.parent()
.map(|p| p.join("harness"))
.unwrap_or_else(|| PathBuf::from(state))
};
base.join("bash-tasks")
}
/// Read a task file by ID. Returns `None` if missing or unparseable.
#[must_use]
pub fn read_task(id: &str) -> Option<TaskFile> {
let path = tasks_dir().join(format!("{id}.json"));
let s = std::fs::read_to_string(path).ok()?;
serde_json::from_str(&s).ok()
}
/// Return all tasks currently in `Pending` or `Running` state.
#[must_use]
pub fn active_tasks() -> Vec<TaskFile> {
let Ok(rd) = std::fs::read_dir(tasks_dir()) else {
return Vec::new();
};
let mut out = Vec::new();
for entry in rd.flatten() {
let path = entry.path();
if path.extension().and_then(|e| e.to_str()) != Some("json") {
continue;
}
let Some(id) = path.file_stem().and_then(|s| s.to_str()).map(str::to_owned) else {
continue;
};
let Some(task) = read_task(&id) else { continue };
if matches!(task.status, TaskStatus::Pending | TaskStatus::Running) {
out.push(task);
}
}
out
}

2
hive-ag3nt/src/lib.rs
View file

@ -1,7 +1,6 @@
//! Shared in-container harness code used by both `hive-ag3nt` (agent) and
//! `hive-m1nd` (manager) binaries.
pub mod bash_tasks;
pub mod client;
pub mod events;
pub mod forge_notify;
@ -9,6 +8,7 @@ pub mod identity;
pub mod login;
pub mod login_session;
pub mod mcp;
pub mod mcp_loose_ends;
pub mod paths;
pub mod plugins;
pub mod prompt;

24
hive-ag3nt/src/mcp.rs
View file

@ -684,8 +684,8 @@ impl AgentServer {
description = "List loose ends pending against this agent: unanswered questions \
where you are the asker (waiting on someone) or the target (someone's waiting on \
you), pending reminders you scheduled, plus — for the manager only — pending \
approvals you submitted that the operator hasn't acted on yet. Also lists any \
local bash tasks still in pending or running state. Cheap sweep, no args. Useful \
approvals you submitted that the operator hasn't acted on yet. Also lists active \
local tasks published by external MCP daemons (e.g. running bash tasks). Cheap sweep, no args. Useful \
at turn start to remember what you owe / what's owed to you without scrolling \
inbox history. Output is a short bulleted list with ids, ages in seconds, and \
the relevant context. Each `question` or `reminder` row can be cancelled by \
@ -737,19 +737,15 @@ impl AgentServer {
}
}
let mut out = annotate_retries(render_loose_ends(&loose_ends), retries);
// Append any local bash tasks still in pending/running state so
// the agent sees all outstanding work in one call.
let active = crate::bash_tasks::active_tasks();
if !active.is_empty() {
// Append loose-end items published by external MCP daemons
// (e.g. active bash tasks from hive-bash-mcp). Generic — no
// per-MCP knowledge needed here.
let mcp_items = crate::mcp_loose_ends::collect();
if !mcp_items.is_empty() {
use std::fmt::Write as _;
let _ = write!(out, "\n\n{} active bash task(s):", active.len());
for task in &active {
let age = crate::serve_common::now_unix() - task.created_at;
let _ = write!(
out,
"\n- `{}` status={:?}, cmd: `{}`, age {}s",
task.id, task.status, task.cmd, age
);
let _ = write!(out, "\n\nlocal task(s):");
for item in &mcp_items {
let _ = write!(out, "\n- {item}");
}
}
out

50
hive-ag3nt/src/mcp_loose_ends.rs Normal file
View file

@ -0,0 +1,50 @@
//! Generic scanner for MCP loose-end summary files.
//!
//! External MCP daemons (hive-bash-mcp, hive-matrix-mcp, etc.) write
//! JSON files to `$HYPERHIVE_HARNESS_DIR/mcp-loose-ends/<name>.json`.
//! Each file contains a JSON array of plain-text summary strings.
//!
//! The harness reads all files in this directory in `get_loose_ends` to
//! surface active background work from any MCP without hardcoding
//! per-MCP knowledge here.
use std::path::PathBuf;
fn loose_ends_dir() -> PathBuf {
let base = if let Some(p) = std::env::var_os("HYPERHIVE_HARNESS_DIR") {
PathBuf::from(p)
} else {
let state = std::env::var("HYPERHIVE_STATE_DIR").unwrap_or_default();
let state_path = PathBuf::from(&state);
state_path
.parent()
.map(|p| p.join("harness"))
.unwrap_or_else(|| PathBuf::from(state))
};
base.join("mcp-loose-ends")
}
/// Collect all loose-end summary strings published by external MCP daemons.
/// Each string is a single line suitable for inclusion in `get_loose_ends`
/// output. Returns an empty vec if the directory doesn't exist or is empty.
#[must_use]
pub fn collect() -> Vec<String> {
let Ok(rd) = std::fs::read_dir(loose_ends_dir()) else {
return Vec::new();
};
let mut out = Vec::new();
for entry in rd.flatten() {
let path = entry.path();
if path.extension().and_then(|e| e.to_str()) != Some("json") {
continue;
}
let Ok(content) = std::fs::read_to_string(&path) else {
continue;
};
let Ok(items) = serde_json::from_str::<Vec<String>>(&content) else {
continue;
};
out.extend(items);
}
out
}