codeam-cli 2.4.13 → 2.4.15

package/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to `codeam-cli` are documented here.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.13] — 2026-05-03
+
+### Fixed
+
+- **cli:** Codeam pair survives SSH disconnect for codeam deploy (v2.4.13)
+
 ## [2.4.12] — 2026-05-03
 
 ### Fixed

package/dist/index.js

@@ -179,7 +179,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.4.13",
+  version: "2.4.15",
   description: "Remote control Claude Code (and other AI coding agents) from your mobile phone. Pair your device, send prompts, stream responses in real-time, and approve commands \u2014 from anywhere.",
   main: "dist/index.js",
   bin: {
@@ -5894,24 +5894,67 @@ async function deploy() {
   const wrapper = [
     "mkdir -p ~/.codeam-deploy",
     "LOG=~/.codeam-deploy/session.log",
-    "PIDFILE=~/.codeam-deploy/session.pid",
-    'if [ -f "$PIDFILE" ]; then OLD=$(cat "$PIDFILE" 2>/dev/null); if [ -n "$OLD" ] && kill -0 "$OLD" 2>/dev/null; then kill "$OLD" 2>/dev/null; sleep 1; fi; fi',
     ': > "$LOG"',
-    // Detach codeam pair from this shell so SSH hangup never reaches
-    // it. The combination is: setsid (new session, no controlling
-    // terminal) + nohup (ignore SIGHUP) + < /dev/null (no stdin
-    // attached) + redirect stdio to log file.
-    'setsid nohup codeam pair > "$LOG" 2>&1 < /dev/null &',
-    "sleep 1",
-    'PID=$(pgrep -fn "codeam pair" | head -1)',
-    'echo "$PID" > "$PIDFILE"',
-    'tail -n +1 -F "$LOG" 2>/dev/null &',
+    // The default `gh codespace ssh` cwd is the repo root
+    // (/workspaces/<repo>), which is exactly where Claude needs to
+    // run so it can read/edit project files. Pass that to PM2 via
+    // --cwd so the relay's child Claude inherits the right
+    // working directory.
+    'PROJECT_DIR="$(pwd)"',
+    // Install PM2 if it isn't already on PATH. Idempotent.
+    "if ! command -v pm2 >/dev/null 2>&1; then",
+    '  echo "Installing pm2 (one-time setup)\u2026"',
+    '  npm install -g pm2 >/dev/null 2>&1 || { echo "\u2717 Failed to install pm2"; exit 1; }',
+    "fi",
+    // Stop any prior codeam-pair instance — fresh start each deploy.
+    "pm2 delete codeam-pair >/dev/null 2>&1",
+    // Start codeam pair under PM2. `--merge-logs` writes stdout
+    // and stderr to the same file so we only need one tail.
+    // --max-restarts 3 keeps PM2 from looping forever if codeam pair
+    // can't start (e.g. backend unreachable) — three attempts is
+    // enough for transient flakes, anything more wastes time.
+    'pm2 start codeam --name codeam-pair --cwd "$PROJECT_DIR" --max-restarts 3 -o "$LOG" -e "$LOG" --merge-logs --time -- pair >/dev/null 2>&1',
+    // Give PM2 a moment to spawn the process before we start polling
+    // status — otherwise the very first jlist can race the spawn.
+    "sleep 2",
+    'tail -n 0 -F "$LOG" 2>/dev/null &',
     "TAIL=$!",
     "trap 'kill $TAIL 2>/dev/null; exit 130' INT TERM",
+    // Phase 1 — wait for "Paired with", or for codeam to print a
+    // recognisable failure, or for PM2 to report the process gone.
     "SUCCESS=0",
+    'FAIL_REASON=""',
     "while true; do",
     '  if grep -q "Paired with" "$LOG" 2>/dev/null; then SUCCESS=1; break; fi',
-    '  if [ -z "$PID" ] || ! kill -0 "$PID" 2>/dev/null; then SUCCESS=0; break; fi',
+    // Detect specific codeam error messages early so the user gets
+    // an actionable message instead of a generic "did not start".
+    '  if grep -q "Could not reach the server" "$LOG" 2>/dev/null; then',
+    '    FAIL_REASON="codeam could not reach the CodeAgent backend (network/firewall? Vercel bot-challenge on the API?)"',
+    "    SUCCESS=0; break",
+    "  fi",
+    '  if grep -qE "Pairing timed out|Failed to" "$LOG" 2>/dev/null; then',
+    '    FAIL_REASON="$(grep -E "Pairing timed out|Failed to" "$LOG" | head -1)"',
+    "    SUCCESS=0; break",
+    "  fi",
+    // Status check: parse PM2 jlist via Python (every codespace has
+    // python3) for resilient JSON handling, instead of fragile grep.
+    '  ALIVE=$(pm2 jlist 2>/dev/null | python3 -c "import json,sys',
+    "try:",
+    "  d=json.load(sys.stdin)",
+    "  it=[x for x in d if x.get('name')=='codeam-pair']",
+    "  print(it[0]['pm2_env']['status'] if it else 'missing')",
+    "except Exception:",
+    `  print('parse-error')" 2>/dev/null)`,
+    '  case "$ALIVE" in',
+    "    online|launching) ;;",
+    // still good
+    '    "")',
+    '      FAIL_REASON="PM2 not responding"',
+    "      SUCCESS=0; break ;;",
+    "    missing|stopped|errored|stopping)",
+    '      FAIL_REASON="PM2 reports codeam-pair is $ALIVE"',
+    "      SUCCESS=0; break ;;",
+    "  esac",
     "  sleep 1",
     "done",
     'if [ "$SUCCESS" = "1" ]; then',
@@ -5920,10 +5963,10 @@ async function deploy() {
     '  echo "  Answer any first-time prompts ("trust this folder", etc.) on your phone."',
     '  echo "  Local terminal will close once Claude is ready."',
     "  echo",
+    // Phase 2 — wait for the Claude "ready" marker.
     "  WAIT_START=$(date +%s)",
     "  while true; do",
     '    if grep -q "for shortcuts" "$LOG" 2>/dev/null; then break; fi',
-    '    if [ -z "$PID" ] || ! kill -0 "$PID" 2>/dev/null; then break; fi',
     "    if [ $(($(date +%s) - WAIT_START)) -gt 180 ]; then break; fi",
     "    sleep 1",
     "  done",
@@ -5932,10 +5975,16 @@ async function deploy() {
     "kill $TAIL 2>/dev/null",
     "echo",
     'if [ "$SUCCESS" = "1" ]; then',
-    '  echo "\u2713 Session running on codespace (PID $PID). Closing local connection \u2014 your phone stays paired."',
+    '  echo "\u2713 Session running via PM2 on the codespace. Closing local connection \u2014 your phone stays paired."',
+    '  echo "  To stop later: gh codespace ssh -- pm2 delete codeam-pair"',
     "  exit 0",
     "else",
-    '  echo "\u2717 Pairing did not complete (codeam pair exited)."',
+    '  echo "\u2717 Pairing did not complete."',
+    '  if [ -n "$FAIL_REASON" ]; then echo "  Reason: $FAIL_REASON"; fi',
+    "  echo",
+    '  echo "  Last log lines from codeam pair:"',
+    '  tail -n 8 "$LOG" 2>/dev/null | sed "s/^/    /"',
+    "  pm2 delete codeam-pair >/dev/null 2>&1",
     "  exit 1",
     "fi"
   ].join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.4.13",
+  "version": "2.4.15",
   "description": "Remote control Claude Code (and other AI coding agents) from your mobile phone. Pair your device, send prompts, stream responses in real-time, and approve commands — from anywhere.",
   "main": "dist/index.js",
   "bin": {