@masslessai/push-todo 3.7.4 → 3.7.6

package/lib/config.js

@@ -150,6 +150,48 @@ export function setAutoCommitEnabled(enabled) {
   return setConfigValue('AUTO_COMMIT', enabled ? 'true' : 'false');
 }
 
+/**
+ * Check if auto-merge into main is enabled after daemon task completion.
+ * Default: true (merge PR into main after session_finished)
+ *
+ * @returns {boolean}
+ */
+export function getAutoMergeEnabled() {
+  const value = getConfigValue('AUTO_MERGE', 'true');
+  return value.toLowerCase() === 'true' || value === '1' || value.toLowerCase() === 'yes';
+}
+
+/**
+ * Set auto-merge setting.
+ *
+ * @param {boolean} enabled
+ * @returns {boolean} True if successful
+ */
+export function setAutoMergeEnabled(enabled) {
+  return setConfigValue('AUTO_MERGE', enabled ? 'true' : 'false');
+}
+
+/**
+ * Check if auto-complete is enabled after daemon task merge.
+ * Default: true (mark task as completed after successful merge)
+ *
+ * @returns {boolean}
+ */
+export function getAutoCompleteEnabled() {
+  const value = getConfigValue('AUTO_COMPLETE', 'true');
+  return value.toLowerCase() === 'true' || value === '1' || value.toLowerCase() === 'yes';
+}
+
+/**
+ * Set auto-complete setting.
+ *
+ * @param {boolean} enabled
+ * @returns {boolean} True if successful
+ */
+export function setAutoCompleteEnabled(enabled) {
+  return setConfigValue('AUTO_COMPLETE', enabled ? 'true' : 'false');
+}
+
 /**
  * Get the maximum batch size for queuing tasks.
  * Default: 5
@@ -226,16 +268,24 @@ export function showSettings() {
   console.log();
 
   const autoCommit = getAutoCommitEnabled();
+  const autoMerge = getAutoMergeEnabled();
+  const autoComplete = getAutoCompleteEnabled();
   const batchSize = getMaxBatchSize();
 
-  console.log(`  auto-commit:  ${autoCommit ? 'ON' : 'OFF'}`);
-  console.log('                Auto-commit when task completes');
+  console.log(`  auto-commit:    ${autoCommit ? 'ON' : 'OFF'}`);
+  console.log('                  Auto-commit when task completes');
+  console.log();
+  console.log(`  auto-merge:     ${autoMerge ? 'ON' : 'OFF'}`);
+  console.log('                  Merge PR into main after daemon task finishes');
   console.log();
-  console.log(`  batch-size:   ${batchSize}`);
-  console.log('                Max tasks for batch queue (1-20)');
+  console.log(`  auto-complete:  ${autoComplete ? 'ON' : 'OFF'}`);
+  console.log('                  Mark task completed after successful merge');
+  console.log();
+  console.log(`  batch-size:     ${batchSize}`);
+  console.log('                  Max tasks for batch queue (1-20)');
   console.log();
   console.log('  Toggle with: push-todo setting <name>');
-  console.log('  Example:     push-todo setting auto-commit');
+  console.log('  Example:     push-todo setting auto-merge');
   console.log();
 }
 
@@ -264,6 +314,38 @@ export function toggleSetting(settingName) {
     return false;
   }
 
+  if (normalized === 'auto-merge') {
+    const current = getAutoMergeEnabled();
+    const newValue = !current;
+    if (setAutoMergeEnabled(newValue)) {
+      console.log(`Auto-merge is now ${newValue ? 'ON' : 'OFF'}`);
+      if (newValue) {
+        console.log('PRs will be merged into main after daemon task finishes.');
+      } else {
+        console.log('PRs will NOT be merged automatically.');
+      }
+      return true;
+    }
+    console.error('Failed to update setting');
+    return false;
+  }
+
+  if (normalized === 'auto-complete') {
+    const current = getAutoCompleteEnabled();
+    const newValue = !current;
+    if (setAutoCompleteEnabled(newValue)) {
+      console.log(`Auto-complete is now ${newValue ? 'ON' : 'OFF'}`);
+      if (newValue) {
+        console.log('Tasks will be marked completed after successful merge.');
+      } else {
+        console.log('Tasks will NOT be marked completed automatically.');
+      }
+      return true;
+    }
+    console.error('Failed to update setting');
+    return false;
+  }
+
   if (normalized === 'batch-size') {
     const batchSize = getMaxBatchSize();
     console.log(`Current batch size: ${batchSize}`);
@@ -272,7 +354,7 @@ export function toggleSetting(settingName) {
   }
 
   console.error(`Unknown setting: ${settingName}`);
-  console.error('Available settings: auto-commit, batch-size');
+  console.error('Available settings: auto-commit, auto-merge, auto-complete, batch-size');
   return false;
 }
 

package/lib/daemon.js

@@ -199,6 +199,37 @@ function getVersion() {
   }
 }
 
+function getConfigValueFromFile(key, defaultValue = '') {
+  const fullKey = `PUSH_${key}`;
+  if (!existsSync(CONFIG_FILE)) return defaultValue;
+  try {
+    const content = readFileSync(CONFIG_FILE, 'utf8');
+    for (const line of content.split('\n')) {
+      const trimmed = line.trim();
+      if (trimmed.startsWith(`export ${fullKey}=`)) {
+        let value = trimmed.split('=')[1] || '';
+        value = value.trim();
+        if ((value.startsWith('"') && value.endsWith('"')) ||
+            (value.startsWith("'") && value.endsWith("'"))) {
+          value = value.slice(1, -1);
+        }
+        return value;
+      }
+    }
+  } catch {}
+  return defaultValue;
+}
+
+function getAutoMergeEnabled() {
+  const v = getConfigValueFromFile('AUTO_MERGE', 'true');
+  return v.toLowerCase() === 'true' || v === '1' || v.toLowerCase() === 'yes';
+}
+
+function getAutoCompleteEnabled() {
+  const v = getConfigValueFromFile('AUTO_COMPLETE', 'true');
+  return v.toLowerCase() === 'true' || v === '1' || v.toLowerCase() === 'yes';
+}
+
 // ==================== E2EE Decryption ====================
 
 let decryptTodoField = null;
@@ -378,11 +409,15 @@ async function claimTask(displayNumber) {
     return true;
   }
 
+  const suffix = getWorktreeSuffix();
+  const branch = `push-${displayNumber}-${suffix}`;
+
   const payload = {
     displayNumber,
     status: 'running',
     machineId,
     machineName,
+    branch,
     atomic: true
   };
 
@@ -596,6 +631,83 @@ Automated PR from Push daemon for task #${displayNumber}.
   }
 }
 
+/**
+ * Merge a PR into main and update local main branch.
+ * Uses `gh pr merge` for clean remote merge, then pulls locally.
+ *
+ * @returns {boolean} True if merge succeeded
+ */
+function mergePRForTask(displayNumber, prUrl, projectPath) {
+  const gitCwd = projectPath || process.cwd();
+
+  // Extract PR number from URL (e.g., https://github.com/user/repo/pull/42)
+  const prMatch = prUrl.match(/\/pull\/(\d+)/);
+  if (!prMatch) {
+    logError(`Could not extract PR number from: ${prUrl}`);
+    return false;
+  }
+  const prNumber = prMatch[1];
+
+  try {
+    execFileSync('gh', ['pr', 'merge', prNumber, '--merge', '--delete-branch'], {
+      cwd: gitCwd,
+      timeout: 60000,
+      stdio: 'pipe'
+    });
+    log(`Merged PR #${prNumber} for task #${displayNumber}`);
+
+    // Pull main locally so next worktree is up to date
+    try {
+      execFileSync('git', ['pull', '--ff-only'], {
+        cwd: gitCwd,
+        timeout: 30000,
+        stdio: 'pipe'
+      });
+      log('Updated local main branch');
+    } catch {
+      log('Could not pull main (may not be checked out), skipping local update');
+    }
+
+    return true;
+  } catch (e) {
+    const stderr = e.stderr?.toString() || e.message || '';
+    if (stderr.includes('merge conflict') || stderr.includes('conflict')) {
+      logError(`PR #${prNumber} has merge conflicts, skipping auto-merge`);
+    } else if (stderr.includes('not found') || stderr.includes('ENOENT')) {
+      log('GitHub CLI (gh) not installed, skipping merge');
+    } else {
+      logError(`Failed to merge PR #${prNumber}: ${stderr.slice(0, 200)}`);
+    }
+    return false;
+  }
+}
+
+/**
+ * Mark a task as completed via the todo-status endpoint.
+ */
+async function markTaskAsCompleted(displayNumber, taskId, comment) {
+  try {
+    const response = await apiRequest('todo-status', {
+      method: 'PATCH',
+      body: JSON.stringify({
+        todoId: taskId,
+        isCompleted: true,
+        completedAt: new Date().toISOString(),
+        completionComment: comment || `Completed by daemon on ${getMachineName()}`
+      })
+    });
+    if (response.ok) {
+      log(`Task #${displayNumber} marked as completed`);
+      return true;
+    }
+    logError(`Failed to mark #${displayNumber} complete: HTTP ${response.status}`);
+    return false;
+  } catch (error) {
+    logError(`Failed to mark #${displayNumber} complete: ${error.message}`);
+    return false;
+  }
+}
+
 // ==================== Stuck Detection ====================
 
 function checkStuckPatterns(displayNumber, line) {
@@ -1000,12 +1112,27 @@ function handleTaskCompletion(displayNumber, exitCode) {
       );
     }
 
+    // Auto-merge PR into main (configurable, default ON)
+    let merged = false;
+    if (getAutoMergeEnabled() && prUrl) {
+      merged = mergePRForTask(displayNumber, prUrl, projectPath);
+    }
+
+    // Auto-complete task after successful merge (configurable, default ON)
+    const taskId = info.taskId;
+    if (getAutoCompleteEnabled() && merged && taskId) {
+      const comment = semanticSummary
+        ? `${semanticSummary} (${durationStr} on ${machineName})`
+        : `Completed in ${durationStr} on ${machineName}`;
+      markTaskAsCompleted(displayNumber, taskId, comment);
+    }
+
     completedToday.push({
       displayNumber,
       summary,
       completedAt: new Date().toISOString(),
       duration,
-      status: 'session_finished',
+      status: merged ? 'completed' : 'session_finished',
       prUrl,
       sessionId
     });

package/package.json

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