@nmakarov/cli-toolkit 0.79.0 → 0.80.0

package/dist/init.cjs

@@ -2668,13 +2668,14 @@ var Logger = class _Logger {
    */
   progress(message, opts) {
     const { prefix, count, total } = opts;
-    const paddedTotal = String(total).length;
+    const displayTotal = Math.max(Number(total) || 0, Number(count) || 0);
+    const paddedTotal = String(displayTotal).length;
     const paddedCount = String(count).padStart(paddedTotal, " ");
     const payload = {
       level: "progress",
       message,
       count: paddedCount,
-      total,
+      total: displayTotal,
       prefix
     };
     const key = prefix ?? "";
@@ -2691,7 +2692,7 @@ var Logger = class _Logger {
       if (wantTimes) {
         let remaining = -1;
         if (itemsPerSec > 0) {
-          remaining = (total - count) / itemsPerSec;
+          remaining = Math.max(0, (displayTotal - count) / itemsPerSec);
         }
         payload.elapsed = this.round(elapsedSeconds, 2);
         payload.remaining = remaining >= 0 ? this.round(remaining, 2) : remaining;
@@ -2700,12 +2701,12 @@ var Logger = class _Logger {
         payload.rate = itemsPerSec >= 0 ? this.round(itemsPerSec, 2) : itemsPerSec;
       }
     }
-    if (count >= total) {
+    if (count === total) {
       delete this.startTimes[key];
       delete this.startCounts[key];
       delete this.lastProgressTimes[key];
     }
-    if (this.shouldOutputProgress(prefix ?? "", count, total)) {
+    if (this.shouldOutputProgress(prefix ?? "", count, displayTotal)) {
       this.out(payload);
       if (this.options.progressThrottle && prefix) {
         this.lastProgressTimes[prefix] = Date.now();
@@ -2864,6 +2865,8 @@ function setup(opts = {}) {
     // a quick "show me the figured params and quit" that skips the flow's
     // actual work. Like --stopAfter=init, this is a hard exit(0) (registered
     // cleanups are skipped); call it once components/params are resolved.
+    _requestExitCode: null,
+    requestExit: null,
     showUsedParamsIfNeeded: () => {
       const mode = params.getShowUsedParamsMode?.();
       if (mode !== "top" && mode !== "stop") return;
@@ -2874,6 +2877,9 @@ function setup(opts = {}) {
       }
     }
   };
+  context.requestExit = (code = 0) => {
+    context._requestExitCode = code;
+  };
   logger.debug("[setup] completed successfully");
   return context;
 }
@@ -2909,9 +2915,25 @@ async function init(flow, opts = {}) {
     if (cleanupRan) return;
     cleanupRan = true;
     const fns = [...ctx.cleanupFunctions].reverse();
+    const budgetMs = 5e3;
+    const started = Date.now();
     for (const fn of fns) {
+      const left = budgetMs - (Date.now() - started);
+      if (left <= 0) {
+        ctx.logger.warn("[cleanup] budget exhausted \u2014 skipping remaining cleanup");
+        break;
+      }
       try {
-        await fn(ctx);
+        await Promise.race([
+          Promise.resolve(fn(ctx)),
+          new Promise((_, reject) => {
+            const t = setTimeout(
+              () => reject(new Error(`cleanup timed out after ${left}ms`)),
+              left
+            );
+            t.unref?.();
+          })
+        ]);
       } catch (error) {
         ctx.logger.warn("[cleanup] error in cleanup function:", error);
       }
@@ -3007,6 +3029,8 @@ async function init(flow, opts = {}) {
       process.exit(process.exitCode);
     } else if (stop || kill) {
       process.exit(0);
+    } else if (context._requestExitCode != null) {
+      process.exit(context._requestExitCode);
     }
   }
 }