diff --git a/docs/tools/hivectl-cli.md b/docs/tools/hivectl-cli.md index ace96cb9..4626758a 100644 --- a/docs/tools/hivectl-cli.md +++ b/docs/tools/hivectl-cli.md @@ -379,7 +379,7 @@ Generate the federation peer-config block for THIS hive — the nix a peer opera Open an interactive Claude session inside an agent container. -Runs claude as the agent user from its state dir with the harness's settings / MCP / system prompt. Bare `choom ` is a fresh session; `--resume ` rejoins a prior one. Never collides with the harness's live session. Requires root + a running container. See `docs/tools/hivectl.md` (Choom) for details. +Runs claude as the agent user from its state dir with the harness's settings / MCP / system prompt. Bare `choom ` is a fresh session; `--continue ` rejoins a prior one. Never collides with the harness's live session. Requires root + a running container. See `docs/tools/hivectl.md` (Choom) for details. **Usage:** `hivectl choom [OPTIONS] ` @@ -389,7 +389,7 @@ Runs claude as the agent user from its state dir with the harness's settings / M ###### **Options:** -* `--resume ` — Resume a prior claude session by its session id, passed through as `claude --resume ` (claude's `--continue` takes no value — it resumes the cwd's latest session, which is the harness's, so choom never uses it; this flag matches the claude flag it maps to). Omit for a fresh blank session. A value is required when the flag is given +* `--continue ` — Resume a prior claude session by id or display name, passed through as `claude --continue `. Omit for a fresh blank session. A value is required when the flag is given diff --git a/docs/tools/hivectl.md b/docs/tools/hivectl.md index 6af3b932..51f3ec47 100644 --- a/docs/tools/hivectl.md +++ b/docs/tools/hivectl.md @@ -127,21 +127,18 @@ running claude from the agent's state dir. Requires root (same as all `machinectl shell` operations). ```bash -hivectl choom iris # fresh blank Claude session in iris's container -hivectl choom iris --resume # rejoin a prior session by id +hivectl choom iris # fresh blank Claude session in iris's container +hivectl choom iris --continue # rejoin a prior session by id or display name ``` -Bare `choom` starts a fresh blank session. `--resume ` passes -through as `claude --resume ` to rejoin a prior session by its -session id — the flag name deliberately matches the claude flag it maps -to. (choom never uses claude's `--continue`: that's a bare flag that -takes no argument and resumes the cwd's *latest* session, i.e. the -harness's; a value after it would be consumed as the first prompt, -silently poking the live harness session.) A value is required when the -flag is given. Either way choom never collides with the harness's live -session in the same project dir: the harness pins its own id via -`--resume`, so a blank choom session is invisible to it. The container -must be running. +Bare `choom` starts a fresh blank session. `--continue ` is +passed straight through as `claude --continue ` to rejoin a +prior session — claude resolves whether the value is a session id or a +display name (you can `/rename` a session in-session for an easy +handle). A value is required when the flag is given. Either way choom +never collides with the harness's live session in the same project dir: +the harness pins its own id via `--resume`, so a blank choom session is +invisible to it. The container must be running. choom reproduces the harness's own claude invocation so the operator lands in a faithful copy of the agent's environment: diff --git a/hive-c0re/src/bin/hivectl.rs b/hive-c0re/src/bin/hivectl.rs index 3a5a743a..3b3a9e2e 100644 --- a/hive-c0re/src/bin/hivectl.rs +++ b/hive-c0re/src/bin/hivectl.rs @@ -112,20 +112,17 @@ enum Cmd { /// /// Runs claude as the agent user from its state dir with the harness's /// settings / MCP / system prompt. Bare `choom ` is a fresh - /// session; `--resume ` rejoins a prior one. Never - /// collides with the harness's live session. Requires root + a running + /// session; `--continue ` rejoins a prior one. Never collides + /// with the harness's live session. Requires root + a running /// container. See `docs/tools/hivectl.md` (Choom) for details. Choom { /// Agent name (e.g. `damocles`, `iris`). name: String, - /// Resume a prior claude session by its session id, passed - /// through as `claude --resume ` (claude's `--continue` - /// takes no value — it resumes the cwd's latest session, which - /// is the harness's, so choom never uses it; this flag matches - /// the claude flag it maps to). Omit for a fresh blank session. - /// A value is required when the flag is given. - #[arg(long = "resume", value_name = "SESSION")] - resume_session: Option, + /// Resume a prior claude session by id or display name, passed + /// through as `claude --continue `. Omit for a fresh + /// blank session. A value is required when the flag is given. + #[arg(long = "continue", value_name = "SESSION")] + continue_session: Option, }, /// Stop containers hive-wide in one operator action. Bare `hivectl /// stop` stops **everything** — all sub-agents plus the ci, forge, @@ -634,8 +631,8 @@ async fn main() -> Result<()> { }, Cmd::Choom { name, - resume_session, - } => choom(&name, resume_session.as_deref()), + continue_session, + } => choom(&name, continue_session.as_deref()), Cmd::Quota { cmd } => match cmd { QuotaCmd::Enable => quota_enable().await, QuotaCmd::Show { name } => quota_show(name.as_deref()).await, @@ -1034,7 +1031,7 @@ fn agent_exists(name: &str) -> Result { /// live harness session). See `docs/tools/hivectl.md` (Choom) for the /// full rationale. Inherits the caller's PTY; requires root + a running /// container. -fn choom(name: &str, resume_session: Option<&str>) -> Result<()> { +fn choom(name: &str, continue_session: Option<&str>) -> Result<()> { if !agent_exists(name)? { bail!("no such agent: '{name}' (no state dir under /var/lib/hyperhive/agents/)"); } @@ -1047,20 +1044,16 @@ fn choom(name: &str, resume_session: Option<&str>) -> Result<()> { let state_dir = format!("/agents/{name}/state"); // Per-turn config the harness writes; matches `paths::config_dir()`. let cfg = "/run/hive-config"; - // `--resume ` passes through as `claude --resume ` — - // the rejoin-by-id surface. (claude's `--continue` is a bare flag - // that resumes the cwd's latest session — the harness's — and would - // consume a trailing value as the first PROMPT; choom never uses - // it.) The value is single-quoted into the shell script, so reject - // an embedded single quote (the only char that breaks - // single-quoting) to rule out injection — session ids never - // contain one. - let session_arg = match resume_session { + // `--continue ` passes straight through to claude. The value is + // single-quoted into the shell script, so reject an embedded single + // quote (the only char that breaks single-quoting) to rule out + // injection — session ids / display names never contain one. + let session_arg = match continue_session { Some(val) => { if val.contains('\'') { - bail!("invalid --resume value '{val}': must not contain a single quote"); + bail!("invalid --continue value '{val}': must not contain a single quote"); } - format!("set -- --resume '{val}';") + format!("set -- --continue '{val}';") } None => "set --;".to_string(), };