git-watchtower 2.1.6 → 2.1.8

package/bin/git-watchtower.js

@@ -1602,6 +1602,43 @@ async function undoLastSwitch() {
   }
 
   const lastSwitch = currentHistory[0];
+
+  // Detached HEAD restore: switchHistory captured the previous state as the
+  // synthetic "HEAD@<hash>" name produced by getCurrentBranch(). sanitizeBranchName
+  // rejects '@', so round-tripping through switchToBranch fails with "Invalid
+  // Branch Name". Detect the detached form and `git checkout <hash>` directly.
+  const detachedMatch = /^HEAD@([0-9a-f]{4,40})$/i.exec(lastSwitch.from);
+  if (detachedMatch) {
+    const hash = detachedMatch[1];
+    addLog(`Undoing: restoring detached HEAD at ${hash}`, 'update');
+
+    if (await hasUncommittedChanges()) {
+      addLog('Cannot undo: uncommitted changes in working directory', 'error');
+      pendingDirtyOperation = { type: 'switch', branch: lastSwitch.from };
+      showStashConfirm(`undo to detached HEAD ${hash}`);
+      return { success: false, reason: 'dirty' };
+    }
+
+    try {
+      await execGit(['checkout', hash], { cwd: PROJECT_ROOT });
+      store.setState({
+        currentBranch: lastSwitch.from,
+        isDetachedHead: true,
+        switchHistory: store.get('switchHistory').slice(1),
+      });
+      addLog(`Undone: detached HEAD at ${hash}`, 'success');
+      branchSwitchCount++;
+      pendingDirtyOperation = null;
+      notifyClients();
+      return { success: true };
+    } catch (e) {
+      const errMsg = e.stderr || e.message || String(e);
+      addLog(`Undo failed: ${errMsg}`, 'error');
+      showErrorToast('Undo Failed', truncate(errMsg, 100), 'Commit may have been garbage-collected');
+      return { success: false };
+    }
+  }
+
   addLog(`Undoing: going back to ${lastSwitch.from}`, 'update');
 
   const result = await switchToBranch(lastSwitch.from, false);
@@ -3125,12 +3162,12 @@ async function handleWebAction(action, payload) {
         sendResult(true, 'Fetch complete');
         break;
       case 'undo': {
-        const last = store.getLastSwitch();
-        if (last) {
-          await switchToBranch(last.from);
-          store.popHistory();
-          await pollGitChanges();
-          sendResult(true, `Switched back to ${last.from}`);
+        // Delegate to undoLastSwitch so detached-HEAD restoration and
+        // history popping stay consistent with the TUI 'u' keybinding.
+        const result = await undoLastSwitch();
+        await pollGitChanges();
+        if (result.success) {
+          sendResult(true, `Undone last switch`);
         } else {
           sendResult(false, 'No switch to undo');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "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');
   }
 }