git-watchtower 1.9.5 → 1.9.7

package/bin/git-watchtower.js

@@ -1691,11 +1691,17 @@ async function pollGitChanges() {
     for (const knownName of knownBranchNames) {
       if (!fetchedBranchNames.has(knownName)) {
         // This branch was deleted from remote
+        // Check if already present in allBranches (avoid duplicates)
+        const alreadyInList = allBranches.some(b => b.name === knownName);
+        if (alreadyInList) continue;
+
         const existingInList = currentBranches.find(b => b.name === knownName);
-        if (existingInList && !existingInList.isDeleted) {
-          existingInList.isDeleted = true;
-          existingInList.deletedAt = now;
-          addLog(`Branch deleted: ${knownName}`, 'warning');
+        if (existingInList) {
+          if (!existingInList.isDeleted) {
+            existingInList.isDeleted = true;
+            existingInList.deletedAt = now;
+            addLog(`Branch deleted: ${knownName}`, 'warning');
+          }
           // Keep it in the list temporarily
           allBranches.push(existingInList);
         }
@@ -2839,13 +2845,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);
 });
 
@@ -2867,7 +2874,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.5",
+  "version": "1.9.7",
   "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/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,