agent-relay-runner 0.66.0 → 0.67.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-runner",
-  "version": "0.66.0",
+  "version": "0.67.1",
   "description": "Unified provider lifecycle runner for Agent Relay",
   "type": "module",
   "bin": {

package/plugins/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.66.0",
+  "version": "0.67.1",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/plugins/claude/hooks/relay-status.sh

@@ -31,23 +31,38 @@ relay_post_status_clearing_subagents() {
   relay_post_status "$1" "${2:-}" "${3:-}" "${4:-}" "${5:-}" "${6:-}" subagent
 }
 
-# #502: count the background shells still running at the moment this turn ends.
+# #502/#539: count user background shells still running at turn end.
 # Claude's Stop payload carries a `background_tasks` array (CC v2.1.157+) listing
-# the shells launched with run_in_background that have not yet finished. It is a
-# full live snapshot, so reporting it each turn-end can never wedge: a completed
-# task wakes Claude, the next Stop re-reports the (now smaller/empty) set. Older
-# Claude builds omit the field → count 0 → graceful no-op (no false busy).
+# shells launched with run_in_background that have not yet finished. It can also
+# include the long-lived Agent Relay monitor; that monitor is notification
+# plumbing, not agent work, so exclude it before driving `background-script`
+# busy state. Older Claude builds omit the field → count 0 → graceful no-op.
 relay_background_task_count() {
   local input="${1:-}"
   [ -z "$input" ] && { printf '0'; return 0; }
   if command -v jq >/dev/null 2>&1; then
     local n
-    n="$(printf '%s' "$input" | jq -r '(.background_tasks // []) | length' 2>/dev/null)"
+    n="$(printf '%s' "$input" | jq -r '
+      (.background_tasks // [])
+      | map(select(
+          (.name // "") != "agent-relay-runner-monitor"
+          and ((.command // "") | contains("relay-monitor.ts") | not)
+          and ((.command // "") | contains("agent-relay-runner-monitor") | not)
+        ))
+      | length
+    ' 2>/dev/null)"
     case "$n" in ''|*[!0-9]*) printf '0' ;; *) printf '%s' "$n" ;; esac
     return 0
   fi
-  # jq-less fallback: a non-empty array literal means at least one is running.
-  if printf '%s' "$input" | tr -d '[:space:]' | grep -q '"background_tasks":\[{'; then
+  # jq-less fallback: avoid a false busy for the common "only relay monitor" case.
+  local compact
+  compact="$(printf '%s' "$input" | tr -d '[:space:]')"
+  if printf '%s' "$compact" | grep -q '"background_tasks":\[{'; then
+    if printf '%s' "$compact" | grep -qE '("name":"agent-relay-runner-monitor"|relay-monitor\.ts)' \
+      && ! printf '%s' "$compact" | grep -q '},{'; then
+      printf '0'
+      return 0
+    fi
     printf '1'
   else
     printf '0'

package/src/relay-instructions.ts

@@ -60,7 +60,7 @@ export function workspaceLifecycleNote(input: { mode?: string | null; branch?: s
   return [
     `[agent-relay] Isolated workspace: you are in a git worktree on branch ${branch}, based on ${base} — NOT the main checkout. Other agents may work in parallel and land to ${base}, so ${base} will move under you. That is expected; don't fight it.`,
     `Do NOT push this branch yourself — not with \`git push\`, not with \`tl push\` or any other push wrapper, and do not manually rebase or merge. A steward may be auto-rebasing this branch in the background; pushing concurrently races it and can leave the worktree mid-rebase. Just commit your work here. When the task is done, run \`agent-relay workspace ready\` — Relay rebases onto the latest ${base}, lands your work, and pushes for you. If the installed \`agent-relay\` binary is stale and says the workspace command is unknown, run the repo-local fallback: \`bun src/index.ts workspace ready\`.`,
-    `After \`ready\`, the status becomes \`review_requested\` — this is the NORMAL, healthy hand-off state, NOT an escalation or a stall. Relay auto-merges clean rebases roughly every 2 minutes; a steward agent is spawned (after a short delay) ONLY if it can't land deterministically, so seeing no steward means it's working, not stuck. Wait with \`agent-relay workspace status --wait\` (it returns the moment your branch lands). On landing you'll be moved onto a fresh rebased branch whose name gains a \`--N\` suffix — expected, keep working there. Never \`cd\` into the main checkout, and never merge/push/resolve conflicts yourself — Relay and the steward own all of that. \`agent-relay workspace status\` anytime shows your current state and the next step.`,
+    `After \`ready\`, the status becomes \`review_requested\` — this is the NORMAL, healthy hand-off state, NOT an escalation or a stall. Relay auto-merges clean rebases roughly every 2 minutes; a steward agent is spawned (after a short delay) ONLY if it can't land deterministically, so seeing no steward means it's working, not stuck. Stop your turn after \`ready\` and go idle; do NOT wait or poll the steward queue. Relay wakes you with \`landed-success\` when your branch lands and refreshes, or \`landed-failure\` if landing fatally fails. On success you'll be on a fresh rebased branch whose name gains a \`--N\` suffix — expected, keep working there. Never \`cd\` into the main checkout, and never merge/push/resolve conflicts yourself — Relay and the steward own all of that. \`agent-relay workspace status\` anytime shows your current state and the exact next step.`,
   ].join("\n");
 }