patchcord 0.6.38 → 0.6.39

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "patchcord",
   "description": "Cross-machine agent messaging. Messages from other agents land in the inbox and wake the agent to reply.",
-  "version": "0.6.38",
+  "version": "0.6.39",
   "author": {
     "name": "ppravdin"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchcord",
-  "version": "0.6.38",
+  "version": "0.6.39",
   "description": "Cross-machine agent messaging for Claude Code and Codex",
   "scripts": {
     "version": "node scripts/sync-plugin-version.mjs && git add .claude-plugin/plugin.json"

package/scripts/check-inbox.sh

@@ -11,7 +11,7 @@ if [ -f "$HOOK_DIR/lib/inbox-guard.sh" ]; then
 else
   # Degrade to the pre-guard behaviour rather than dying: a partial install
   # must still nudge, just without the identity hint or the loop breaker.
-  pc_inbox_reason() { printf '%s patchcord message(s) waiting. Call inbox() and reply to all immediately.' "$1"; }
+  pc_inbox_reason() { printf '%s patchcord message(s) waiting — call inbox() and reply.' "$1"; }
   pc_streak_ok() { return 0; }
   pc_state_path() { printf ''; }
   pc_streak_n() { printf '1'; }

package/scripts/codex-stop-hook.sh

@@ -17,7 +17,7 @@ elif [ -f "$HOOK_DIR/patchcord-inbox-guard.sh" ]; then
   # shellcheck source=lib/inbox-guard.sh
   . "$HOOK_DIR/patchcord-inbox-guard.sh"
 else
-  pc_inbox_reason() { printf '%s patchcord message(s) waiting. Call inbox() and reply to all.' "$1"; }
+  pc_inbox_reason() { printf '%s patchcord message(s) waiting — call inbox() and reply.' "$1"; }
   pc_streak_ok() { return 0; }
   pc_state_path() { printf ''; }
   pc_streak_n() { printf '1'; }

package/scripts/cursor-stop-hook.sh

@@ -147,10 +147,15 @@ echo "$NOW $(( STREAK + 1 ))" > "$STATE_FILE"
 NAMESPACE=$(echo "$RESPONSE" | jq -r '.namespace_id // empty' 2>/dev/null || true)
 AGENT_ID=$(echo "$RESPONSE" | jq -r '.agent_id // empty' 2>/dev/null || true)
 
+# The identity belongs in the FIRST sentence, not appended after it. Tacked on
+# the end it reads as an afterthought and the reader has already moved on.
+WHO=""
+[ -n "$NAMESPACE" ] && [ -n "$AGENT_ID" ] && WHO=" for ${AGENT_ID}@${NAMESPACE}"
+
 if [ "$COUNT" -eq 1 ]; then
-  MSG="Patchcord: 1 pending message. Call the patchcord inbox tool now, do the work it asks for, then reply with what you did."
+  MSG="Patchcord: 1 pending message${WHO} — call the patchcord inbox tool, do what it asks, then reply with what you did."
 else
-  MSG="Patchcord: ${COUNT} pending messages. Call the patchcord inbox tool now, do the work each one asks for, then reply to each with what you did."
+  MSG="Patchcord: ${COUNT} pending messages${WHO} — call the patchcord inbox tool, do what each asks, then reply to each with what you did."
 fi
 
 # Name the identity the count belongs to. This hook reads the token from
@@ -160,7 +165,8 @@ fi
 # the old one — a contradiction neither side can see alone. See
 # lib/inbox-guard.sh.
 if [ -n "$NAMESPACE" ] && [ -n "$AGENT_ID" ]; then
-  MSG="${MSG} These are addressed to ${AGENT_ID}@${NAMESPACE}. If the inbox tool reports a different identity, or reports 0 pending, this session is authenticated as another agent — the token on disk was replaced after it started. Do not keep retrying: say so and ask the user to restart the session."
+  MSG="${MSG}
+If the inbox tool shows a different agent or 0 pending: the token on disk changed after this session started, so this session is signed in as someone else. Do not retry — tell the user and ask them to restart the session."
 fi
 
 jq -n --arg msg "$MSG" '{followup_message: $msg}'

package/scripts/lib/inbox-guard.sh

@@ -25,6 +25,11 @@
 # The nudge text. Names the identity so a session authenticated as a different
 # agent can recognise the mismatch.
 #
+# BOTH BRANCHES ARE READ BY A HUMAN. They are printed in the transcript, so
+# every word is read by a person as well as by an agent: lead with the action,
+# keep the diagnosis to one sentence, and never emit "message(s)" — singular and
+# plural are already computed one line below.
+#
 # THE STALE-IDENTITY EXPLANATION IS ONLY EMITTED ONCE THE SYMPTOM HAS ACTUALLY
 # OCCURRED. It used to be appended to EVERY nudge, fleet-wide, which was wrong
 # for three reasons:
@@ -53,28 +58,31 @@
 pc_inbox_reason() {
   local count="$1" ns="$2" agent="$3" call="${4:-inbox()}" hint="${5:-restart this session}"
   local streak="${6:-1}"
-  local noun="message(s)"
+  local noun="messages"
   [ "$count" = "1" ] && noun="message"
   case "$streak" in ''|*[!0-9]*) streak=1 ;; esac
 
   if [ -z "$ns" ] || [ -z "$agent" ]; then
-    printf '%s patchcord %s waiting. Call %s and reply to all immediately.' \
+    printf '%s patchcord %s waiting — call %s and reply.' \
       "$count" "$noun" "$call"
     return
   fi
 
   if [ "$streak" -lt 2 ]; then
-    printf '%s patchcord %s waiting for %s@%s. Call %s and reply to all immediately.' \
+    printf '%s patchcord %s for %s@%s — call %s and reply.' \
       "$count" "$noun" "$agent" "$ns" "$call"
     return
   fi
 
-  printf 'STILL %s patchcord %s waiting for %s@%s after a previous nudge — %s did not clear it. Call %s once more. If it reports a different identity than %s@%s, or reports 0 pending, then this session is authenticated as another agent: the token on disk was replaced after the session started. In that case do NOT keep calling %s — say so and ask the user to %s so it reloads the config.' \
+  # Second consecutive identical block: the nudge did NOT clear, which is the
+  # actual evidence of the stale-token condition. Even here the action comes
+  # first and the diagnosis is one sentence on its own line — a repeat is a
+  # worse moment to make someone parse a paragraph, not a better one.
+  printf 'Still %s patchcord %s for %s@%s — %s did not clear it. Call %s once more.
+If it shows a different agent or 0 pending: the token on disk changed after this session started, so this session is signed in as someone else. Do not retry — tell the user and ask them to %s.' \
     "$count" "$noun" "$agent" "$ns" \
-    "$call" \
-    "$call" \
-    "$agent" "$ns" \
-    "$call" "$hint"
+    "$call" "$call" \
+    "$hint"
 }
 
 # pc_streak_n <state_file>