git-watchtower 1.9.4 → 1.9.6

package/bin/git-watchtower.js

@@ -81,9 +81,9 @@ const { parseGitHubPr, parseGitLabMr, parseGitHubPrList, parseGitLabMrList, isBa
 // ============================================================================
 // Security & Validation (imported from src/git/branch.js and src/git/commands.js)
 // ============================================================================
-const { isValidBranchName, sanitizeBranchName, getGoneBranches, deleteGoneBranches } = require('../src/git/branch');
+const { isValidBranchName, sanitizeBranchName, getGoneBranches, deleteGoneBranches, getCurrentBranch: getCurrentBranchRaw, getAllBranches: getAllBranchesRaw } = require('../src/git/branch');
 const { pruneStaleEntries } = require('../src/polling/engine');
-const { isGitAvailable: checkGitAvailable, execGit, execGitSilent, getDiffStats: getDiffStatsSafe, getAheadBehind, getDiffShortstat } = require('../src/git/commands');
+const { isGitAvailable: checkGitAvailable, execGit, execGitSilent, getDiffStats: getDiffStatsSafe, getAheadBehind, getDiffShortstat, hasUncommittedChanges: checkUncommittedChanges } = require('../src/git/commands');
 
 // Session stats (always-on, non-casino stats)
 const sessionStats = require('../src/stats/session');
@@ -743,8 +743,9 @@ const actions = require('../src/ui/actions');
 // Diff stats parsing and stash imported from src/git/commands.js
 const { parseDiffStats, stash: gitStash, stashPop: gitStashPop } = require('../src/git/commands');
 
-// Server process command parsing
+// Server process command parsing and static server utilities
 const { parseCommand } = require('../src/server/process');
+const { getMimeType, injectLiveReload } = require('../src/server/static');
 
 // State (non-store globals)
 let previousBranchStates = new Map(); // branch name -> commit hash
@@ -781,39 +782,7 @@ const MAX_HISTORY = 20;
 let lastSparklineUpdate = 0;
 const SPARKLINE_CACHE_TTL = 5 * 60 * 1000; // 5 minutes
 
-// MIME types
-const MIME_TYPES = {
-  '.html': 'text/html',
-  '.css': 'text/css',
-  '.js': 'application/javascript',
-  '.json': 'application/json',
-  '.png': 'image/png',
-  '.jpg': 'image/jpeg',
-  '.jpeg': 'image/jpeg',
-  '.gif': 'image/gif',
-  '.svg': 'image/svg+xml',
-  '.ico': 'image/x-icon',
-  '.webp': 'image/webp',
-  '.woff': 'font/woff',
-  '.woff2': 'font/woff2',
-  '.ttf': 'font/ttf',
-  '.xml': 'application/xml',
-  '.txt': 'text/plain',
-  '.md': 'text/markdown',
-  '.pdf': 'application/pdf',
-};
-
-// Live reload script
-const LIVE_RELOAD_SCRIPT = `
-<script>
-(function() {
-  var source = new EventSource('/livereload');
-  source.onmessage = function(e) {
-    if (e.data === 'reload') location.reload();
-  };
-})();
-</script>
-</body>`;
+// MIME_TYPES and LIVE_RELOAD_SCRIPT imported from src/server/static.js (via getMimeType and injectLiveReload)
 
 // ============================================================================
 // Utility Functions
@@ -1379,20 +1348,9 @@ function hideStashConfirm() {
 // ============================================================================
 
 async function getCurrentBranch() {
-  try {
-    const { stdout } = await execGit(['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: PROJECT_ROOT });
-    // Check for detached HEAD state
-    if (stdout === 'HEAD') {
-      store.setState({ isDetachedHead: true });
-      // Get the short commit hash instead
-      const { stdout: commitHash } = await execGit(['rev-parse', '--short', 'HEAD'], { cwd: PROJECT_ROOT });
-      return `HEAD@${commitHash}`;
-    }
-    store.setState({ isDetachedHead: false });
-    return stdout;
-  } catch (e) {
-    return null;
-  }
+  const result = await getCurrentBranchRaw(PROJECT_ROOT);
+  store.setState({ isDetachedHead: result.isDetached });
+  return result.name;
 }
 
 async function checkRemoteExists() {
@@ -1406,91 +1364,14 @@ async function checkRemoteExists() {
 }
 
 async function hasUncommittedChanges() {
-  try {
-    const { stdout } = await execGit(['status', '--porcelain'], { cwd: PROJECT_ROOT, timeout: 5000 });
-    return stdout.length > 0;
-  } catch (e) {
-    return false;
-  }
+  return checkUncommittedChanges(PROJECT_ROOT);
 }
 
 // isAuthError, isMergeConflict, isNetworkError imported from src/utils/errors.js
 
 async function getAllBranches() {
   try {
-    await execGitSilent(['fetch', '--all', '--prune'], { cwd: PROJECT_ROOT, timeout: 60000 });
-
-    const branchList = [];
-    const seenBranches = new Set();
-
-    // Get local branches
-    // Use \x1f (Unit Separator) as delimiter since | can appear in commit subjects
-    const delimiter = '\x1f';
-    const { stdout: localOutput } = await execGit(
-      ['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, 'refs/heads/'],
-      { cwd: PROJECT_ROOT }
-    );
-
-    for (const line of localOutput.split('\n').filter(Boolean)) {
-      const [name, dateStr, commit, ...subjectParts] = line.split(delimiter);
-      const subject = subjectParts.join(delimiter);
-      if (!seenBranches.has(name) && isValidBranchName(name)) {
-        seenBranches.add(name);
-        branchList.push({
-          name,
-          commit,
-          subject: subject || '',
-          date: new Date(dateStr),
-          isLocal: true,
-          hasRemote: false,
-          hasUpdates: false,
-        });
-      }
-    }
-
-    // Get remote branches (using configured remote name)
-    const remoteResult = await execGitSilent(
-      ['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, `refs/remotes/${REMOTE_NAME}/`],
-      { cwd: PROJECT_ROOT }
-    );
-    const remoteOutput = remoteResult ? remoteResult.stdout : '';
-
-    const remotePrefix = `${REMOTE_NAME}/`;
-    for (const line of remoteOutput.split('\n').filter(Boolean)) {
-      const [fullName, dateStr, commit, ...subjectParts] = line.split(delimiter);
-      const subject = subjectParts.join(delimiter);
-      const name = fullName.replace(remotePrefix, '');
-      if (name === 'HEAD') continue;
-      if (!isValidBranchName(name)) continue;
-
-      const existing = branchList.find(b => b.name === name);
-      if (existing) {
-        existing.hasRemote = true;
-        existing.remoteCommit = commit;
-        existing.remoteDate = new Date(dateStr);
-        existing.remoteSubject = subject || '';
-        if (commit !== existing.commit) {
-          existing.hasUpdates = true;
-          // Use remote's date when it has updates (so it sorts to top)
-          existing.date = new Date(dateStr);
-          existing.subject = subject || existing.subject;
-        }
-      } else if (!seenBranches.has(name)) {
-        seenBranches.add(name);
-        branchList.push({
-          name,
-          commit,
-          subject: subject || '',
-          date: new Date(dateStr),
-          isLocal: false,
-          hasRemote: true,
-          hasUpdates: false,
-        });
-      }
-    }
-
-    branchList.sort((a, b) => b.date - a.date);
-    return branchList; // Return all branches, caller will slice
+    return await getAllBranchesRaw({ remoteName: REMOTE_NAME, fetch: true, cwd: PROJECT_ROOT });
   } catch (e) {
     addLog(`Failed to get branches: ${e.message || e}`, 'error');
     return [];
@@ -1841,6 +1722,8 @@ async function pollGitChanges() {
     const updatedBranches = [];
     const currentBranchName = store.get('currentBranch');
     for (const branch of pollFilteredBranches) {
+      // Clear previous cycle's flag so only freshly-updated branches are highlighted
+      branch.justUpdated = false;
       if (branch.isDeleted) continue;
       const prevCommit = previousBranchStates.get(branch.name);
       if (prevCommit && prevCommit !== branch.commit && branch.name !== currentBranchName) {
@@ -2109,7 +1992,7 @@ function handleLiveReload(req, res) {
 
 function serveFile(res, filePath, logPath) {
   const ext = path.extname(filePath).toLowerCase();
-  const mimeType = MIME_TYPES[ext] || 'application/octet-stream';
+  const mimeType = getMimeType(ext);
 
   fs.readFile(filePath, (err, data) => {
     if (err) {
@@ -2120,10 +2003,7 @@ function serveFile(res, filePath, logPath) {
     }
 
     if (mimeType === 'text/html') {
-      let html = data.toString();
-      if (html.includes('</body>')) {
-        html = html.replace('</body>', LIVE_RELOAD_SCRIPT);
-      }
+      const html = injectLiveReload(data.toString());
       res.writeHead(200, { 'Content-Type': mimeType });
       res.end(html);
     } else {
@@ -2959,13 +2839,14 @@ async function shutdown() {
 
 process.on('SIGINT', shutdown);
 process.on('SIGTERM', shutdown);
-process.on('uncaughtException', (err) => {
+process.on('uncaughtException', async (err) => {
   telemetry.captureError(err);
   write(ansi.showCursor);
   write(ansi.restoreScreen);
   restoreTerminalTitle();
   if (process.stdin.isTTY) process.stdin.setRawMode(false);
   console.error('Uncaught exception:', err);
+  await telemetry.shutdown();
   process.exit(1);
 });
 
@@ -2987,7 +2868,8 @@ async function start() {
   const config = await ensureConfig(cliArgs);
   applyConfig(config);
 
-  // Telemetry: opt-in prompt (first run only) and initialization
+  // Telemetry: set version early so consent events include $lib_version
+  telemetry.setVersion(PACKAGE_VERSION);
   await telemetry.promptIfNeeded(promptYesNo);
   telemetry.init({ version: PACKAGE_VERSION });
   sessionStartTime = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "description": "Terminal-based Git branch monitor with activity sparklines and optional dev server with live reload",
   "main": "bin/git-watchtower.js",
   "bin": {
@@ -8,13 +8,13 @@
   },
   "scripts": {
     "start": "node bin/git-watchtower.js",
-    "test": "node --test tests/unit/**/*.test.js tests/integration/**/*.test.js",
-    "test:unit": "node --test tests/unit/**/*.test.js",
-    "test:integration": "node --test tests/integration/**/*.test.js",
-    "test:watch": "node --test --watch tests/unit/**/*.test.js",
-    "test:coverage": "c8 --reporter=text --reporter=html --reporter=lcov node --test tests/unit/**/*.test.js tests/integration/**/*.test.js",
-    "test:coverage:text": "c8 --reporter=text node --test tests/unit/**/*.test.js tests/integration/**/*.test.js",
-    "test:coverage:html": "c8 --reporter=html node --test tests/unit/**/*.test.js tests/integration/**/*.test.js && echo 'Coverage report: coverage/index.html'",
+    "test": "node --require ./tests/setup.js --test tests/unit/**/*.test.js tests/integration/**/*.test.js",
+    "test:unit": "node --require ./tests/setup.js --test tests/unit/**/*.test.js",
+    "test:integration": "node --require ./tests/setup.js --test tests/integration/**/*.test.js",
+    "test:watch": "node --require ./tests/setup.js --test --watch tests/unit/**/*.test.js",
+    "test:coverage": "c8 --reporter=text --reporter=html --reporter=lcov node --require ./tests/setup.js --test tests/unit/**/*.test.js tests/integration/**/*.test.js",
+    "test:coverage:text": "c8 --reporter=text node --require ./tests/setup.js --test tests/unit/**/*.test.js tests/integration/**/*.test.js",
+    "test:coverage:html": "c8 --reporter=html node --require ./tests/setup.js --test tests/unit/**/*.test.js tests/integration/**/*.test.js && echo 'Coverage report: coverage/index.html'",
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {

package/src/polling/engine.js

@@ -57,6 +57,8 @@ function detectDeletedBranches(knownBranchNames, fetchedBranchNames, existingBra
 function detectUpdatedBranches(branches, previousStates, currentBranch) {
   const updated = [];
   for (const branch of branches) {
+    // Clear previous cycle's flag so only freshly-updated branches are highlighted
+    branch.justUpdated = false;
     if (branch.isDeleted) continue;
     const prevCommit = previousStates.get(branch.name);
     if (prevCommit && prevCommit !== branch.commit && branch.name !== currentBranch) {

package/src/telemetry/analytics.js

@@ -22,40 +22,46 @@ const FLUSH_INTERVAL = 30000; // 30 seconds
 const FLUSH_AT = 10; // flush when 10 events accumulated
 
 /**
- * Send a batch of events to PostHog via HTTPS POST (fire-and-forget)
+ * Send a batch of events to PostHog via HTTPS POST.
+ * Returns a promise that resolves when the request completes (or fails).
+ * Callers that don't need to wait can ignore the return value.
  * @param {Array<Record<string, any>>} events
+ * @returns {Promise<void>}
  */
 function sendBatch(events) {
-  if (events.length === 0) return;
-
-  const payload = JSON.stringify({ api_key: POSTHOG_API_KEY, batch: events });
-
-  const req = https.request({
-    hostname: POSTHOG_HOST,
-    port: 443,
-    path: '/batch',
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      'Content-Length': Buffer.byteLength(payload),
-    },
-    timeout: 5000,
-  });
+  if (events.length === 0) return Promise.resolve();
+
+  return new Promise((resolve) => {
+    const payload = JSON.stringify({ api_key: POSTHOG_API_KEY, batch: events });
+
+    const req = https.request({
+      hostname: POSTHOG_HOST,
+      port: 443,
+      path: '/batch',
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': Buffer.byteLength(payload),
+      },
+      timeout: 5000,
+    });
 
-  // Fire-and-forget: ignore all errors and responses
-  req.on('error', () => {});
-  req.on('timeout', () => req.destroy());
-  req.end(payload);
+    req.on('error', () => resolve());
+    req.on('timeout', () => { req.destroy(); resolve(); });
+    req.on('response', () => resolve());
+    req.end(payload);
+  });
 }
 
 /**
- * Flush pending events
+ * Flush pending events.
+ * @returns {Promise<void>} Resolves when the batch has been sent (or fails).
  */
 function flush() {
-  if (eventQueue.length === 0) return;
+  if (eventQueue.length === 0) return Promise.resolve();
   const batch = eventQueue;
   eventQueue = [];
-  sendBatch(batch);
+  return sendBatch(batch);
 }
 
 /**
@@ -81,6 +87,15 @@ function queueEvent(event, properties, overrideDistinctId) {
   }
 }
 
+/**
+ * Set the app version so that even pre-init events include $lib_version.
+ * Call this before promptIfNeeded() so consent events carry the version.
+ * @param {string} version
+ */
+function setVersion(version) {
+  appVersion = version;
+}
+
 /**
  * Initialize the analytics client if telemetry is enabled
  * @param {{ version: string }} options
@@ -190,7 +205,7 @@ function captureAlways(event, userDistinctId, properties = {}) {
 }
 
 /**
- * Flush pending events and shutdown
+ * Flush pending events and shutdown.
  * Call this before process exit to ensure events are sent.
  * @returns {Promise<void>}
  */
@@ -203,7 +218,7 @@ async function shutdown() {
   if (!enabled) return;
 
   try {
-    flush();
+    await flush();
   } catch {
     // Best-effort flush
   } finally {
@@ -220,6 +235,7 @@ function isEnabled() {
 }
 
 module.exports = {
+  setVersion,
   init,
   capture,
   captureError,

package/src/telemetry/index.js

@@ -83,6 +83,7 @@ async function promptIfNeeded(promptYesNo) {
 
 module.exports = {
   // Analytics
+  setVersion: analytics.setVersion,
   init: analytics.init,
   capture: analytics.capture,
   captureError: analytics.captureError,