git-watchtower 1.10.11 → 1.10.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.10.11",
+  "version": "1.10.13",
   "description": "Terminal-based Git branch monitor with activity sparklines and optional dev server with live reload",
   "main": "bin/git-watchtower.js",
   "bin": {

package/src/config/loader.js

@@ -5,7 +5,7 @@
 const fs = require('fs');
 const path = require('path');
 const { ConfigError } = require('../utils/errors');
-const { getDefaultConfig, validateConfig, migrateConfig } = require('./schema');
+const { validateConfig, migrateConfig } = require('./schema');
 
 /**
  * Default configuration file name
@@ -117,212 +117,6 @@ function deleteConfig(projectRoot) {
   return true;
 }
 
-/**
- * Apply CLI arguments to configuration
- * CLI args take precedence over config file values
- * @param {Object} config - Base configuration
- * @param {Object} cliArgs - CLI arguments
- * @returns {Object} - Merged configuration
- */
-function applyCliArgs(config, cliArgs) {
-  const result = JSON.parse(JSON.stringify(config)); // Deep clone
-
-  // Server settings
-  if (cliArgs.mode !== undefined && cliArgs.mode !== null) {
-    result.server.mode = cliArgs.mode;
-  }
-  if (cliArgs.noServer) {
-    result.server.mode = 'none';
-  }
-  if (cliArgs.port !== undefined && cliArgs.port !== null) {
-    result.server.port = cliArgs.port;
-  }
-  if (cliArgs.staticDir !== undefined && cliArgs.staticDir !== null) {
-    result.server.staticDir = cliArgs.staticDir;
-  }
-  if (cliArgs.command !== undefined && cliArgs.command !== null) {
-    result.server.command = cliArgs.command;
-  }
-  if (cliArgs.restartOnSwitch !== undefined && cliArgs.restartOnSwitch !== null) {
-    result.server.restartOnSwitch = cliArgs.restartOnSwitch;
-  }
-
-  // Web dashboard
-  if (cliArgs.web) {
-    result.web = { ...result.web, enabled: true };
-  }
-  if (cliArgs.webPort !== undefined && cliArgs.webPort !== null) {
-    result.web = { ...result.web, port: cliArgs.webPort };
-  }
-
-  // Git settings
-  if (cliArgs.remote !== undefined && cliArgs.remote !== null) {
-    result.remoteName = cliArgs.remote;
-  }
-  if (cliArgs.autoPull !== undefined && cliArgs.autoPull !== null) {
-    result.autoPull = cliArgs.autoPull;
-  }
-  if (cliArgs.pollInterval !== undefined && cliArgs.pollInterval !== null) {
-    result.gitPollInterval = cliArgs.pollInterval;
-  }
-
-  // UI settings
-  if (cliArgs.sound !== undefined && cliArgs.sound !== null) {
-    result.soundEnabled = cliArgs.sound;
-  }
-  if (cliArgs.visibleBranches !== undefined && cliArgs.visibleBranches !== null) {
-    result.visibleBranches = cliArgs.visibleBranches;
-  }
-  if (cliArgs.casino !== undefined && cliArgs.casino !== null) {
-    result.casinoMode = cliArgs.casino;
-  }
-
-  return result;
-}
-
-/**
- * Parse CLI arguments
- * @param {string[]} [argv] - Command line arguments (defaults to process.argv.slice(2))
- * @returns {Object} - Parsed arguments
- */
-function parseCliArgs(argv = process.argv.slice(2)) {
-  const result = {
-    // Server settings
-    mode: null,
-    noServer: false,
-    port: null,
-    staticDir: null,
-    command: null,
-    restartOnSwitch: null,
-    // Git settings
-    remote: null,
-    autoPull: null,
-    pollInterval: null,
-    // UI settings
-    sound: null,
-    visibleBranches: null,
-    casino: null,
-    // Special flags
-    init: false,
-    help: false,
-    version: false,
-  };
-
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i];
-
-    switch (arg) {
-      // Server settings
-      case '--mode':
-        result.mode = argv[++i];
-        break;
-      case '--no-server':
-        result.noServer = true;
-        break;
-      case '--port':
-      case '-p':
-        result.port = parseInt(argv[++i], 10);
-        break;
-      case '--static-dir':
-        result.staticDir = argv[++i];
-        break;
-      case '--command':
-      case '-c':
-        result.command = argv[++i];
-        break;
-      case '--restart-on-switch':
-        result.restartOnSwitch = true;
-        break;
-      case '--no-restart-on-switch':
-        result.restartOnSwitch = false;
-        break;
-
-      // Git settings
-      case '--remote':
-      case '-r':
-        result.remote = argv[++i];
-        break;
-      case '--auto-pull':
-        result.autoPull = true;
-        break;
-      case '--no-auto-pull':
-        result.autoPull = false;
-        break;
-      case '--poll-interval':
-        result.pollInterval = parseInt(argv[++i], 10) * 1000; // Convert seconds to ms
-        break;
-
-      // UI settings
-      case '--sound':
-        result.sound = true;
-        break;
-      case '--no-sound':
-        result.sound = false;
-        break;
-      case '--visible-branches':
-        result.visibleBranches = parseInt(argv[++i], 10);
-        break;
-      case '--casino':
-        result.casino = true;
-        break;
-      case '--no-casino':
-        result.casino = false;
-        break;
-
-      // Special flags
-      case '--init':
-        result.init = true;
-        break;
-      case '--help':
-      case '-h':
-        result.help = true;
-        break;
-      case '--version':
-      case '-v':
-        result.version = true;
-        break;
-    }
-  }
-
-  return result;
-}
-
-/**
- * Ensure configuration exists
- * Loads from file, runs wizard if needed, and applies CLI args
- * @param {Object} cliArgs - CLI arguments
- * @param {Object} [options] - Options
- * @param {string} [options.projectRoot] - Project root directory
- * @param {boolean} [options.interactive=true] - Allow interactive prompts
- * @param {Function} [options.runWizard] - Wizard function to run if needed
- * @returns {Promise<Object>} - Final configuration
- */
-async function ensureConfig(cliArgs, options = {}) {
-  const { projectRoot, interactive = true, runWizard } = options;
-
-  // Check if --init flag was passed (force reconfiguration)
-  if (cliArgs.init && runWizard) {
-    const config = await runWizard();
-    return applyCliArgs(config, cliArgs);
-  }
-
-  // Load existing config
-  let config = loadConfig(projectRoot);
-
-  // If no config exists
-  if (!config) {
-    if (runWizard && interactive && process.stdin.isTTY) {
-      config = await runWizard();
-    } else {
-      // Use defaults
-      config = getDefaultConfig();
-    }
-  }
-
-  // Apply CLI args over config
-  return applyCliArgs(config, cliArgs);
-}
-
 module.exports = {
   CONFIG_FILE_NAME,
   getConfigPath,
@@ -331,7 +125,4 @@ module.exports = {
   loadConfig,
   saveConfig,
   deleteConfig,
-  applyCliArgs,
-  parseCliArgs,
-  ensureConfig,
 };

package/src/git/commands.js

@@ -5,7 +5,6 @@
 
 const { execFile } = require('child_process');
 const { GitError } = require('../utils/errors');
-const { withTimeout } = require('../utils/async');
 
 // Default timeout for git operations (30 seconds)
 const DEFAULT_TIMEOUT = 30000;
@@ -44,10 +43,12 @@ async function execGit(args, options = {}) {
   const command = `git ${args.join(' ')}`;
 
   try {
-    const promise = new Promise((resolve, reject) => {
+    const result = await new Promise((resolve, reject) => {
       execFile('git', args, {
         cwd,
         maxBuffer: 10 * 1024 * 1024, // 10MB buffer for large outputs
+        timeout,          // kill child process after timeout ms
+        killSignal: 'SIGTERM',
       }, (error, stdout, stderr) => {
         if (error) {
           error.stderr = stderr;
@@ -58,23 +59,13 @@ async function execGit(args, options = {}) {
       });
     });
 
-    const result = await withTimeout(
-      promise,
-      timeout,
-      `Git command timed out after ${timeout}ms: ${command}`
-    );
-
     return {
       stdout: result.stdout.trim(),
       stderr: result.stderr.trim(),
     };
   } catch (error) {
-    // Handle timeout error
-    if (error.message && error.message.includes('timed out')) {
-      throw new GitError(error.message, 'GIT_TIMEOUT', { command });
-    }
-
-    // Handle exec error
+    // execFile sets error.killed = true when the process is killed due to
+    // timeout.  GitError.fromExecError already maps killed → GIT_TIMEOUT.
     throw GitError.fromExecError(error, command, error.stderr);
   }
 }

package/src/index.js

@@ -151,9 +151,6 @@ module.exports = {
   loadConfig: configLoader.loadConfig,
   saveConfig: configLoader.saveConfig,
   deleteConfig: configLoader.deleteConfig,
-  applyCliArgs: configLoader.applyCliArgs,
-  parseCliArgs: configLoader.parseCliArgs,
-  ensureConfig: configLoader.ensureConfig,
 
   // Server process management
   ProcessManager: serverProcess.ProcessManager,

package/src/utils/gitignore.js

@@ -125,19 +125,12 @@ function loadGitignorePatterns(searchPaths) {
  * @returns {boolean} - True if the file is in the .git directory
  */
 function isGitDirectory(filename) {
-  if (filename === '.git' || filename.startsWith('.git/') || filename.startsWith('.git\\')) {
-    return true;
-  }
-
   // Normalize path separators for cross-platform support
-  const normalizedPath = filename.replace(/\\/g, '/');
+  const p = filename.replace(/\\/g, '/');
 
-  // Check if path contains .git directory anywhere
-  if (normalizedPath.includes('/.git/') || normalizedPath.includes('/.git')) {
-    return true;
-  }
-
-  return false;
+  // Match exactly ".git" as a path segment, not ".github", ".gitignore", etc.
+  // Valid matches: ".git", ".git/hooks/pre-commit", "src/.git/config"
+  return /^\.git(\/|$)/.test(p) || /\/\.git(\/|$)/.test(p);
 }
 
 /**