oh-my-claude-sisyphus 3.8.11 → 3.8.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-claude-sisyphus",
-  "version": "3.8.11",
+  "version": "3.8.13",
   "description": "Multi-agent orchestration system for Claude Code - Inspired by oh-my-opencode",
   "type": "module",
   "main": "dist/index.js",

package/scripts/persistent-mode.mjs

@@ -83,23 +83,20 @@ function countIncompleteTasks(sessionId) {
   return count;
 }
 
-function countIncompleteTodos(todosDir, projectDir) {
+function countIncompleteTodos(sessionId, projectDir) {
   let count = 0;
 
-  if (existsSync(todosDir)) {
+  // Session-specific todos only (no global scan)
+  if (sessionId && typeof sessionId === 'string' && /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,255}$/.test(sessionId)) {
+    const sessionTodoPath = join(homedir(), '.claude', 'todos', `${sessionId}.json`);
     try {
-      const files = readdirSync(todosDir).filter(f => f.endsWith('.json'));
-      for (const file of files) {
-        try {
-          const content = readFileSync(join(todosDir, file), 'utf-8');
-          const data = JSON.parse(content);
-          const todos = Array.isArray(data) ? data : (Array.isArray(data?.todos) ? data.todos : []);
-          count += todos.filter(t => t.status !== 'completed' && t.status !== 'cancelled').length;
-        } catch { /* skip */ }
-      }
+      const data = readJsonFile(sessionTodoPath);
+      const todos = Array.isArray(data) ? data : (Array.isArray(data?.todos) ? data.todos : []);
+      count += todos.filter(t => t.status !== 'completed' && t.status !== 'cancelled').length;
     } catch { /* skip */ }
   }
 
+  // Project-local todos only
   for (const path of [
     join(projectDir, '.omc', 'todos.json'),
     join(projectDir, '.claude', 'todos.json')
@@ -158,11 +155,13 @@ function isUserAbort(data) {
   if (data.user_requested || data.userRequested) return true;
 
   const reason = (data.stop_reason || data.stopReason || '').toLowerCase();
-  const abortPatterns = [
-    'user_cancel', 'user_interrupt', 'ctrl_c', 'manual_stop',
-    'aborted', 'abort', 'cancel', 'interrupt',
-  ];
-  return abortPatterns.some(p => reason.includes(p));
+  // Exact-match patterns: short generic words that cause false positives with .includes()
+  const exactPatterns = ['aborted', 'abort', 'cancel', 'interrupt'];
+  // Substring patterns: compound words safe for .includes() matching
+  const substringPatterns = ['user_cancel', 'user_interrupt', 'ctrl_c', 'manual_stop'];
+
+  return exactPatterns.some(p => reason === p) ||
+         substringPatterns.some(p => reason.includes(p));
 }
 
 async function main() {
@@ -173,7 +172,6 @@ async function main() {
 
     const directory = data.directory || process.cwd();
     const sessionId = data.sessionId || data.session_id || '';
-    const todosDir = join(homedir(), '.claude', 'todos');
     const stateDir = join(directory, '.omc', 'state');
     const globalStateDir = join(homedir(), '.omc', 'state');
 
@@ -204,9 +202,9 @@ async function main() {
     const swarmMarker = existsSync(join(stateDir, 'swarm-active.marker'));
     const swarmSummary = readJsonFile(join(stateDir, 'swarm-summary.json'));
 
-    // Count incomplete items
+    // Count incomplete items (session-specific + project-local only)
     const taskCount = countIncompleteTasks(sessionId);
-    const todoCount = countIncompleteTodos(todosDir, directory);
+    const todoCount = countIncompleteTodos(sessionId, directory);
     const totalIncomplete = taskCount + todoCount;
 
     // Priority 1: Ralph Loop (explicit persistence mode)
@@ -219,8 +217,8 @@ async function main() {
         writeJsonFile(ralph.path, ralph.state);
 
         console.log(JSON.stringify({
-          continue: false,
-          reason: `[RALPH LOOP - ITERATION ${iteration + 1}/${maxIter}] Work is NOT done. Continue. When complete, output: <promise>${ralph.state.completion_promise || 'DONE'}</promise>\n${ralph.state.prompt ? `Task: ${ralph.state.prompt}` : ''}`
+          continue: true,
+          message: `[RALPH LOOP - ITERATION ${iteration + 1}/${maxIter}] Work is NOT done. Continue. When complete, output: <promise>${ralph.state.completion_promise || 'DONE'}</promise>\n${ralph.state.prompt ? `Task: ${ralph.state.prompt}` : ''}`
         }));
         return;
       }
@@ -236,8 +234,8 @@ async function main() {
           writeJsonFile(autopilot.path, autopilot.state);
 
           console.log(JSON.stringify({
-            continue: false,
-            reason: `[AUTOPILOT - Phase: ${phase}] Autopilot not complete. Continue working.`
+            continue: true,
+            message: `[AUTOPILOT - Phase: ${phase}] Autopilot not complete. Continue working.`
           }));
           return;
         }
@@ -255,8 +253,8 @@ async function main() {
           writeJsonFile(ultrapilot.path, ultrapilot.state);
 
           console.log(JSON.stringify({
-            continue: false,
-            reason: `[ULTRAPILOT] ${incomplete} workers still running. Continue.`
+            continue: true,
+            message: `[ULTRAPILOT] ${incomplete} workers still running. Continue.`
           }));
           return;
         }
@@ -273,8 +271,8 @@ async function main() {
           writeJsonFile(join(stateDir, 'swarm-summary.json'), swarmSummary);
 
           console.log(JSON.stringify({
-            continue: false,
-            reason: `[SWARM ACTIVE] ${pending} tasks remain. Continue working.`
+            continue: true,
+            message: `[SWARM ACTIVE] ${pending} tasks remain. Continue working.`
           }));
           return;
         }
@@ -292,8 +290,8 @@ async function main() {
           writeJsonFile(pipeline.path, pipeline.state);
 
           console.log(JSON.stringify({
-            continue: false,
-            reason: `[PIPELINE - Stage ${currentStage + 1}/${totalStages}] Pipeline not complete. Continue.`
+            continue: true,
+            message: `[PIPELINE - Stage ${currentStage + 1}/${totalStages}] Pipeline not complete. Continue.`
           }));
           return;
         }
@@ -309,8 +307,8 @@ async function main() {
         writeJsonFile(ultraqa.path, ultraqa.state);
 
         console.log(JSON.stringify({
-          continue: false,
-          reason: `[ULTRAQA - Cycle ${cycle + 1}/${maxCycles}] Tests not all passing. Continue fixing.`
+          continue: true,
+          message: `[ULTRAQA - Cycle ${cycle + 1}/${maxCycles}] Tests not all passing. Continue fixing.`
         }));
         return;
       }
@@ -345,8 +343,8 @@ async function main() {
       }
 
       console.log(JSON.stringify({
-        continue: false,
-        reason
+        continue: true,
+        message: reason
       }));
       return;
     }
@@ -374,31 +372,8 @@ async function main() {
       }
 
       console.log(JSON.stringify({
-        continue: false,
-        reason
-      }));
-      return;
-    }
-
-    // Priority 9: Generic Task/Todo continuation (no specific mode)
-    if (totalIncomplete > 0) {
-      const contFile = join(stateDir, 'continuation-count.json');
-      let contState = readJsonFile(contFile) || { count: 0 };
-      contState.count = (contState.count || 0) + 1;
-      writeJsonFile(contFile, contState);
-
-      if (contState.count > 15) {
-        console.log(JSON.stringify({
-          continue: true,
-          reason: `[CONTINUATION ESCAPE] Max continuations reached. Allowing stop.`
-        }));
-        return;
-      }
-
-      const itemType = taskCount > 0 ? 'Tasks' : 'todos';
-      console.log(JSON.stringify({
-        continue: false,
-        reason: `[CONTINUATION ${contState.count}/15] ${totalIncomplete} incomplete ${itemType}. Continue working.`
+        continue: true,
+        message: reason
       }));
       return;
     }

package/scripts/post-tool-verifier.mjs

@@ -15,7 +15,6 @@ 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;
@@ -28,15 +27,6 @@ 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');
 
@@ -272,34 +262,9 @@ 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 - use hookSpecificOutput.additionalContext for PostToolUse
     const response = { continue: true };
-    const contextMessage = clearSuggestionMessage || message;
+    const contextMessage = message;
     if (contextMessage) {
       response.hookSpecificOutput = {
         hookEventName: 'PostToolUse',

package/skills/cancel/SKILL.md

@@ -25,7 +25,7 @@ Automatically detects which mode is active and cancels it:
 /oh-my-claudecode:cancel
 ```
 
-Or say: "stop", "cancel", "abort"
+Or say: "cancelomc", "stopomc"
 
 ## Auto-Detection
 

package/templates/hooks/persistent-mode.mjs

@@ -83,23 +83,20 @@ function countIncompleteTasks(sessionId) {
   return count;
 }
 
-function countIncompleteTodos(todosDir, projectDir) {
+function countIncompleteTodos(sessionId, projectDir) {
   let count = 0;
 
-  if (existsSync(todosDir)) {
+  // Session-specific todos only (no global scan)
+  if (sessionId && typeof sessionId === 'string' && /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,255}$/.test(sessionId)) {
+    const sessionTodoPath = join(homedir(), '.claude', 'todos', `${sessionId}.json`);
     try {
-      const files = readdirSync(todosDir).filter(f => f.endsWith('.json'));
-      for (const file of files) {
-        try {
-          const content = readFileSync(join(todosDir, file), 'utf-8');
-          const data = JSON.parse(content);
-          const todos = Array.isArray(data) ? data : (Array.isArray(data?.todos) ? data.todos : []);
-          count += todos.filter(t => t.status !== 'completed' && t.status !== 'cancelled').length;
-        } catch { /* skip */ }
-      }
+      const data = readJsonFile(sessionTodoPath);
+      const todos = Array.isArray(data) ? data : (Array.isArray(data?.todos) ? data.todos : []);
+      count += todos.filter(t => t.status !== 'completed' && t.status !== 'cancelled').length;
     } catch { /* skip */ }
   }
 
+  // Project-local todos only
   for (const path of [
     join(projectDir, '.omc', 'todos.json'),
     join(projectDir, '.claude', 'todos.json')
@@ -156,11 +153,13 @@ function isUserAbort(data) {
   if (data.user_requested || data.userRequested) return true;
 
   const reason = (data.stop_reason || data.stopReason || '').toLowerCase();
-  const abortPatterns = [
-    'user_cancel', 'user_interrupt', 'ctrl_c', 'manual_stop',
-    'aborted', 'abort', 'cancel', 'interrupt',
-  ];
-  return abortPatterns.some(p => reason.includes(p));
+  // Exact-match patterns: short generic words that cause false positives with .includes()
+  const exactPatterns = ['aborted', 'abort', 'cancel', 'interrupt'];
+  // Substring patterns: compound words safe for .includes() matching
+  const substringPatterns = ['user_cancel', 'user_interrupt', 'ctrl_c', 'manual_stop'];
+
+  return exactPatterns.some(p => reason === p) ||
+         substringPatterns.some(p => reason.includes(p));
 }
 
 async function main() {
@@ -171,7 +170,6 @@ async function main() {
 
     const directory = data.directory || process.cwd();
     const sessionId = data.sessionId || data.session_id || '';
-    const todosDir = join(homedir(), '.claude', 'todos');
     const stateDir = join(directory, '.omc', 'state');
     const globalStateDir = join(homedir(), '.omc', 'state');
 
@@ -202,9 +200,9 @@ async function main() {
     const swarmMarker = existsSync(join(stateDir, 'swarm-active.marker'));
     const swarmSummary = readJsonFile(join(stateDir, 'swarm-summary.json'));
 
-    // Count incomplete items
+    // Count incomplete items (session-specific + project-local only)
     const taskCount = countIncompleteTasks(sessionId);
-    const todoCount = countIncompleteTodos(todosDir, directory);
+    const todoCount = countIncompleteTodos(sessionId, directory);
     const totalIncomplete = taskCount + todoCount;
 
     // Priority 1: Ralph Loop (explicit persistence mode)
@@ -217,8 +215,8 @@ async function main() {
         writeJsonFile(ralph.path, ralph.state);
 
         console.log(JSON.stringify({
-          continue: false,
-          reason: `[RALPH LOOP - ITERATION ${iteration + 1}/${maxIter}] Work is NOT done. Continue. When complete, output: <promise>${ralph.state.completion_promise || 'DONE'}</promise>\n${ralph.state.prompt ? `Task: ${ralph.state.prompt}` : ''}`
+          continue: true,
+          message: `[RALPH LOOP - ITERATION ${iteration + 1}/${maxIter}] Work is NOT done. Continue. When complete, output: <promise>${ralph.state.completion_promise || 'DONE'}</promise>\n${ralph.state.prompt ? `Task: ${ralph.state.prompt}` : ''}`
         }));
         return;
       }
@@ -234,8 +232,8 @@ async function main() {
           writeJsonFile(autopilot.path, autopilot.state);
 
           console.log(JSON.stringify({
-            continue: false,
-            reason: `[AUTOPILOT - Phase: ${phase}] Autopilot not complete. Continue working.`
+            continue: true,
+            message: `[AUTOPILOT - Phase: ${phase}] Autopilot not complete. Continue working.`
           }));
           return;
         }
@@ -253,8 +251,8 @@ async function main() {
           writeJsonFile(ultrapilot.path, ultrapilot.state);
 
           console.log(JSON.stringify({
-            continue: false,
-            reason: `[ULTRAPILOT] ${incomplete} workers still running. Continue.`
+            continue: true,
+            message: `[ULTRAPILOT] ${incomplete} workers still running. Continue.`
           }));
           return;
         }
@@ -271,8 +269,8 @@ async function main() {
           writeJsonFile(join(stateDir, 'swarm-summary.json'), swarmSummary);
 
           console.log(JSON.stringify({
-            continue: false,
-            reason: `[SWARM ACTIVE] ${pending} tasks remain. Continue working.`
+            continue: true,
+            message: `[SWARM ACTIVE] ${pending} tasks remain. Continue working.`
           }));
           return;
         }
@@ -290,8 +288,8 @@ async function main() {
           writeJsonFile(pipeline.path, pipeline.state);
 
           console.log(JSON.stringify({
-            continue: false,
-            reason: `[PIPELINE - Stage ${currentStage + 1}/${totalStages}] Pipeline not complete. Continue.`
+            continue: true,
+            message: `[PIPELINE - Stage ${currentStage + 1}/${totalStages}] Pipeline not complete. Continue.`
           }));
           return;
         }
@@ -307,8 +305,8 @@ async function main() {
         writeJsonFile(ultraqa.path, ultraqa.state);
 
         console.log(JSON.stringify({
-          continue: false,
-          reason: `[ULTRAQA - Cycle ${cycle + 1}/${maxCycles}] Tests not all passing. Continue fixing.`
+          continue: true,
+          message: `[ULTRAQA - Cycle ${cycle + 1}/${maxCycles}] Tests not all passing. Continue fixing.`
         }));
         return;
       }
@@ -342,8 +340,8 @@ async function main() {
       }
 
       console.log(JSON.stringify({
-        continue: false,
-        reason
+        continue: true,
+        message: reason
       }));
       return;
     }
@@ -371,31 +369,8 @@ async function main() {
       }
 
       console.log(JSON.stringify({
-        continue: false,
-        reason
-      }));
-      return;
-    }
-
-    // Priority 9: Generic Task/Todo continuation (no specific mode)
-    if (totalIncomplete > 0) {
-      const contFile = join(stateDir, 'continuation-count.json');
-      let contState = readJsonFile(contFile) || { count: 0 };
-      contState.count = (contState.count || 0) + 1;
-      writeJsonFile(contFile, contState);
-
-      if (contState.count > 15) {
-        console.log(JSON.stringify({
-          continue: true,
-          reason: `[CONTINUATION ESCAPE] Max continuations reached. Allowing stop.`
-        }));
-        return;
-      }
-
-      const itemType = taskCount > 0 ? 'Tasks' : 'todos';
-      console.log(JSON.stringify({
-        continue: false,
-        reason: `[CONTINUATION ${contState.count}/15] ${totalIncomplete} incomplete ${itemType}. Continue working.`
+        continue: true,
+        message: reason
       }));
       return;
     }

package/templates/hooks/stop-continuation.mjs

@@ -1,167 +1,15 @@
 #!/usr/bin/env node
-// OMC Stop Continuation Hook (Node.js)
-// Checks for incomplete todos and injects continuation prompt
-// Cross-platform: Windows, macOS, Linux
+// OMC Stop Continuation Hook (Simplified)
+// Always allows stop - soft enforcement via message injection only.
 
-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() {
+// Consume stdin (required for hook protocol)
+async function main() {
   const chunks = [];
   for await (const chunk of process.stdin) {
     chunks.push(chunk);
   }
-  return Buffer.concat(chunks).toString('utf-8');
-}
-
-/**
- * Detect if stop was triggered by context-limit related reasons.
- * See: https://github.com/Yeachan-Heo/oh-my-claudecode/issues/213
- */
-function isContextLimitStop(data) {
-  const reason = (data.stop_reason || data.stopReason || '').toLowerCase();
-  const endTurnReason = (data.end_turn_reason || data.endTurnReason || '').toLowerCase();
-  const contextPatterns = [
-    'context_limit', 'context_window', 'context_exceeded', 'context_full',
-    'max_context', 'token_limit', 'max_tokens', 'conversation_too_long', 'input_too_long',
-  ];
-  return contextPatterns.some(p => reason.includes(p) || endTurnReason.includes(p));
-}
-
-function isUserAbort(data) {
-  if (data.user_requested || data.userRequested) return true;
-  const reason = (data.stop_reason || data.stopReason || '').toLowerCase();
-  const abortPatterns = [
-    'user_cancel', 'user_interrupt', 'ctrl_c', 'manual_stop',
-    'aborted', 'abort', 'cancel', 'interrupt',
-  ];
-  return abortPatterns.some(p => reason.includes(p));
-}
-
-// Main
-async function main() {
-  try {
-    // 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 */ }
-
-    // Never block context-limit or user-abort stops
-    if (isContextLimitStop(data) || isUserAbort(data)) {
-      console.log(JSON.stringify({ continue: true }));
-      return;
-    }
-
-    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');
-
-    if (!existsSync(todosDir)) {
-      console.log(JSON.stringify({ continue: true }));
-      return;
-    }
-
-    let incompleteCount = 0;
-
-    try {
-      const files = readdirSync(todosDir).filter(f => f.endsWith('.json'));
-
-      for (const file of files) {
-        try {
-          const content = readFileSync(join(todosDir, file), 'utf-8');
-          const todos = JSON.parse(content);
-
-          if (Array.isArray(todos)) {
-            const incomplete = todos.filter(
-              t => t.status !== 'completed' && t.status !== 'cancelled'
-            );
-            incompleteCount += incomplete.length;
-          }
-        } catch {
-          // Skip files that can't be parsed
-        }
-      }
-    } catch {
-      // Directory read error - allow continuation
-      console.log(JSON.stringify({ continue: true }));
-      return;
-    }
-
-    // Combine both counts
-    const totalIncomplete = taskCount + incompleteCount;
-
-    if (totalIncomplete > 0) {
-      const sourceLabel = taskCount > 0 ? 'Task' : 'todo';
-      const reason = `[SYSTEM REMINDER - ${sourceLabel.toUpperCase()} CONTINUATION]
-
-Incomplete ${sourceLabel}s remain (${totalIncomplete} remaining). Continue working on the next pending ${sourceLabel}.
-
-- Proceed without asking for permission
-- Mark each ${sourceLabel} complete when finished
-- Do not stop until all ${sourceLabel}s are done`;
-
-      console.log(JSON.stringify({ decision: "block", reason }));
-      return;
-    }
-
-    // No incomplete tasks or todos - allow stop
-    console.log(JSON.stringify({ continue: true }));
-  } catch (error) {
-    // On any error, allow continuation
-    console.log(JSON.stringify({ continue: true }));
-  }
+  // Always allow stop
+  console.log(JSON.stringify({ continue: true }));
 }
 
 main();