@ours.network/hermes 0.17.0 → 0.18.0-nightly.2

package/README.md

@@ -120,7 +120,7 @@ To get woken on new mail, ask the `ours` skill in-session to wake you: it tails
 
 ## Verify
 
-- `ours-mcp status` — daemon up.
+- `ours daemon status` — shared daemon up.
 - In Hermes: *"which mcp_ours tools are available?"* — should list ours tools.
 - Ask the agent to wake you on new mail (bind an identity first), then send yourself a
   message from a peer identity and confirm the in-session watch reacts.

package/bin/hermes-config-install.mjs

@@ -23,7 +23,12 @@ const SENTINEL_END = '# <<< ours.network plugin';
 // could corrupt existing YAML.
 export function planConfigInstall(text) {
   const t = text ?? '';
-  if (t.includes(SENTINEL)) return { action: 'noop', reason: 'ours block already present' };
+  if (t.includes(SENTINEL)) {
+    if (!t.includes(SENTINEL_END)) return { action: 'manual', reason: 'ours managed block is incomplete' };
+    return t.includes('ours-mcp') && t.includes('proxy') && !t.includes('--application')
+      ? { action: 'noop', reason: 'ours block already present' }
+      : { action: 'replace', reason: 'migrate the managed block to shared-daemon selection' };
+  }
   if (!t.trim()) return { action: 'write', reason: 'no existing config' };
   if (/^mcp_servers:/m.test(t)) {
     return {
@@ -67,9 +72,13 @@ function main() {
     process.exitCode = 3;
     return;
   }
-  const next = plan.action === 'write' ? block : existing.replace(/\s*$/, '\n\n') + block;
+  const next = plan.action === 'write' ? block
+    : plan.action === 'replace'
+      ? existing.replace(new RegExp(`${SENTINEL.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${SENTINEL_END.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`), block)
+      : existing.replace(/\s*$/, '\n\n') + block;
   writeFileSync(cfgPath, next);
-  console.log(`ours: ${plan.action === 'write' ? 'wrote' : 'appended ours block to'} ${cfgPath}. Run /reload-mcp in Hermes.`);
+  const verb = plan.action === 'write' ? 'wrote' : plan.action === 'replace' ? 'updated ours block in' : 'appended ours block to';
+  console.log(`ours: ${verb} ${cfgPath}. Run /reload-mcp in Hermes.`);
 }
 
 if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) main();

package/install.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Install the ours.network plugin into Hermes:
-#   1. ensure the ours daemon (@ours.network/mcp) is installed + running
+#   1. ensure the ours operator CLI and MCP adapter are installed; start the shared daemon
 #   2. install the ours + writing-agent-bios skills into ~/.hermes/skills/
 #   3. write the `ours` MCP server into ~/.hermes/config.yaml (idempotent, never corrupts
 #      existing YAML)
@@ -31,18 +31,18 @@ say(){ printf 'ours-install: %s\n' "$1"; }
 ensure_daemon_latest(){
   if [ "${OURS_INSTALL_SKIP_DAEMON:-}" = "1" ]; then say "skipping daemon step (OURS_INSTALL_SKIP_DAEMON=1)"; return 0; fi
   local before after
-  before="$(ours-mcp --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || true)"
-  say "ensuring @ours.network/mcp@latest…"
-  npm i -g @ours.network/mcp@latest
-  after="$(ours-mcp --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || true)"
-  if ! ours-mcp status >/dev/null 2>&1; then
-    say "starting the ours daemon…"; ours-mcp start || say "could not auto-start; run 'ours-mcp start' if the tools error."
+  before="$(ours version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || true)"
+  say "ensuring @ours.network/cli@latest and @ours.network/mcp@latest…"
+  npm i -g @ours.network/cli@latest @ours.network/mcp@latest
+  after="$(ours version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || true)"
+  if ! ours daemon status >/dev/null 2>&1; then
+    say "starting the ours daemon…"; ours daemon start || say "could not start; run 'ours daemon start' if the tools error."
   elif [ -n "$before" ] && [ "$before" != "$after" ]; then
-    say "daemon upgraded (v${before} → v${after}) — restarting…"; ours-mcp restart || ours-mcp start || true
+    say "operator CLI upgraded (v${before} → v${after}) — restarting its daemon…"; ours daemon restart || ours daemon start || true
   else
     say "daemon already current (v${after:-unknown})."
   fi
-  say "daemon: $(command -v ours-mcp) (v${after:-unknown})"
+  say "operator CLI: $(command -v ours) (v${after:-unknown}); MCP adapter: $(command -v ours-mcp)"
 }
 
 # Idempotent, GUARDED cleanup of legacy connector-era artifacts earlier (0.2.0/0.3.0) installers
@@ -93,7 +93,7 @@ say "done. Run /reload-mcp in Hermes to load the mcp_ours_* tools."
 # --- version echo: show the user they are on latest ---
 if [ "${OURS_INSTALL_SKIP_DAEMON:-}" != "1" ]; then
   say "versions:"
-  say "  daemon: $(ours-mcp --version 2>/dev/null | head -1 || echo 'unknown')"
+  say "  MCP adapter: $(ours-mcp --version 2>/dev/null | head -1 || echo 'unknown')"
   say "  plugin: $(npm ls -g @ours.network/hermes 2>/dev/null | grep -oE '@ours\.network/hermes@[0-9][0-9.]*' | head -1 || echo '@ours.network/hermes (not a global install)')"
 fi
 say "next: in your agent, bind (or create) an identity and ask the ours skill to \"wake me on new"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/hermes",
-  "version": "0.17.0",
+  "version": "0.18.0-nightly.2",
   "description": "Hermes (Nous Research) plugin for ours — secure agent-to-agent messaging over ADAPT. Registers the ours MCP server, bundles the ours skill, and wires in-session wake-on-mail via `ours-mcp watch` (no webhook, no external watcher).",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",

package/skills/ours/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: ours
-description: Use when the user wants to set up or configure ours or ours-fleet, onboard onto the ours network, create or switch an identity, connect with another agent or person, exchange encrypted messages or files, check incoming mail, arm live monitoring, bind a web-messenger control proxy, or spawn/configure/oversee a persistent or temporary fleet agent. Trigger phrases include "set up ours", "set up ours-fleet", "configure fleet", "spawn fleet agent", "use identity X", "send a message", "check my messages", "watch for messages", "wake me on new mail", "bind the monitoring proxy", and "set up the control panel".
+description: Use when the user wants to set up or configure ours or ours-fleet, onboard onto the ours network, create or switch an identity, connect with another agent or person, exchange encrypted messages or files, check incoming mail, arm live monitoring, or spawn/configure/oversee a persistent or temporary fleet agent. Trigger phrases include "set up ours", "set up ours-fleet", "configure fleet", "spawn fleet agent", "use identity X", "send a message", "check my messages", "watch for messages", "wake me on new mail".
 metadata:
   hermes:
     tags: [ours, ours.network, a2a, adapt, e2e, messaging, identity]
@@ -21,8 +21,9 @@ are three surfaces:
 
 - **Layer 1 — identities** (global): create / bind / switch the identity you act as.
 - **Layer 2 — messaging** (per the bound identity): invites, contacts, send/read.
-- **Control plane** (the host's **Human identity**): bind a human's web-messenger as a
-  **monitoring & control proxy** that can oversee and command a fleet of agents.
+- **Control plane** (the host's **Human identity**): a human's web-messenger acting as a
+  **monitoring & control proxy** over a fleet of agents. **Not available in this release** —
+  its MCP tools were removed; see "Control plane" below before offering anything.
 
 Identities come in exactly two kinds, in a fixed order:
 
@@ -76,19 +77,19 @@ allows it for legacy reasons; this skill does not.
 
 Walk the user through these, checking each. Stop and help at the first one that isn't done.
 
-1. **Daemon running.** The MCP tools talk to a local background daemon. Check it:
-   `ours-mcp status`. If the command is missing, install it: `npm i -g
-   @ours.network/mcp`, then `ours-mcp start`. For boot-persistence offer
-   `ours-mcp install-service`. To change broker / port / state dir, run the
-   interactive `ours-mcp setup` (this edits config only — it is NOT identity setup).
-   These run on the user's machine; if a step needs them at a terminal, suggest they
-   type `! ours-mcp status` etc.
-   Then check optional voice support with `ours-mcp voice-status --json`. If it is
-   not ready and the user wants voice transcription, ask them to run `ours-install`
-   in a terminal: it re-detects incomplete setup and reads the provider key with
-   hidden input. **Never ask for, paste, echo, or put the key in chat/tool arguments.**
-   Environment-only operators may set `OURS_STT_*` themselves. Troubleshooting and
-   the exact Telegram OGG/Opus fallback contract are in `references/configuration.md`.
+For a first-time or complete host setup, prefer `ours-install`. It installs the
+CLI, one shared daemon, MCP, cowork, Telegram, Fleet, the Human identity, and
+every safely detected harness plugin in one progress-driven flow. It starts the
+daemon and cowork, but deliberately leaves Telegram and Fleet stopped. If
+`~/fleet.yaml` does not exist, it writes a conservative stopped starter with a
+`FleetCoordinator`, watchdog, and coordinator health loop; it never overwrites an
+existing file.
+
+1. **Daemon running.** Check it with `ours daemon status`. If the stack is
+   missing or incomplete, ask the user to run `ours-install`; use the manual CLI
+   package/config/start commands only as a troubleshooting fallback. These are
+   operator commands; explain the shared blast radius and obtain consent before
+   changing configuration or lifecycle.
 2. **Plugin installed.** Run this package's `install.sh` (from `@ours.network/hermes`).
    It ensures the daemon, writes the `ours` MCP server into `~/.hermes/config.yaml`, and
    installs this skill into `~/.hermes/skills/`. That's all — no identities, no webhook route,
@@ -103,8 +104,9 @@ Walk the user through these, checking each. Stop and help at the first one that
    via the `terminal` tool and react to each new message from that loop (see *Getting woken on new mail*
    below). **Be honest that this BLOCKS the session** (unlike Claude Code's background Monitor) —
    don't sell it as "just works". The installer never sets this up.
-6. **(Optional) Oversight.** If they want to watch/command a fleet from a phone or
-   browser, set up the **control-plane monitoring proxy**.
+6. **Oversight.** If they ask to watch/command a fleet from a phone or browser, say the
+   **control-plane monitoring proxy is not available in this release** — there is no tool
+   to call. See "Control plane" below.
 
 - **Configuration.** Port, state dir, broker, and GC interval are configurable
   (env > `~/.ours/config.json` > default; port default 3050). Daemon config is
@@ -126,6 +128,19 @@ the version-matched source of truth:
    subcommand's `--help`, and recommend upgrading. Do not ask the user to
    explain available flags or rely on a copied fleet workflow from this skill.
 
+After `ours-install`, review `~/fleet.yaml` with the user before activation. Do
+not start Fleet or Telegram merely because installation finished. With explicit
+approval, the exact activation commands are:
+
+```sh
+ours-fleet doctor && ours-fleet config && ours-fleet up
+ours-fleet ls
+ours-tg-connector install-service
+```
+
+For Telegram, first guide bot and route setup locally. Never ask the user to put
+a bot token in chat, a tool argument, or a transcript.
+
 ## Layer 1 — identities (global)
 
 A session must **bind** an identity before it can send or read messages. Binding is
@@ -231,8 +246,8 @@ random public-safe `tmp-…` name), binds it to this session, and marks it **tem
 If a notice says your plugin and the running daemon are different
 versions, it is **advisory** — everything still works. Relay it to the user and,
 if they want matching versions, tell them: the daemon is shared and is not
-restarted automatically, so run `ours-mcp stop` when no other session is
-mid-task (the next session starts the new version), or update the lagging side.
+restarted automatically, so run `ours daemon restart` only when no other session
+is mid-task, or update the lagging side.
 Do **not** stop work, refuse, or restart anything on your own over this.
 
 ### Workspace identity pin (`.ours-identity`)
@@ -365,45 +380,21 @@ When you bind an identity, offer the user, in plain language:
 - **Auto-wake** → arm the monitor: you hold a live `ours-mcp watch <id>` and react to each message as it arrives. **Be upfront:** while watching, this session is **busy** — you can't send it new prompts. To do something else: press **ESCAPE** to interrupt the watch, type your prompt, then ask it to **resume** watching. *(On Claude Code this same monitor runs non-blocking in the background — a Claude Code advantage.)*
 - **Manual** → don't arm it; ask it to check `get_messages` whenever you want. No blocking.
 
-## Control plane — bind a monitoring proxy (human oversight of a fleet)
-
-This is **separate** from the wake-on-mail watch above. The control plane lets a **person's
-web-messenger account** (the ours web messenger, shipping as part of the upcoming ours-control-plane)
-oversee and command all agents under this host's **Human identity** from a **Control
-Panel**: view a **live monitoring feed** of monitored agents' traffic, create agents, edit
-their bios **and personas**, toggle each agent's monitoring, open a chat with any agent (the
-Human identity commands the agent to mint an invite — no out-of-band step), and remove agents. A
-coordinator can also set a worker's local persona via the cluster; the agent still asks the
-user before adopting it. All of it rides the same
-e2e channels as messages but in a separate control queue agents never see; monitoring bodies
-are never written to disk on the host.
-
-**Prerequisites**
-- The **Human identity** exists (`create_root_identity` — the onboarding step). The
-  proxy binds to the Human identity.
-- The messenger account is already a **contact of the Human identity** — do the normal
-  invite exchange first: bind the Human identity, `generate_invite`, and have the
-  messenger redeem it (or redeem the messenger's invite with `add_contact`).
-
-**Binding ceremony (6-digit code, out-of-band)**
-1. "bind my messenger account as the monitoring proxy" →
-   `bind_monitoring_proxy({ contact: "<the messenger contact>" })`. This automatically
-   targets the host's Human identity (you do **not** need to be bound as it). It returns a
-   **6-digit code** (valid 5 minutes, 3 attempts) and shows it **here**.
-2. **Read the code to the user.** They open the messenger → the conversation with the Human identity →
-   **Control Panel** → enter the code. The code must travel **out-of-band** — reading it off
-   this terminal is what proves you control both ends. **Never send the code over ours.**
-3. On success the contact becomes the proxy. Confirm with `get_monitoring_status`.
-
-**Per-agent monitoring is controller-gated.** Once a proxy is bound, the proxy (Control
-Panel) turns an agent's monitoring on/off — there is **no local enable/disable tool**. A
-monitored agent reports a signed copy of every message it sends/receives to the Human
-identity's node, which forwards it to the proxy's feed.
-
-**Status** — "what's the monitoring/control state" → `get_monitoring_status()` reports the
-Human identity's bound proxy (if any), a pending code verification, queued copies/control
-requests, and each agent's monitoring ON/off. Works whenever the Human identity exists.
+## Control plane — human oversight of a fleet
+
+**NOT AVAILABLE IN THIS RELEASE. Do not offer it, and do not call a tool for it.**
+The `bind_monitoring_proxy` and `get_monitoring_status` MCP tools were removed with the
+daemon-side control plane; there is no tool behind them and a call will fail. Nothing has
+replaced them yet.
+
+The capability itself is not cancelled: the monitoring/control surface remains in the
+**protocol core**, untouched, for whenever it is reimplemented. What is gone is this
+plugin's exposure of it as MCP tools.
 
+If a user asks to bind a web-messenger account as a monitoring/control proxy, to open a
+Control Panel, or to check monitoring status — say plainly that it is not available in this
+release, and do not improvise a substitute. Per-identity wake-on-mail is a **different**
+feature and still works; it is described above.
 ## Notes
 
 - Identities and their state (contacts, inbox, keys) persist under the daemon's state dir
@@ -416,7 +407,7 @@ requests, and each agent's monitoring ON/off. Works whenever the Human identity
   event (sender + id + date) to `$OURS_STATE_DIR/<identity>/notifications.log` (the wake
   signal `ours-mcp watch` reads) and refreshes a body-free `unread.json`. Text lives in the
   packet and leaves it solely via `get_messages`.
-- **The wake signal is uniform.** `ours-mcp watch <identity>` is the common stream; each harness
+- **The wake signal is uniform.** `ours-mcp watch <identity>` is the explicitly named stream; each harness
   drives it in-session. Claude Code uses its native `Monitor` tool; **Hermes uses autonomous watch
   mode** — the agent holds a blocking `ours-mcp watch` via the `terminal` tool and reacts from that
   loop (see *Getting woken on new mail*). The ours daemon, identities, and tools are identical across

package/skills/ours/references/configuration.md

@@ -1,82 +1,26 @@
-# ours configuration & self-service
-
-The daemon is a **shared, host-wide singleton** reachable only on `127.0.0.1`
-(loopback — there is no host knob, by design). Configuration is resolved
-**env var > `~/.ours/config.json` > built-in default**:
-
-| Setting | Env | config.json | Default |
-|---|---|---|---|
-| HTTP port | `OURS_PORT` | `port` | `3050` |
-| State dir | `OURS_STATE_DIR` | `stateDir` | `~/.ours` |
-| Broker URL | `OURS_BROKER_URL` | `brokerUrl` | (bundled default) |
-| GC interval (ms) | `OURS_GC_INTERVAL_MS` | `gcIntervalMs` | `3600000` |
-| Auto-start daemon | `OURS_AUTOSTART` | `autoStart` | `false` |
-
-**The port is shared.** Every process that dials the daemon — the `ours-mcp proxy` MCP
-server and `ours-mcp watch` — connects to `127.0.0.1:<OURS_PORT>`, and the daemon binds the
-same port (both read `OURS_PORT`/`config.json`). Change it **once in shared config**, never
-per-side, or a dialer won't find the daemon.
-
-**Changing config (consent-first — never on your own initiative):**
-- Interactive: `ours-mcp config` (a survey). It needs a TTY, so ask the **user**
-  to run it via `!ours-mcp config` — you cannot drive the survey yourself.
-- Scripted: edit `~/.ours/config.json` (a key per setting), then restart:
-  `ours-mcp restart` (with `autoStart` off — the default — a stopped daemon
-  stays stopped; sessions report an error instead of relaunching it).
-
-Both methods edit the same `~/.ours/config.json` file — the interactive survey is just guided editing.
-
-**Blast radius — explain this before any change:**
-- **Any config change restarts the daemon — every active session loses its binding and must `choose_identity` again.** Only change config when no other session is mid-task.
-- **Changing `stateDir` orphans existing identities** — they live under the old
-  directory and won't be found under the new one.
-
-If a tool can't reach the daemon, first check `ours-mcp status` (is it running,
-on which port). With `autoStart` off (the default) the most common cause is
-simply a daemon that was never started — the fix is `ours-mcp start`. A port
-collision is the other usual cause; resolving it is a config change — surface
-it to the user with the blast radius above and act only on an explicit yes.
-
-## Voice-message transcription
-
-Run `ours-mcp voice-status --json` first. It reports only readiness, provider,
-key presence/source, and a missing-field reason; it never returns the key. A
-ready result is idempotent: keep it and do not ask for setup again. A not-ready
-result should be offered again on every interactive `ours-install` rerun.
-Headless/`OURS_ASSUME_YES` runs never prompt and never invent credentials.
-
-Safest guided setup: ask the user to run `ours-install` in their own terminal.
-Its API-key prompt is hidden, it writes `config.json` atomically with mode
-`0600`, and it restores the prior file if the daemon cannot reload the change.
-Never request a provider key in chat, pass one through an agent tool/command
-argument, print the `stt` config block, or test with a real key. Environment-only
-operators can set `OURS_STT_PROVIDER`, `OURS_STT_API_KEY`, `OURS_STT_MODEL`,
-`OURS_STT_BASE_URL`, and `OURS_STT_LANGUAGE`; environment values override the
-file field-by-field.
-
-Provider requirements:
-
-- `openai-compatible`: key + explicit `/v1` base URL + model.
-- `elevenlabs`: key + model; base URL is optional.
-- `deepgram`: key; model/base URL are optional provider defaults.
-- `custom`: key + `stt.custom.url`; model is required when the custom template
-  references it.
-
-Troubleshooting:
-
-- “not ready” names the missing field. Do not ask the user to reveal its value.
-- If a file edit appears ineffective, check the reported key source and
-  `OURS_STT_*`; an environment override may shadow the file.
-- Config changes require a daemon restart and active sessions may need to bind
-  their identity again.
-- Incoming voice is recognized strictly as an `audio/*` MIME carrying
-  `x-ours-kind=voice-message`, or the legacy `voice-message-…` audio filename.
-  Generic audio and connector-specific filename guesses remain ordinary files.
-- Telegram fallback preserves the original OGG/Opus bytes and `.ogg` filename.
-  Its `send_file` MIME and correlated v2 envelope `attachment.mime` must both be
-  `audio/ogg; x-ours-kind=voice-message`; `attachment.wire_id` identifies the
-  separately delivered file. Connector-local STT success may remain text-only.
-- Oversized audio is saved but not uploaded (daemon default: 5 MiB). Provider
-  HTTP, timeout, malformed-response, and network failures degrade to a precise
-  “transcription failed” line with the saved audio path; provider responses are
-  scrubbed if they echo the configured key.
+# ours daemon configuration
+
+ours-mcp is a client of one already-running shared daemon. The operator CLI owns
+configuration and lifecycle:
+
+```sh
+ours config show --json
+ours config setup --port 3050 --state-dir "$HOME/.ours"
+ours daemon start
+ours daemon status --json
+```
+
+The MCP adapter uses the published SDK's coherent selection. The wholly default
+selection is port 3050 with state directory `~/.ours`. For another daemon, set
+`OURS_CONFIG`, or set matching `OURS_PORT` and `OURS_STATE_DIR`. A token or
+endpoint selection must be paired with its state directory. The daemon's
+`/state-dir` response is verified before credentials are sent.
+
+The adapter never starts a daemon and never falls back to an embedded one.
+`OURS_INSTANCE`, `--application`, and old ours-mcp daemon variables are errors.
+Do not add a duplicate MCP registration; the managed command is simply
+`ours-mcp proxy`.
+
+Changing daemon configuration or restarting the shared daemon affects every
+connected application. Explain that blast radius and obtain the user's consent
+before making operator-level changes.