@masslessai/push-todo 4.2.4 → 4.2.6

package/lib/agent-versions.js

@@ -279,6 +279,8 @@ export function checkForAgentUpdate(agentType) {
 
 /**
  * Install a specific version of an agent CLI globally.
+ * For claude-code: tries npm first, falls back to `claude update` which
+ * handles non-npm installations (brew, app installer, happy-coder wrapper).
  *
  * @param {string} agentType
  * @param {string} targetVersion
@@ -288,6 +290,7 @@ export function performAgentUpdate(agentType, targetVersion) {
   const agent = AGENTS[agentType];
   if (!agent?.npmPackage) return false;
 
+  // Try npm install first (works for standard npm global installs)
   try {
     execFileSync('npm', ['install', '-g', `${agent.npmPackage}@${targetVersion}`], {
       timeout: 120000,
@@ -295,8 +298,29 @@ export function performAgentUpdate(agentType, targetVersion) {
     });
     return true;
   } catch {
-    return false;
+    // npm failed — fall through to agent-specific fallbacks
   }
+
+  // Fallback: use the agent's own update command (handles non-npm installs)
+  if (agentType === 'claude-code') {
+    try {
+      const env = { ...process.env };
+      delete env.CLAUDECODE;
+      delete env.CLAUDE_CODE_ENTRYPOINT;
+      execFileSync('claude', ['update'], {
+        timeout: 120000,
+        stdio: 'pipe',
+        env,
+      });
+      // Verify the update actually worked
+      const after = detectAgentVersion('claude-code');
+      return after.installed && after.version != null;
+    } catch {
+      return false;
+    }
+  }
+
+  return false;
 }
 
 /**
@@ -333,6 +357,51 @@ export function checkAllAgentUpdates({ force = false } = {}) {
   return results;
 }
 
+/**
+ * Pre-flight check: verify an agent meets minimum version before task execution.
+ * If below minimum, attempts an immediate update and rechecks.
+ *
+ * @param {string} agentType
+ * @returns {{ ok: boolean, version: string|null, error: string|null }}
+ */
+export function ensureAgentReady(agentType) {
+  const agent = AGENTS[agentType];
+  if (!agent) {
+    return { ok: false, version: null, error: `Unknown agent type: ${agentType}` };
+  }
+
+  const info = detectAgentVersion(agentType);
+  if (!info.installed) {
+    return { ok: false, version: null, error: `${agentType} CLI not found` };
+  }
+  if (!info.version) {
+    return { ok: false, version: null, error: `${agentType} installed but version unknown` };
+  }
+
+  // Check minimum version
+  if (agent.minVersion && compareSemver(info.version, agent.minVersion) < 0) {
+    // Attempt immediate update
+    const latest = fetchLatestAgentVersion(agentType);
+    if (latest?.version) {
+      const updated = performAgentUpdate(agentType, latest.version);
+      if (updated) {
+        // Recheck after update
+        const after = detectAgentVersion(agentType);
+        if (after.version && compareSemver(after.version, agent.minVersion) >= 0) {
+          return { ok: true, version: after.version, error: null };
+        }
+      }
+    }
+    return {
+      ok: false,
+      version: info.version,
+      error: `${agentType} v${info.version} is below minimum v${agent.minVersion} (needs --worktree support). Update with: claude update`,
+    };
+  }
+
+  return { ok: true, version: info.version, error: null };
+}
+
 // ==================== Version Parity ====================
 
 /**

package/lib/daemon.js

@@ -25,7 +25,7 @@ import { getProjectContext, buildSmartPrompt, invalidateCache } from './context-
 import { sendMacNotification } from './utils/notify.js';
 import { checkAndRunDueJobs } from './cron.js';
 import { runHeartbeatChecks } from './heartbeat.js';
-import { getAgentVersions, formatAgentVersionSummary, checkAllAgentUpdates, performAgentUpdate, checkVersionParity } from './agent-versions.js';
+import { getAgentVersions, formatAgentVersionSummary, checkAllAgentUpdates, performAgentUpdate, checkVersionParity, ensureAgentReady } from './agent-versions.js';
 import { checkAllProjectsFreshness } from './project-freshness.js';
 import { getStatus as getLaunchAgentStatus, install as refreshLaunchAgent } from './launchagent.js';
 
@@ -91,6 +91,7 @@ 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 COMPLETED_FILE = join(PUSH_DIR, 'completed_tasks.json');
 const CONFIG_FILE = join(CONFIG_DIR, 'config');
 const MACHINE_ID_FILE = join(CONFIG_DIR, 'machine_id');
 const REGISTRY_FILE = join(CONFIG_DIR, 'projects.json');
@@ -110,6 +111,25 @@ function trackCompleted(entry) {
   if (completedToday.length > COMPLETED_TODAY_MAX) {
     completedToday.splice(0, completedToday.length - COMPLETED_TODAY_MAX);
   }
+  // Persist to disk so new daemon instances skip already-completed tasks
+  try {
+    writeFileSync(COMPLETED_FILE, JSON.stringify(completedToday));
+  } catch {}
+}
+
+function loadCompletedTasks() {
+  try {
+    if (!existsSync(COMPLETED_FILE)) return;
+    const data = JSON.parse(readFileSync(COMPLETED_FILE, 'utf8'));
+    if (!Array.isArray(data)) return;
+    // Only load entries from the last 24 hours
+    const cutoff = Date.now() - 86400000;
+    for (const entry of data) {
+      if (entry.completedAt && new Date(entry.completedAt).getTime() > cutoff) {
+        completedToday.push(entry);
+      }
+    }
+  } catch {}
 }
 const taskLastOutput = new Map(); // displayNumber -> timestamp
 const taskStdoutBuffer = new Map(); // displayNumber -> lines[]
@@ -886,6 +906,16 @@ function createPRForTask(displayNumber, summary, projectPath) {
   const gitCwd = projectPath || process.cwd();
 
   try {
+    // Verify branch exists before comparing (worktree may have been auto-cleaned)
+    try {
+      execFileSync('git', ['rev-parse', '--verify', branch], {
+        cwd: gitCwd, timeout: 5000, stdio: 'pipe'
+      });
+    } catch {
+      log(`Branch ${branch} does not exist, skipping PR creation`);
+      return null;
+    }
+
     // Check if branch has commits
     const logResult = execSync(`git log HEAD..${branch} --oneline`, {
       cwd: gitCwd,
@@ -1667,6 +1697,7 @@ function respawnWithInjectedMessage(displayNumber) {
     '--continue', sessionId,
     '-p', injectionPrompt,
     '--verbose',
+    '--worktree', getWorktreeName(displayNumber),
     '--allowedTools', allowedTools,
     '--output-format', 'stream-json',
     '--permission-mode', 'bypassPermissions',
@@ -2230,6 +2261,17 @@ async function executeTask(task) {
     log(`Task #${displayNumber}: Project ${gitRemote} -> ${projectPath}`);
   }
 
+  // Pre-flight: verify agent CLI meets minimum version (attempts auto-update if not)
+  const agentType = taskActionType || 'claude-code';
+  const readiness = ensureAgentReady(agentType);
+  if (!readiness.ok) {
+    logError(`Task #${displayNumber}: ${readiness.error}`);
+    await updateTaskStatus(displayNumber, 'failed', {
+      error: readiness.error
+    }, taskId);
+    return null;
+  }
+
   // Pre-assign session ID so we can store it at claim time (not rely on parsing stdout)
   const preAssignedSessionId = randomUUID();
 
@@ -2332,6 +2374,7 @@ async function executeTask(task) {
         '--continue', previousSessionId,
         '-p', prompt,
         '--verbose',
+        '--worktree', worktreeName,
         '--allowedTools', allowedTools,
         '--output-format', 'stream-json',
         '--permission-mode', 'bypassPermissions',
@@ -2340,6 +2383,7 @@ async function executeTask(task) {
     : [
         '-p', prompt,
         '--verbose',
+        '--worktree', worktreeName,
         '--allowedTools', allowedTools,
         '--output-format', 'stream-json',
         '--permission-mode', 'bypassPermissions',
@@ -3200,6 +3244,14 @@ async function recoverOrphanedTasks() {
     for (const task of orphaned) {
       const dn = task.displayNumber || task.display_number;
       const tid = task.id || task.todo_id || null;
+
+      // Skip tasks already completed by the previous daemon instance
+      // (race condition: API may return stale 'running' status after session_finished update)
+      if (completedToday.some(c => c.displayNumber === dn)) {
+        log(`Task #${dn}: skipping orphan recovery — already completed by previous daemon`);
+        continue;
+      }
+
       log(`Task #${dn}: resetting from 'running' to 'queued' (orphaned by restart)`);
       await updateTaskStatus(dn, 'queued', {
         event: {
@@ -3259,6 +3311,9 @@ async function mainLoop() {
     writeFileSync(VERSION_FILE, getVersion());
   } catch {}
 
+  // Load completed tasks from previous daemon instance (prevents re-execution)
+  loadCompletedTasks();
+
   // Recover orphaned tasks from previous daemon instance
   // When the daemon restarts (self-update, crash, reboot), tasks may be stuck
   // in 'running' with no process actually working on them. Reset them to 'queued'

package/lib/launchagent.js

@@ -68,7 +68,7 @@ function generatePlist() {
         <key>PUSH_DAEMON</key>
         <string>1</string>
         <key>PATH</key>
-        <string>/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin:${dirname(nodeBin)}</string>
+        <string>/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin:${dirname(nodeBin)}:${join(homedir(), '.local', 'bin')}</string>
     </dict>
 
     <key>RunAtLoad</key>

package/package.json

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