git-watchtower 2.3.22 → 2.3.24

package/package.json

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

package/src/git/pr.js

@@ -8,12 +8,24 @@
  * @param {Array} prs - Array of PR objects from gh CLI
  * @returns {object|null} Normalized PR info
  */
+// GitHub statusCheckRollup conclusions that mean "this check did not pass."
+// FAILURE alone misses TIMED_OUT, CANCELLED, ACTION_REQUIRED, and STARTUP_FAILURE
+// — a PR with any of those would render no CI badge in the action modal,
+// leaving the user blind to a real CI break.
+const FAILED_CONCLUSIONS = new Set([
+  'FAILURE',
+  'TIMED_OUT',
+  'CANCELLED',
+  'ACTION_REQUIRED',
+  'STARTUP_FAILURE',
+]);
+
 function parseGitHubPr(prs) {
   if (!prs || prs.length === 0) return null;
   const pr = prs[0];
   const checks = pr.statusCheckRollup || [];
   const checksPass = checks.length > 0 && checks.every(c => c.conclusion === 'SUCCESS');
-  const checksFail = checks.some(c => c.conclusion === 'FAILURE');
+  const checksFail = checks.some(c => FAILED_CONCLUSIONS.has(c.conclusion));
   return {
     number: pr.number,
     title: pr.title,

package/src/server/coordinator.js

@@ -710,12 +710,21 @@ class Worker {
 
       this.socket.on('error', (err) => {
         this._connected = false;
-        settleReject(err);
+        // Pre-registration: settleReject the connect-promise with the
+        // socket error. Post-registration: the promise has already
+        // resolved, so just maintain _connected. Without the `settled`
+        // guard we still passed the same Error into settleReject — a
+        // no-op on the already-settled promise, but the misleading
+        // "before registration" message would survive in any future
+        // change that logged it.
+        if (!settled) settleReject(err);
       });
 
       this.socket.on('close', () => {
         this._connected = false;
-        settleReject(new Error('coordinator socket closed before registration'));
+        if (!settled) {
+          settleReject(new Error('coordinator socket closed before registration'));
+        }
       });
     });
   }

package/src/ui/renderer.js

@@ -26,6 +26,32 @@ const { isBaseBranch } = require('../git/pr');
 const { detectInstallSource, getUpdateCommand } = require('../utils/install-source');
 const { version: PACKAGE_VERSION } = require('../../package.json');
 
+// ---------------------------------------------------------------------------
+// Branch-row layout helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Spaces to write after the (possibly truncated) branch name so the
+ * sparkline column lands at a consistent offset regardless of the
+ * branch name's actual byte count.
+ *
+ * Must measure in display columns, not UTF-16 code units. truncate()
+ * appends ansi.reset (4 bytes) on its long-string path; CJK / wide
+ * emoji span 1 code unit per 2 columns; ZWJ clusters render as 2
+ * columns from up to 8 units. Using raw .length would drift the
+ * sparkline by N columns per non-ASCII branch and by 4 for any
+ * truncated branch.
+ *
+ * Always returns at least 1 so consecutive writes never abut.
+ *
+ * @param {string} displayName - Already truncate()d branch name.
+ * @param {number} maxNameLen - Column budget the name was truncated to.
+ * @returns {number} Number of space characters to write.
+ */
+function computeNamePadding(displayName, maxNameLen) {
+  return Math.max(1, maxNameLen - visibleLength(displayName) + 2);
+}
+
 // ---------------------------------------------------------------------------
 // Compact number formatting
 // ---------------------------------------------------------------------------
@@ -239,7 +265,7 @@ function renderBranchList(state, write) {
     const fixedWidth = 27 + DIFF_TAG_FIXED_LEN;
     const maxNameLen = contentWidth - fixedWidth;
     const displayName = truncate(branch.name, maxNameLen);
-    const namePadding = Math.max(1, maxNameLen - displayName.length + 2);
+    const namePadding = computeNamePadding(displayName, maxNameLen);
 
     if (isSelected) write(ansi.inverse);
     write(cursor);
@@ -1600,4 +1626,6 @@ module.exports = {
   renderStashConfirm,
   renderCleanupConfirm,
   renderUpdateModal,
+  // Layout helpers — exported for unit testing
+  computeNamePadding,
 };