Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5351eb59c | ||
|
|
18e0e8fc2b |
9 changed files with 29 additions and 27 deletions
|
|
@ -285,7 +285,7 @@ binary flavor.
|
|||
| `messaging` | `send`, `recv`, `ask`, `answer` |
|
||||
| `meta` | `set_status`, `get_agent_meta` |
|
||||
| `inbox` | `get_loose_ends`, `cancel_loose_end`, `remind`, `request_next_turn` |
|
||||
| `execution` | `bash_run`, `bash_status` |
|
||||
| `execution` | `run`, `status` (`mcp__bash__run`, `mcp__bash__status`) |
|
||||
| `lifecycle` | `kill`, `start`, `restart`, `update` *(privileged)* |
|
||||
| `approvals` | `request_init_config`, `request_apply_commit`, `request_update_meta_inputs` *(privileged)* |
|
||||
| `scheduling` | `request_schedule_prompt`, `fire_schedule_now`, `cancel_schedule`, `edit_schedule`, `list_schedules` *(privileged)* |
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ force-clear `HOST_ADDRESS` / `LOCAL_ADDRESS` / `HOST_ADDRESS6` /
|
|||
The hive-c0re service sets `path = [ pkgs.git "/run/current-system/sw" ]`.
|
||||
In-container harness services do the same so anything an agent adds
|
||||
to its own `agent.nix` (`environment.systemPackages`) is visible to
|
||||
the `bash_run` MCP tool (and any other in-container process) without
|
||||
the `mcp__bash__run` MCP tool (and any other in-container process) without
|
||||
editing the service definition.
|
||||
`environment.HYPERHIVE_GIT` bakes git's absolute path in (read by
|
||||
`lifecycle::git_command()`) for the host.
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ Under `/var/lib/hyperhive/agents/<name>/`:
|
|||
agent consumption. Bind-mounted to `/agents/<name>/harness`
|
||||
inside the container (`$HYPERHIVE_HARNESS_DIR`). Contents:
|
||||
- `bash-tasks/` — task JSON + stdout/stderr files for
|
||||
background `bash_run` jobs. JSON files are
|
||||
background `mcp__bash__run` jobs. JSON files are
|
||||
`<id>.json` (status + tails), `<id>.out` / `<id>.err`
|
||||
(full captured output). Task files persist until container
|
||||
purge.
|
||||
|
|
|
|||
|
|
@ -373,20 +373,21 @@ it as a stdio child via `--mcp-config`. The hyperhive socket name is
|
|||
continue without waiting for an external message. The next turn starts
|
||||
with `from: "self"` and `body: "continue"`. No-op if new inbox
|
||||
messages arrive before this turn ends. No args.
|
||||
- `bash_run(cmd, timeout_secs?)` — submit a shell command for
|
||||
- `run(cmd, timeout_secs?)` — submit a shell command for
|
||||
background execution (`sh -c <cmd>`). Returns a task ID immediately;
|
||||
the command runs asynchronously in a harness-managed tokio task. Stdout
|
||||
and stderr stream to `harness/bash-tasks/<id>.{out,err}`. When the
|
||||
task completes (or times out, or the process errors), the harness wakes
|
||||
the agent with a summary body — handle on a future turn. Default
|
||||
timeout 180s; pass `timeout_secs` to override. Requires the
|
||||
`execution` tool group.
|
||||
- `bash_status(id)` — poll the status of a task submitted with
|
||||
`bash_run`. Returns status (`pending`/`running`/`done`/`timed_out`/
|
||||
`execution` tool group. Exposed as `mcp__bash__run`.
|
||||
- `status(id)` — poll the status of a task submitted with
|
||||
`run`. Returns status (`pending`/`running`/`done`/`timed_out`/
|
||||
`interrupted`), exit code, run duration, and the last 4 KiB of stdout
|
||||
and stderr (full output in the `.out`/`.err` files). Tasks marked
|
||||
`interrupted` had their process killed by a harness restart; a best-
|
||||
effort wake was still sent so the agent is not silently blocked.
|
||||
Exposed as `mcp__bash__status`.
|
||||
|
||||
### Waking the agent from inside the container
|
||||
|
||||
|
|
@ -581,9 +582,10 @@ status hint moved to the wake prompt + UI header.
|
|||
- Allowed MCP tools: as listed above per flavor.
|
||||
|
||||
`Bash` is disallowed — shell execution goes through
|
||||
`mcp__hyperhive__bash_run` (background tasks with structured output +
|
||||
task-id tracking) instead of an interactive shell. The `bash_run` /
|
||||
`bash_status` MCP tools are always in the `--allowedTools` list.
|
||||
`mcp__bash__run` (background tasks with structured output +
|
||||
task-id tracking) instead of an interactive shell. The `run` /
|
||||
`status` MCP tools (`mcp__bash__run` / `mcp__bash__status`) are always
|
||||
in the `--allowedTools` list.
|
||||
|
||||
`WebFetch` / `WebSearch` are off by default; enable the `web_tools`
|
||||
tool group in the P3RM1SS10NS tab and rebuild the agent to enable them.
|
||||
|
|
|
|||
|
|
@ -1254,13 +1254,13 @@ window.marked = marked;
|
|||
case 'mcp__hyperhive__kill': return short + ' ' + (input.name || '');
|
||||
case 'mcp__hyperhive__request_apply_commit':
|
||||
return short + ' ' + (input.agent || '') + ' @ ' + (input.commit_ref || '').slice(0, 12);
|
||||
case 'mcp__bash__bash_run': {
|
||||
case 'mcp__bash__run': {
|
||||
// Rich renderer handles the full body; this summary covers any
|
||||
// fallback path and the details summary line.
|
||||
const firstLine = String(input.cmd || '').split('\n')[0];
|
||||
return short + ' $ ' + trim(firstLine.trim(), 72);
|
||||
}
|
||||
case 'mcp__bash__bash_status':
|
||||
case 'mcp__bash__status':
|
||||
return short + ' id:' + (input.id || '?')
|
||||
+ (input.wait_seconds != null ? ' · wait ' + input.wait_seconds + 's' : '');
|
||||
default: return fmtArgsGeneric(short, input);
|
||||
|
|
@ -1354,10 +1354,10 @@ window.marked = marked;
|
|||
// Bash task runner — show full command in an expandable pre block so
|
||||
// multi-line scripts are readable. Summary uses the first line so the
|
||||
// row is identifiable without expanding.
|
||||
if (name === 'mcp__bash__bash_run') {
|
||||
if (name === 'mcp__bash__run') {
|
||||
const cmd = String(input.cmd || '');
|
||||
const firstLine = cmd.split('\n')[0];
|
||||
const summary = 'bash_run* $ ' + trim(firstLine.trim(), 72);
|
||||
const summary = 'run* $ ' + trim(firstLine.trim(), 72);
|
||||
return api.details('tool-use', summary, '$ ' + cmd);
|
||||
}
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -2003,7 +2003,7 @@ pub const SERVER_NAME: &str = "hyperhive";
|
|||
/// exist in the session. Web egress (`WebFetch`/`WebSearch`) are
|
||||
/// tool-group-gated (`web_tools`) — off by default. Nested agents
|
||||
/// (`Task`) are intentionally omitted. `Bash` is disallowed — shell
|
||||
/// execution goes through `mcp__hive_bash__bash_run` (background tasks
|
||||
/// execution goes through `mcp__bash__run` (background tasks
|
||||
/// with structured output via `hive-bash-mcp`) instead of a raw interactive shell. `TodoWrite`
|
||||
/// is omitted because the todo list lives in claude's in-process session
|
||||
/// state and silently evaporates on /compact or session reset — agents
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ struct BashRunArgs {
|
|||
/// `timed_out` when the limit is exceeded.
|
||||
#[serde(default)]
|
||||
timeout_secs: Option<u64>,
|
||||
/// Optional inline wait: `bash_run` polls for up to `wait_seconds`
|
||||
/// Optional inline wait: `run` polls for up to `wait_seconds`
|
||||
/// (capped at 30) before returning. When the task finishes within the
|
||||
/// window the full status is returned immediately and no wake is fired;
|
||||
/// when the timeout expires the task keeps running and the normal
|
||||
|
|
@ -158,9 +158,9 @@ fn default_wait() -> Option<u64> {
|
|||
|
||||
#[derive(Debug, Deserialize, JsonSchema)]
|
||||
struct BashStatusArgs {
|
||||
/// Task ID returned by `bash_run`.
|
||||
/// Task ID returned by `run`.
|
||||
id: String,
|
||||
/// Optional inline wait: `bash_status` polls for up to `wait_seconds`
|
||||
/// Optional inline wait: `status` polls for up to `wait_seconds`
|
||||
/// (capped at 30) before returning. Useful to avoid a separate
|
||||
/// round-trip when the task is expected to finish soon.
|
||||
#[serde(default)]
|
||||
|
|
@ -176,7 +176,7 @@ impl BashMcp {
|
|||
description = "Run a shell command in the background. Returns a task ID immediately — \
|
||||
do NOT wait inline. When the command finishes, the harness fires a wake with \
|
||||
`from: \"bash-task-<id>\"` and the exit code + last stdout lines in the body; \
|
||||
handle it on a future turn. Use `bash_status` to poll the task status within \
|
||||
handle it on a future turn. Use `status` to poll the task status within \
|
||||
the same turn if needed. `timeout_secs` defaults to 180. Pass `wait_seconds` \
|
||||
(capped at 30) to wait inline for fast commands: when the task finishes within \
|
||||
the window the full status is returned immediately and no wake is fired; when \
|
||||
|
|
@ -184,7 +184,7 @@ impl BashMcp {
|
|||
response is returned. `wait_seconds` defaults to 3; pass `wait_seconds: 0` to \
|
||||
disable inline waiting and always get the immediate response."
|
||||
)]
|
||||
async fn bash_run(&self, Parameters(args): Parameters<BashRunArgs>) -> String {
|
||||
async fn run(&self, Parameters(args): Parameters<BashRunArgs>) -> String {
|
||||
let req = DaemonRequest::BashRun {
|
||||
cmd: args.cmd,
|
||||
timeout_secs: args.timeout_secs,
|
||||
|
|
@ -202,7 +202,7 @@ impl BashMcp {
|
|||
}
|
||||
|
||||
#[tool(
|
||||
description = "Check the status of a background bash task by its ID (from `bash_run`). \
|
||||
description = "Check the status of a background bash task by its ID (from `run`). \
|
||||
Returns the current status (pending/running/done/timed_out/interrupted), exit code \
|
||||
if finished, and a tail of stdout/stderr. Full output lives in \
|
||||
`harness/bash-tasks/<id>.out` / `.err`. \
|
||||
|
|
@ -210,7 +210,7 @@ impl BashMcp {
|
|||
task finishes within the window the full status is returned immediately. Useful to \
|
||||
avoid a separate round-trip when the task is expected to finish soon."
|
||||
)]
|
||||
async fn bash_status(&self, Parameters(args): Parameters<BashStatusArgs>) -> String {
|
||||
async fn status(&self, Parameters(args): Parameters<BashStatusArgs>) -> String {
|
||||
let id = args.id.clone();
|
||||
let req = DaemonRequest::BashStatus {
|
||||
id: args.id,
|
||||
|
|
|
|||
|
|
@ -804,7 +804,7 @@ pub enum ToolGroup {
|
|||
Scheduling,
|
||||
/// `get_logs` - *(privileged)*
|
||||
Diagnostics,
|
||||
/// `bash_run`, `bash_status`
|
||||
/// `run`, `status` (via `mcp__bash__*`)
|
||||
Execution,
|
||||
/// Claude built-in web egress tools: `WebFetch` (retrieve a URL) and
|
||||
/// `WebSearch` (search the web). Both are omitted from `--tools` by
|
||||
|
|
@ -843,7 +843,7 @@ impl ToolGroup {
|
|||
"list_schedules",
|
||||
],
|
||||
Self::Diagnostics => &["get_logs"],
|
||||
Self::Execution => &["bash_run", "bash_status"],
|
||||
Self::Execution => &["run", "status"],
|
||||
Self::WebTools => &[],
|
||||
}
|
||||
}
|
||||
|
|
@ -928,7 +928,7 @@ impl ToolGroup {
|
|||
Self::Diagnostics => {
|
||||
"get_logs — read a sub-agent container's systemd journal (privileged)"
|
||||
}
|
||||
Self::Execution => "bash_run, bash_status — run shell commands in the container",
|
||||
Self::Execution => "run, status — run shell commands via mcp__bash__run / mcp__bash__status",
|
||||
Self::WebTools => "WebFetch, WebSearch — Claude built-in web egress; not MCP tools",
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ in
|
|||
default = [ ];
|
||||
description = ''
|
||||
Deprecated - has no effect. The built-in Bash tool is fully
|
||||
disabled regardless of this list; agents use mcp__hyperhive__bash_run
|
||||
disabled regardless of this list; agents use mcp__bash__run
|
||||
instead. Remove this option from your agent.nix.
|
||||
'';
|
||||
visible = false;
|
||||
|
|
@ -612,7 +612,7 @@ in
|
|||
config = {
|
||||
warnings = lib.optional (config.hyperhive.allowedBashPatterns != [ ]) ''
|
||||
hyperhive.allowedBashPatterns is deprecated and has no effect.
|
||||
The built-in Bash tool is fully disabled; agents use mcp__hyperhive__bash_run instead.
|
||||
The built-in Bash tool is fully disabled; agents use mcp__bash__run instead.
|
||||
Remove allowedBashPatterns from your agent.nix.
|
||||
'';
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue