git-watchtower 1.10.2 → 1.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "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 --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": "node --require ./tests/setup.js --test tests/unit/**/*.test.js tests/unit/**/**/*.test.js tests/integration/**/*.test.js",
+    "test:unit": "node --require ./tests/setup.js --test tests/unit/**/*.test.js 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'",
+    "test:watch": "node --require ./tests/setup.js --test --watch tests/unit/**/*.test.js tests/unit/**/**/*.test.js",
+    "test:coverage": "c8 --reporter=text --reporter=html --reporter=lcov node --require ./tests/setup.js --test tests/unit/**/*.test.js 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/unit/**/**/*.test.js tests/integration/**/*.test.js",
+    "test:coverage:html": "c8 --reporter=html node --require ./tests/setup.js --test tests/unit/**/*.test.js tests/unit/**/**/*.test.js tests/integration/**/*.test.js && echo 'Coverage report: coverage/index.html'",
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
@@ -22,6 +22,7 @@
     "@semantic-release/git": "^10.0.1",
     "@types/node": "^22.0.0",
     "c8": "^10.1.2",
+    "jsdom": "^24.1.3",
     "semantic-release": "^25.0.3",
     "typescript": "^5.7.0"
   },

package/src/server/web-ui/js.js

@@ -34,6 +34,7 @@ function getDashboardJs() {
   var stashMode = false;
   var pendingStashBranch = null;
   var updateNotificationShown = false;
+  var remoteTabPollTimer = null;
 
   // ── Persistent Preferences (localStorage) ─────────────────────
   var PREFS_KEY = 'git-watchtower-prefs';
@@ -187,14 +188,33 @@ function getDashboardJs() {
     evtSource.addEventListener('state', function(e) {
       try {
         var newState = JSON.parse(e.data);
-        // Diff branches for desktop notifications
-        if (state && state.branches) {
-          diffBranchesForNotifications(state.branches, newState.branches || []);
+        if (!activeTabId && newState.activeProjectId) {
+          activeTabId = newState.activeProjectId;
         }
-        prevBranches = state ? state.branches : null;
-        state = newState;
-        if (!activeTabId && state.activeProjectId) {
-          activeTabId = state.activeProjectId;
+        // SSE always pushes the local project's state.  When the user
+        // is viewing a different tab we must NOT overwrite the per-project
+        // data (branches, PRs, activity, etc.) — only update global
+        // metadata so the tab bar, connection status, and version info
+        // stay current.
+        var viewingLocalProject = !activeTabId || activeTabId === newState.activeProjectId;
+        if (viewingLocalProject) {
+          // Diff branches for desktop notifications
+          if (state && state.branches) {
+            diffBranchesForNotifications(state.branches, newState.branches || []);
+          }
+          prevBranches = state ? state.branches : null;
+          state = newState;
+        } else {
+          // Viewing a remote tab — preserve per-project fields, update globals only
+          if (state) {
+            state.projects = newState.projects;
+            state.version = newState.version;
+            state.updateAvailable = newState.updateAvailable;
+            state.updateInProgress = newState.updateInProgress;
+            state.clientCount = newState.clientCount;
+          } else {
+            state = newState;
+          }
         }
         renderTabs();
         render();
@@ -331,23 +351,17 @@ function getDashboardJs() {
     tabBar.innerHTML = html;
   }
 
-  function switchTab(projectId) {
-    if (projectId === activeTabId) return;
-    activeTabId = projectId;
-    selectedIndex = 0;
-    searchQuery = '';
-    searchMode = false;
-    document.getElementById('search-bar').className = 'search-bar';
-    document.getElementById('search-input').value = '';
-    renderTabs();
-    // Fetch the project's state
+  /**
+   * Fetch a project's state from the server and merge it into the
+   * current client-side state for rendering.
+   */
+  function fetchAndApplyProjectState(projectId) {
     var xhr = new XMLHttpRequest();
     xhr.open('GET', '/api/projects/' + projectId + '/state');
     xhr.onload = function() {
-      if (xhr.status === 200) {
+      if (xhr.status === 200 && activeTabId === projectId) {
         try {
           var pState = JSON.parse(xhr.responseText);
-          // Merge into current state for rendering
           state.branches = pState.branches || [];
           state.currentBranch = pState.currentBranch;
           state.activityLog = pState.activityLog || [];
@@ -359,6 +373,7 @@ function getDashboardJs() {
           state.pollingStatus = pState.pollingStatus || 'idle';
           state.isOffline = pState.isOffline || false;
           state.serverMode = pState.serverMode || 'none';
+          state.repoWebUrl = pState.repoWebUrl || null;
           render();
         } catch (err) { /* ignore */ }
       }
@@ -366,6 +381,28 @@ function getDashboardJs() {
     xhr.send();
   }
 
+  function switchTab(projectId) {
+    if (projectId === activeTabId) return;
+    activeTabId = projectId;
+    selectedIndex = 0;
+    searchQuery = '';
+    searchMode = false;
+    document.getElementById('search-bar').className = 'search-bar';
+    document.getElementById('search-input').value = '';
+    renderTabs();
+    fetchAndApplyProjectState(projectId);
+
+    // For non-local tabs the SSE stream won't push per-project updates,
+    // so poll the server periodically to keep the view fresh.
+    clearInterval(remoteTabPollTimer);
+    remoteTabPollTimer = null;
+    if (state && projectId !== state.activeProjectId) {
+      remoteTabPollTimer = setInterval(function() {
+        fetchAndApplyProjectState(projectId);
+      }, 2000);
+    }
+  }
+
   // ── Time Formatting ────────────────────────────────────────────
   function timeAgo(dateStr) {
     if (!dateStr) return '';