ht-skills 0.2.6 → 0.2.8

package/lib/cli.js

@@ -36,6 +36,8 @@ const CONFIG_FILE_NAME = "config.json";
 const DEFAULT_LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
 const DEFAULT_LOGIN_POLL_MS = 1500;
 const DEFAULT_PUBLISH_POLL_MS = 1500;
+const DEFAULT_PUBLISH_TIMEOUT_MS = 5 * 60 * 1000;
+const DEFAULT_PUBLISH_POLL_ERROR_LIMIT = 3;
 
 const BANNER_TEXT = String.raw`  _  _ _____   ___ _   _ _ _      __  __          _       _        _         
  | || |_   _| / __| |_(_) | |___ |  \/  |__ _ _ _| |_____| |_ _ __| |__ _ __ 
@@ -819,6 +821,64 @@ function formatSearchCard(item, { index = 0, colorize = (text) => text, width =
   return [title, blank, firstLine, ...detailRendered, blank, bottom].join("\n");
 }
 
+const PUBLISH_FLOW_STEPS = [
+  { id: "auth", label: "Login" },
+  { id: "pack", label: "Pack" },
+  { id: "inspect", label: "Inspect" },
+  { id: "submit", label: "Submit" },
+];
+
+function getPublishStepStatusLabel(status) {
+  switch (status) {
+    case "done":
+      return "Done";
+    case "active":
+      return "Active";
+    case "error":
+      return "Error";
+    default:
+      return "Pending";
+  }
+}
+
+function renderPublishFlowCard(flowState, { colorize = (text) => text, width = 80 } = {}) {
+  const maxInnerWidth = Math.max(28, width - 6);
+  const lines = PUBLISH_FLOW_STEPS.map((step, index) => {
+    const status = flowState?.[step.id] || "pending";
+    const symbol = status === "done"
+      ? colorize("●", "success")
+      : status === "active"
+        ? colorize("◉", "accent")
+        : status === "error"
+          ? colorize("▲", "warn")
+          : colorize("○", "muted");
+    const label = status === "done"
+      ? colorize(step.label, "success")
+      : status === "active"
+        ? colorize(step.label, "accent")
+        : status === "error"
+          ? colorize(step.label, "warn")
+          : step.label;
+    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));
+    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 bottom = `╰${"─".repeat(contentWidth + 2)}╯`;
+  return [title, ...normalizedLines, bottom].join("\n");
+}
+
 function printFallbackIntro({ registry, slug, version, skillName, skillDescription, installTargets }, log = console.log) {
   log("");
   log("ht-skills");
@@ -848,6 +908,19 @@ function printFallbackSearchIntro({ registry, query, limit }, log = console.log)
   log("");
 }
 
+function printFallbackPublishIntro({ registry, skillDir, archiveName, visibility }, log = console.log) {
+  log("");
+  log(renderGradientBanner());
+  log("");
+  log("Publish");
+  log("");
+  log(`Source: ${registry}`);
+  log(`Directory: ${skillDir}`);
+  log(`Archive: ${archiveName}`);
+  log(`Access: ${visibility}`);
+  log("");
+}
+
 async function loadTerminalUi() {
   const [{ intro, outro, note, multiselect, select, spinner, isCancel, cancel }, pcModule] = await Promise.all([
     import("@clack/prompts"),
@@ -1440,17 +1513,79 @@ async function cmdPublish(flags, deps = {}) {
   const log = deps.log || ((message) => console.log(message));
   const registry = getRegistryUrl(flags);
   const skillDir = path.resolve(flags._[0] || ".");
-  log(`Checking login for ${registry}...`);
+  const visibility = String(flags.access || flags.visibility || "public").trim().toLowerCase() || "public";
+  const archiveName = `${path.basename(skillDir) || "skill"}.zip`;
+  const isInteractive = isInteractiveSession(deps);
+  const canUseFancyUi = Boolean(isInteractive && !deps.disableUi);
+  const ui = deps.ui || (canUseFancyUi ? await loadTerminalUi().catch(() => null) : null);
+  const colorize = ui ? createUiColorizer(ui.pc) : (text) => String(text);
+  const outputWidth = getOutputWidth(deps.outputWidth);
+  const pollIntervalMs = Math.max(500, Number(flags["poll-interval"] || deps.pollIntervalMs || DEFAULT_PUBLISH_POLL_MS));
+  const publishTimeoutMs = Math.max(10_000, Number(flags.timeout || deps.timeoutMs || DEFAULT_PUBLISH_TIMEOUT_MS));
+  const pollErrorLimit = Math.max(1, Number(flags["poll-error-limit"] || deps.pollErrorLimit || DEFAULT_PUBLISH_POLL_ERROR_LIMIT));
+  const flowState = {
+    auth: "pending",
+    pack: "pending",
+    inspect: "pending",
+    submit: "pending",
+  };
+
+  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 (ui) {
+    // eslint-disable-next-line no-console
+    console.log(`\n${renderGradientBanner()}\n`);
+    ui.intro(ui.pc.bgCyan(ui.pc.black(" ht-skills ")));
+    ui.note(
+      [
+        `${colorize("Source", "muted")}: ${registry}`,
+        `${colorize("Directory", "muted")}: ${skillDir}`,
+        `${colorize("Archive", "muted")}: ${archiveName}`,
+        `${colorize("Access", "muted")}: ${visibility}`,
+      ].join("\n"),
+      "Publish",
+    );
+    renderPublishFlow();
+  } else {
+    printFallbackPublishIntro({ registry, skillDir, archiveName, visibility }, log);
+  }
+
+  flowState.auth = "active";
+  if (!ui) {
+    log(`Checking login for ${registry}...`);
+  }
   const { token } = await ensureValidAuthToken(registry, flags, deps);
+  flowState.auth = "done";
 
-  const archiveName = `${path.basename(skillDir) || "skill"}.zip`;
-  log(`Packing skill directory: ${skillDir}`);
+  const packSpinner = ui ? ui.spinner() : null;
+  flowState.pack = "active";
+  if (packSpinner) {
+    packSpinner.start(`Packing ${path.basename(skillDir) || skillDir}`);
+  } else {
+    log(`Packing skill directory: ${skillDir}`);
+  }
   const archiveBuffer = await createZipFromDirectory(skillDir);
-  log(`Created archive ${archiveName} (${formatBytes(archiveBuffer.length)})`);
-
-  const pollIntervalMs = Math.max(500, Number(flags["poll-interval"] || deps.pollIntervalMs || DEFAULT_PUBLISH_POLL_MS));
+  flowState.pack = "done";
+  if (packSpinner) {
+    packSpinner.stop(`Created ${archiveName} (${formatBytes(archiveBuffer.length)})`);
+  } else {
+    log(`Created archive ${archiveName} (${formatBytes(archiveBuffer.length)})`);
+  }
 
-  log("Uploading archive for package inspection...");
+  const uploadSpinner = ui ? ui.spinner() : null;
+  flowState.inspect = "active";
+  if (uploadSpinner) {
+    uploadSpinner.start("Uploading archive for package inspection");
+  } else {
+    log("Uploading archive for package inspection...");
+  }
   const job = await requestJsonImpl(
     `${registry}/api/skills/inspect-package-jobs/upload?archive_name=${encodeURIComponent(archiveName)}`,
     {
@@ -1466,18 +1601,61 @@ async function cmdPublish(flags, deps = {}) {
   if (!jobId) {
     throw new Error("registry did not return an inspection job id");
   }
-  log(`Inspection job created: ${jobId}`);
+  if (uploadSpinner) {
+    uploadSpinner.stop(`Inspection job created (${jobId})`);
+  } else {
+    log(`Inspection job created: ${jobId}`);
+  }
 
   let inspection = job;
   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");
+      }
+      throw new Error(`Inspection timed out after ${Math.round(publishTimeoutMs / 1000)}s`);
+    }
+
     await sleep(pollIntervalMs);
-    inspection = await requestJsonImpl(
-      `${registry}/api/skills/inspect-package-jobs/${encodeURIComponent(jobId)}`,
-      {
-        headers: withBearerToken({}, token),
-      },
-    );
+    try {
+      inspection = await requestJsonImpl(
+        `${registry}/api/skills/inspect-package-jobs/${encodeURIComponent(jobId)}`,
+        {
+          headers: withBearerToken({}, token),
+        },
+      );
+      consecutivePollErrors = 0;
+    } catch (error) {
+      consecutivePollErrors += 1;
+      if (consecutivePollErrors >= pollErrorLimit) {
+        flowState.inspect = "error";
+        if (inspectSpinner) {
+          inspectSpinner.stop("Inspection polling failed");
+        }
+        throw new Error(`Inspection polling failed ${consecutivePollErrors} times: ${error.message}`);
+      }
+      if (!inspectSpinner) {
+        log(`Inspection polling retry ${consecutivePollErrors}/${pollErrorLimit}: ${error.message}`);
+      }
+      continue;
+    }
+
+    const runtimeError = String(inspection.error?.message || inspection.error || "").trim();
+    if (runtimeError && inspection.status !== "succeeded") {
+      flowState.inspect = "error";
+      if (inspectSpinner) {
+        inspectSpinner.stop("Inspection failed");
+      }
+      throw new Error(runtimeError);
+    }
 
     const step = String(inspection.progress?.step || inspection.result?.step || "").trim();
     const percent = inspection.progress?.percent;
@@ -1487,22 +1665,36 @@ async function cmdPublish(flags, deps = {}) {
       const progressLabel = step
         ? `${step}${typeof percent === "number" ? ` ${percent}%` : ""}`
         : inspection.status;
-      log(`Inspection in progress: ${progressLabel}`);
+      if (inspectSpinner) {
+        inspectSpinner.message(`Inspecting archive (${progressLabel})`);
+      } else {
+        log(`Inspection in progress: ${progressLabel}`);
+      }
     }
   }
 
   if (inspection.status !== "succeeded") {
+    flowState.inspect = "error";
+    if (inspectSpinner) {
+      inspectSpinner.stop("Inspection failed");
+    }
     throw new Error(inspection.error || "skill archive inspection failed");
   }
-  log("Inspection passed.");
+  flowState.inspect = "done";
+  if (inspectSpinner) {
+    inspectSpinner.stop("Inspection passed");
+  } else {
+    log("Inspection passed.");
+  }
 
   const preview = inspection.result || {};
   if (!preview.valid || !preview.preview_token) {
     throw new Error(summarizePreviewErrors(preview));
   }
-  log(`Preview token created: ${preview.preview_token}`);
+  if (!ui) {
+    log(`Preview token created: ${preview.preview_token}`);
+  }
 
-  const visibility = String(flags.access || flags.visibility || "public").trim().toLowerCase() || "public";
   const body = {
     preview_token: preview.preview_token,
     visibility,
@@ -1517,7 +1709,13 @@ async function cmdPublish(flags, deps = {}) {
     body.publish_now = true;
   }
 
-  log(`Submitting review request with access=${visibility}...`);
+  const submitSpinner = ui ? ui.spinner() : null;
+  flowState.submit = "active";
+  if (submitSpinner) {
+    submitSpinner.start(`Submitting review request (${visibility})`);
+  } else {
+    log(`Submitting review request with access=${visibility}...`);
+  }
   const result = await requestJsonImpl(`${registry}/api/skills/submit`, {
     method: "POST",
     headers: withBearerToken({
@@ -1525,9 +1723,14 @@ async function cmdPublish(flags, deps = {}) {
     }, token),
     body: JSON.stringify(body),
   });
-  log(`Review submission created: ${result.submission_id || "(no submission id returned)"}`);
+  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)"}`);
+  }
 
-  log(JSON.stringify({
+  const summaryPayload = {
     status: result.status,
     submission_id: result.submission_id || null,
     created_at: result.created_at || null,
@@ -1535,7 +1738,23 @@ async function cmdPublish(flags, deps = {}) {
     publication: result.publication || null,
     preview_token: preview.preview_token,
     archive_name: archiveName,
-  }, null, 2));
+  };
+
+  if (ui) {
+    ui.note(
+      [
+        `${colorize("Status", "muted")}: ${result.status || "pending"}`,
+        `${colorize("Submission", "muted")}: ${result.submission_id || "-"}`,
+        `${colorize("Preview", "muted")}: ${preview.preview_token}`,
+        `${colorize("Access", "muted")}: ${summaryPayload.visibility || visibility}`,
+      ].join("\n"),
+      "Published",
+    );
+    renderPublishFlow();
+    ui.outro(`Submitted ${ui.pc.cyan(archiveName)} for review.`);
+  } else {
+    log(JSON.stringify(summaryPayload, null, 2));
+  }
 
   return result;
 }

package/package.json

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