claude-code-notify-lite 1.0.5 → 1.0.7

package/bin/cli.js

@@ -31,6 +31,7 @@ Examples:
   $ ccnotify install     Install hooks
   $ ccnotify test        Test notification
   $ ccnotify status      Check status
+  $ ccnotify repair      Fix conflicting hooks
   $ ccnotify logs        View debug logs
 
 Version: ${pkg.version}
@@ -118,6 +119,11 @@ program
     console.log(`  Hook configured: ${status.hasHook ? chalk.green('Yes') : chalk.red('No')}`);
     console.log(`  Config exists: ${status.hasConfig ? chalk.green('Yes') : chalk.red('No')}`);
 
+    if (status.hasConflicting) {
+      console.log(chalk.yellow('\n  [WARN] Conflicting notification hooks detected'));
+      console.log(chalk.yellow('  Run "ccnotify repair" to fix'));
+    }
+
     console.log(chalk.gray(`\n  Log file: ${logger.getLogPath()}`));
 
     if (!status.installed) {
@@ -125,6 +131,14 @@ program
     }
   });
 
+program
+  .command('repair')
+  .description('Clean up conflicting hooks and reinstall')
+  .action(() => {
+    const { repair } = require('../src/installer');
+    repair();
+  });
+
 program
   .command('config')
   .description('Configure settings interactively')
@@ -296,4 +310,70 @@ program
     console.log('');
   });
 
+program
+  .command('doctor')
+  .description('Diagnose hook configuration and show current settings')
+  .action(() => {
+    console.log(chalk.blue('Diagnosing claude-code-notify-lite...\n'));
+
+    const { getClaudeConfigDir } = safeRequire('../src/config', 'config');
+    const settingsPath = path.join(getClaudeConfigDir(), 'settings.json');
+
+    console.log(`  Settings file: ${chalk.gray(settingsPath)}`);
+
+    if (!fs.existsSync(settingsPath)) {
+      console.log(chalk.yellow('  [!] Settings file not found'));
+      console.log(chalk.yellow('  Run "ccnotify install" to create hooks\n'));
+      return;
+    }
+
+    try {
+      const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+
+      if (!settings.hooks || !settings.hooks.Stop) {
+        console.log(chalk.yellow('  [!] No Stop hooks configured'));
+        console.log(chalk.yellow('  Run "ccnotify install" to create hooks\n'));
+        return;
+      }
+
+      console.log(chalk.green('  [OK] Stop hooks found\n'));
+      console.log(chalk.blue('  Current Stop hooks:'));
+
+      let hookCount = 0;
+      let hasValidHook = false;
+
+      settings.hooks.Stop.forEach((hookGroup, i) => {
+        if (hookGroup.hooks) {
+          hookGroup.hooks.forEach((hook, j) => {
+            hookCount++;
+            const cmd = hook.command || '(no command)';
+            const isValid = cmd.includes('cli.js') || cmd.includes('run.js') || cmd.includes('ccnotify');
+
+            if (isValid) {
+              hasValidHook = true;
+              console.log(chalk.green(`  ${hookCount}. [VALID] ${cmd}`));
+            } else {
+              console.log(chalk.red(`  ${hookCount}. [INVALID] ${cmd}`));
+            }
+          });
+        }
+      });
+
+      console.log('');
+
+      if (!hasValidHook) {
+        console.log(chalk.red('  [ERROR] No valid notification hooks found'));
+        console.log(chalk.yellow('  The hook command appears incomplete or corrupted'));
+        console.log(chalk.yellow('  Run "ccnotify repair" to fix\n'));
+      } else if (hookCount > 1) {
+        console.log(chalk.yellow(`  [WARN] Multiple hooks detected (${hookCount})`));
+        console.log(chalk.yellow('  Run "ccnotify repair" to clean up\n'));
+      } else {
+        console.log(chalk.green('  [OK] Configuration looks good\n'));
+      }
+    } catch (err) {
+      console.log(chalk.red(`  [ERROR] Failed to parse settings: ${err.message}\n`));
+    }
+  });
+
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-notify-lite",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Task completion notifications for Claude Code - Cross-platform, lightweight, and easy to use",
   "main": "src/index.js",
   "bin": {

package/src/installer.js

@@ -79,6 +79,11 @@ function getHookCommand() {
   const nodePath = process.execPath;
   const originalCliPath = path.resolve(__dirname, '..', 'bin', 'cli.js');
 
+  if (!fs.existsSync(originalCliPath)) {
+    logger.error('CLI script not found', { originalCliPath });
+    throw new Error(`CLI script not found: ${originalCliPath}`);
+  }
+
   let cliPath = originalCliPath;
   let useLocalCopy = false;
   let command;
@@ -93,6 +98,11 @@ function getHookCommand() {
     command = `"${nodePath}" "${cliPath}" run`;
   }
 
+  if (!command.includes('cli.js') && !command.includes('run.js')) {
+    logger.error('Invalid hook command generated', { command, nodePath, cliPath });
+    throw new Error(`Invalid hook command: ${command}`);
+  }
+
   logger.info('Using absolute path command', { command, nodePath, cliPath, useLocalCopy });
   return command;
 }
@@ -151,6 +161,22 @@ function isOurHook(command) {
          command.includes('notify.js');
 }
 
+function isNotificationHook(command) {
+  if (!command) return false;
+  const patterns = [
+    'claude-code-notify-lite',
+    'ccnotify',
+    'notify.js',
+    'notify.bat',
+    'notify.ps1',
+    'task-complete-notify',
+    'notification',
+    'notifier'
+  ];
+  const lowerCommand = command.toLowerCase();
+  return patterns.some(p => lowerCommand.includes(p.toLowerCase()));
+}
+
 function install(options = {}) {
   console.log('Installing claude-code-notify-lite...\n');
   logger.info('Install started', { options });
@@ -195,22 +221,36 @@ function install(options = {}) {
       settings.hooks.Stop = [stopHook];
       logger.info('Created new Stop hook');
     } else {
-      const existingIndex = settings.hooks.Stop.findIndex(h =>
-        h.hooks && h.hooks.some(hh => isOurHook(hh.command))
+      const conflictingHooks = settings.hooks.Stop.filter(h =>
+        h.hooks && h.hooks.some(hh => isNotificationHook(hh.command) && !isOurHook(hh.command))
       );
 
-      if (existingIndex === -1) {
-        settings.hooks.Stop.push(stopHook);
-        logger.info('Added Stop hook');
-      } else {
-        settings.hooks.Stop[existingIndex] = stopHook;
-        console.log('  [OK] Updated existing hook');
-        logger.info('Updated existing Stop hook');
+      if (conflictingHooks.length > 0) {
+        console.log('  [WARN] Found existing notification hooks:');
+        conflictingHooks.forEach(h => {
+          h.hooks.forEach(hh => {
+            if (isNotificationHook(hh.command)) {
+              console.log(`         - ${hh.command}`);
+            }
+          });
+        });
+        console.log('  [INFO] Replacing with claude-code-notify-lite...');
+        logger.info('Found conflicting hooks, replacing them');
       }
+
+      settings.hooks.Stop = settings.hooks.Stop.filter(h => {
+        if (!h.hooks) return true;
+        h.hooks = h.hooks.filter(hh => !isNotificationHook(hh.command));
+        return h.hooks.length > 0;
+      });
+
+      settings.hooks.Stop.push(stopHook);
+      logger.info('Replaced notification hooks with our hook');
     }
 
     writeClaudeSettings(settings);
     console.log('  [OK] Configured Claude Code hooks');
+    console.log(`  [OK] Hook command: ${hookCommand}`);
 
     console.log('\nInstallation complete!');
     console.log('Run "ccnotify test" or "npx ccnotify test" to verify.\n');
@@ -284,16 +324,84 @@ function checkInstallation() {
       h.hooks && h.hooks.some(hh => isOurHook(hh.command))
     );
 
+  const hasConflicting = settings.hooks &&
+    settings.hooks.Stop &&
+    settings.hooks.Stop.some(h =>
+      h.hooks && h.hooks.some(hh => isNotificationHook(hh.command) && !isOurHook(hh.command))
+    );
+
   const configDir = getConfigDir();
   const hasConfig = fs.existsSync(path.join(configDir, 'config.json'));
 
-  logger.debug('Installation check', { hasHook, hasConfig });
+  logger.debug('Installation check', { hasHook, hasConfig, hasConflicting });
 
   return {
     installed: hasHook && hasConfig,
     hasHook,
-    hasConfig
+    hasConfig,
+    hasConflicting
   };
 }
 
-module.exports = { install, uninstall, checkInstallation };
+function repair() {
+  console.log('Repairing claude-code-notify-lite...\n');
+  logger.info('Repair started');
+
+  try {
+    const settings = readClaudeSettings();
+
+    if (!settings.hooks || !settings.hooks.Stop) {
+      console.log('  [INFO] No Stop hooks found');
+      console.log('  [INFO] Running fresh install...\n');
+      return install();
+    }
+
+    let removedCount = 0;
+    const removedHooks = [];
+
+    settings.hooks.Stop.forEach(h => {
+      if (h.hooks) {
+        h.hooks.forEach(hh => {
+          if (isNotificationHook(hh.command)) {
+            removedHooks.push(hh.command);
+            removedCount++;
+          }
+        });
+      }
+    });
+
+    if (removedCount > 0) {
+      console.log('  [INFO] Found notification hooks to clean:');
+      removedHooks.forEach(cmd => console.log(`         - ${cmd}`));
+
+      settings.hooks.Stop = settings.hooks.Stop.filter(h => {
+        if (!h.hooks) return true;
+        h.hooks = h.hooks.filter(hh => !isNotificationHook(hh.command));
+        return h.hooks.length > 0;
+      });
+
+      if (settings.hooks.Stop.length === 0) {
+        delete settings.hooks.Stop;
+      }
+
+      if (Object.keys(settings.hooks).length === 0) {
+        delete settings.hooks;
+      }
+
+      writeClaudeSettings(settings);
+      console.log(`  [OK] Removed ${removedCount} notification hook(s)`);
+      logger.info('Cleaned notification hooks', { removedCount, removedHooks });
+    } else {
+      console.log('  [INFO] No conflicting hooks found');
+    }
+
+    console.log('  [INFO] Reinstalling...\n');
+    return install();
+  } catch (err) {
+    logger.error('Repair failed', err);
+    console.error(`  [ERROR] ${err.message}`);
+    return { success: false, error: err.message };
+  }
+}
+
+module.exports = { install, uninstall, checkInstallation, repair };