patchcord 0.3.4 → 0.3.5

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.4",
+  "version": "0.3.5",
   "author": {
     "name": "ppravdin"
   },

package/README.md

@@ -2,20 +2,85 @@
 
 Cross-machine messaging between Claude Code agents.
 
+<<<<<<< Updated upstream
 ## Install
+||||||| Stash base
+## Setup (3 steps)
 
+**1.** Copy `.env.example` to `.env` and paste your token:
+=======
+This plugin is not the connection itself.
+
+The plugin provides:
+>>>>>>> Stashed changes
+
+<<<<<<< Updated upstream
 ```bash
 npx patchcord@latest install
 ```
+||||||| Stash base
+```bash
+cp .env.example .env
+# Open .env, replace paste-your-token-here with your actual token
+```
+=======
+- Patchcord skills
+- statusline integration
+- turn-end inbox checks
+>>>>>>> Stashed changes
 
+<<<<<<< Updated upstream
 Or with full statusline (model, context%, git branch):
+||||||| Stash base
+**2.** Load the env vars (pick one):
+=======
+The actual Patchcord connection must still come from the current project configuration.
+>>>>>>> Stashed changes
 
+<<<<<<< Updated upstream
 ```bash
 npx patchcord@latest install --full
 ```
+||||||| Stash base
+```bash
+# Option A: add to your shell profile (~/.bashrc or ~/.zshrc)
+echo 'source /path/to/your/.env' >> ~/.bashrc
+
+# Option B: use direnv (if you have it)
+cp .env .envrc && direnv allow
+
+# Option C: just export manually
+export PATCHCORD_TOKEN="your-token"
+```
+=======
+## Safe model
+
+Use this plugin with project-local Patchcord config.
 
+Good:
+>>>>>>> Stashed changes
+
+<<<<<<< Updated upstream
 The plugin provides skills, statusline integration, and turn-end inbox hooks. The actual Patchcord connection comes from the project's `.mcp.json`.
+||||||| Stash base
+**3.** Install the plugin and start Claude Code:
+=======
+- install the plugin once
+- keep `.mcp.json` inside each Patchcord-enabled project
+- let the plugin no-op in projects that do not have Patchcord configured
+
+Bad:
+
+- exporting `PATCHCORD_TOKEN` / `PATCHCORD_URL` globally in `~/.bashrc`, `~/.profile`, or similar
+- keeping Patchcord config in an ancestor directory like `~/.mcp.json`
+- assuming the plugin should make every project a Patchcord project
+
+## Setup
 
+### 1. Install the plugin
+>>>>>>> Stashed changes
+
+<<<<<<< Updated upstream
 ## How it works
 
 - Install the plugin once (globally)
@@ -41,8 +106,19 @@ Create a project-local `.mcp.json` in the project that should act as a Patchcord
     }
   }
 }
+||||||| Stash base
+```bash
+claude plugin marketplace add /path/to/patchcord-internal
+claude plugin install patchcord@patchcord-marketplace
+claude
+=======
+```bash
+claude plugin marketplace add /path/to/patchcord-internal
+claude plugin install patchcord@patchcord-marketplace
+>>>>>>> Stashed changes
 ```
 
+<<<<<<< Updated upstream
 ### 3. Start Claude Code in that project
 
 The plugin and statusline scripts read the current project configuration from the session's working tree.
@@ -56,9 +132,47 @@ Nothing Patchcord-specific should appear.
 - no hook-driven Patchcord prompts
 
 The plugin can stay installed globally, but it must no-op unless the current project is configured.
+||||||| Stash base
+That's it. Inbox, send messages, reply — all works automatically.
+=======
+### 2. Configure the project
+
+Create a project-local `.mcp.json` in the project that should act as a Patchcord agent.
+
+Example:
+
+```json
+{
+  "mcpServers": {
+    "patchcord": {
+      "type": "http",
+      "url": "https://patchcord.yourdomain.com/mcp",
+      "headers": {
+        "Authorization": "Bearer <project-token>"
+      }
+    }
+  }
+}
+```
+
+### 3. Restart Claude Code in that project
+
+The plugin and statusline scripts read the current project configuration when the session starts.
+
+## What happens in non-Patchcord projects
+
+Nothing Patchcord-specific should appear.
+
+- no Patchcord identity in the statusline
+- no inbox checks
+- no hook-driven Patchcord prompts
+
+The plugin is allowed to stay installed globally, but it must no-op unless the current project is configured.
+>>>>>>> Stashed changes
 
 ## Self-hosted server
 
+<<<<<<< Updated upstream
 Point the project `.mcp.json` at your own server URL.
 
 Bearer-token clients can also use `/mcp/bearer` if you want the dedicated bearer-only endpoint.
@@ -82,8 +196,26 @@ npx patchcord@latest install --full
 ```
 
 Without `--full`:
+||||||| Stash base
+By default the plugin connects to `https://patchcord.dev`. If you run your own server, add to your `.env`:
+=======
+The project `.mcp.json` should point to your own server URL:
+>>>>>>> Stashed changes
 
+```json
+{
+  "mcpServers": {
+    "patchcord": {
+      "type": "http",
+      "url": "https://patchcord.yourdomain.com/mcp",
+      "headers": {
+        "Authorization": "Bearer <project-token>"
+      }
+    }
+  }
+}
 ```
+<<<<<<< Updated upstream
 ds@default (thick) 2 msg
 ```
 
@@ -105,3 +237,21 @@ In an unrelated project:
 - statusline should be empty (default) or show only model/context/git (`--full`)
 - no Patchcord hooks should fire
 - no Patchcord tools should be present unless that project is configured
+||||||| Stash base
+PATCHCORD_URL=https://your-server.example.com
+```
+=======
+
+## Verify
+
+In a Patchcord-enabled project:
+
+- statusline should show the Patchcord identity
+- `inbox()` should return the expected `namespace_id` and `agent_id`
+
+In an unrelated project:
+
+- statusline should not show Patchcord identity
+- no Patchcord hooks should fire
+- no Patchcord tools should be present unless that project is configured
+>>>>>>> Stashed changes

package/package.json

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

package/scripts/statusline.sh

@@ -85,6 +85,7 @@ if [ -n "$pc_url" ] && [ -n "$pc_token" ]; then
     if $needs_refresh; then
         http_code=$(curl -s -o /tmp/claude/patchcord-sl-resp.json -w "%{http_code}" --max-time 3 \
             -H "Authorization: Bearer $pc_token" \
+<<<<<<< Updated upstream
             "${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}'
@@ -92,11 +93,25 @@ if [ -n "$pc_url" ] && [ -n "$pc_token" ]; then
         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"
+||||||| Stash base
+            "${pc_url}/api/inbox?status=pending&limit=50" 2>/dev/null || true)
+        if [ -n "$response" ]; then
+            pc_data="$response"
+            echo "$response" > "$cache_file"
+        elif [ -f "$cache_file" ]; then
+            pc_data=$(cat "$cache_file" 2>/dev/null)
+=======
+            "${pc_url}/api/inbox?status=pending&limit=50" 2>/dev/null || true)
+        if [ -n "$response" ]; then
+            pc_data="$response"
+            echo "$response" > "$cache_file"
+>>>>>>> Stashed changes
         fi
         rm -f /tmp/claude/patchcord-sl-resp.json
     fi
 
     if [ -n "$pc_data" ]; then
+<<<<<<< Updated upstream
         auth_error=$(echo "$pc_data" | jq -r '._auth_error // false' 2>/dev/null)
         if [ "$auth_error" = "true" ]; then
             pc_part="${red}BAD TOKEN${reset}"
@@ -106,6 +121,32 @@ if [ -n "$pc_url" ] && [ -n "$pc_token" ]; then
             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 "")
+||||||| Stash base
+        agent_id=$(echo "$pc_data" | jq -r '.agent_id // empty' 2>/dev/null)
+        machine=$(hostname -s 2>/dev/null || hostname 2>/dev/null || echo "")
+        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 "$machine" ]; then
+                pc_part+="${dim}@${machine}${reset}"
+=======
+        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}"
+            fi
+            if [ -n "$machine" ]; then
+                pc_part+=" ${dim}(${machine})${reset}"
+>>>>>>> Stashed changes
             fi
             count=$(echo "$pc_data" | jq -r '.count // .pending_count // 0' 2>/dev/null)