patchcord 0.5.83 → 0.5.85

package/package.json

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

package/scripts/kimi-session-start.sh

@@ -24,5 +24,9 @@ if command -v jq >/dev/null 2>&1; then
   fi
 fi
 
-nohup bash "$KIMI_SUB" 5 >/dev/null 2>&1 &
+# --force tells kimi-subscribe.sh to kill any orphan listener (from a prior
+# Kimi session for this same project) before claiming the pidfile. Subscribe
+# resolves the project-specific pidfile name from .kimi/mcp.json itself, so
+# concurrent sessions for OTHER projects are untouched.
+nohup bash "$KIMI_SUB" --force 5 >/dev/null 2>&1 &
 exit 0

package/scripts/kimi-subscribe.sh

@@ -14,6 +14,19 @@ set -euo pipefail
 
 command -v jq >/dev/null 2>&1 || { echo "jq required" >&2; exit 1; }
 
+# Parse --force flag (kills any existing listener for THIS project first).
+# SessionStart hook passes --force so fresh sessions always get a fresh listener.
+FORCE=0
+ARGS=()
+for arg in "$@"; do
+  if [ "$arg" = "--force" ]; then
+    FORCE=1
+  else
+    ARGS+=("$arg")
+  fi
+done
+set -- "${ARGS[@]+"${ARGS[@]}"}"
+
 # Resolve MCP config: per-project first, then global
 KIMI_MCP=""
 dir="$PWD"
@@ -60,14 +73,28 @@ fi
 PIDFILE="/tmp/patchcord_subscribe_${NAMESPACE_ID}_${AGENT_ID}.pid"
 NOTIFY_FILE="${HOME}/.kimi/patchcord-subscribe-notify.txt"
 
-# Pidfile guard: if another instance is already running, that's the desired
-# state (typically the SessionStart hook armed the listener). Exit 0 so flow
-# skill invocations don't surface as "background task failed".
+# Pidfile guard.
+# --force: kill the existing listener (if any) and take over. Used by SessionStart
+#   so a fresh Kimi session always gets a fresh listener for this project.
+# default: if another instance is alive, exit 0 with a clear message so user-
+#   invoked flow skill calls are idempotent (no "background task failed").
 if [ -f "$PIDFILE" ]; then
   OLD_PID=$(cat "$PIDFILE" 2>/dev/null || echo "")
   if [ -n "$OLD_PID" ] && kill -0 "$OLD_PID" 2>/dev/null; then
-    echo "Patchcord listener already running (pid $OLD_PID)"
-    exit 0
+    if [ "$FORCE" = "1" ]; then
+      kill "$OLD_PID" 2>/dev/null || true
+      # Wait briefly for the old process to clean up its pidfile
+      for _ in 1 2 3 4 5; do
+        kill -0 "$OLD_PID" 2>/dev/null || break
+        sleep 0.2
+      done
+      rm -f "$PIDFILE" 2>/dev/null || true
+    else
+      echo "Patchcord listener already running (pid $OLD_PID)"
+      exit 0
+    fi
+  else
+    rm -f "$PIDFILE" 2>/dev/null || true
   fi
 fi
 echo $$ > "$PIDFILE"
@@ -96,11 +123,12 @@ while true; do
   if [ "$COUNT" -gt 0 ] 2>/dev/null; then
     # Write notification file so the agent sees context on wake
     echo "PATCHCORD: ${COUNT} message(s) waiting" > "$NOTIFY_FILE"
-    echo "PATCHCORD: ${COUNT} message(s) waiting — exiting to trigger auto-run"
-    # Kimi v1.44.0 background tasks trigger auto-run on exit 2 (BLOCK),
-    # same as Stop hooks. stderr becomes the wake-up message.
-    printf '%s\n' "📬 Patchcord: You have ${COUNT} pending message(s). Call inbox() to read and reply." >&2
-    exit 2
+    # Kimi auto-triggers a new agent turn when ANY background task reaches a
+    # terminal state — exit code doesn't matter. Use exit 0 so Kimi shows
+    # "completed" (not "failed"), and emit the wake-up text to stdout so it
+    # appears in the agent's task output preview.
+    printf '%s\n' "📬 Patchcord: ${COUNT} pending message(s). Call inbox(), reply to each, then re-arm by running 'patchcord subscribe --kimi 5' as a background Shell task (run_in_background=true, timeout=86400)."
+    exit 0
   fi
 
   sleep "$INTERVAL"