patchcord 0.3.5 → 0.3.6

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

package/README.md

@@ -2,69 +2,22 @@
 
 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
@@ -78,63 +31,12 @@ Bad:
 ## Setup
 
 ### 1. Install the plugin
->>>>>>> Stashed changes
-
-<<<<<<< Updated upstream
-## How it works
-
-- Install the plugin once (globally)
-- Keep `.mcp.json` inside each Patchcord-enabled project
-- The plugin no-ops in projects without Patchcord configured
-
-Don't export `PATCHCORD_TOKEN` / `PATCHCORD_URL` globally or put config in `~/.mcp.json`.
 
-## Configure the project
-
-Create a project-local `.mcp.json` in the project that should act as a Patchcord agent.
-
-```json
-{
-  "mcpServers": {
-    "patchcord": {
-      "type": "http",
-      "url": "https://patchcord.yourdomain.com/mcp",
-      "headers": {
-        "Authorization": "Bearer <project-token>",
-        "X-Patchcord-Client-Type": "claude_code"
-      }
-    }
-  }
-}
-||||||| 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.
-
-## 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 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.
@@ -168,39 +70,10 @@ Nothing Patchcord-specific should appear.
 - 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.
-
-## What the plugin provides
-
-- Stop hook / turn-end inbox check
-- Patchcord skill for Claude
-- statusline identity display
-
-The MCP tools themselves come from the project's `.mcp.json` server connection, not from the plugin bundle.
-
-## Statusline
-
-By default the statusline shows only Patchcord identity and inbox count. In non-Patchcord projects it outputs nothing.
-
-To also show model, context usage, repo, and git branch:
-
-```bash
-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
 {
@@ -215,32 +88,6 @@ The project `.mcp.json` should point to your own server URL:
   }
 }
 ```
-<<<<<<< Updated upstream
-ds@default (thick) 2 msg
-```
-
-With `--full`:
-
-```
-Opus 4.6 │ 73% │ myproject (main) │ ds@default (thick) 2 msg
-```
-
-## Verify
-
-In a Patchcord-enabled project:
-
-- statusline should show the Patchcord identity and pending message count
-- `inbox()` should return the expected `namespace_id` and `agent_id`
-
-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
 
@@ -254,4 +101,3 @@ 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/bin/patchcord.mjs

@@ -77,6 +77,17 @@ Then run: patchcord install`);
     process.exit(1);
   }
 
+  // Disable patchcord as Codex ChatGPT app (prevents OAuth identity conflict)
+  const codexConfig = join(process.env.HOME || "", ".codex", "config.toml");
+  if (existsSync(codexConfig)) {
+    const { readFileSync, writeFileSync } = await import("fs");
+    const content = readFileSync(codexConfig, "utf-8");
+    if (!content.includes("[apps.patchcord]")) {
+      writeFileSync(codexConfig, content.trimEnd() + "\n\n[apps.patchcord]\nenabled = false\n");
+      console.log("✓ Disabled patchcord ChatGPT app in Codex (prevents identity conflict).");
+    }
+  }
+
   // Enable statusline
   const enableScript = join(pluginRoot, "scripts", "enable-statusline.sh");
   if (existsSync(enableScript)) {

package/package.json

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

package/scripts/statusline.sh

@@ -1,20 +1,9 @@
 #!/bin/bash
 # Patchcord statusline for Claude Code.
-#
-# Default: shows only patchcord identity + inbox count.
-# With --full: also shows model, context%, repo (branch).
-#
-# --full mode model/context/git display based on claude-statusline by Kamran Ahmed
-# https://github.com/kamranahmedse/claude-statusline (MIT)
-#
+# Shows: model | context% | repo (branch) | agent@host [N msg]
 # 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
@@ -30,6 +19,7 @@ find_patchcord_mcp_json() {
 input=$(cat)
 
 if [ -z "$input" ]; then
+    printf "Claude"
     exit 0
 fi
 
@@ -46,10 +36,44 @@ reset='\033[0m'
 
 sep=" ${dim}│${reset} "
 
-# ── Patchcord: agent identity + inbox ───────────────────
+# ── 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 ─────────────────────────────────────
 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)
@@ -83,54 +107,16 @@ if [ -n "$pc_url" ] && [ -n "$pc_token" ]; then
     fi
 
     if $needs_refresh; then
-        http_code=$(curl -s -o /tmp/claude/patchcord-sl-resp.json -w "%{http_code}" --max-time 3 \
+        response=$(curl -sf --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}'
-            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"
-||||||| 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}"
-        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 "")
-||||||| 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)
@@ -146,117 +132,27 @@ if [ -n "$pc_url" ] && [ -n "$pc_token" ]; then
             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)
-
-            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
-
-            if [ "$count" -gt 0 ] 2>/dev/null; then
-                pc_part+=" ${red}${count} msg${reset}"
             fi
         fi
-    fi
-fi
 
-# ── Update check (once per 24h) ───────────────────────
-update_part=""
-plugin_json="${CLAUDE_PLUGIN_ROOT:-.}/.claude-plugin/plugin.json"
-if [ -f "$plugin_json" ]; then
-    installed_ver=$(jq -r '.version // ""' "$plugin_json" 2>/dev/null)
-    if [ -n "$installed_ver" ]; then
-        update_cache="/tmp/claude/patchcord-update-check.json"
-        mkdir -p /tmp/claude
-        update_stale=true
-        if [ -f "$update_cache" ]; then
-            uc_mtime=$(stat -c %Y "$update_cache" 2>/dev/null || stat -f %m "$update_cache" 2>/dev/null)
-            uc_now=$(date +%s)
-            [ $(( uc_now - uc_mtime )) -lt 86400 ] && update_stale=false
-        fi
-        if $update_stale; then
-            latest=$(npm view patchcord version --json 2>/dev/null | tr -d '"' || true)
-            if [ -n "$latest" ]; then
-                echo "{\"latest\":\"$latest\"}" > "$update_cache"
-            fi
-        else
-            latest=$(jq -r '.latest // ""' "$update_cache" 2>/dev/null)
-        fi
-        if [ -n "$latest" ] && [ "$latest" != "$installed_ver" ]; then
-            update_part="${yellow}⬆ ${latest} (npm update -g patchcord)${reset}"
+        if [ "$count" -gt 0 ] 2>/dev/null; then
+            pc_part+=" ${red}${count} msg${reset}"
         fi
     fi
 fi
 
-# No patchcord config — output nothing in default mode
-if [ -z "$pc_part" ] && [ -z "$update_part" ] && ! $FULL; then
-    exit 0
-fi
-
 # ── 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="${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}"
+fi
+if [ -n "$pc_part" ]; then
     line+="${sep}"
-    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
-    if [ -n "$update_part" ]; then
-        line+="${sep}"
-        line+="${update_part}"
-    fi
-else
-    line="${pc_part}"
-    if [ -n "$update_part" ]; then
-        if [ -n "$line" ]; then
-            line+="${sep}"
-        fi
-        line+="${update_part}"
-    fi
+    line+="${pc_part}"
 fi
 
 # ── Output ──────────────────────────────────────────────