agent-relay-plugin 0.1.0 → 0.1.6

package/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "agent-relay",
   "description": "Client connector for Agent Relay — auto-registers Claude Code sessions as agents and enables inter-agent messaging via a lightweight HTTP message bus",
-  "version": "0.1.0"
+  "version": "0.1.6"
 }

package/hooks/hooks.json

@@ -1,16 +1,5 @@
 {
   "hooks": {
-    "SessionStart": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "bash \"${CLAUDE_PLUGIN_ROOT}/hooks/session-start.sh\"",
-            "timeout": 15
-          }
-        ]
-      }
-    ],
     "SessionEnd": [
       {
         "hooks": [

package/hooks/poll-inbox.sh

@@ -12,14 +12,26 @@ if [ -z "$RELAY_URL" ] || [ -z "$AGENT_ID" ]; then
   exit 1
 fi
 
+# PID file so session-start.sh can find and kill us on /clear or /compact.
+pid_file="/tmp/agent-relay-poll-${AGENT_ID}.pid"
+cleanup() { rm -f "$pid_file"; }
+trap cleanup EXIT
+echo $$ > "$pid_file"
+
 # Bootstrap cursor at current max so we only see messages arriving after session start.
 since_id=$(curl -s "${RELAY_URL}/api/messages/cursor" 2>/dev/null | jq -r '.latestId // 0' 2>/dev/null || echo 0)
 
 fail_streak=0
+marked_ready=false
 while true; do
   hb_code=$(curl -s -o /dev/null -w '%{http_code}' -X POST \
     "${RELAY_URL}/api/agents/${AGENT_ID}/heartbeat" 2>/dev/null)
 
+  # Agent was deleted or doesn't exist — we're orphaned, exit.
+  if [ "$hb_code" = "404" ]; then
+    exit 0
+  fi
+
   msgs=$(curl -s --fail "${RELAY_URL}/api/messages?for=${AGENT_ID}&sinceId=${since_id}&unread=true" 2>/dev/null)
   poll_rc=$?
 
@@ -39,9 +51,15 @@ while true; do
   fi
   fail_streak=0
 
+  if [ "$marked_ready" = "false" ]; then
+    curl -s -o /dev/null -X PATCH "${RELAY_URL}/api/agents/${AGENT_ID}/ready" \
+      -H 'Content-Type: application/json' -d '{"ready":true}' 2>/dev/null
+    marked_ready=true
+  fi
+
   count=$(echo "$msgs" | jq 'length' 2>/dev/null || echo 0)
   if [ "$count" -gt 0 ] 2>/dev/null && [ "$count" != "0" ]; then
-    echo "$msgs" | jq -r '.[] | "\(.from) → \(.to) | \(.subject // "(no subject)"): \(.body)"'
+    echo "$msgs" | jq -r '.[] | if .type == "system" then "⚠ SYSTEM [msg:\(.id)]: \(.body)" else "[msg:\(.id)] \(.from) → \(.to) | \(.subject // "(no subject)"): \(.body)" end'
     since_id=$(echo "$msgs" | jq '[.[].id] | max')
     echo "$msgs" | jq -r '.[].id' | while read -r mid; do
       curl -s -X PATCH "${RELAY_URL}/api/messages/${mid}" \

package/hooks/{session-start.sh → relay-monitor.sh}

@@ -1,33 +1,53 @@
 #!/usr/bin/env bash
-# Agent Relay plugin — SessionStart hook
-# Registers this Claude Code session as an agent and injects messaging context.
+# Agent Relay — self-contained native monitor
+# Registers this session as an agent, outputs messaging context, then polls inbox.
+# Runs automatically via monitors.json — no user interaction required.
+# PPID = Claude Code process, stable across /clear and /compact.
 
 RELAY_URL="${AGENT_RELAY_URL:-http://localhost:4850}"
-PLUGIN_ROOT="${CLAUDE_PLUGIN_ROOT:-$(dirname "$(dirname "$0")")}"
-
-input=$(cat)
-
-session_id=$(echo "$input" | jq -r '.session_id // empty')
-cwd=$(echo "$input" | jq -r '.cwd // empty')
-model=$(echo "$input" | jq -r '.model // empty')
-source=$(echo "$input" | jq -r '.source // empty')
 
+# --- Compute agent identity ---
 machine=$(hostname)
-project=$(basename "${cwd:-unknown}")
-rig="${CLAUDE_RIG_NAME:-default}"
+project=$(basename "${PWD:-unknown}")
+
+if [ -n "$CLAUDE_RIG_NAME" ]; then
+  rig="$CLAUDE_RIG_NAME"
+elif [ -n "$CLAUDE_CONFIG_DIR" ]; then
+  rig=$(basename "$CLAUDE_CONFIG_DIR")
+else
+  rig="default"
+fi
 
 if command -v shasum >/dev/null 2>&1; then
-  short_sid=$(printf '%s' "$session_id" | shasum -a 1 | head -c 6)
+  short_pid=$(printf '%s' "$PPID" | shasum -a 1 | head -c 6)
 else
-  short_sid=$(printf '%s' "$session_id" | md5sum | head -c 6)
+  short_pid=$(printf '%s' "$PPID" | md5sum | head -c 6)
+fi
+agent_id="${machine}-${rig}-${project}-${short_pid}"
+
+# --- Clean up previous agent from this instance ---
+instance_state="/tmp/agent-relay-instance-${PPID}.state"
+if [ -f "$instance_state" ]; then
+  old_agent_id=$(head -1 "$instance_state" 2>/dev/null)
+  if [ -n "$old_agent_id" ] && [ "$old_agent_id" != "$agent_id" ]; then
+    old_pid_file="/tmp/agent-relay-poll-${old_agent_id}.pid"
+    if [ -f "$old_pid_file" ]; then
+      old_pid=$(cat "$old_pid_file" 2>/dev/null)
+      if [ -n "$old_pid" ] && kill -0 "$old_pid" 2>/dev/null; then
+        kill "$old_pid" 2>/dev/null
+      fi
+      rm -f "$old_pid_file"
+    fi
+    curl -s -o /dev/null -X PATCH "${RELAY_URL}/api/agents/${old_agent_id}/status" \
+      -H 'Content-Type: application/json' -d '{"status":"offline"}' 2>/dev/null
+  fi
 fi
-agent_id="${machine}-${rig}-${project}-${short_sid}"
+printf '%s\n' "$agent_id" > "$instance_state"
 
-# Capabilities: AGENT_RELAY_CAPS="chat,review,edit" (comma-separated) → JSON array
+# --- Register agent ---
 caps_csv="${AGENT_RELAY_CAPS:-chat}"
 caps_json=$(echo "$caps_csv" | jq -R 'split(",") | map(gsub("^\\s+|\\s+$"; ""))')
 
-# Register agent card
 reg_code=$(curl -s -o /dev/null -w '%{http_code}' -X POST "${RELAY_URL}/api/agents" \
   -H 'Content-Type: application/json' \
   -d "$(jq -n \
@@ -37,18 +57,15 @@ reg_code=$(curl -s -o /dev/null -w '%{http_code}' -X POST "${RELAY_URL}/api/agen
     --arg rig "$rig" \
     --argjson tags "$(jq -n --arg r "$rig" --arg p "$project" '[$r, $p]')" \
     --argjson caps "$caps_json" \
-    --argjson meta "$(jq -n --arg sid "$session_id" --arg model "$model" --arg src "$source" --arg cwd "$cwd" '{sessionId: $sid, model: $model, source: $src, cwd: $cwd}')" \
+    --argjson meta "$(jq -n --arg cwd "$PWD" '{cwd: $cwd}')" \
     '{id: $id, name: $name, machine: $machine, rig: $rig, tags: $tags, capabilities: $caps, status: "online", meta: $meta}'
   )" 2>/dev/null)
+
 if [ "$reg_code" != "201" ] && [ "$reg_code" != "200" ]; then
   echo "warn: agent-relay register failed (HTTP ${reg_code:-none}) — ${RELAY_URL}" >&2
 fi
 
-# Check for unread messages
-unread=$(curl -s "${RELAY_URL}/api/messages?for=${agent_id}&unread=true" 2>/dev/null)
-unread_count=$(echo "$unread" | jq 'length' 2>/dev/null || echo "0")
-
-# Build context output
+# --- Output context (first stdout = notification injected into conversation) ---
 cat <<CONTEXT
 Agent Relay active. Your agent ID: ${agent_id}
 Relay URL: ${RELAY_URL}
@@ -66,6 +83,7 @@ To rename yourself (set a short, human-friendly label so the user can refer to y
 To reply to a message (threading):
   curl -s -X POST ${RELAY_URL}/api/messages -H 'Content-Type: application/json' -d '{"from":"${agent_id}","to":"TARGET","body":"MESSAGE","replyTo":MSG_ID}'
   Always use replyTo when responding to a specific message — it creates a thread.
+  The inbox monitor prefixes each message with [msg:ID] — parse the ID from there.
 
 To send a claimable task (only one agent can claim it):
   curl -s -X POST ${RELAY_URL}/api/messages -H 'Content-Type: application/json' -d '{"from":"${agent_id}","to":"cap:review","body":"TASK","claimable":true}'
@@ -89,14 +107,19 @@ To find agents by capability:
 To list online agents:
   curl -s '${RELAY_URL}/api/agents?status=online'
 
-IMPORTANT: Start a persistent Monitor NOW to listen for incoming messages:
-  Monitor({ command: "${PLUGIN_ROOT}/hooks/poll-inbox.sh ${RELAY_URL} ${agent_id} 10", description: "Agent Relay inbox for ${agent_id}", persistent: true })
-You MUST start this Monitor immediately at session start. Do not wait for the user to ask.
+System messages:
+  Messages prefixed with "⚠ SYSTEM" are relay-level instructions (e.g. plugin updates, restart requests).
+  When you see one, follow the instruction immediately — for example, restart the inbox monitor if asked.
 CONTEXT
 
-# Append unread messages if any
+# --- Check for unread messages ---
+unread=$(curl -s "${RELAY_URL}/api/messages?for=${agent_id}&unread=true" 2>/dev/null)
+unread_count=$(echo "$unread" | jq 'length' 2>/dev/null || echo "0")
 if [ "$unread_count" -gt 0 ] 2>/dev/null && [ "$unread_count" != "0" ]; then
   echo ""
   echo "${unread_count} unread message(s):"
   echo "$unread" | jq -r '.[] | "  [\(.from)] \(.subject // "(no subject)"): \(.body | if length > 120 then .[:120] + "..." else . end)"'
 fi
+
+# --- Start poll loop ---
+exec "$(dirname "$0")/poll-inbox.sh" "$RELAY_URL" "$agent_id" 10

package/hooks/session-end.sh

@@ -1,27 +1,19 @@
 #!/usr/bin/env bash
 # Agent Relay plugin — SessionEnd hook
-# Marks this session's agent as offline.
+# Marks this session's agent as offline using state file written by relay-monitor.
 
 RELAY_URL="${AGENT_RELAY_URL:-http://localhost:4850}"
+instance_state="/tmp/agent-relay-instance-${PPID}.state"
 
-input=$(cat)
-cwd=$(echo "$input" | jq -r '.cwd // empty')
-session_id=$(echo "$input" | jq -r '.session_id // empty')
-
-machine=$(hostname)
-project=$(basename "${cwd:-unknown}")
-rig="${CLAUDE_RIG_NAME:-default}"
-
-if command -v shasum >/dev/null 2>&1; then
-  short_sid=$(printf '%s' "$session_id" | shasum -a 1 | head -c 6)
-else
-  short_sid=$(printf '%s' "$session_id" | md5sum | head -c 6)
+if [ -f "$instance_state" ]; then
+  agent_id=$(head -1 "$instance_state" 2>/dev/null)
+  if [ -n "$agent_id" ]; then
+    curl -s -X PATCH "${RELAY_URL}/api/agents/${agent_id}/status" \
+      -H 'Content-Type: application/json' \
+      -d '{"status":"offline"}' \
+      > /dev/null 2>&1 &
+  fi
+  rm -f "$instance_state"
 fi
-agent_id="${machine}-${rig}-${project}-${short_sid}"
-
-curl -s -X PATCH "${RELAY_URL}/api/agents/${agent_id}/status" \
-  -H 'Content-Type: application/json' \
-  -d '{"status":"offline"}' \
-  > /dev/null 2>&1 &
 
 exit 0

package/monitors/monitors.json

@@ -0,0 +1,7 @@
+[
+  {
+    "name": "agent-relay-inbox",
+    "command": "bash \"${CLAUDE_PLUGIN_ROOT}/hooks/relay-monitor.sh\"",
+    "description": "Agent Relay inbox"
+  }
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-plugin",
-  "version": "0.1.0",
+  "version": "0.1.6",
   "description": "Claude Code plugin for Agent Relay — auto-registers sessions as agents and enables inter-agent messaging",
   "type": "module",
   "license": "MIT",
@@ -8,11 +8,12 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/edimuj/agent-relay.git",
-    "directory": "plugin"
+    "directory": "claude"
   },
   "files": [
     ".claude-plugin/",
-    "hooks/"
+    "hooks/",
+    "monitors/"
   ],
   "keywords": [
     "claude-code",