@getmonoceros/workbench 1.37.1 → 1.37.2

package/dist/bin.js

@@ -1184,6 +1184,7 @@ function makePalette(isTty2) {
     cyan: (s) => wrap(s, ANSI_CYAN2),
     green: (s) => wrap(s, ANSI_GREEN),
     yellow: (s) => wrap(s, ANSI_YELLOW),
+    red: (s) => wrap(s, ANSI_RED),
     dim: (s) => wrap(s, ANSI_GREY2),
     sectionLine: (label) => wrap(`\u25B8 ${label}`, ANSI_BOLD2, ANSI_UNDERLINE2)
   };
@@ -1191,7 +1192,7 @@ function makePalette(isTty2) {
 function colorsFor(stream) {
   return makePalette(stream.isTTY ?? false);
 }
-var ESC, ANSI_BOLD2, ANSI_UNDERLINE2, ANSI_CYAN2, ANSI_GREEN, ANSI_YELLOW, ANSI_GREY2, ANSI_RESET2, ANSI_RE2, stderrPalette, bold2, underline2, cyan2, green, yellow, dim, sectionLine;
+var ESC, ANSI_BOLD2, ANSI_UNDERLINE2, ANSI_CYAN2, ANSI_GREEN, ANSI_YELLOW, ANSI_RED, ANSI_GREY2, ANSI_RESET2, ANSI_RE2, stderrPalette, bold2, underline2, cyan2, green, yellow, red, dim, sectionLine;
 var init_format = __esm({
   "src/util/format.ts"() {
     "use strict";
@@ -1201,6 +1202,7 @@ var init_format = __esm({
     ANSI_CYAN2 = `${ESC}36m`;
     ANSI_GREEN = `${ESC}32m`;
     ANSI_YELLOW = `${ESC}33m`;
+    ANSI_RED = `${ESC}31m`;
     ANSI_GREY2 = `${ESC}90m`;
     ANSI_RESET2 = `${ESC}0m`;
     ANSI_RE2 = /\x1b\[[0-9;]*m/g;
@@ -1210,6 +1212,7 @@ var init_format = __esm({
     cyan2 = stderrPalette.cyan;
     green = stderrPalette.green;
     yellow = stderrPalette.yellow;
+    red = stderrPalette.red;
     dim = stderrPalette.dim;
     sectionLine = stderrPalette.sectionLine;
   }
@@ -7530,6 +7533,12 @@ var init_apply_log = __esm({
 
 // src/apply/apply-progress.ts
 import { Writable as Writable3 } from "stream";
+function isNoiseTailLine(line) {
+  const t = line.trim();
+  return /^at\s/.test(t) || // JS stack frame
+  t.startsWith('{"outcome":') || // devcontainer-cli result blob
+  /^Error: Command failed: \/bin\/sh -c/.test(t);
+}
 function createApplyProgress(opts) {
   const out = opts.out;
   const now = opts.now ?? (() => Date.now());
@@ -7601,17 +7610,19 @@ function createApplyProgress(opts) {
         const line = lineBuf.slice(0, nl);
         lineBuf = lineBuf.slice(nl + 1);
         if (line.length === 0) continue;
-        tail.push(line);
-        if (tail.length > TAIL_LINES) tail.shift();
         for (const trig of PHASE_TRIGGERS) {
           const m = line.match(trig.pattern);
           if (m) {
-            setPhase(
-              typeof trig.label === "function" ? trig.label(m) : trig.label
-            );
+            const label = typeof trig.label === "function" ? trig.label(m) : trig.label;
+            if (label !== phase) tail.length = 0;
+            setPhase(label);
             break;
           }
         }
+        if (!isNoiseTailLine(line)) {
+          tail.push(line);
+          if (tail.length > TAIL_LINES) tail.shift();
+        }
       }
       cb();
     }
@@ -8445,7 +8456,7 @@ Fix the value in the env file (or the yml).`
       } else {
         const { tailLines } = progress.fail();
         progressOut.write(`
-\u2718 apply failed (exit ${exitCode})
+${red(`\u2718 apply failed (exit ${exitCode})`)}
 
 `);
         for (const line of tailLines) {
@@ -8842,7 +8853,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.37.1" : "dev";
+    CLI_VERSION = true ? "1.37.2" : "dev";
   }
 });