@ours.network/hermes 0.4.0 → 0.5.0

package/README.md

@@ -73,12 +73,16 @@ re-invoke a dormant agent on background output.
 Equivalently, from a checkout you can run `bash install.sh` directly (same env knobs).
 `install.sh` is idempotent and:
 
-1. ensures `@ours.network/mcp` is installed and the daemon is running;
-2. installs the `ours` + `writing-agent-bios` skills into
+1. ensures `@ours.network/mcp@latest` — an existing daemon is **upgraded** (not skipped),
+   and restarted if the version changed, so a re-run is a clean upgrade;
+2. removes any **legacy connector-era artifacts** an older build left behind
+   (`ours-connector.env`/`.log` and a stale `ours-wake` webhook block in `config.yaml`);
+3. installs the `ours` + `writing-agent-bios` skills into
    `~/.hermes/skills/communication/`;
-3. writes the `ours` MCP server into `~/.hermes/config.yaml` — **safely**: if your
+4. writes the `ours` MCP server into `~/.hermes/config.yaml` — **safely**: if your
    config already defines `mcp_servers:` or `platforms:`, it prints the block for
-   you to merge by hand instead of risking a duplicate-key corruption.
+   you to merge by hand instead of risking a duplicate-key corruption;
+5. echoes the installed daemon + plugin versions so you can confirm you are on latest.
 
 That's the whole base install — daemon, skills, and the `ours` MCP server. Wake-on-mail
 is enabled later, in-session, via the agent's `ours-mcp watch` tail (see *Optional: get

package/install.sh

@@ -17,20 +17,63 @@ SELFDIR="$(cd "$(dirname "$0")" && pwd)"
 HERMES_DIR="${HERMES_DIR:-$HOME/.hermes}"
 HERMES_CONFIG="$HERMES_DIR/config.yaml"
 SKILLS_DEST="$HERMES_DIR/skills/communication"
+# Managed-block sentinels (must match hermes-config-install.mjs verbatim) — used to strip a
+# LEGACY connector-era block on upgrade.
+MANAGED_SENTINEL='# >>> ours.network plugin (managed block)'
+MANAGED_SENTINEL_END='# <<< ours.network plugin'
 
 say(){ printf 'ours-install: %s\n' "$1"; }
 
-# --- 1) daemon ---
-if [ "${OURS_INSTALL_SKIP_DAEMON:-}" != "1" ]; then
-  if ! command -v ours-mcp >/dev/null 2>&1; then
-    say "installing @ours.network/mcp globally (npm i -g)…"
-    npm i -g @ours.network/mcp
+# Ensure the ours daemon is on @latest (UPGRADE, not install-if-missing): an already-present
+# daemon must still be pulled up to the newest published version — that is the whole point of a
+# re-run. Record the CLI version before/after; start if not running, restart only if the version
+# actually changed, so the RUNNING daemon always ends on latest.
+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."
+  elif [ -n "$before" ] && [ "$before" != "$after" ]; then
+    say "daemon upgraded (v${before} → v${after}) — restarting…"; ours-mcp restart || ours-mcp start || true
+  else
+    say "daemon already current (v${after:-unknown})."
   fi
-  if ! ours-mcp status >/dev/null 2>&1; then say "starting the ours daemon…"; ours-mcp start || true; fi
-  say "daemon: $(command -v ours-mcp)"
-else
-  say "skipping daemon step (OURS_INSTALL_SKIP_DAEMON=1)"
-fi
+  say "daemon: $(command -v ours-mcp) (v${after:-unknown})"
+}
+
+# Idempotent, GUARDED cleanup of legacy connector-era artifacts earlier (0.2.0/0.3.0) installers
+# wrote. Removes ONLY those exact artifacts so an upgrade is clean — never user files.
+legacy_cleanup(){
+  local f tmp
+  for f in "$HERMES_DIR/ours-connector.env" "$HERMES_DIR/ours-connector.log"; do
+    [ -f "$f" ] && rm -f "$f" && say "removed legacy connector artifact: $f"
+  done
+  # Stop a leftover reactivity watcher the old installer may have launched.
+  pkill -f 'connector-watch.sh' 2>/dev/null && say "stopped a leftover connector watcher" || true
+  # Strip the managed config block ONLY when it is the LEGACY variant — i.e. it still carries the
+  # connector-era webhook wake route (`ours-wake`). The current block is mcp_servers.ours only, so
+  # this never touches an up-to-date block; config-install (step 3) then re-writes the current one.
+  if [ -f "$HERMES_CONFIG" ] && grep -qF "$MANAGED_SENTINEL" "$HERMES_CONFIG" 2>/dev/null \
+     && grep -qiE 'ours-wake|ours_wake' "$HERMES_CONFIG" 2>/dev/null; then
+    tmp="$(mktemp)"
+    awk -v s="$MANAGED_SENTINEL" -v e="$MANAGED_SENTINEL_END" '
+      index($0,s){skip=1}
+      skip && index($0,e){skip=0; next}
+      !skip{print}
+    ' "$HERMES_CONFIG" > "$tmp" && mv "$tmp" "$HERMES_CONFIG" \
+      && say "removed legacy connector wake-route block from $HERMES_CONFIG (re-adding the current mcp-only block)"
+  fi
+}
+
+# --- 1) daemon (ensure @latest + restart on change) ---
+ensure_daemon_latest
+
+# --- 1b) legacy connector-era cleanup (idempotent, guarded) ---
+legacy_cleanup
 
 # --- 2) skills ---
 mkdir -p "$SKILLS_DEST"
@@ -47,5 +90,11 @@ HERMES_CONFIG="$HERMES_CONFIG" node "$SELFDIR/bin/hermes-config-install.mjs" ||
 }
 
 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 "  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"
 say "      mail\" — it tails ours-mcp watch in-session and reacts to new mail as it arrives."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/hermes",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "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",