agent-relay-plugin 0.4.35 → 0.6.0

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.4.35"
+  "version": "0.6.0"
 }

package/hooks/poll-inbox.sh

@@ -194,7 +194,7 @@ while true; do
         fi
       fi
 
-      if ! line=$(printf '%s' "$msg" | jq -r '(.meta.pairId // "") as $pair | (if $pair != "" then " [pair:\($pair)]" else "" end) as $pairText | (.body | gsub("\r"; "\\r") | gsub("\n"; "\\n")) as $body | if .type == "system" then "⚠ SYSTEM [msg:\(.id)]\($pairText): \($body)" else "[msg:\(.id)]\($pairText) \(.from) → \(.to) | \(.subject // "(no subject)"): \($body)" end') || [ -z "$line" ]; then
+      if ! line=$(printf '%s' "$msg" | jq -r '(.payload.pairId // "") as $pair | (if $pair != "" then " [pair:\($pair)]" else "" end) as $pairText | (.body | gsub("\r"; "\\r") | gsub("\n"; "\\n")) as $body | if .kind == "system" or .kind == "control" then "⚠ SYSTEM [msg:\(.id)]\($pairText): \($body)" else "[msg:\(.id)]\($pairText) \(.from) → \(.to) | \(.subject // "(no subject)"): \($body)" end') || [ -z "$line" ]; then
         echo "warn: failed to format relay message ${mid}" >&2
         delivery_failed=true
         continue

package/hooks/profile-lib.sh

@@ -6,12 +6,12 @@ ar_csv_json() {
 
 ar_profile_value() {
   local key="$1"
-  printf '%s' "${AR_PROFILE_JSON:-{}}" | jq -r --arg key "$key" '.[$key] // empty | if type == "string" then gsub("^\\s+|\\s+$"; "") else empty end'
+  printf '%s' "${AR_PROFILE_JSON}" | jq -r --arg key "$key" '.[$key] // empty | if type == "string" then gsub("^\\s+|\\s+$"; "") else empty end'
 }
 
 ar_profile_array() {
   local key="$1"
-  printf '%s' "${AR_PROFILE_JSON:-{}}" | jq -c --arg key "$key" 'if (.[$key] | type) == "array" then .[$key] | map(select(type == "string") | gsub("^\\s+|\\s+$"; "") | select(length > 0)) | reduce .[] as $x ([]; if index($x) then . else . + [$x] end) else [] end'
+  printf '%s' "${AR_PROFILE_JSON}" | jq -c --arg key "$key" 'if (.[$key] | type) == "array" then .[$key] | map(select(type == "string") | gsub("^\\s+|\\s+$"; "") | select(length > 0)) | reduce .[] as $x ([]; if index($x) then . else . + [$x] end) else [] end'
 }
 
 ar_init_profile() {

package/hooks/relay-monitor.sh

@@ -38,8 +38,11 @@ fi
 ar_init_profile "claude" "$rig" "$project"
 
 session_key="${CLAUDE_CODE_SESSION_ID:-$PPID}"
+safe_session_key=$(printf '%s' "$session_key" | sed 's/[^A-Za-z0-9_.:-]/_/g')
 if command -v shasum >/dev/null 2>&1; then
   short_pid=$(printf '%s' "$session_key" | shasum -a 1 | head -c 6)
+elif command -v sha1sum >/dev/null 2>&1; then
+  short_pid=$(printf '%s' "$session_key" | sha1sum | head -c 6)
 else
   short_pid=$(printf '%s' "$session_key" | md5sum | head -c 6)
 fi
@@ -64,6 +67,25 @@ if [ -f "$instance_state" ]; then
 fi
 printf '%s\n' "$agent_id" > "$instance_state"
 
+context_dir="${HOME:-/tmp}/.agent-relay/contexts"
+context_path="${context_dir}/${safe_session_key}.json"
+mkdir -p "$context_dir" 2>/dev/null || true
+jq -n \
+  --arg agentId "$agent_id" \
+  --arg relayUrl "$RELAY_URL" \
+  --arg cwd "${PWD:-}" \
+  --arg session "$session_key" \
+  --arg updatedAt "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+  '{
+    version: 1,
+    agentId: $agentId,
+    provider: "claude",
+    relayUrl: $relayUrl,
+    cwd: $cwd,
+    matchEnv: [{name: "CLAUDE_CODE_SESSION_ID", value: $session}],
+    updatedAt: $updatedAt
+  }' > "$context_path" 2>/dev/null || true
+
 reg_code=$(curl -s -o /dev/null -w '%{http_code}' -X POST "${RELAY_URL}/api/agents" "${auth_header_args[@]}" \
   -H 'Content-Type: application/json' \
   -d "$(jq -n \
@@ -86,7 +108,7 @@ fi
 server_version=$(curl -s "${auth_header_args[@]}" "${RELAY_URL}/api/stats" 2>/dev/null | jq -r '.version // empty' 2>/dev/null)
 version_warning=""
 if [ -z "$server_version" ]; then
-  version_warning="⚠ Server does not report its version — consider updating: bunx agent-relay-server@latest"
+  version_warning="⚠ Server does not report its version — consider updating: agent-relay upgrade"
 elif [ "$PLUGIN_VERSION" = "unknown" ]; then
   version_warning="⚠ Version mismatch — server ${server_version}, plugin unknown. Restart Claude Code or update the Agent Relay plugin."
 elif [ "$server_version" != "$PLUGIN_VERSION" ]; then
@@ -126,7 +148,7 @@ To reply to a message (threading):
   Anti-loop rule: do not auto-reply to pure acknowledgements, "thanks", or "received" messages; acknowledge once, then only send follow-ups when there is new work, a decision, or a deliverable.
 
 To send a claimable task (only one agent can claim it):
-  curl -s -X POST ${RELAY_URL}/api/messages${auth_header_example} -H 'Content-Type: application/json' -d '{"from":"${agent_id}","to":"cap:review","body":"TASK","claimable":true}'
+  curl -s -X POST ${RELAY_URL}/api/messages${auth_header_example} -H 'Content-Type: application/json' -d '{"from":"${agent_id}","to":"cap:review","kind":"task","body":"TASK","claimable":true,"payload":{"title":"TASK"}}'
 
 To claim a task:
   curl -s -X POST ${RELAY_URL}/api/messages/MSG_ID/claim${auth_header_example} -H 'Content-Type: application/json' -d '{"agentId":"${agent_id}"}'
@@ -175,7 +197,7 @@ if [ -n "$version_warning" ]; then
 fi
 
 # --- Check for unread messages ---
-unread=$(curl -s "${auth_header_args[@]}" "${RELAY_URL}/api/messages?for=${agent_id}&unread=true" 2>/dev/null)
+unread=$(curl -s --fail "${auth_header_args[@]}" "${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 ""

package/hooks/session-end.sh

@@ -11,28 +11,38 @@ auth_header_args=()
 if [ -n "${AGENT_RELAY_TOKEN:-}" ]; then
   auth_header_args=(-H "X-Agent-Relay-Token: ${AGENT_RELAY_TOKEN}")
 fi
-session_key="${CLAUDE_CODE_SESSION_ID:-$PPID}"
+input=$(cat)
+session_key="${CLAUDE_CODE_SESSION_ID:-}"
+if [ -z "$session_key" ] && [ -n "$input" ]; then
+  session_key=$(printf '%s' "$input" | jq -r '.session_id // empty' 2>/dev/null)
+fi
+if [ -z "$session_key" ]; then
+  exit 0
+fi
 instance_state="/tmp/agent-relay-instance-${session_key}.state"
+safe_session_key=$(printf '%s' "$session_key" | sed 's/[^A-Za-z0-9_.:-]/_/g')
+context_path="${HOME:-/tmp}/.agent-relay/contexts/${safe_session_key}.json"
 
 if [ -f "$instance_state" ]; then
   agent_id=$(head -1 "$instance_state" 2>/dev/null)
-  if [ -n "$agent_id" ]; then
-    # Kill the poll-inbox process so it stops heartbeating.
-    poll_pid_file="/tmp/agent-relay-poll-${agent_id}.pid"
-    if [ -f "$poll_pid_file" ]; then
-      poll_pid=$(cat "$poll_pid_file" 2>/dev/null)
-      if [ -n "$poll_pid" ] && kill -0 "$poll_pid" 2>/dev/null; then
-        kill "$poll_pid" 2>/dev/null
-      fi
-      rm -f "$poll_pid_file"
+fi
+
+if [ -n "${agent_id:-}" ]; then
+  poll_pid_file="/tmp/agent-relay-poll-${agent_id}.pid"
+  if [ -f "$poll_pid_file" ]; then
+    poll_pid=$(cat "$poll_pid_file" 2>/dev/null)
+    if [ -n "$poll_pid" ] && kill -0 "$poll_pid" 2>/dev/null; then
+      kill "$poll_pid" 2>/dev/null
     fi
-    printf 'offline\n' > "/tmp/agent-relay-status-${agent_id}.state"
-    curl -s -X PATCH "${RELAY_URL}/api/agents/${agent_id}/status" "${auth_header_args[@]}" \
-      -H 'Content-Type: application/json' \
-      -d '{"status":"offline"}' \
-      > /dev/null 2>&1 &
+    rm -f "$poll_pid_file"
   fi
-  rm -f "$instance_state"
+  printf 'offline\n' > "/tmp/agent-relay-status-${agent_id}.state"
+  curl -s -X PATCH "${RELAY_URL}/api/agents/${agent_id}/status" "${auth_header_args[@]}" \
+    -H 'Content-Type: application/json' \
+    -d '{"status":"offline"}' \
+    > /dev/null 2>&1 &
+  [ -n "$instance_state" ] && [ -f "$instance_state" ] && rm -f "$instance_state"
+  [ -f "$context_path" ] && rm -f "$context_path"
 fi
 
 exit 0

package/hooks/set-status.sh

@@ -17,7 +17,14 @@ auth_header_args=()
 if [ -n "${AGENT_RELAY_TOKEN:-}" ]; then
   auth_header_args=(-H "X-Agent-Relay-Token: ${AGENT_RELAY_TOKEN}")
 fi
-session_key="${CLAUDE_CODE_SESSION_ID:-$PPID}"
+input=$(cat)
+session_key="${CLAUDE_CODE_SESSION_ID:-}"
+if [ -z "$session_key" ] && [ -n "$input" ]; then
+  session_key=$(printf '%s' "$input" | jq -r '.session_id // empty' 2>/dev/null)
+fi
+if [ -z "$session_key" ]; then
+  exit 0
+fi
 instance_state="/tmp/agent-relay-instance-${session_key}.state"
 
 if [ ! -f "$instance_state" ]; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-plugin",
-  "version": "0.4.35",
+  "version": "0.6.0",
   "description": "Claude Code plugin for Agent Relay — auto-registers sessions as agents and enables inter-agent messaging",
   "type": "module",
   "license": "AGPL-3.0-or-later",