oh-my-claude-sisyphus 3.7.15 → 3.7.16

package/templates/hooks/stop-continuation.mjs

@@ -7,6 +7,48 @@ import { readdirSync, readFileSync, existsSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 
+/**
+ * Validates session ID to prevent path traversal attacks.
+ * @param {string} sessionId
+ * @returns {boolean}
+ */
+function isValidSessionId(sessionId) {
+  if (!sessionId || typeof sessionId !== 'string') return false;
+  return /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,255}$/.test(sessionId);
+}
+
+/**
+ * Count incomplete tasks in the new Task system.
+ *
+ * SYNC NOTICE: This function is intentionally duplicated across:
+ * - templates/hooks/persistent-mode.mjs
+ * - templates/hooks/stop-continuation.mjs
+ * - src/hooks/todo-continuation/index.ts (as checkIncompleteTasks)
+ *
+ * Templates cannot import shared modules (they're standalone scripts).
+ * When modifying this logic, update ALL THREE files to maintain consistency.
+ */
+function countIncompleteTasks(sessionId) {
+  if (!sessionId || !isValidSessionId(sessionId)) return 0;
+  const taskDir = join(homedir(), '.claude', 'tasks', sessionId);
+  if (!existsSync(taskDir)) return 0;
+
+  let count = 0;
+  try {
+    const files = readdirSync(taskDir).filter(f => f.endsWith('.json') && f !== '.lock');
+    for (const file of files) {
+      try {
+        const content = readFileSync(join(taskDir, file), 'utf-8');
+        const task = JSON.parse(content);
+        // Match TypeScript isTaskIncomplete(): only pending/in_progress are incomplete
+        // 'deleted' and 'completed' are both treated as done
+        if (task.status === 'pending' || task.status === 'in_progress') count++;
+      } catch { /* skip invalid files */ }
+    }
+  } catch { /* dir read error */ }
+  return count;
+}
+
 // Read all stdin
 async function readStdin() {
   const chunks = [];
@@ -19,8 +61,19 @@ async function readStdin() {
 // Main
 async function main() {
   try {
-    // Read stdin (we don't use it much, but need to consume it)
-    await readStdin();
+    // Read stdin to get sessionId and consume it
+    const input = await readStdin();
+
+    // Parse sessionId from input
+    let data = {};
+    try {
+      data = JSON.parse(input);
+    } catch { /* invalid JSON - continue with empty data */ }
+
+    const sessionId = data.sessionId || data.session_id || '';
+
+    // Count incomplete Task system tasks
+    const taskCount = countIncompleteTasks(sessionId);
 
     // Check for incomplete todos
     const todosDir = join(homedir(), '.claude', 'todos');
@@ -56,20 +109,24 @@ async function main() {
       return;
     }
 
-    if (incompleteCount > 0) {
-      const reason = `[SYSTEM REMINDER - TODO CONTINUATION]
+    // Combine both counts
+    const totalIncomplete = taskCount + incompleteCount;
+
+    if (totalIncomplete > 0) {
+      const sourceLabel = taskCount > 0 ? 'Task' : 'todo';
+      const reason = `[SYSTEM REMINDER - ${sourceLabel.toUpperCase()} CONTINUATION]
 
-Incomplete tasks remain in your todo list (${incompleteCount} remaining). Continue working on the next pending task.
+Incomplete ${sourceLabel}s remain (${totalIncomplete} remaining). Continue working on the next pending ${sourceLabel}.
 
 - Proceed without asking for permission
-- Mark each task complete when finished
-- Do not stop until all tasks are done`;
+- Mark each ${sourceLabel} complete when finished
+- Do not stop until all ${sourceLabel}s are done`;
 
       console.log(JSON.stringify({ continue: false, reason }));
       return;
     }
 
-    // No incomplete todos - allow stop
+    // No incomplete tasks or todos - allow stop
     console.log(JSON.stringify({ continue: true }));
   } catch (error) {
     // On any error, allow continuation

package/templates/hooks/stop-continuation.sh

@@ -3,6 +3,18 @@
 # Checks for incomplete todos and injects continuation prompt
 # Ported from oh-my-opencode's todo-continuation-enforcer
 
+# Validate session ID to prevent path traversal attacks
+is_valid_session_id() {
+  local id="$1"
+  if [ -z "$id" ]; then
+    return 1
+  fi
+  if echo "$id" | grep -qE '^[a-zA-Z0-9][a-zA-Z0-9_-]{0,255}$'; then
+    return 0
+  fi
+  return 1
+}
+
 # Read stdin
 INPUT=$(cat)
 
@@ -12,6 +24,38 @@ if command -v jq &> /dev/null; then
   SESSION_ID=$(echo "$INPUT" | jq -r '.sessionId // .session_id // ""' 2>/dev/null)
 fi
 
+# Check for incomplete tasks in new Task system
+TASKS_DIR="$HOME/.claude/tasks"
+TASK_COUNT=0
+JQ_AVAILABLE=false
+if command -v jq &> /dev/null; then
+  JQ_AVAILABLE=true
+fi
+
+if [ -n "$SESSION_ID" ] && is_valid_session_id "$SESSION_ID" && [ -d "$TASKS_DIR/$SESSION_ID" ]; then
+  for task_file in "$TASKS_DIR/$SESSION_ID"/*.json; do
+    if [ -f "$task_file" ] && [ "$(basename "$task_file")" != ".lock" ]; then
+      if [ "$JQ_AVAILABLE" = "true" ]; then
+        STATUS=$(jq -r '.status // "pending"' "$task_file" 2>/dev/null)
+        # Match TypeScript isTaskIncomplete(): only pending/in_progress are incomplete
+        # 'deleted' and 'completed' are both treated as done
+        if [ "$STATUS" = "pending" ] || [ "$STATUS" = "in_progress" ]; then
+          TASK_COUNT=$((TASK_COUNT + 1))
+        fi
+      else
+        # Fallback: grep for incomplete status values (pending or in_progress)
+        if grep -qE '"status"[[:space:]]*:[[:space:]]*"(pending|in_progress)"' "$task_file" 2>/dev/null; then
+          TASK_COUNT=$((TASK_COUNT + 1))
+        fi
+      fi
+    fi
+  done
+
+  if [ "$JQ_AVAILABLE" = "false" ] && [ "$TASK_COUNT" -gt 0 ]; then
+    echo "[OMC WARNING] jq not installed - Task counting may be less accurate." >&2
+  fi
+fi
+
 # Check for incomplete todos in the Claude todos directory
 TODOS_DIR="$HOME/.claude/todos"
 if [ -d "$TODOS_DIR" ]; then
@@ -26,11 +70,20 @@ if [ -d "$TODOS_DIR" ]; then
     fi
   done
 
-  if [ "$INCOMPLETE_COUNT" -gt 0 ]; then
-    # Output continuation message
-    cat << EOF
-{"continue": false, "reason": "[SYSTEM REMINDER - TODO CONTINUATION]\\n\\nIncomplete tasks remain in your todo list ($INCOMPLETE_COUNT remaining). Continue working on the next pending task.\\n\\n- Proceed without asking for permission\\n- Mark each task complete when finished\\n- Do not stop until all tasks are done"}
+  # Combine task and todo counts
+  TOTAL_INCOMPLETE=$((TASK_COUNT + INCOMPLETE_COUNT))
+
+  if [ "$TOTAL_INCOMPLETE" -gt 0 ]; then
+    # Use Task terminology if we have tasks, otherwise todos
+    if [ "$TASK_COUNT" -gt 0 ]; then
+      cat << EOF
+{"continue": false, "reason": "[SYSTEM REMINDER - TASK CONTINUATION]\\n\\nIncomplete Tasks remain ($TOTAL_INCOMPLETE remaining). Continue working on the next pending Task.\\n\\n- Proceed without asking for permission\\n- Mark each Task complete when finished\\n- Do not stop until all Tasks are done"}
 EOF
+    else
+      cat << EOF
+{"continue": false, "reason": "[SYSTEM REMINDER - TODO CONTINUATION]\\n\\nIncomplete tasks remain in your todo list ($TOTAL_INCOMPLETE remaining). Continue working on the next pending task.\\n\\n- Proceed without asking for permission\\n- Mark each task complete when finished\\n- Do not stop until all tasks are done"}
+EOF
+    fi
     exit 0
   fi
 fi