git-watchtower 2.1.5 → 2.1.7

package/bin/git-watchtower.js

@@ -2282,7 +2282,18 @@ function createStaticServer() {
     // directory. Without this second realpath+check, a symlinked dir
     // whose target pointed outside would serve its attacker-controlled
     // index.html through our root check.
-    if (fs.statSync(initial.path).isDirectory()) {
+    let isDir;
+    try {
+      isDir = fs.statSync(initial.path).isDirectory();
+    } catch (e) {
+      // File vanished (ENOENT), perms changed (EACCES), or symlink loop
+      // (ELOOP) between resolveStaticPath's realpath and this stat.
+      // Without this guard the throw bubbles to uncaughtException and
+      // tears down the entire TUI for what should be a 404.
+      send404();
+      return;
+    }
+    if (isDir) {
       const indexResult = resolveStaticPath(
         path.join(initial.path, 'index.html'),
         realStaticDir,

package/package.json

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

package/src/telemetry/config.js

@@ -31,7 +31,7 @@ function getConfigPath() {
 
 /**
  * Load telemetry config from disk
- * @returns {{ telemetryEnabled: boolean, distinctId: string, promptedAt: string } | null}
+ * @returns {{ telemetryEnabled: boolean, distinctId?: string, promptedAt: string } | null}
  */
 function loadTelemetryConfig() {
   try {
@@ -48,7 +48,14 @@ function loadTelemetryConfig() {
 
 /**
  * Save telemetry config to disk
- * @param {{ telemetryEnabled: boolean, distinctId: string, promptedAt: string }} config
+ *
+ * `distinctId` is optional: when the user declines telemetry we persist
+ * `{ telemetryEnabled: false, promptedAt }` only — no persistent identifier
+ * lands on disk for declining users. `getOrCreateDistinctId` already
+ * handles the missing case by minting a fresh UUID if the user later
+ * opts in.
+ *
+ * @param {{ telemetryEnabled: boolean, distinctId?: string, promptedAt: string }} config
  */
 function saveTelemetryConfig(config) {
   const dir = getConfigDir();

package/src/telemetry/index.js

@@ -58,25 +58,30 @@ async function promptIfNeeded(promptYesNo) {
   console.log('\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518');
   console.log('');
 
-  const distinctId = config.getOrCreateDistinctId();
-
-  // Fire analytics_prompt_shown event — always sent regardless of user's choice
-  analytics.captureAlways('analytics_prompt_shown', distinctId);
-
   const answer = await promptYesNo('Enable anonymous telemetry to help improve Git Watchtower?', false);
 
-  // Fire analytics_decision event — always sent so we know opt-in/out rates
-  analytics.captureAlways('analytics_decision', distinctId, { opted_in: answer });
-
-  config.saveTelemetryConfig({
-    telemetryEnabled: answer,
-    distinctId,
-    promptedAt: new Date().toISOString(),
-  });
-
   if (answer) {
+    // Consent given: assign and persist a stable distinctId, then fire the
+    // prompt-shown and decision events so opt-in rates are observable.
+    const distinctId = config.getOrCreateDistinctId();
+    analytics.captureAlways('analytics_prompt_shown', distinctId);
+    analytics.captureAlways('analytics_decision', distinctId, { opted_in: true });
+    config.saveTelemetryConfig({
+      telemetryEnabled: true,
+      distinctId,
+      promptedAt: new Date().toISOString(),
+    });
     console.log('  Thank you! Telemetry enabled.\n');
   } else {
+    // No consent: don't ship any events to PostHog and don't persist a
+    // distinctId on disk. Previously the prompt-shown and decision events
+    // fired regardless of the answer, tagged with the user's persistent
+    // distinctId — which contradicted the README's "anonymous, opt-in"
+    // pitch and meant declining users still showed up in analytics.
+    config.saveTelemetryConfig({
+      telemetryEnabled: false,
+      promptedAt: new Date().toISOString(),
+    });
     console.log('  No problem! Telemetry disabled.\n');
   }
 }