patchcord 0.3.10 → 0.3.12

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "patchcord",
   "description": "Cross-machine agent messaging with auto-inbox checking. Agents automatically respond to messages from other agents without human intervention.",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "author": {
     "name": "ppravdin"
   },

package/bin/patchcord.mjs

@@ -84,8 +84,10 @@ if (cmd === "install") {
         if (changed) {
           writeFileSync(claudeSettings, JSON.stringify(settings, null, 2) + "\n");
         }
-      } catch {
-        // Non-fatal — settings.json might be malformed
+      } catch (e) {
+        console.log(`  ✗ Failed to update ${claudeSettings}`);
+        console.log(`    Fix: your settings.json has invalid JSON (${e.message})`);
+        console.log(`    Patchcord permissions were NOT configured. Fix the JSON and re-run install.`);
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchcord",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "description": "Cross-machine agent messaging for Claude Code and Codex",
   "author": "ppravdin",
   "license": "MIT",

package/scripts/enable-statusline.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
-# Enable the patchcord statusline in Claude Code user settings.
+# Enable the patchcord statusline in Claude Code settings.
 # Usage: bash enable-statusline.sh [--full]
 #   --full: also show model, context%, repo (branch)
+#
+# Writes to user-level ~/.claude/settings.json unless another
+# tool's statusline is already set there — in that case, writes
+# to project-level .claude/settings.json to avoid overwriting.
 set -euo pipefail
 
 EXTRA_ARGS=""
@@ -9,32 +13,7 @@ for arg in "$@"; do
     [ "$arg" = "--full" ] && EXTRA_ARGS=" --full"
 done
 
-# Find the project root (walk up from cwd to find .mcp.json with patchcord)
-find_project_root() {
-    local dir="${1:-$(pwd)}"
-    while [ -n "$dir" ] && [ "$dir" != "/" ]; do
-        if [ -f "$dir/.mcp.json" ] && jq -e '.mcpServers.patchcord' "$dir/.mcp.json" >/dev/null 2>&1; then
-            printf '%s\n' "$dir"
-            return 0
-        fi
-        dir=$(dirname "$dir")
-    done
-    return 1
-}
-
-PROJECT_ROOT=$(find_project_root || true)
-
-if [ -n "$PROJECT_ROOT" ]; then
-    # Project-level settings (only affects this repo)
-    SETTINGS="$PROJECT_ROOT/.claude/settings.json"
-    mkdir -p "$PROJECT_ROOT/.claude"
-else
-    # Fallback to user-level if no project found
-    SETTINGS="$HOME/.claude/settings.json"
-    mkdir -p "$HOME/.claude"
-fi
-
-# Find the plugin's statusline script
+# Find the statusline script path
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 STATUSLINE="$SCRIPT_DIR/statusline.sh"
 
@@ -43,6 +22,47 @@ if [ ! -f "$STATUSLINE" ]; then
     exit 1
 fi
 
+NEW_CMD="bash \"$STATUSLINE\"${EXTRA_ARGS}"
+
+# Decide where to write
+USER_SETTINGS="$HOME/.claude/settings.json"
+mkdir -p "$HOME/.claude"
+
+SETTINGS="$USER_SETTINGS"
+
+if [ -f "$USER_SETTINGS" ]; then
+    EXISTING_CMD=$(jq -r '.statusLine.command // ""' "$USER_SETTINGS" 2>/dev/null || true)
+    if [ -n "$EXISTING_CMD" ]; then
+        # Already has a statusline — is it ours?
+        if echo "$EXISTING_CMD" | grep -q "patchcord"; then
+            # Ours — update in place (e.g. add/remove --full)
+            SETTINGS="$USER_SETTINGS"
+        else
+            # Another tool's statusline — don't overwrite, use project
+            find_project_root() {
+                local dir="${1:-$(pwd)}"
+                while [ -n "$dir" ] && [ "$dir" != "/" ]; do
+                    if [ -f "$dir/.mcp.json" ] && jq -e '.mcpServers.patchcord' "$dir/.mcp.json" >/dev/null 2>&1; then
+                        printf '%s\n' "$dir"
+                        return 0
+                    fi
+                    dir=$(dirname "$dir")
+                done
+                return 1
+            }
+            PROJECT_ROOT=$(find_project_root || true)
+            if [ -n "$PROJECT_ROOT" ]; then
+                SETTINGS="$PROJECT_ROOT/.claude/settings.json"
+                mkdir -p "$PROJECT_ROOT/.claude"
+            else
+                # No project found — skip, don't overwrite another tool
+                echo "Statusline: another tool's statusline is set globally. Skipping."
+                exit 0
+            fi
+        fi
+    fi
+fi
+
 # Read existing settings or start fresh
 if [ -f "$SETTINGS" ]; then
     CURRENT=$(cat "$SETTINGS")
@@ -51,10 +71,5 @@ else
 fi
 
 # Set statusLine field
-UPDATED=$(echo "$CURRENT" | jq --arg cmd "bash \"$STATUSLINE\"${EXTRA_ARGS}" '.statusLine = {"type": "command", "command": $cmd}')
+UPDATED=$(echo "$CURRENT" | jq --arg cmd "$NEW_CMD" '.statusLine = {"type": "command", "command": $cmd}')
 echo "$UPDATED" > "$SETTINGS"
-
-echo "Patchcord statusline enabled."
-echo "  Script: $STATUSLINE"
-echo "  Settings: $SETTINGS"
-echo "Restart Claude Code to see the statusline."

package/scripts/statusline.sh

@@ -1,9 +1,17 @@
 #!/bin/bash
 # Patchcord statusline for Claude Code.
-# Shows: model | context% | repo (branch) | agent@host [N msg]
+#
+# Default: shows only patchcord identity + inbox count.
+# With --full: also shows model, context%, repo (branch).
+#
 # Receives session JSON on stdin, outputs ANSI-formatted text.
 set -f
 
+FULL=false
+for arg in "$@"; do
+    [ "$arg" = "--full" ] && FULL=true
+done
+
 find_patchcord_mcp_json() {
     local dir="$1"
     while [ -n "$dir" ] && [ "$dir" != "/" ]; do
@@ -19,7 +27,6 @@ find_patchcord_mcp_json() {
 input=$(cat)
 
 if [ -z "$input" ]; then
-    printf "Claude"
     exit 0
 fi
 
@@ -36,44 +43,10 @@ reset='\033[0m'
 
 sep=" ${dim}│${reset} "
 
-# ── Model + context ─────────────────────────────────────
-model_name=$(echo "$input" | jq -r '.model.display_name // "Claude"')
-
-size=$(echo "$input" | jq -r '.context_window.context_window_size // 200000')
-[ "$size" -eq 0 ] 2>/dev/null && size=200000
-
-input_tokens=$(echo "$input" | jq -r '.context_window.current_usage.input_tokens // 0')
-cache_create=$(echo "$input" | jq -r '.context_window.current_usage.cache_creation_input_tokens // 0')
-cache_read=$(echo "$input" | jq -r '.context_window.current_usage.cache_read_input_tokens // 0')
-current=$(( input_tokens + cache_create + cache_read ))
-
-if [ "$size" -gt 0 ]; then
-    pct_used=$(( current * 100 / size ))
-else
-    pct_used=0
-fi
-
-if [ "$pct_used" -ge 90 ]; then pct_color="$red"
-elif [ "$pct_used" -ge 70 ]; then pct_color="$yellow"
-elif [ "$pct_used" -ge 50 ]; then pct_color="$orange"
-else pct_color="$green"
-fi
-
-# ── Directory + git ─────────────────────────────────────
+# ── Patchcord: agent identity + inbox ───────────────────
 cwd=$(echo "$input" | jq -r '.cwd // ""')
 [ -z "$cwd" ] || [ "$cwd" = "null" ] && cwd=$(pwd)
-dirname=$(basename "$cwd")
-
-git_branch=""
-git_dirty=""
-if git -C "$cwd" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-    git_branch=$(git -C "$cwd" symbolic-ref --short HEAD 2>/dev/null)
-    if [ -n "$(git -C "$cwd" status --porcelain 2>/dev/null)" ]; then
-        git_dirty="*"
-    fi
-fi
 
-# ── Patchcord: agent identity + inbox ───────────────────
 pc_token=""
 pc_url=""
 mcp_json=$(find_patchcord_mcp_json "$cwd" || true)
@@ -107,52 +80,101 @@ if [ -n "$pc_url" ] && [ -n "$pc_token" ]; then
     fi
 
     if $needs_refresh; then
-        response=$(curl -sf --max-time 3 \
+        http_code=$(curl -s -o /tmp/claude/patchcord-sl-resp.json -w "%{http_code}" --max-time 3 \
             -H "Authorization: Bearer $pc_token" \
-            "${pc_url}/api/inbox?status=pending&limit=50" 2>/dev/null || true)
-        if [ -n "$response" ]; then
-            pc_data="$response"
-            echo "$response" > "$cache_file"
+            "${pc_url}/api/inbox?status=pending&limit=50" 2>/dev/null || echo "000")
+        if [ "$http_code" = "401" ] || [ "$http_code" = "403" ]; then
+            pc_data='{"_auth_error":true}'
+            echo "$pc_data" > "$cache_file"
+        elif [ "$http_code" = "200" ]; then
+            pc_data=$(cat /tmp/claude/patchcord-sl-resp.json 2>/dev/null)
+            [ -n "$pc_data" ] && echo "$pc_data" > "$cache_file"
         fi
+        rm -f /tmp/claude/patchcord-sl-resp.json
     fi
 
     if [ -n "$pc_data" ]; then
-        agent_id=$(echo "$pc_data" | jq -r '.agent_id // empty' 2>/dev/null)
-        namespace_id=$(echo "$pc_data" | jq -r '.namespace_id // empty' 2>/dev/null)
-        machine=$(echo "$pc_data" | jq -r '.machine_name // empty' 2>/dev/null)
-        if [ -z "$machine" ] || [ "$machine" = "null" ]; then
-            machine=$(hostname -s 2>/dev/null || hostname 2>/dev/null || echo "")
-        fi
-        count=$(echo "$pc_data" | jq -r '.count // .pending_count // 0' 2>/dev/null)
-
-        if [ -n "$agent_id" ]; then
-            pc_part="${white}${agent_id}${reset}"
-            if [ -n "$namespace_id" ] && [ "$namespace_id" != "null" ]; then
-                pc_part+="${dim}@${namespace_id}${reset}"
+        auth_error=$(echo "$pc_data" | jq -r '._auth_error // false' 2>/dev/null)
+        if [ "$auth_error" = "true" ]; then
+            pc_part="${red}BAD TOKEN${reset}"
+        else
+            agent_id=$(echo "$pc_data" | jq -r '.agent_id // empty' 2>/dev/null)
+            namespace_id=$(echo "$pc_data" | jq -r '.namespace_id // empty' 2>/dev/null)
+            machine=$(echo "$pc_data" | jq -r '.machine_name // empty' 2>/dev/null)
+            if [ -z "$machine" ] || [ "$machine" = "null" ]; then
+                machine=$(hostname -s 2>/dev/null || hostname 2>/dev/null || echo "")
             fi
-            if [ -n "$machine" ]; then
-                pc_part+=" ${dim}(${machine})${reset}"
+            count=$(echo "$pc_data" | jq -r '.count // .pending_count // 0' 2>/dev/null)
+
+            if [ -n "$agent_id" ]; then
+                pc_part="${white}${agent_id}${reset}"
+                if [ -n "$namespace_id" ] && [ "$namespace_id" != "null" ]; then
+                    pc_part+="${dim}@${namespace_id}${reset}"
+                fi
+                if [ -n "$machine" ]; then
+                    pc_part+=" ${dim}(${machine})${reset}"
+                fi
             fi
-        fi
 
-        if [ "$count" -gt 0 ] 2>/dev/null; then
-            pc_part+=" ${red}${count} msg${reset}"
+            if [ "$count" -gt 0 ] 2>/dev/null; then
+                pc_part+=" ${red}${count} msg${reset}"
+            fi
         fi
     fi
 fi
 
-# ── Build line ──────────────────────────────────────────
-line="${blue}${model_name}${reset}"
-line+="${sep}"
-line+="${pct_color}${pct_used}%${reset}"
-line+="${sep}"
-line+="${cyan}${dirname}${reset}"
-if [ -n "$git_branch" ]; then
-    line+=" ${green}(${git_branch}${red}${git_dirty}${green})${reset}"
+# No patchcord config — output nothing in default mode
+if [ -z "$pc_part" ] && ! $FULL; then
+    exit 0
 fi
-if [ -n "$pc_part" ]; then
+
+# ── Build line ──────────────────────────────────────────
+line=""
+
+if $FULL; then
+    model_name=$(echo "$input" | jq -r '.model.display_name // "Claude"')
+
+    size=$(echo "$input" | jq -r '.context_window.context_window_size // 200000')
+    [ "$size" -eq 0 ] 2>/dev/null && size=200000
+    input_tokens=$(echo "$input" | jq -r '.context_window.current_usage.input_tokens // 0')
+    cache_create=$(echo "$input" | jq -r '.context_window.current_usage.cache_creation_input_tokens // 0')
+    cache_read=$(echo "$input" | jq -r '.context_window.current_usage.cache_read_input_tokens // 0')
+    current=$(( input_tokens + cache_create + cache_read ))
+    if [ "$size" -gt 0 ]; then
+        pct_used=$(( current * 100 / size ))
+    else
+        pct_used=0
+    fi
+    if [ "$pct_used" -ge 90 ]; then pct_color="$red"
+    elif [ "$pct_used" -ge 70 ]; then pct_color="$yellow"
+    elif [ "$pct_used" -ge 50 ]; then pct_color="$orange"
+    else pct_color="$green"
+    fi
+
+    dirname=$(basename "$cwd")
+    git_branch=""
+    git_dirty=""
+    if git -C "$cwd" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        git_branch=$(git -C "$cwd" symbolic-ref --short HEAD 2>/dev/null)
+        if [ -n "$(git -C "$cwd" status --porcelain 2>/dev/null)" ]; then
+            git_dirty="*"
+        fi
+    fi
+
+    line="${blue}${model_name}${reset}"
+    line+="${sep}"
+    line+="${pct_color}${pct_used}%${reset}"
     line+="${sep}"
-    line+="${pc_part}"
+    line+="${cyan}${dirname}${reset}"
+    if [ -n "$git_branch" ]; then
+        line+=" ${green}(${git_branch}${red}${git_dirty}${green})${reset}"
+    fi
+    if [ -n "$pc_part" ]; then
+        line+="${sep}"
+        line+="${pc_part}"
+    fi
+else
+    line="${pc_part}"
 fi
 
 # ── Output ──────────────────────────────────────────────