oh-my-claude-sisyphus 3.7.15 → 3.8.1

package/scripts/post-tool-verifier.mjs

@@ -15,6 +15,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const distDir = join(__dirname, '..', 'dist', 'hooks', 'notepad');
+const clearSuggestionsDistDir = join(__dirname, '..', 'dist', 'hooks', 'clear-suggestions');
 
 // Try to import notepad functions (may fail if not built)
 let setPriorityContext = null;
@@ -27,6 +28,15 @@ try {
   // Notepad module not available - remember tags will be silently ignored
 }
 
+// Try to import clear suggestions functions (may fail if not built)
+let checkClearSuggestion = null;
+try {
+  const clearSuggestionsModule = await import(join(clearSuggestionsDistDir, 'index.js'));
+  checkClearSuggestion = clearSuggestionsModule.checkClearSuggestion;
+} catch {
+  // Clear suggestions module not available - will be silently skipped
+}
+
 // State file for session tracking
 const STATE_FILE = join(homedir(), '.claude', '.session-stats.json');
 
@@ -262,9 +272,37 @@ async function main() {
     // Generate contextual message
     const message = generateMessage(toolName, toolOutput, sessionId, toolCount);
 
+    // Check for clear suggestions (complements /compact suggestions)
+    let clearSuggestionMessage = null;
+    if (checkClearSuggestion) {
+      try {
+        const stats = loadStats();
+        const session = stats.sessions[sessionId];
+        // Estimate context usage from total tool calls (rough heuristic)
+        const estimatedContextRatio = session ? Math.min(session.total_calls / 200, 1.0) : 0;
+
+        const clearResult = checkClearSuggestion({
+          sessionId,
+          directory,
+          toolName,
+          toolOutput,
+          contextUsageRatio: estimatedContextRatio,
+        });
+
+        if (clearResult.shouldSuggest && clearResult.message) {
+          clearSuggestionMessage = clearResult.message;
+        }
+      } catch {
+        // Clear suggestion check failed - continue without it
+      }
+    }
+
     // Build response
     const response = { continue: true };
-    if (message) {
+    // Prefer clear suggestion over contextual message (more impactful)
+    if (clearSuggestionMessage) {
+      response.message = clearSuggestionMessage;
+    } else if (message) {
       response.message = message;
     }
 

package/templates/hooks/keyword-detector.sh

@@ -1,7 +1,24 @@
 #!/bin/bash
-# OMC Keyword Detector Hook
-# Detects ultrawork/ultrathink/search/analyze keywords and injects enhanced mode messages
-# Also activates persistent ultrawork state when ultrawork keyword is detected
+# OMC Keyword Detector Hook (Bash)
+# Detects magic keywords and invokes skill tools
+# Linux/macOS compatible
+#
+# Supported keywords (in priority order):
+# 1. cancel: Stop active modes
+# 2. ralph: Persistence mode until task completion
+# 3. autopilot: Full autonomous execution
+# 4. ultrapilot: Parallel autopilot
+# 5. ultrawork/ulw: Maximum parallel execution
+# 6. ecomode/eco: Token-efficient execution
+# 7. swarm: N coordinated agents
+# 8. pipeline: Sequential agent chaining
+# 9. ralplan: Iterative planning with consensus
+# 10. plan: Planning interview mode
+# 11. tdd: Test-driven development
+# 12. research: Research orchestration
+# 13. ultrathink/think: Extended reasoning
+# 14. deepsearch: Codebase search (restricted patterns)
+# 15. analyze: Analysis mode (restricted patterns)
 
 # Read stdin (JSON input from Claude Code)
 INPUT=$(cat)
@@ -45,58 +62,207 @@ PROMPT_NO_CODE=$(echo "$PROMPT" | sed 's/```[^`]*```//g' | sed 's/`[^`]*`//g')
 # Convert to lowercase for case-insensitive matching
 PROMPT_LOWER=$(echo "$PROMPT_NO_CODE" | tr '[:upper:]' '[:lower:]')
 
-# Check for ultrawork keywords (highest priority)
-if echo "$PROMPT_LOWER" | grep -qE '\b(ultrawork|ulw|uw)\b'; then
-  # Create persistent ultrawork state
-  mkdir -p "$DIRECTORY/.omc/state" 2>/dev/null
+# Create a skill invocation message that tells Claude to use the Skill tool
+create_skill_invocation() {
+  local skill_name="$1"
+  local original_prompt="$2"
+  local args="$3"
+
+  local args_section=""
+  if [ -n "$args" ]; then
+    args_section="\\nArguments: $args"
+  fi
+
+  local skill_upper=$(echo "$skill_name" | tr '[:lower:]' '[:upper:]')
+
+  cat << EOF
+[MAGIC KEYWORD: ${skill_upper}]
+
+You MUST invoke the skill using the Skill tool:
+
+Skill: oh-my-claudecode:${skill_name}${args_section}
+
+User request:
+${original_prompt}
+
+IMPORTANT: Invoke the skill IMMEDIATELY. Do not proceed without loading the skill instructions.
+EOF
+}
+
+# Clear state files for cancel operation
+clear_state_files() {
+  local directory="$1"
+  local modes=("ralph" "autopilot" "ultrapilot" "ultrawork" "ecomode" "swarm" "pipeline")
+
+  for mode in "${modes[@]}"; do
+    rm -f "$directory/.omc/state/${mode}-state.json" 2>/dev/null
+    rm -f "$HOME/.omc/state/${mode}-state.json" 2>/dev/null
+  done
+}
+
+# Activate state for a mode
+activate_state() {
+  local directory="$1"
+  local prompt="$2"
+  local state_name="$3"
+
+  # Create directories
+  mkdir -p "$directory/.omc/state" 2>/dev/null
   mkdir -p "$HOME/.omc/state" 2>/dev/null
 
   # Escape prompt for JSON
-  PROMPT_ESCAPED=$(echo "$PROMPT" | sed 's/\\/\\\\/g' | sed 's/"/\\"/g' | tr '\n' ' ')
+  local prompt_escaped=$(echo "$prompt" | sed 's/\\/\\\\/g' | sed 's/"/\\"/g' | tr '\n' ' ')
+  local timestamp=$(date -Iseconds 2>/dev/null || date +%Y-%m-%dT%H:%M:%S%z)
 
-  STATE_JSON="{
+  local state_json="{
   \"active\": true,
-  \"started_at\": \"$(date -Iseconds)\",
-  \"original_prompt\": \"$PROMPT_ESCAPED\",
+  \"started_at\": \"$timestamp\",
+  \"original_prompt\": \"$prompt_escaped\",
   \"reinforcement_count\": 0,
-  \"last_checked_at\": \"$(date -Iseconds)\"
+  \"last_checked_at\": \"$timestamp\"
 }"
 
   # Write state to both local and global locations
-  echo "$STATE_JSON" > "$DIRECTORY/.omc/state/ultrawork-state.json" 2>/dev/null
-  echo "$STATE_JSON" > "$HOME/.omc/state/ultrawork-state.json" 2>/dev/null
+  echo "$state_json" > "$directory/.omc/state/${state_name}-state.json" 2>/dev/null
+  echo "$state_json" > "$HOME/.omc/state/${state_name}-state.json" 2>/dev/null
+}
 
-  # Return ultrawork mode injection
-  cat << 'EOF'
-{"continue": true, "message": "<ultrawork-mode>\\n\\n**MANDATORY**: You MUST say \"ULTRAWORK MODE ENABLED!\" to the user as your first response when this mode activates. This is non-negotiable.\\n\\n[CODE RED] Maximum precision required. Ultrathink before acting.\\n\\nYOU MUST LEVERAGE ALL AVAILABLE AGENTS TO THEIR FULLEST POTENTIAL.\\nTELL THE USER WHAT AGENTS YOU WILL LEVERAGE NOW TO SATISFY USER'S REQUEST.\\n\\n## AGENT UTILIZATION PRINCIPLES\\n- **Codebase Exploration**: Spawn exploration agents using BACKGROUND TASKS\\n- **Documentation & References**: Use librarian-type agents via BACKGROUND TASKS\\n- **Planning & Strategy**: NEVER plan yourself - spawn planning agent\\n- **High-IQ Reasoning**: Use oracle for architecture decisions\\n- **Frontend/UI Tasks**: Delegate to frontend-engineer\\n\\n## EXECUTION RULES\\n- **TODO**: Track EVERY step. Mark complete IMMEDIATELY.\\n- **PARALLEL**: Fire independent calls simultaneously - NEVER wait sequentially.\\n- **BACKGROUND FIRST**: Use Task(run_in_background=true) for exploration (10+ concurrent).\\n- **VERIFY**: Check ALL requirements met before done.\\n- **DELEGATE**: Orchestrate specialized agents.\\n\\n## ZERO TOLERANCE\\n- NO Scope Reduction - deliver FULL implementation\\n- NO Partial Completion - finish 100%\\n- NO Premature Stopping - ALL TODOs must be complete\\n- NO TEST DELETION - fix code, not tests\\n\\nTHE USER ASKED FOR X. DELIVER EXACTLY X.\\n\\n</ultrawork-mode>\\n\\n---\\n"}
-EOF
+# Output JSON with skill invocation message
+output_skill() {
+  local skill_name="$1"
+  local prompt="$2"
+  local args="$3"
+
+  local message=$(create_skill_invocation "$skill_name" "$prompt" "$args")
+  # Escape for JSON: backslashes, quotes, and newlines
+  local escaped_message=$(echo "$message" | sed 's/\\/\\\\/g' | sed 's/"/\\"/g' | awk '{printf "%s\\n", $0}' | sed 's/\\n$//')
+
+  echo "{\"continue\": true, \"message\": \"$escaped_message\"}"
+}
+
+# Priority 1: Cancel (BEFORE other modes - clears states)
+if echo "$PROMPT_LOWER" | grep -qE '\b(stop|cancel|abort)\b'; then
+  clear_state_files "$DIRECTORY"
+  output_skill "cancel" "$PROMPT"
   exit 0
 fi
 
-# Check for ultrathink/think keywords
-if echo "$PROMPT_LOWER" | grep -qE '\b(ultrathink|think)\b'; then
-  cat << 'EOF'
-{"continue": true, "message": "<think-mode>\\n\\n**ULTRATHINK MODE ENABLED** - Extended reasoning activated.\\n\\nYou are now in deep thinking mode. Take your time to:\\n1. Thoroughly analyze the problem from multiple angles\\n2. Consider edge cases and potential issues\\n3. Think through the implications of each approach\\n4. Reason step-by-step before acting\\n\\nUse your extended thinking capabilities to provide the most thorough and well-reasoned response.\\n\\n</think-mode>\\n\\n---\\n"}
-EOF
+# Priority 2: Ralph keywords
+if echo "$PROMPT_LOWER" | grep -qE '\b(ralph|don'\''t stop|must complete|until done)\b'; then
+  activate_state "$DIRECTORY" "$PROMPT" "ralph"
+  activate_state "$DIRECTORY" "$PROMPT" "ultrawork"
+  output_skill "ralph" "$PROMPT"
   exit 0
 fi
 
-# Check for search keywords (EN + multilingual)
-if echo "$PROMPT_LOWER" | grep -qE '\b(search|find|locate|lookup|explore|discover|scan|grep|query|browse|detect|trace|seek|track|pinpoint|hunt)\b|where\s+is|show\s+me|list\s+all'; then
-  cat << 'EOF'
-{"continue": true, "message": "<search-mode>\\nMAXIMIZE SEARCH EFFORT. Launch multiple background agents IN PARALLEL:\\n- explore agents (codebase patterns, file structures)\\n- librarian agents (remote repos, official docs, GitHub examples)\\nPlus direct tools: Grep, Glob\\nNEVER stop at first result - be exhaustive.\\n</search-mode>\\n\\n---\\n"}
-EOF
+# Priority 3: Autopilot keywords
+if echo "$PROMPT_LOWER" | grep -qE '\b(autopilot|auto pilot|auto-pilot|autonomous|full auto|fullsend)\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bbuild\s+me\s+' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bcreate\s+me\s+' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bmake\s+me\s+' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bi\s+want\s+a\s+' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bi\s+want\s+an\s+' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bhandle\s+it\s+all\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bend\s+to\s+end\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\be2e\s+this\b'; then
+  activate_state "$DIRECTORY" "$PROMPT" "autopilot"
+  output_skill "autopilot" "$PROMPT"
+  exit 0
+fi
+
+# Priority 4: Ultrapilot
+if echo "$PROMPT_LOWER" | grep -qE '\b(ultrapilot|ultra-pilot)\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bparallel\s+build\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bswarm\s+build\b'; then
+  activate_state "$DIRECTORY" "$PROMPT" "ultrapilot"
+  output_skill "ultrapilot" "$PROMPT"
+  exit 0
+fi
+
+# Priority 5: Ultrawork keywords
+if echo "$PROMPT_LOWER" | grep -qE '\b(ultrawork|ulw|uw)\b'; then
+  activate_state "$DIRECTORY" "$PROMPT" "ultrawork"
+  output_skill "ultrawork" "$PROMPT"
   exit 0
 fi
 
-# Check for analyze keywords
-if echo "$PROMPT_LOWER" | grep -qE '\b(analyze|analyse|investigate|examine|research|study|deep.?dive|inspect|audit|evaluate|assess|review|diagnose|scrutinize|dissect|debug|comprehend|interpret|breakdown|understand)\b|why\s+is|how\s+does|how\s+to'; then
+# Priority 6: Ecomode keywords
+if echo "$PROMPT_LOWER" | grep -qE '\b(eco|ecomode|eco-mode|efficient|save-tokens|budget)\b'; then
+  activate_state "$DIRECTORY" "$PROMPT" "ecomode"
+  output_skill "ecomode" "$PROMPT"
+  exit 0
+fi
+
+# Priority 7: Swarm - parse N from "swarm N agents"
+SWARM_MATCH=$(echo "$PROMPT_LOWER" | grep -oE '\bswarm\s+[0-9]+\s+agents?\b' | grep -oE '[0-9]+')
+if [ -n "$SWARM_MATCH" ]; then
+  output_skill "swarm" "$PROMPT" "$SWARM_MATCH"
+  exit 0
+fi
+if echo "$PROMPT_LOWER" | grep -qE '\bcoordinated\s+agents\b'; then
+  output_skill "swarm" "$PROMPT" "3"
+  exit 0
+fi
+
+# Priority 8: Pipeline
+if echo "$PROMPT_LOWER" | grep -qE '\b(pipeline)\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bchain\s+agents\b'; then
+  output_skill "pipeline" "$PROMPT"
+  exit 0
+fi
+
+# Priority 9: Ralplan keyword (before plan to avoid false match)
+if echo "$PROMPT_LOWER" | grep -qE '\b(ralplan)\b'; then
+  output_skill "ralplan" "$PROMPT"
+  exit 0
+fi
+
+# Priority 10: Plan keywords
+if echo "$PROMPT_LOWER" | grep -qE '\b(plan this|plan the)\b'; then
+  output_skill "plan" "$PROMPT"
+  exit 0
+fi
+
+# Priority 11: TDD
+if echo "$PROMPT_LOWER" | grep -qE '\b(tdd)\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\btest\s+first\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bred\s+green\b'; then
+  output_skill "tdd" "$PROMPT"
+  exit 0
+fi
+
+# Priority 12: Research
+if echo "$PROMPT_LOWER" | grep -qE '\b(research)\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\banalyze\s+data\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bstatistics\b'; then
+  output_skill "research" "$PROMPT"
+  exit 0
+fi
+
+# Priority 13: Ultrathink/think keywords (keep inline message)
+if echo "$PROMPT_LOWER" | grep -qE '\b(ultrathink|think hard|think deeply)\b'; then
   cat << 'EOF'
-{"continue": true, "message": "<analyze-mode>\\nANALYSIS MODE. Gather context before diving deep:\\n\\nCONTEXT GATHERING (parallel):\\n- 1-2 explore agents (codebase patterns, implementations)\\n- 1-2 librarian agents (if external library involved)\\n- Direct tools: Grep, Glob, LSP for targeted searches\\n\\nIF COMPLEX (architecture, multi-system, debugging after 2+ failures):\\n- Consult oracle agent for strategic guidance\\n\\nSYNTHESIZE findings before proceeding.\\n</analyze-mode>\\n\\n---\\n"}
+{"continue": true, "message": "<think-mode>\n\n**ULTRATHINK MODE ENABLED** - Extended reasoning activated.\n\nYou are now in deep thinking mode. Take your time to:\n1. Thoroughly analyze the problem from multiple angles\n2. Consider edge cases and potential issues\n3. Think through the implications of each approach\n4. Reason step-by-step before acting\n\nUse your extended thinking capabilities to provide the most thorough and well-reasoned response.\n\n</think-mode>\n\n---\n"}
 EOF
   exit 0
 fi
 
+# Priority 14: Deepsearch (RESTRICTED patterns)
+if echo "$PROMPT_LOWER" | grep -qE '\b(deepsearch)\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bsearch\s+(the\s+)?(codebase|code|files|project)\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bfind\s+(in\s+)?(codebase|code|all\s+files)\b'; then
+  output_skill "deepsearch" "$PROMPT"
+  exit 0
+fi
+
+# Priority 15: Analyze (RESTRICTED patterns)
+if echo "$PROMPT_LOWER" | grep -qE '\bdeep\s*analyze\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\binvestigate\s+(the|this|why)\b' || \
+   echo "$PROMPT_LOWER" | grep -qE '\bdebug\s+(the|this|why)\b'; then
+  output_skill "analyze" "$PROMPT"
+  exit 0
+fi
+
 # No keywords detected - continue without modification
 echo '{"continue": true}'
 exit 0

package/templates/hooks/persistent-mode.mjs

@@ -7,6 +7,18 @@ import { existsSync, readFileSync, writeFileSync, readdirSync } 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;
+  // Allow alphanumeric, hyphens, and underscores only
+  // Must not start with dot or hyphen
+  return /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,255}$/.test(sessionId);
+}
+
 async function readStdin() {
   const chunks = [];
   for await (const chunk of process.stdin) {
@@ -24,6 +36,38 @@ function readJsonFile(path) {
   }
 }
 
+/**
+ * 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;
+}
+
 function writeJsonFile(path, data) {
   try {
     writeFileSync(path, JSON.stringify(data, null, 2));
@@ -71,6 +115,7 @@ async function main() {
 
     const stopReason = data.stop_reason || data.stopReason || '';
     const userRequested = data.user_requested || data.userRequested || false;
+    const sessionId = data.sessionId || data.session_id || '';
 
     // Check for user abort - skip all continuation enforcement
     // NOTE: Abort patterns are assumed - verify against actual Claude Code API values
@@ -95,6 +140,10 @@ async function main() {
     // Count incomplete todos
     const incompleteCount = countIncompleteTodos(todosDir, directory);
 
+    // Count incomplete Tasks
+    const taskCount = countIncompleteTasks(sessionId);
+    const totalIncomplete = taskCount + incompleteCount;
+
     // Priority 1: Ralph Loop with Oracle Verification
     if (ralphState?.active) {
       const iteration = ralphState.iteration || 1;
@@ -183,7 +232,7 @@ ${ralphState.prompt ? `Original task: ${ralphState.prompt}` : ''}
     }
 
     // Priority 2: Ultrawork with incomplete todos
-    if (ultraworkState?.active && incompleteCount > 0) {
+    if (ultraworkState?.active && totalIncomplete > 0) {
       const newCount = (ultraworkState.reinforcement_count || 0) + 1;
       ultraworkState.reinforcement_count = newCount;
       ultraworkState.last_checked_at = new Date().toISOString();
@@ -196,7 +245,7 @@ ${ralphState.prompt ? `Original task: ${ralphState.prompt}` : ''}
 
 [ULTRAWORK MODE STILL ACTIVE - Reinforcement #${newCount}]
 
-Your ultrawork session is NOT complete. ${incompleteCount} incomplete todos remain.
+Your ultrawork session is NOT complete. ${totalIncomplete} incomplete items remain.
 
 REMEMBER THE ULTRAWORK RULES:
 - **PARALLEL**: Fire independent calls simultaneously - NEVER wait sequentially
@@ -218,18 +267,19 @@ ${ultraworkState.original_prompt ? `Original task: ${ultraworkState.original_pro
     }
 
     // Priority 3: Todo Continuation
-    if (incompleteCount > 0) {
+    if (totalIncomplete > 0) {
+      const itemType = taskCount > 0 ? 'Tasks' : 'todos';
       console.log(JSON.stringify({
         continue: false,
         reason: `<todo-continuation>
 
-[SYSTEM REMINDER - TODO CONTINUATION]
+[SYSTEM REMINDER - CONTINUATION]
 
-Incomplete tasks remain in your todo list (${incompleteCount} remaining). Continue working on the next pending task.
+Incomplete ${itemType} remain (${totalIncomplete} remaining). Continue working on the next pending item.
 
 - Proceed without asking for permission
-- Mark each task complete when finished
-- Do not stop until all tasks are done
+- Mark each item complete when finished
+- Do not stop until all items are done
 
 </todo-continuation>
 

package/templates/hooks/persistent-mode.sh

@@ -3,6 +3,21 @@
 # Unified handler for ultrawork, ralph-loop, and todo continuation
 # Prevents stopping when work remains incomplete
 
+# Validate session ID to prevent path traversal attacks
+# Returns 0 (success) for valid, 1 for invalid
+is_valid_session_id() {
+  local id="$1"
+  if [ -z "$id" ]; then
+    return 1
+  fi
+  # Allow alphanumeric, hyphens, and underscores only
+  # Must not start with dot or hyphen, max 256 chars
+  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)
 
@@ -19,6 +34,40 @@ if [ -z "$DIRECTORY" ]; then
   DIRECTORY=$(pwd)
 fi
 
+# Check for incomplete tasks in new Task system (priority over todos)
+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)
+        # This is less accurate but provides basic functionality
+        if grep -qE '"status"[[:space:]]*:[[:space:]]*"(pending|in_progress)"' "$task_file" 2>/dev/null; then
+          TASK_COUNT=$((TASK_COUNT + 1))
+        fi
+      fi
+    fi
+  done
+
+  # Warn if using fallback (only once per invocation, to stderr)
+  if [ "$JQ_AVAILABLE" = "false" ] && [ "$TASK_COUNT" -gt 0 ]; then
+    echo "[OMC WARNING] jq not installed - Task counting may be less accurate. Install jq for best results." >&2
+  fi
+fi
+
 # Extract stop reason for abort detection
 STOP_REASON=""
 USER_REQUESTED=""
@@ -86,6 +135,9 @@ for todo_path in "$DIRECTORY/.omc/todos.json" "$DIRECTORY/.claude/todos.json"; d
   fi
 done
 
+# Combine Task and todo counts
+TOTAL_INCOMPLETE=$((TASK_COUNT + INCOMPLETE_COUNT))
+
 # Priority 1: Ralph Loop with Oracle Verification
 if [ -n "$RALPH_STATE" ]; then
   IS_ACTIVE=$(echo "$RALPH_STATE" | jq -r '.active // false' 2>/dev/null)
@@ -132,7 +184,7 @@ EOF
 fi
 
 # Priority 2: Ultrawork Mode with incomplete todos
-if [ -n "$ULTRAWORK_STATE" ] && [ "$INCOMPLETE_COUNT" -gt 0 ]; then
+if [ -n "$ULTRAWORK_STATE" ] && [ "$TOTAL_INCOMPLETE" -gt 0 ]; then
   # Check if active (with jq fallback)
   IS_ACTIVE=""
   if command -v jq &> /dev/null; then
@@ -168,16 +220,21 @@ if [ -n "$ULTRAWORK_STATE" ] && [ "$INCOMPLETE_COUNT" -gt 0 ]; then
     fi
 
     cat << EOF
-{"continue": false, "reason": "<ultrawork-persistence>\\n\\n[ULTRAWORK MODE STILL ACTIVE - Reinforcement #$NEW_COUNT]\\n\\nYour ultrawork session is NOT complete. $INCOMPLETE_COUNT incomplete todos remain.\\n\\nREMEMBER THE ULTRAWORK RULES:\\n- **PARALLEL**: Fire independent calls simultaneously - NEVER wait sequentially\\n- **BACKGROUND FIRST**: Use Task(run_in_background=true) for exploration (10+ concurrent)\\n- **TODO**: Track EVERY step. Mark complete IMMEDIATELY after each\\n- **VERIFY**: Check ALL requirements met before done\\n- **NO Premature Stopping**: ALL TODOs must be complete\\n\\nContinue working on the next pending task. DO NOT STOP until all tasks are marked complete.\\n\\nOriginal task: $ORIGINAL_PROMPT\\n\\n</ultrawork-persistence>\\n\\n---\\n"}
+{"continue": false, "reason": "<ultrawork-persistence>\\n\\n[ULTRAWORK MODE STILL ACTIVE - Reinforcement #$NEW_COUNT]\\n\\nYour ultrawork session is NOT complete. $TOTAL_INCOMPLETE incomplete items remain.\\n\\nREMEMBER THE ULTRAWORK RULES:\\n- **PARALLEL**: Fire independent calls simultaneously - NEVER wait sequentially\\n- **BACKGROUND FIRST**: Use Task(run_in_background=true) for exploration (10+ concurrent)\\n- **TODO**: Track EVERY step. Mark complete IMMEDIATELY after each\\n- **VERIFY**: Check ALL requirements met before done\\n- **NO Premature Stopping**: ALL TODOs must be complete\\n\\nContinue working on the next pending item. DO NOT STOP until all items are marked complete.\\n\\nOriginal task: $ORIGINAL_PROMPT\\n\\n</ultrawork-persistence>\\n\\n---\\n"}
 EOF
     exit 0
   fi
 fi
 
-# Priority 3: Todo Continuation (baseline)
-if [ "$INCOMPLETE_COUNT" -gt 0 ]; then
+# Priority 3: Todo/Task Continuation (baseline)
+if [ "$TOTAL_INCOMPLETE" -gt 0 ]; then
+  if [ "$TASK_COUNT" -gt 0 ]; then
+    ITEM_TYPE="Tasks"
+  else
+    ITEM_TYPE="todos"
+  fi
   cat << EOF
-{"continue": false, "reason": "<todo-continuation>\\n\\n[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\\n\\n</todo-continuation>\\n\\n---\\n"}
+{"continue": false, "reason": "<todo-continuation>\\n\\n[SYSTEM REMINDER - CONTINUATION]\\n\\nIncomplete $ITEM_TYPE remain ($TOTAL_INCOMPLETE remaining). Continue working on the next pending item.\\n\\n- Proceed without asking for permission\\n- Mark each item complete when finished\\n- Do not stop until all items are done\\n\\n</todo-continuation>\\n\\n---\\n"}
 EOF
   exit 0
 fi

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