ht-skills 0.2.8 → 0.2.10

package/lib/cli.js

@@ -841,8 +841,15 @@ 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,
+  currentMessage = "",
+} = {}) {
+  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 +866,57 @@ 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 messageLines = currentMessage
+    ? wrapText(currentMessage, contentWidth).map((line) => `│ ${colorize(line, "muted")}${" ".repeat(Math.max(0, contentWidth - getDisplayWidth(line)))} │`)
+    : [];
   const bottom = `╰${"─".repeat(contentWidth + 2)}╯`;
-  return [title, ...normalizedLines, bottom].join("\n");
+  return [title, ...lines, ...messageLines, bottom].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,15 +1569,25 @@ 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, {
+    if (!flowRenderer) return;
+    flowRenderer.render(renderPublishFlowCard(flowState, {
       colorize,
       width: Math.max(44, Math.min(outputWidth - 4, 72)),
+      currentMessage,
     }));
   };
+  const setFlowStatus = (stepId, status) => {
+    flowState[stepId] = status;
+    renderPublishFlow();
+  };
+  const setFlowMessage = (message) => {
+    currentMessage = message;
+    renderPublishFlow();
+  };
 
   if (ui) {
     // eslint-disable-next-line no-console
@@ -1557,53 +1607,65 @@ async function cmdPublish(flags, deps = {}) {
     printFallbackPublishIntro({ registry, skillDir, archiveName, visibility }, log);
   }
 
-  flowState.auth = "active";
+  setFlowMessage(`Checking login for ${registry}`);
+  setFlowStatus("auth", "active");
   if (!ui) {
     log(`Checking login for ${registry}...`);
   }
   const { token } = await ensureValidAuthToken(registry, flags, deps);
-  flowState.auth = "done";
+  setFlowMessage("Login confirmed");
+  setFlowStatus("auth", "done");
 
-  const packSpinner = ui ? ui.spinner() : null;
-  flowState.pack = "active";
-  if (packSpinner) {
-    packSpinner.start(`Packing ${path.basename(skillDir) || skillDir}`);
-  } else {
+  setFlowMessage(`Packing ${path.basename(skillDir) || skillDir}`);
+  setFlowStatus("pack", "active");
+  if (!ui) {
     log(`Packing skill directory: ${skillDir}`);
   }
-  const archiveBuffer = await createZipFromDirectory(skillDir);
-  flowState.pack = "done";
-  if (packSpinner) {
-    packSpinner.stop(`Created ${archiveName} (${formatBytes(archiveBuffer.length)})`);
-  } else {
-    log(`Created archive ${archiveName} (${formatBytes(archiveBuffer.length)})`);
+  let archiveBuffer;
+  try {
+    archiveBuffer = await createZipFromDirectory(skillDir);
+    setFlowMessage(`Created ${archiveName} (${formatBytes(archiveBuffer.length)})`);
+    setFlowStatus("pack", "done");
+    if (!ui) {
+      log(`Created archive ${archiveName} (${formatBytes(archiveBuffer.length)})`);
+    }
+  } catch (error) {
+    setFlowMessage(`Packing failed: ${error.message}`);
+    setFlowStatus("pack", "error");
+    throw error;
   }
 
-  const uploadSpinner = ui ? ui.spinner() : null;
-  flowState.inspect = "active";
-  if (uploadSpinner) {
-    uploadSpinner.start("Uploading archive for package inspection");
-  } else {
+  setFlowMessage("Uploading archive for package inspection");
+  setFlowStatus("inspect", "active");
+  if (!ui) {
     log("Uploading archive for package inspection...");
   }
-  const job = await requestJsonImpl(
-    `${registry}/api/skills/inspect-package-jobs/upload?archive_name=${encodeURIComponent(archiveName)}`,
-    {
-      method: "POST",
-      headers: withBearerToken({
-        "content-type": "application/zip",
-      }, token),
-      body: archiveBuffer,
-    },
-  );
+  let job;
+  try {
+    job = await requestJsonImpl(
+      `${registry}/api/skills/inspect-package-jobs/upload?archive_name=${encodeURIComponent(archiveName)}`,
+      {
+        method: "POST",
+        headers: withBearerToken({
+          "content-type": "application/zip",
+        }, token),
+        body: archiveBuffer,
+      },
+    );
+  } catch (error) {
+    setFlowMessage(`Inspection upload failed: ${error.message}`);
+    setFlowStatus("inspect", "error");
+    throw error;
+  }
 
   const jobId = String(job.job_id || "").trim();
   if (!jobId) {
+    setFlowMessage("Inspection upload failed: missing inspection job id");
+    setFlowStatus("inspect", "error");
     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}`);
   }
 
@@ -1611,16 +1673,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) {
-      flowState.inspect = "error";
-      if (inspectSpinner) {
-        inspectSpinner.stop("Inspection timed out");
-      }
+      setFlowMessage(`Inspection timed out after ${Math.round(publishTimeoutMs / 1000)}s`);
+      setFlowStatus("inspect", "error");
       throw new Error(`Inspection timed out after ${Math.round(publishTimeoutMs / 1000)}s`);
     }
 
@@ -1636,13 +1692,12 @@ async function cmdPublish(flags, deps = {}) {
     } catch (error) {
       consecutivePollErrors += 1;
       if (consecutivePollErrors >= pollErrorLimit) {
-        flowState.inspect = "error";
-        if (inspectSpinner) {
-          inspectSpinner.stop("Inspection polling failed");
-        }
+        setFlowMessage(`Inspection polling failed: ${error.message}`);
+        setFlowStatus("inspect", "error");
         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;
@@ -1650,10 +1705,8 @@ async function cmdPublish(flags, deps = {}) {
 
     const runtimeError = String(inspection.error?.message || inspection.error || "").trim();
     if (runtimeError && inspection.status !== "succeeded") {
-      flowState.inspect = "error";
-      if (inspectSpinner) {
-        inspectSpinner.stop("Inspection failed");
-      }
+      setFlowMessage(`Inspection failed: ${runtimeError}`);
+      setFlowStatus("inspect", "error");
       throw new Error(runtimeError);
     }
 
@@ -1665,30 +1718,28 @@ 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") {
-    flowState.inspect = "error";
-    if (inspectSpinner) {
-      inspectSpinner.stop("Inspection failed");
-    }
+    setFlowMessage(`Inspection failed: ${inspection.error || "unknown error"}`);
+    setFlowStatus("inspect", "error");
     throw new Error(inspection.error || "skill archive inspection failed");
   }
-  flowState.inspect = "done";
-  if (inspectSpinner) {
-    inspectSpinner.stop("Inspection passed");
-  } else {
+  setFlowMessage("Inspection passed");
+  setFlowStatus("inspect", "done");
+  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));
   }
   if (!ui) {
@@ -1709,25 +1760,29 @@ async function cmdPublish(flags, deps = {}) {
     body.publish_now = true;
   }
 
-  const submitSpinner = ui ? ui.spinner() : null;
-  flowState.submit = "active";
-  if (submitSpinner) {
-    submitSpinner.start(`Submitting review request (${visibility})`);
-  } else {
+  setFlowMessage(`Submitting review request (${visibility})`);
+  setFlowStatus("submit", "active");
+  if (!ui) {
     log(`Submitting review request with access=${visibility}...`);
   }
-  const result = await requestJsonImpl(`${registry}/api/skills/submit`, {
-    method: "POST",
-    headers: withBearerToken({
-      "content-type": "application/json",
-    }, token),
-    body: JSON.stringify(body),
-  });
-  flowState.submit = "done";
-  if (submitSpinner) {
-    submitSpinner.stop(`Review submission created (${result.submission_id || "pending"})`);
-  } else {
-    log(`Review submission created: ${result.submission_id || "(no submission id returned)"}`);
+  let result;
+  try {
+    result = await requestJsonImpl(`${registry}/api/skills/submit`, {
+      method: "POST",
+      headers: withBearerToken({
+        "content-type": "application/json",
+      }, token),
+      body: JSON.stringify(body),
+    });
+    setFlowMessage(`Review submission created (${result.submission_id || "pending"})`);
+    setFlowStatus("submit", "done");
+    if (!ui) {
+      log(`Review submission created: ${result.submission_id || "(no submission id returned)"}`);
+    }
+  } catch (error) {
+    setFlowMessage(`Submit failed: ${error.message}`);
+    setFlowStatus("submit", "error");
+    throw error;
   }
 
   const summaryPayload = {
@@ -1750,7 +1805,7 @@ async function cmdPublish(flags, deps = {}) {
       ].join("\n"),
       "Published",
     );
-    renderPublishFlow();
+    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.8",
+  "version": "0.2.10",
   "description": "CLI for installing and submitting skills from HT Skills Marketplace.",
   "type": "commonjs",
   "bin": {