ht-skills 0.2.9 → 0.2.11

package/lib/cli.js

@@ -841,8 +841,14 @@ function getPublishStepStatusLabel(status) {
   }
 }
 
-function renderPublishFlowCard(flowState, { colorize = (text) => text, width = 80 } = {}) {
-  const maxInnerWidth = Math.max(28, width - 6);
+function renderPublishFlowCard(flowState, {
+  colorize = (text) => text,
+  width = 80,
+} = {}) {
+  const contentWidth = Math.max(
+    28,
+    ...PUBLISH_FLOW_STEPS.map((step, index) => getDisplayWidth(`${index + 1}. ${step.label}  Pending`)),
+  );
   const lines = PUBLISH_FLOW_STEPS.map((step, index) => {
     const status = flowState?.[step.id] || "pending";
     const symbol = status === "done"
@@ -859,24 +865,62 @@ function renderPublishFlowCard(flowState, { colorize = (text) => text, width = 8
         : status === "error"
           ? colorize(step.label, "warn")
           : step.label;
-    const statusLabel = colorize(getPublishStepStatusLabel(status), status === "pending" ? "muted" : status === "error" ? "warn" : status === "active" ? "accent" : "success");
+    const statusLabel = colorize(
+      getPublishStepStatusLabel(status),
+      status === "pending" ? "muted" : status === "error" ? "warn" : status === "active" ? "accent" : "success",
+    );
     const plainLine = `${index + 1}. ${step.label}  ${getPublishStepStatusLabel(status)}`;
-    const paddedWidth = Math.max(0, maxInnerWidth - getDisplayWidth(plainLine));
+    const paddedWidth = Math.max(0, contentWidth - getDisplayWidth(plainLine));
     return `│ ${symbol} ${label}${" ".repeat(paddedWidth)} ${statusLabel} │`;
   });
 
-  const contentWidth = Math.max(
-    28,
-    ...PUBLISH_FLOW_STEPS.map((step, index) => getDisplayWidth(`${index + 1}. ${step.label}  Pending`)),
-  );
-  const title = `◇  ${colorize("Publish Flow", "accent")} ${colorize("─".repeat(Math.max(0, contentWidth - getDisplayWidth("Publish Flow") - 1)), "muted")}╮`;
-  const normalizedLines = lines.map((line) => {
-    const plainWidth = getDisplayWidth(line);
-    const targetWidth = contentWidth + 4;
-    return plainWidth < targetWidth ? `${line.slice(0, -2)}${" ".repeat(targetWidth - plainWidth)} │` : line;
-  });
+  const titleSuffix = "─".repeat(Math.max(0, contentWidth - getDisplayWidth("Publish Flow") - 1));
+  const title = `◇  ${colorize("Publish Flow", "accent")} ${colorize(titleSuffix, "muted")}╮`;
   const bottom = `╰${"─".repeat(contentWidth + 2)}╯`;
-  return [title, ...normalizedLines, bottom].join("\n");
+  return [title, ...lines, bottom].join("\n");
+}
+
+function renderPublishStatusLine(message, { colorize = (text) => text, width = 80 } = {}) {
+  const contentWidth = Math.max(24, width);
+  const wrapped = wrapText(message || "", contentWidth);
+  return wrapped
+    .map((line, index) => `${index === 0 ? colorize("•", "accent") : " "} ${colorize(line, "muted")}`)
+    .join("\n");
+}
+
+function createLiveBlockRenderer(output = process.stdout) {
+  let renderedLines = 0;
+
+  function clearPrevious() {
+    if (!renderedLines || !output.isTTY) {
+      return;
+    }
+    output.write(`\x1B[${renderedLines}F`);
+    for (let index = 0; index < renderedLines; index += 1) {
+      output.write("\x1B[2K");
+      if (index < renderedLines - 1) {
+        output.write("\x1B[1E");
+      }
+    }
+    if (renderedLines > 1) {
+      output.write(`\x1B[${renderedLines - 1}F`);
+    } else {
+      output.write("\r");
+    }
+  }
+
+  return {
+    render(content) {
+      const text = String(content || "");
+      clearPrevious();
+      output.write(`${text}\n`);
+      renderedLines = text.split("\n").length;
+    },
+    clear() {
+      clearPrevious();
+      renderedLines = 0;
+    },
+  };
 }
 
 function printFallbackIntro({ registry, slug, version, skillName, skillDescription, installTargets }, log = console.log) {
@@ -1529,19 +1573,32 @@ async function cmdPublish(flags, deps = {}) {
     inspect: "pending",
     submit: "pending",
   };
+  let currentMessage = "Ready to publish";
+  const flowRenderer = ui ? createLiveBlockRenderer(process.stdout) : null;
 
   const renderPublishFlow = () => {
-    if (!ui) return;
-    // eslint-disable-next-line no-console
-    console.log(renderPublishFlowCard(flowState, {
-      colorize,
-      width: Math.max(44, Math.min(outputWidth - 4, 72)),
-    }));
+    if (!flowRenderer) return;
+    const panelWidth = Math.max(44, Math.min(outputWidth - 4, 72));
+    flowRenderer.render([
+      renderPublishFlowCard(flowState, {
+        colorize,
+        width: panelWidth,
+      }),
+      "",
+      renderPublishStatusLine(currentMessage, {
+        colorize,
+        width: panelWidth,
+      }),
+    ].join("\n"));
   };
   const setFlowStatus = (stepId, status) => {
     flowState[stepId] = status;
     renderPublishFlow();
   };
+  const setFlowMessage = (message) => {
+    currentMessage = message;
+    renderPublishFlow();
+  };
 
   if (ui) {
     // eslint-disable-next-line no-console
@@ -1561,42 +1618,37 @@ async function cmdPublish(flags, deps = {}) {
     printFallbackPublishIntro({ registry, skillDir, archiveName, visibility }, log);
   }
 
+  setFlowMessage(`Checking login for ${registry}`);
   setFlowStatus("auth", "active");
   if (!ui) {
     log(`Checking login for ${registry}...`);
   }
   const { token } = await ensureValidAuthToken(registry, flags, deps);
+  setFlowMessage("Login confirmed");
   setFlowStatus("auth", "done");
 
-  const packSpinner = ui ? ui.spinner() : null;
+  setFlowMessage(`Packing ${path.basename(skillDir) || skillDir}`);
   setFlowStatus("pack", "active");
-  if (packSpinner) {
-    packSpinner.start(`Packing ${path.basename(skillDir) || skillDir}`);
-  } else {
+  if (!ui) {
     log(`Packing skill directory: ${skillDir}`);
   }
   let archiveBuffer;
   try {
     archiveBuffer = await createZipFromDirectory(skillDir);
+    setFlowMessage(`Created ${archiveName} (${formatBytes(archiveBuffer.length)})`);
     setFlowStatus("pack", "done");
-    if (packSpinner) {
-      packSpinner.stop(`Created ${archiveName} (${formatBytes(archiveBuffer.length)})`);
-    } else {
+    if (!ui) {
       log(`Created archive ${archiveName} (${formatBytes(archiveBuffer.length)})`);
     }
   } catch (error) {
+    setFlowMessage(`Packing failed: ${error.message}`);
     setFlowStatus("pack", "error");
-    if (packSpinner) {
-      packSpinner.stop("Packing failed");
-    }
     throw error;
   }
 
-  const uploadSpinner = ui ? ui.spinner() : null;
+  setFlowMessage("Uploading archive for package inspection");
   setFlowStatus("inspect", "active");
-  if (uploadSpinner) {
-    uploadSpinner.start("Uploading archive for package inspection");
-  } else {
+  if (!ui) {
     log("Uploading archive for package inspection...");
   }
   let job;
@@ -1612,24 +1664,19 @@ async function cmdPublish(flags, deps = {}) {
       },
     );
   } catch (error) {
+    setFlowMessage(`Inspection upload failed: ${error.message}`);
     setFlowStatus("inspect", "error");
-    if (uploadSpinner) {
-      uploadSpinner.stop("Inspection upload failed");
-    }
     throw error;
   }
 
   const jobId = String(job.job_id || "").trim();
   if (!jobId) {
+    setFlowMessage("Inspection upload failed: missing inspection job id");
     setFlowStatus("inspect", "error");
-    if (uploadSpinner) {
-      uploadSpinner.stop("Inspection upload failed");
-    }
     throw new Error("registry did not return an inspection job id");
   }
-  if (uploadSpinner) {
-    uploadSpinner.stop(`Inspection job created (${jobId})`);
-  } else {
+  setFlowMessage(`Inspection job created (${jobId})`);
+  if (!ui) {
     log(`Inspection job created: ${jobId}`);
   }
 
@@ -1637,16 +1684,10 @@ async function cmdPublish(flags, deps = {}) {
   let lastProgressKey = "";
   let consecutivePollErrors = 0;
   const publishDeadline = Date.now() + publishTimeoutMs;
-  const inspectSpinner = ui ? ui.spinner() : null;
-  if (inspectSpinner) {
-    inspectSpinner.start("Inspecting archive");
-  }
   while (inspection.status !== "succeeded" && inspection.status !== "failed") {
     if (Date.now() > publishDeadline) {
+      setFlowMessage(`Inspection timed out after ${Math.round(publishTimeoutMs / 1000)}s`);
       setFlowStatus("inspect", "error");
-      if (inspectSpinner) {
-        inspectSpinner.stop("Inspection timed out");
-      }
       throw new Error(`Inspection timed out after ${Math.round(publishTimeoutMs / 1000)}s`);
     }
 
@@ -1662,13 +1703,12 @@ async function cmdPublish(flags, deps = {}) {
     } catch (error) {
       consecutivePollErrors += 1;
       if (consecutivePollErrors >= pollErrorLimit) {
+        setFlowMessage(`Inspection polling failed: ${error.message}`);
         setFlowStatus("inspect", "error");
-        if (inspectSpinner) {
-          inspectSpinner.stop("Inspection polling failed");
-        }
         throw new Error(`Inspection polling failed ${consecutivePollErrors} times: ${error.message}`);
       }
-      if (!inspectSpinner) {
+      setFlowMessage(`Inspection polling retry ${consecutivePollErrors}/${pollErrorLimit}: ${error.message}`);
+      if (!ui) {
         log(`Inspection polling retry ${consecutivePollErrors}/${pollErrorLimit}: ${error.message}`);
       }
       continue;
@@ -1676,10 +1716,8 @@ async function cmdPublish(flags, deps = {}) {
 
     const runtimeError = String(inspection.error?.message || inspection.error || "").trim();
     if (runtimeError && inspection.status !== "succeeded") {
+      setFlowMessage(`Inspection failed: ${runtimeError}`);
       setFlowStatus("inspect", "error");
-      if (inspectSpinner) {
-        inspectSpinner.stop("Inspection failed");
-      }
       throw new Error(runtimeError);
     }
 
@@ -1691,30 +1729,27 @@ async function cmdPublish(flags, deps = {}) {
       const progressLabel = step
         ? `${step}${typeof percent === "number" ? ` ${percent}%` : ""}`
         : inspection.status;
-      if (inspectSpinner) {
-        inspectSpinner.message(`Inspecting archive (${progressLabel})`);
-      } else {
+      setFlowMessage(`Inspecting archive (${progressLabel})`);
+      if (!ui) {
         log(`Inspection in progress: ${progressLabel}`);
       }
     }
   }
 
   if (inspection.status !== "succeeded") {
+    setFlowMessage(`Inspection failed: ${inspection.error || "unknown error"}`);
     setFlowStatus("inspect", "error");
-    if (inspectSpinner) {
-      inspectSpinner.stop("Inspection failed");
-    }
     throw new Error(inspection.error || "skill archive inspection failed");
   }
+  setFlowMessage("Inspection passed");
   setFlowStatus("inspect", "done");
-  if (inspectSpinner) {
-    inspectSpinner.stop("Inspection passed");
-  } else {
+  if (!ui) {
     log("Inspection passed.");
   }
 
   const preview = inspection.result || {};
   if (!preview.valid || !preview.preview_token) {
+    setFlowMessage("Inspection failed: preview token missing");
     setFlowStatus("inspect", "error");
     throw new Error(summarizePreviewErrors(preview));
   }
@@ -1736,11 +1771,9 @@ async function cmdPublish(flags, deps = {}) {
     body.publish_now = true;
   }
 
-  const submitSpinner = ui ? ui.spinner() : null;
+  setFlowMessage(`Submitting review request (${visibility})`);
   setFlowStatus("submit", "active");
-  if (submitSpinner) {
-    submitSpinner.start(`Submitting review request (${visibility})`);
-  } else {
+  if (!ui) {
     log(`Submitting review request with access=${visibility}...`);
   }
   let result;
@@ -1752,17 +1785,14 @@ async function cmdPublish(flags, deps = {}) {
       }, token),
       body: JSON.stringify(body),
     });
+    setFlowMessage(`Review submission created (${result.submission_id || "pending"})`);
     setFlowStatus("submit", "done");
-    if (submitSpinner) {
-      submitSpinner.stop(`Review submission created (${result.submission_id || "pending"})`);
-    } else {
+    if (!ui) {
       log(`Review submission created: ${result.submission_id || "(no submission id returned)"}`);
     }
   } catch (error) {
+    setFlowMessage(`Submit failed: ${error.message}`);
     setFlowStatus("submit", "error");
-    if (submitSpinner) {
-      submitSpinner.stop("Submit failed");
-    }
     throw error;
   }
 
@@ -1786,6 +1816,7 @@ async function cmdPublish(flags, deps = {}) {
       ].join("\n"),
       "Published",
     );
+    setFlowMessage(`Submitted ${archiveName} for review`);
     ui.outro(`Submitted ${ui.pc.cyan(archiveName)} for review.`);
   } else {
     log(JSON.stringify(summaryPayload, null, 2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-skills",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "CLI for installing and submitting skills from HT Skills Marketplace.",
   "type": "commonjs",
   "bin": {