git-watchtower 2.3.21 → 2.3.23

package/package.json

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

package/src/casino/index.js

@@ -6,7 +6,7 @@
  * like hitting the jackpot.
  */
 
-const { ansi, box } = require('../ui/ansi');
+const { ansi, box, visibleLength } = require('../ui/ansi');
 const sounds = require('./sounds');
 
 // ============================================================================
@@ -537,7 +537,13 @@ function getWinDisplay(width) {
   const label = currentWinLevel.label;
   const color = flashOn ? currentWinLevel.color : ansi.dim + currentWinLevel.color;
 
-  const padding = Math.max(0, Math.floor((width - label.length) / 2));
+  // Use visibleLength so multi-codepoint emoji clusters (ZWJ family,
+  // flag emoji, variation selectors) are counted by display columns
+  // rather than UTF-16 code units. The current WIN_LEVELS labels happen
+  // to use 2-codepoint emoji whose .length matches column width, but a
+  // future label with a flag or family emoji would otherwise center
+  // off by one or more columns per glyph.
+  const padding = Math.max(0, Math.floor((width - visibleLength(label)) / 2));
 
   return color + ' '.repeat(padding) + label + ' '.repeat(padding) + ansi.reset;
 }
@@ -615,7 +621,10 @@ function getLossDisplay(width) {
   const display = `${symbols}${lossMessage}${symbols}`;
   const color = flashOn ? ansi.bgRed + ansi.white : ansi.bgBlack + ansi.red;
 
-  const padding = Math.max(0, Math.floor((width - display.length) / 2));
+  // Same reasoning as getWinDisplay: count terminal columns, not UTF-16
+  // code units. Untrusted lossMessage strings can also contain wide
+  // characters (e.g. CJK in error messages from a localised git build).
+  const padding = Math.max(0, Math.floor((width - visibleLength(display)) / 2));
 
   return color + ' '.repeat(padding) + display + ' '.repeat(padding) + ansi.reset;
 }

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'));
+        }
       });
     });
   }