@masslessai/push-todo 3.7.2 → 3.7.4

package/hooks/session-end.js

@@ -2,28 +2,29 @@
 /**
  * Session end hook for Push CLI.
  *
- * Reports session completion status to the backend.
+ * Reports session_finished status to Supabase when a Claude Code session ends.
+ * Reads the active task from ~/.push/active_task.json (written by fetch.js showTask).
+ *
+ * This mirrors the daemon's completion flow: daemon sends session_finished
+ * when its Claude process exits, this hook does the same for foreground sessions.
  */
 
-import { existsSync, readFileSync } from 'fs';
-import { homedir } from 'os';
+import { existsSync, readFileSync, unlinkSync } from 'fs';
+import { homedir, hostname } from 'os';
 import { join } from 'path';
 
 const CONFIG_FILE = join(homedir(), '.config', 'push', 'config');
+const MACHINE_ID_FILE = join(homedir(), '.config', 'push', 'machine_id');
+const ACTIVE_TASK_FILE = join(homedir(), '.push', 'active_task.json');
 const API_BASE = 'https://jxuzqcbqhiaxmfitzxlo.supabase.co/functions/v1';
 
-/**
- * Get the API key from config.
- */
 function getApiKey() {
   if (process.env.PUSH_API_KEY) {
     return process.env.PUSH_API_KEY;
   }
-
   if (!existsSync(CONFIG_FILE)) {
     return null;
   }
-
   try {
     const content = readFileSync(CONFIG_FILE, 'utf8');
     const match = content.match(/^export\s+PUSH_API_KEY\s*=\s*["']?([^"'\n]+)["']?/m);
@@ -33,65 +34,91 @@ function getApiKey() {
   }
 }
 
-/**
- * Get the machine ID.
- */
 function getMachineId() {
-  const machineIdFile = join(homedir(), '.config', 'push', 'machine_id');
-
-  if (existsSync(machineIdFile)) {
+  if (existsSync(MACHINE_ID_FILE)) {
     try {
-      return readFileSync(machineIdFile, 'utf8').trim();
+      return readFileSync(MACHINE_ID_FILE, 'utf8').trim();
     } catch {
       return null;
     }
   }
-
   return null;
 }
 
-/**
- * Report session end to backend.
- */
-async function reportSessionEnd(apiKey, machineId, exitReason) {
+function getActiveTask() {
+  if (!existsSync(ACTIVE_TASK_FILE)) {
+    return null;
+  }
+  try {
+    return JSON.parse(readFileSync(ACTIVE_TASK_FILE, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function clearActiveTask() {
+  try {
+    if (existsSync(ACTIVE_TASK_FILE)) {
+      unlinkSync(ACTIVE_TASK_FILE);
+    }
+  } catch {
+    // Ignore cleanup errors
+  }
+}
+
+async function reportSessionFinished(apiKey, activeTask) {
+  const machineId = getMachineId();
+  const machineName = hostname();
+  const startedAt = activeTask.startedAt ? new Date(activeTask.startedAt) : null;
+  const now = new Date();
+
+  const durationMs = startedAt ? now.getTime() - startedAt.getTime() : null;
+  const durationStr = durationMs
+    ? `${Math.floor(durationMs / 60000)}m ${Math.floor((durationMs % 60000) / 1000)}s`
+    : null;
+
+  const payload = {
+    displayNumber: activeTask.displayNumber,
+    status: 'session_finished',
+    machineId,
+    machineName,
+    event: {
+      type: 'session_finished',
+      timestamp: now.toISOString(),
+      machineName: machineName || undefined,
+      summary: durationStr
+        ? `Foreground session ended (${durationStr})`
+        : 'Foreground session ended',
+    },
+  };
+
   try {
-    const response = await fetch(`${API_BASE}/session-end`, {
-      method: 'POST',
+    const response = await fetch(`${API_BASE}/update-task-execution`, {
+      method: 'PATCH',
       headers: {
         'Authorization': `Bearer ${apiKey}`,
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
       },
-      body: JSON.stringify({
-        machine_id: machineId,
-        exit_reason: exitReason,
-        timestamp: new Date().toISOString()
-      }),
-      signal: AbortSignal.timeout(10000)
+      body: JSON.stringify(payload),
+      signal: AbortSignal.timeout(10000),
     });
-
     return response.ok;
   } catch {
     return false;
   }
 }
 
-/**
- * Main entry point.
- */
 async function main() {
   const apiKey = getApiKey();
-  const machineId = getMachineId();
+  const activeTask = getActiveTask();
 
-  if (!apiKey || !machineId) {
-    // Not configured - silent exit
+  if (!apiKey || !activeTask) {
+    // Not configured or no active task — silent exit
     process.exit(0);
   }
 
-  // Get exit reason from environment (Claude Code may set this)
-  const exitReason = process.env.CLAUDE_EXIT_REASON || 'normal';
-
-  // Report to backend
-  await reportSessionEnd(apiKey, machineId, exitReason);
+  await reportSessionFinished(apiKey, activeTask);
+  clearActiveTask();
 
   process.exit(0);
 }

package/lib/api.js

@@ -229,7 +229,7 @@ export async function searchTasks(query, gitRemote = null) {
  */
 export async function updateTaskExecution(payload) {
   const response = await apiRequest('update-task-execution', {
-    method: 'POST',
+    method: 'PATCH',
     body: JSON.stringify(payload)
   });
 

package/lib/fetch.js

@@ -12,6 +12,9 @@ import { formatTaskForDisplay, formatSearchResult } from './utils/format.js';
 import { bold, green, yellow, red, cyan, dim, muted } from './utils/colors.js';
 import { decryptTodoField, isE2EEAvailable } from './encryption.js';
 import { getAutoCommitEnabled, getMaxBatchSize } from './config.js';
+import { writeFileSync, mkdirSync } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
 
 /**
  * Decrypt encrypted fields in a task object.
@@ -121,7 +124,7 @@ export async function listTasks(options = {}) {
   if (!options.backlog && !options.completed && running.length > 0) {
     console.log(`# ${running.length} Running/Queued Tasks (${scope})\n`);
     for (const task of running) {
-      const displayNum = task.displayNumber || task.display_number;
+      const displayNum = task.displayNumber;
       console.log(`---\n### #${displayNum}\n`);
       console.log(formatTaskForDisplay(task));
       console.log('');
@@ -134,7 +137,7 @@ export async function listTasks(options = {}) {
 
   // Show full details for each task (matching Python behavior)
   for (const task of tasksToShow) {
-    const displayNum = task.displayNumber || task.display_number;
+    const displayNum = task.displayNumber;
     console.log(`---\n### #${displayNum}\n`);
     console.log(formatTaskForDisplay(task));
     console.log('');
@@ -183,6 +186,49 @@ export async function showTask(displayNumber, options = {}) {
   }
 
   console.log(formatTaskForDisplay(decrypted));
+
+  // Track active task for session-end hook and send running status to Supabase.
+  // Skip if task is already running or queued (daemon owns it).
+  const execStatus = decrypted.executionStatus;
+  if (execStatus !== 'running' && execStatus !== 'queued') {
+    trackActiveTask(decrypted).catch(() => {});
+  }
+}
+
+/**
+ * Track active task for foreground execution.
+ *
+ * Mirrors the daemon's behavior: sends 'running' status to Supabase
+ * and writes ~/.push/active_task.json for the session-end hook.
+ *
+ * @param {Object} task - Task object from API
+ */
+async function trackActiveTask(task) {
+  const pushDir = join(homedir(), '.push');
+  mkdirSync(pushDir, { recursive: true });
+
+  // Write active task file for session-end hook to read
+  writeFileSync(join(pushDir, 'active_task.json'), JSON.stringify({
+    displayNumber: task.displayNumber,
+    taskId: task.id,
+    startedAt: new Date().toISOString(),
+  }));
+
+  // Send running status to Supabase (same as daemon's updateTaskStatus)
+  const machineId = getMachineId();
+  const machineName = getMachineName();
+  await api.updateTaskExecution({
+    displayNumber: task.displayNumber,
+    status: 'running',
+    machineId,
+    machineName,
+    event: {
+      type: 'started',
+      timestamp: new Date().toISOString(),
+      machineName: machineName || undefined,
+      summary: 'Foreground session started',
+    },
+  });
 }
 
 /**
@@ -432,7 +478,7 @@ export async function runReview(options = {}) {
 
   // Show full details for each task (matching Python behavior)
   for (const task of decrypted) {
-    const displayNum = task.displayNumber || task.display_number;
+    const displayNum = task.displayNumber;
     console.log(`---\n### #${displayNum}\n`);
     console.log(formatTaskForDisplay(task));
     console.log('');

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@masslessai/push-todo",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "Voice tasks from Push iOS app for Claude Code",
   "type": "module",
   "bin": {
-    "push-todo": "./bin/push-todo.js"
+    "push-todo": "bin/push-todo.js"
   },
   "main": "./lib/index.js",
   "exports": {
@@ -44,7 +44,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/MasslessAI/push-todo-cli"
+    "url": "git+https://github.com/MasslessAI/push-todo-cli.git"
   },
   "homepage": "https://pushto.do",
   "bugs": {