oh-my-claude-sisyphus 3.8.12 → 3.8.14

package/dist/mcp/omc-tools-server.js

@@ -1,18 +1,20 @@
 /**
  * OMC Tools Server - In-process MCP server for custom tools
  *
- * Exposes 15 custom tools (12 LSP, 2 AST, 1 python_repl) via the Claude Agent SDK's
+ * Exposes 18 custom tools (12 LSP, 2 AST, 1 python_repl, 3 skills) via the Claude Agent SDK's
  * createSdkMcpServer helper for use by subagents.
  */
 import { createSdkMcpServer, tool } from "@anthropic-ai/claude-agent-sdk";
 import { lspTools } from "../tools/lsp-tools.js";
 import { astTools } from "../tools/ast-tools.js";
 import { pythonReplTool } from "../tools/python-repl/index.js";
+import { skillsTools } from "../tools/skills-tools.js";
 // Aggregate all custom tools
 const allTools = [
     ...lspTools,
     ...astTools,
-    pythonReplTool
+    pythonReplTool,
+    ...skillsTools
 ];
 // Convert to SDK tool format
 // The SDK's tool() expects a ZodRawShape directly (not wrapped in z.object())
@@ -35,7 +37,7 @@ export const omcToolNames = allTools.map(t => `mcp__omc-tools__${t.name}`);
  * Get tool names filtered by category
  */
 export function getOmcToolNames(options) {
-    const { includeLsp = true, includeAst = true, includePython = true } = options || {};
+    const { includeLsp = true, includeAst = true, includePython = true, includeSkills = true } = options || {};
     return omcToolNames.filter(name => {
         if (!includeLsp && name.includes('lsp_'))
             return false;
@@ -43,6 +45,8 @@ export function getOmcToolNames(options) {
             return false;
         if (!includePython && name.includes('python_repl'))
             return false;
+        if (!includeSkills && (name.includes('load_omc_skills') || name.includes('list_omc_skills')))
+            return false;
         return true;
     });
 }

package/dist/mcp/omc-tools-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"omc-tools-server.js","sourceRoot":"","sources":["../../src/mcp/omc-tools-server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAU/D,6BAA6B;AAC7B,MAAM,QAAQ,GAAc;IAC1B,GAAI,QAAiC;IACrC,GAAI,QAAiC;IACrC,cAAoC;CACrC,CAAC;AAEF,6BAA6B;AAC7B,8EAA8E;AAC9E,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAChC,IAAI,CACF,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,WAAW,EACb,CAAC,CAAC,MAAoC,EACtC,KAAK,EAAE,IAAa,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAC/C,CACF,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;IAC/C,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,QAAQ;CAChB,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAE3E;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,OAI/B;IACC,MAAM,EAAE,UAAU,GAAG,IAAI,EAAE,UAAU,GAAG,IAAI,EAAE,aAAa,GAAG,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAErF,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAChC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QACvD,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QACvD,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;YAAE,OAAO,KAAK,CAAC;QACjE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"omc-tools-server.js","sourceRoot":"","sources":["../../src/mcp/omc-tools-server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAUvD,6BAA6B;AAC7B,MAAM,QAAQ,GAAc;IAC1B,GAAI,QAAiC;IACrC,GAAI,QAAiC;IACrC,cAAoC;IACpC,GAAI,WAAoC;CACzC,CAAC;AAEF,6BAA6B;AAC7B,8EAA8E;AAC9E,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAChC,IAAI,CACF,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,WAAW,EACb,CAAC,CAAC,MAAoC,EACtC,KAAK,EAAE,IAAa,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAC/C,CACF,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;IAC/C,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,QAAQ;CAChB,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAE3E;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,OAK/B;IACC,MAAM,EAAE,UAAU,GAAG,IAAI,EAAE,UAAU,GAAG,IAAI,EAAE,aAAa,GAAG,IAAI,EAAE,aAAa,GAAG,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAE3G,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAChC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QACvD,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QACvD,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;YAAE,OAAO,KAAK,CAAC;QACjE,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAC3G,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/tools/skills-tools.d.ts

@@ -0,0 +1,75 @@
+/**
+ * Skills Tools
+ *
+ * MCP tools for loading and listing OMC learned skills
+ * from local (.omc/skills/) and global (~/.omc/skills/) directories.
+ */
+import { z } from 'zod';
+export declare const loadLocalTool: {
+    name: string;
+    description: string;
+    schema: {
+        projectRoot: z.ZodOptional<z.ZodString>;
+    };
+    handler: (args: {
+        projectRoot?: string;
+    }) => Promise<{
+        content: {
+            type: "text";
+            text: string;
+        }[];
+    }>;
+};
+export declare const loadGlobalTool: {
+    name: string;
+    description: string;
+    schema: {};
+    handler: (_args: Record<string, never>) => Promise<{
+        content: {
+            type: "text";
+            text: string;
+        }[];
+    }>;
+};
+export declare const listSkillsTool: {
+    name: string;
+    description: string;
+    schema: {
+        projectRoot: z.ZodOptional<z.ZodString>;
+    };
+    handler: (args: {
+        projectRoot?: string;
+    }) => Promise<{
+        content: {
+            type: "text";
+            text: string;
+        }[];
+    }>;
+};
+/** All skills tools for registration in omc-tools-server */
+export declare const skillsTools: ({
+    name: string;
+    description: string;
+    schema: {
+        projectRoot: z.ZodOptional<z.ZodString>;
+    };
+    handler: (args: {
+        projectRoot?: string;
+    }) => Promise<{
+        content: {
+            type: "text";
+            text: string;
+        }[];
+    }>;
+} | {
+    name: string;
+    description: string;
+    schema: {};
+    handler: (_args: Record<string, never>) => Promise<{
+        content: {
+            type: "text";
+            text: string;
+        }[];
+    }>;
+})[];
+//# sourceMappingURL=skills-tools.d.ts.map

package/dist/tools/skills-tools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills-tools.d.ts","sourceRoot":"","sources":["../../src/tools/skills-tools.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA+FxB,eAAO,MAAM,aAAa;;;;;;oBAIF;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;;;;;;CAY/C,CAAC;AAGF,eAAO,MAAM,cAAc;;;;qBAIF,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;;;;;;CAW7C,CAAC;AAGF,eAAO,MAAM,cAAc;;;;;;oBAIH;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;;;;;;CA2B/C,CAAC;AAEF,4DAA4D;AAC5D,eAAO,MAAM,WAAW;;;;;;oBAnEA;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;qBAmBvB,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;;;;;;IAgD4B,CAAC"}

package/dist/tools/skills-tools.js

@@ -0,0 +1,151 @@
+/**
+ * Skills Tools
+ *
+ * MCP tools for loading and listing OMC learned skills
+ * from local (.omc/skills/) and global (~/.omc/skills/) directories.
+ */
+import { z } from 'zod';
+import { resolve, normalize, sep } from 'path';
+import { homedir } from 'os';
+import { loadAllSkills } from '../hooks/learner/loader.js';
+import { MAX_SKILL_CONTENT_LENGTH } from '../hooks/learner/constants.js';
+/** Allowed boundary directories for projectRoot validation */
+const ALLOWED_BOUNDARIES = [process.cwd(), homedir()];
+/** Role boundary tags that could be used for prompt injection */
+const ROLE_BOUNDARY_PATTERN = /^<\s*\/?\s*(system|human|assistant|user|tool_use|tool_result)\b[^>]*>/i;
+/**
+ * Validate projectRoot is within allowed directories.
+ * Prevents path traversal attacks.
+ */
+function validateProjectRoot(input) {
+    const normalized = normalize(resolve(input));
+    // Reject path traversal sequences in raw input
+    if (input.includes('..')) {
+        throw new Error('Invalid project root: path traversal not allowed');
+    }
+    // Positive boundary validation: resolved path must be under cwd or HOME
+    const isWithinAllowed = ALLOWED_BOUNDARIES.some(boundary => {
+        const normalizedBoundary = normalize(boundary);
+        return normalized === normalizedBoundary ||
+            normalized.startsWith(normalizedBoundary + sep);
+    });
+    if (!isWithinAllowed) {
+        throw new Error('Invalid project root: path is outside allowed directories');
+    }
+    return normalized;
+}
+/**
+ * Sanitize skill content to prevent prompt injection.
+ */
+function sanitizeSkillContent(content) {
+    // Truncate to max length
+    const truncated = content.length > MAX_SKILL_CONTENT_LENGTH
+        ? content.slice(0, MAX_SKILL_CONTENT_LENGTH) + '\n[truncated]'
+        : content;
+    // Strip role boundary tags
+    return truncated
+        .split('\n')
+        .filter(line => !ROLE_BOUNDARY_PATTERN.test(line.trim()))
+        .join('\n');
+}
+// Schema definitions
+const loadLocalSchema = {
+    projectRoot: z.string()
+        .max(500)
+        .optional()
+        .describe('Project root directory (defaults to cwd)'),
+};
+// Empty ZodRawShape: SDK expects plain object of z-types; {} means no parameters
+const loadGlobalSchema = {};
+const listSkillsSchema = {
+    projectRoot: z.string()
+        .max(500)
+        .optional()
+        .describe('Project root directory (defaults to cwd)'),
+};
+/**
+ * Format skills into readable markdown output.
+ */
+function formatSkillOutput(skills) {
+    if (skills.length === 0) {
+        return 'No skills found in the searched directories.';
+    }
+    const lines = [];
+    for (const skill of skills) {
+        lines.push(`### ${skill.metadata.id}`);
+        lines.push(`- **Name:** ${skill.metadata.name}`);
+        lines.push(`- **Description:** ${skill.metadata.description}`);
+        lines.push(`- **Triggers:** ${skill.metadata.triggers.join(', ')}`);
+        if (skill.metadata.tags?.length) {
+            lines.push(`- **Tags:** ${skill.metadata.tags.join(', ')}`);
+        }
+        lines.push(`- **Scope:** ${skill.scope}`);
+        lines.push(`- **Path:** ${skill.relativePath}`);
+        lines.push('');
+    }
+    return lines.join('\n');
+}
+// Tool 1: load_omc_skills_local
+export const loadLocalTool = {
+    name: 'load_omc_skills_local',
+    description: 'Load and list skills from the project-local .omc/skills/ directory. Returns skill metadata (id, name, description, triggers, tags) for all discovered project-scoped skills.',
+    schema: loadLocalSchema,
+    handler: async (args) => {
+        const projectRoot = args.projectRoot ? validateProjectRoot(args.projectRoot) : process.cwd();
+        const allSkills = loadAllSkills(projectRoot);
+        const projectSkills = allSkills.filter(s => s.scope === 'project');
+        return {
+            content: [{
+                    type: 'text',
+                    text: `## Project Skills (${projectSkills.length})\n\n${formatSkillOutput(projectSkills)}`,
+                }],
+        };
+    },
+};
+// Tool 2: load_omc_skills_global
+export const loadGlobalTool = {
+    name: 'load_omc_skills_global',
+    description: 'Load and list skills from global user directories (~/.omc/skills/ and ~/.claude/skills/omc-learned/). Returns skill metadata for all discovered user-scoped skills.',
+    schema: loadGlobalSchema,
+    handler: async (_args) => {
+        const allSkills = loadAllSkills(null);
+        const userSkills = allSkills.filter(s => s.scope === 'user');
+        return {
+            content: [{
+                    type: 'text',
+                    text: `## Global User Skills (${userSkills.length})\n\n${formatSkillOutput(userSkills)}`,
+                }],
+        };
+    },
+};
+// Tool 3: list_omc_skills
+export const listSkillsTool = {
+    name: 'list_omc_skills',
+    description: 'List all available skills (both project-local and global user skills). Project skills take priority over user skills with the same ID.',
+    schema: listSkillsSchema,
+    handler: async (args) => {
+        const projectRoot = args.projectRoot ? validateProjectRoot(args.projectRoot) : process.cwd();
+        const skills = loadAllSkills(projectRoot);
+        const projectSkills = skills.filter(s => s.scope === 'project');
+        const userSkills = skills.filter(s => s.scope === 'user');
+        let output = `## All Available Skills (${skills.length} total)\n\n`;
+        if (projectSkills.length > 0) {
+            output += `### Project Skills (${projectSkills.length})\n\n${formatSkillOutput(projectSkills)}\n`;
+        }
+        if (userSkills.length > 0) {
+            output += `### User Skills (${userSkills.length})\n\n${formatSkillOutput(userSkills)}`;
+        }
+        if (skills.length === 0) {
+            output = '## No Skills Found\n\nNo skill files were discovered in any searched directories.\n\nSearched:\n- Project: .omc/skills/\n- Global: ~/.omc/skills/\n- Legacy: ~/.claude/skills/omc-learned/';
+        }
+        return {
+            content: [{
+                    type: 'text',
+                    text: output,
+                }],
+        };
+    },
+};
+/** All skills tools for registration in omc-tools-server */
+export const skillsTools = [loadLocalTool, loadGlobalTool, listSkillsTool];
+//# sourceMappingURL=skills-tools.js.map

package/dist/tools/skills-tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills-tools.js","sourceRoot":"","sources":["../../src/tools/skills-tools.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/scripts/persistent-mode.mjs

@@ -155,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() {

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/scripts/skill-injector.mjs

@@ -26,7 +26,8 @@ try {
 
 // Constants (used by fallback)
 const USER_SKILLS_DIR = join(homedir(), '.claude', 'skills', 'omc-learned');
-const PROJECT_SKILLS_SUBDIR = '.omc/skills';
+const GLOBAL_SKILLS_DIR = join(homedir(), '.omc', 'skills');
+const PROJECT_SKILLS_SUBDIR = join('.omc', 'skills');
 const SKILL_EXTENSION = '.md';
 const MAX_SKILLS_PER_SESSION = 5;
 
@@ -92,26 +93,29 @@ function findSkillFilesFallback(directory) {
     }
   }
 
-  // User-level skills
-  if (existsSync(USER_SKILLS_DIR)) {
-    try {
-      const files = readdirSync(USER_SKILLS_DIR, { withFileTypes: true });
-      for (const file of files) {
-        if (file.isFile() && file.name.endsWith(SKILL_EXTENSION)) {
-          const fullPath = join(USER_SKILLS_DIR, file.name);
-          try {
-            const realPath = realpathSync(fullPath);
-            if (!seenPaths.has(realPath)) {
-              seenPaths.add(realPath);
-              candidates.push({ path: fullPath, scope: 'user' });
+  // User-level skills (search both global and legacy directories)
+  const userDirs = [GLOBAL_SKILLS_DIR, USER_SKILLS_DIR];
+  for (const userDir of userDirs) {
+    if (existsSync(userDir)) {
+      try {
+        const files = readdirSync(userDir, { withFileTypes: true });
+        for (const file of files) {
+          if (file.isFile() && file.name.endsWith(SKILL_EXTENSION)) {
+            const fullPath = join(userDir, file.name);
+            try {
+              const realPath = realpathSync(fullPath);
+              if (!seenPaths.has(realPath)) {
+                seenPaths.add(realPath);
+                candidates.push({ path: fullPath, scope: 'user' });
+              }
+            } catch {
+              // Ignore symlink resolution errors
             }
-          } catch {
-            // Ignore symlink resolution errors
           }
         }
+      } catch {
+        // Ignore directory read errors
       }
-    } catch {
-      // Ignore directory read errors
     }
   }
 

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

@@ -153,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() {