ht-skills 0.2.7 → 0.2.9

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`  _  _ _____   ___ _   _ _ _      __  __          _       _        _         
  | || |_   _| / __| |_(_) | |___ |  \/  |__ _ _ _| |_____| |_ _ __| |__ _ __ 
@@ -1519,6 +1521,8 @@ async function cmdPublish(flags, deps = {}) {
   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",
@@ -1534,6 +1538,10 @@ async function cmdPublish(flags, deps = {}) {
       width: Math.max(44, Math.min(outputWidth - 4, 72)),
     }));
   };
+  const setFlowStatus = (stepId, status) => {
+    flowState[stepId] = status;
+    renderPublishFlow();
+  };
 
   if (ui) {
     // eslint-disable-next-line no-console
@@ -1553,59 +1561,70 @@ async function cmdPublish(flags, deps = {}) {
     printFallbackPublishIntro({ registry, skillDir, archiveName, visibility }, log);
   }
 
-  const authSpinner = ui ? ui.spinner() : null;
-  flowState.auth = "active";
-  renderPublishFlow();
-  if (authSpinner) {
-    authSpinner.start("Checking login");
-  } else {
+  setFlowStatus("auth", "active");
+  if (!ui) {
     log(`Checking login for ${registry}...`);
   }
   const { token } = await ensureValidAuthToken(registry, flags, deps);
-  flowState.auth = "done";
-  renderPublishFlow();
-  if (authSpinner) {
-    authSpinner.stop("Login confirmed");
-  }
+  setFlowStatus("auth", "done");
 
   const packSpinner = ui ? ui.spinner() : null;
-  flowState.pack = "active";
-  renderPublishFlow();
+  setFlowStatus("pack", "active");
   if (packSpinner) {
     packSpinner.start(`Packing ${path.basename(skillDir) || skillDir}`);
   } else {
     log(`Packing skill directory: ${skillDir}`);
   }
-  const archiveBuffer = await createZipFromDirectory(skillDir);
-  flowState.pack = "done";
-  renderPublishFlow();
-  if (packSpinner) {
-    packSpinner.stop(`Created ${archiveName} (${formatBytes(archiveBuffer.length)})`);
-  } else {
-    log(`Created archive ${archiveName} (${formatBytes(archiveBuffer.length)})`);
+  let archiveBuffer;
+  try {
+    archiveBuffer = await createZipFromDirectory(skillDir);
+    setFlowStatus("pack", "done");
+    if (packSpinner) {
+      packSpinner.stop(`Created ${archiveName} (${formatBytes(archiveBuffer.length)})`);
+    } else {
+      log(`Created archive ${archiveName} (${formatBytes(archiveBuffer.length)})`);
+    }
+  } catch (error) {
+    setFlowStatus("pack", "error");
+    if (packSpinner) {
+      packSpinner.stop("Packing failed");
+    }
+    throw error;
   }
 
   const uploadSpinner = ui ? ui.spinner() : null;
-  flowState.inspect = "active";
-  renderPublishFlow();
+  setFlowStatus("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)}`,
-    {
-      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) {
+    setFlowStatus("inspect", "error");
+    if (uploadSpinner) {
+      uploadSpinner.stop("Inspection upload failed");
+    }
+    throw error;
+  }
 
   const jobId = String(job.job_id || "").trim();
   if (!jobId) {
+    setFlowStatus("inspect", "error");
+    if (uploadSpinner) {
+      uploadSpinner.stop("Inspection upload failed");
+    }
     throw new Error("registry did not return an inspection job id");
   }
   if (uploadSpinner) {
@@ -1616,18 +1635,53 @@ async function cmdPublish(flags, deps = {}) {
 
   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) {
+      setFlowStatus("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) {
+        setFlowStatus("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") {
+      setFlowStatus("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;
@@ -1646,15 +1700,13 @@ async function cmdPublish(flags, deps = {}) {
   }
 
   if (inspection.status !== "succeeded") {
-    flowState.inspect = "error";
-    renderPublishFlow();
+    setFlowStatus("inspect", "error");
     if (inspectSpinner) {
       inspectSpinner.stop("Inspection failed");
     }
     throw new Error(inspection.error || "skill archive inspection failed");
   }
-  flowState.inspect = "done";
-  renderPublishFlow();
+  setFlowStatus("inspect", "done");
   if (inspectSpinner) {
     inspectSpinner.stop("Inspection passed");
   } else {
@@ -1663,6 +1715,7 @@ async function cmdPublish(flags, deps = {}) {
 
   const preview = inspection.result || {};
   if (!preview.valid || !preview.preview_token) {
+    setFlowStatus("inspect", "error");
     throw new Error(summarizePreviewErrors(preview));
   }
   if (!ui) {
@@ -1684,26 +1737,33 @@ async function cmdPublish(flags, deps = {}) {
   }
 
   const submitSpinner = ui ? ui.spinner() : null;
-  flowState.submit = "active";
-  renderPublishFlow();
+  setFlowStatus("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({
-      "content-type": "application/json",
-    }, token),
-    body: JSON.stringify(body),
-  });
-  flowState.submit = "done";
-  renderPublishFlow();
-  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),
+    });
+    setFlowStatus("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)"}`);
+    }
+  } catch (error) {
+    setFlowStatus("submit", "error");
+    if (submitSpinner) {
+      submitSpinner.stop("Submit failed");
+    }
+    throw error;
   }
 
   const summaryPayload = {

package/package.json

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