@masslessai/push-todo 3.10.8 → 4.0.0

package/lib/daemon-health.js

@@ -8,7 +8,7 @@
  */
 
 import { existsSync, readFileSync, writeFileSync, mkdirSync, unlinkSync } from 'fs';
-import { spawn } from 'child_process';
+import { spawn, execFileSync } from 'child_process';
 import { homedir } from 'os';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
@@ -116,6 +116,30 @@ function formatUptime(startedAt) {
   }
 }
 
+/**
+ * Kill any orphaned daemon processes not tracked by PID file.
+ * Prevents zombie daemons from racing the real daemon for tasks.
+ */
+function killOrphanedDaemons() {
+  try {
+    const trackedPid = existsSync(PID_FILE)
+      ? parseInt(readFileSync(PID_FILE, 'utf8').trim(), 10)
+      : null;
+    const output = execFileSync('pgrep', ['-f', 'push-todo.*daemon\\.js'], {
+      encoding: 'utf8',
+      timeout: 5000
+    }).trim();
+    for (const line of output.split('\n')) {
+      const pid = parseInt(line.trim(), 10);
+      if (!isNaN(pid) && pid !== trackedPid && pid !== process.pid) {
+        try { process.kill(pid, 'SIGTERM'); } catch {}
+      }
+    }
+  } catch {
+    // pgrep not found or no matches — both fine
+  }
+}
+
 /**
  * Start the daemon process.
  * Same as Python's start_daemon().
@@ -126,6 +150,9 @@ export function startDaemon() {
     return true;
   }
 
+  // Kill any zombie daemons before starting fresh
+  killOrphanedDaemons();
+
   mkdirSync(PUSH_DIR, { recursive: true });
 
   const daemonScript = join(__dirname, 'daemon.js');
@@ -141,6 +168,7 @@ export function startDaemon() {
       env: (() => {
         const env = { ...process.env, PUSH_DAEMON: '1' };
         delete env.CLAUDECODE;  // Strip to avoid leaking into Claude child processes
+        delete env.CLAUDE_CODE_ENTRYPOINT;  // Strip to avoid any entrypoint-based guards
         return env;
       })()
     });

package/lib/daemon.js

@@ -78,6 +78,7 @@ const PID_FILE = join(PUSH_DIR, 'daemon.pid');
 const LOG_FILE = join(PUSH_DIR, 'daemon.log');
 const STATUS_FILE = join(PUSH_DIR, 'daemon_status.json');
 const VERSION_FILE = join(PUSH_DIR, 'daemon.version');
+const LOCK_FILE = join(PUSH_DIR, 'daemon.lock');
 const CONFIG_FILE = join(CONFIG_DIR, 'config');
 const MACHINE_ID_FILE = join(CONFIG_DIR, 'machine_id');
 const REGISTRY_FILE = join(CONFIG_DIR, 'projects.json');
@@ -90,8 +91,17 @@ const LOG_BACKUP_COUNT = 3;
 const runningTasks = new Map(); // displayNumber -> taskInfo
 const taskDetails = new Map();  // displayNumber -> details
 const completedToday = [];
+const COMPLETED_TODAY_MAX = 100;
+
+function trackCompleted(entry) {
+  completedToday.push(entry);
+  if (completedToday.length > COMPLETED_TODAY_MAX) {
+    completedToday.splice(0, completedToday.length - COMPLETED_TODAY_MAX);
+  }
+}
 const taskLastOutput = new Map(); // displayNumber -> timestamp
 const taskStdoutBuffer = new Map(); // displayNumber -> lines[]
+const taskStderrBuffer = new Map(); // displayNumber -> lines[]
 const taskProjectPaths = new Map(); // displayNumber -> projectPath
 let daemonStartTime = null;
 
@@ -125,7 +135,7 @@ function rotateLogs() {
 
 function log(message, level = 'INFO') {
   const timestamp = new Date().toISOString();
-  const line = `[${timestamp}] [${level}] ${message}\n`;
+  const line = `[${timestamp}] [PID:${process.pid}] [${level}] ${message}\n`;
 
   if (process.env.PUSH_DAEMON !== '1') {
     process.stdout.write(line);
@@ -140,6 +150,38 @@ function logError(message) {
   log(message, 'ERROR');
 }
 
+// ==================== Lock File ====================
+
+function isProcessRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function acquireLock() {
+  try {
+    if (existsSync(LOCK_FILE)) {
+      const holderPid = parseInt(readFileSync(LOCK_FILE, 'utf8').trim(), 10);
+      if (!isNaN(holderPid) && holderPid !== process.pid && isProcessRunning(holderPid)) {
+        return false;
+      }
+      // Holder is dead or is us — clean up stale lock
+      try { unlinkSync(LOCK_FILE); } catch {}
+    }
+    writeFileSync(LOCK_FILE, String(process.pid));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function releaseLock() {
+  try { unlinkSync(LOCK_FILE); } catch {}
+}
+
 // ==================== Mac Notifications ====================
 
 function sendMacNotification(title, message, sound = 'default') {
@@ -1024,7 +1066,7 @@ async function autoHealExistingWork(displayNumber, summary, projectPath, taskId)
         }
       }
 
-      completedToday.push({
+      trackCompleted({
         displayNumber, summary,
         completedAt: new Date().toISOString(),
         duration: 0, status, prUrl
@@ -1061,7 +1103,7 @@ async function autoHealExistingWork(displayNumber, summary, projectPath, taskId)
         }
       }
 
-      completedToday.push({
+      trackCompleted({
         displayNumber, summary,
         completedAt: new Date().toISOString(),
         duration: 0, status, prUrl
@@ -1078,7 +1120,7 @@ async function autoHealExistingWork(displayNumber, summary, projectPath, taskId)
         await updateTaskStatus(displayNumber, 'session_finished', {
           summary: executionSummary
         });
-        completedToday.push({
+        trackCompleted({
           displayNumber, summary,
           completedAt: new Date().toISOString(),
           duration: 0, status: 'session_finished', prUrl: newPrUrl
@@ -1380,6 +1422,7 @@ IMPORTANT:
       env: (() => {
         const env = { ...process.env, PUSH_TASK_ID: task.id, PUSH_DISPLAY_NUMBER: String(displayNumber) };
         delete env.CLAUDECODE;  // Strip to avoid "nested session" guard in Claude Code
+        delete env.CLAUDE_CODE_ENTRYPOINT;  // Strip to avoid any entrypoint-based guards
         return env;
       })()
     });
@@ -1395,6 +1438,20 @@ IMPORTANT:
     runningTasks.set(displayNumber, taskInfo);
     taskLastOutput.set(displayNumber, Date.now());
     taskStdoutBuffer.set(displayNumber, []);
+    taskStderrBuffer.set(displayNumber, []);
+
+    // Monitor stderr (critical for diagnosing fast exits)
+    child.stderr.on('data', (data) => {
+      const lines = data.toString().split('\n');
+      for (const line of lines) {
+        if (line.trim()) {
+          const buffer = taskStderrBuffer.get(displayNumber) || [];
+          buffer.push(line);
+          if (buffer.length > 20) buffer.shift();
+          taskStderrBuffer.set(displayNumber, buffer);
+        }
+      }
+    });
 
     // Monitor stdout
     child.stdout.on('data', (data) => {
@@ -1569,7 +1626,7 @@ async function handleTaskCompletion(displayNumber, exitCode) {
       }
     }
 
-    completedToday.push({
+    trackCompleted({
       displayNumber,
       summary,
       completedAt: new Date().toISOString(),
@@ -1579,7 +1636,11 @@ async function handleTaskCompletion(displayNumber, exitCode) {
       sessionId
     });
   } else {
-    const stderr = taskInfo.process.stderr?.read()?.toString() || '';
+    const stderrLines = taskStderrBuffer.get(displayNumber) || [];
+    const stderr = stderrLines.join('\n');
+    if (stderr) {
+      log(`Task #${displayNumber} stderr: ${stderr.slice(0, 500)}`);
+    }
 
     // Ask Claude to explain what went wrong (needs worktree path)
     const failureSummary = extractSemanticSummary(worktreePath, sessionId);
@@ -1601,7 +1662,7 @@ async function handleTaskCompletion(displayNumber, exitCode) {
       );
     }
 
-    completedToday.push({
+    trackCompleted({
       displayNumber,
       summary,
       completedAt: new Date().toISOString(),
@@ -1614,6 +1675,7 @@ async function handleTaskCompletion(displayNumber, exitCode) {
   taskDetails.delete(displayNumber);
   taskLastOutput.delete(displayNumber);
   taskStdoutBuffer.delete(displayNumber);
+  taskStderrBuffer.delete(displayNumber);
   taskProjectPaths.delete(displayNumber);
   updateStatusFile();
 }
@@ -1744,7 +1806,7 @@ async function checkTimeouts() {
       );
     }
 
-    completedToday.push({
+    trackCompleted({
       displayNumber,
       summary: info.summary || 'Unknown task',
       completedAt: new Date().toISOString(),
@@ -1757,6 +1819,7 @@ async function checkTimeouts() {
     taskDetails.delete(displayNumber);
     taskLastOutput.delete(displayNumber);
     taskStdoutBuffer.delete(displayNumber);
+    taskStderrBuffer.delete(displayNumber);
     taskProjectPaths.delete(displayNumber);
     cleanupWorktree(displayNumber, projectPath);
   }
@@ -1799,6 +1862,7 @@ function checkAndApplyUpdate() {
       const daemonScript = join(__dirname, 'daemon.js');
       const selfUpdateEnv = { ...process.env, PUSH_DAEMON: '1' };
       delete selfUpdateEnv.CLAUDECODE;  // Strip to avoid leaking into Claude child processes
+      delete selfUpdateEnv.CLAUDE_CODE_ENTRYPOINT;  // Strip to avoid any entrypoint-based guards
       const child = spawn(process.execPath, [daemonScript], {
         detached: true,
         stdio: ['ignore', 'ignore', 'ignore'],
@@ -2020,6 +2084,7 @@ async function cleanup() {
   }
 
   // Clean up files
+  releaseLock();
   try { unlinkSync(PID_FILE); } catch {}
 
   // Update status
@@ -2049,6 +2114,15 @@ mkdirSync(CONFIG_DIR, { recursive: true });
 // Rotate logs
 rotateLogs();
 
+// Acquire lock (prevents zombie daemons from racing)
+if (!acquireLock()) {
+  const holderPid = parseInt(readFileSync(LOCK_FILE, 'utf8').trim(), 10);
+  // Log to file directly since log() may not work yet
+  const msg = `[${new Date().toISOString()}] [PID:${process.pid}] [INFO] Another daemon (PID ${holderPid}) holds the lock. Exiting.\n`;
+  try { appendFileSync(LOG_FILE, msg); } catch {}
+  process.exit(0);
+}
+
 // Write PID file
 writeFileSync(PID_FILE, String(process.pid));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@masslessai/push-todo",
-  "version": "3.10.8",
+  "version": "4.0.0",
   "description": "Voice tasks from Push iOS app for Claude Code",
   "type": "module",
   "bin": {