ht-skills 0.2.4 → 0.2.6

package/lib/cli.js

@@ -157,6 +157,15 @@ async function setStoredRegistryAuth(registry, value, { homeDir = os.homedir() }
   await saveCliConfig(config, homeDir);
 }
 
+async function clearStoredRegistryAuth(registry, { homeDir = os.homedir() } = {}) {
+  const config = await loadCliConfig(homeDir);
+  if (!config.registries || typeof config.registries !== "object") {
+    return;
+  }
+  delete config.registries[getRegistryConfigKey(registry)];
+  await saveCliConfig(config, homeDir);
+}
+
 async function resolveAuthToken(registry, flags, { homeDir = os.homedir() } = {}) {
   const inlineToken = String(flags.token || "").trim();
   if (inlineToken) {
@@ -174,6 +183,79 @@ async function getRequiredAuthToken(registry, flags, { homeDir = os.homedir() }
   return token;
 }
 
+function isInteractiveSession(deps = {}) {
+  return typeof deps.isInteractive === "boolean"
+    ? deps.isInteractive
+    : Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+
+async function validateAuthToken(registry, token, deps = {}) {
+  const requestJsonImpl = deps.requestJson || requestJson;
+  try {
+    const payload = await requestJsonImpl(`${registry}/auth/me`, {
+      headers: withBearerToken({}, token),
+    });
+    if (!payload || payload.authenticated !== true) {
+      return null;
+    }
+    return payload;
+  } catch (error) {
+    if (Number(error?.status || 0) === 401) {
+      return null;
+    }
+    throw error;
+  }
+}
+
+async function ensureValidAuthToken(registry, flags, deps = {}) {
+  const log = deps.log || ((message) => console.log(message));
+  const homeDir = deps.homeDir || os.homedir();
+  const loginImpl = deps.cmdLogin || cmdLogin;
+  const interactive = isInteractiveSession(deps);
+  const explicitToken = String(flags.token || "").trim();
+
+  let token = await resolveAuthToken(registry, flags, { homeDir });
+  if (!token) {
+    if (!interactive) {
+      throw new Error(`No saved login for ${registry}. Run "ht-skills login --registry ${registry}" first.`);
+    }
+    log(`Login required for ${registry}. Starting browser sign-in...`);
+    await loginImpl({ ...flags, registry }, deps);
+    token = await getRequiredAuthToken(registry, flags, { homeDir });
+  }
+
+  const authState = await validateAuthToken(registry, token, deps);
+  if (authState) {
+    return {
+      token,
+      authState,
+    };
+  }
+
+  if (explicitToken) {
+    throw new Error(`The provided token for ${registry} is invalid or expired.`);
+  }
+
+  await clearStoredRegistryAuth(registry, { homeDir });
+
+  if (!interactive) {
+    throw new Error(`Saved login for ${registry} is invalid or expired. Run "ht-skills login --registry ${registry}" first.`);
+  }
+
+  log(`Saved login for ${registry} is invalid or expired. Starting browser sign-in...`);
+  await loginImpl({ ...flags, registry }, deps);
+  token = await getRequiredAuthToken(registry, flags, { homeDir });
+  const refreshedAuthState = await validateAuthToken(registry, token, deps);
+  if (!refreshedAuthState) {
+    throw new Error(`Login completed but ${registry} did not accept the refreshed token.`);
+  }
+
+  return {
+    token,
+    authState: refreshedAuthState,
+  };
+}
+
 function withBearerToken(headers = {}, token = null) {
   if (!token) return { ...headers };
   return {
@@ -186,6 +268,17 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+function formatBytes(bytes) {
+  const value = Number(bytes || 0);
+  if (value >= 1024 * 1024) {
+    return `${(value / (1024 * 1024)).toFixed(2)} MB`;
+  }
+  if (value >= 1024) {
+    return `${(value / 1024).toFixed(2)} KB`;
+  }
+  return `${value} B`;
+}
+
 function openBrowserUrl(url) {
   const safeUrl = String(url || "").trim();
   if (!safeUrl) {
@@ -242,7 +335,7 @@ function summarizePreviewErrors(preview) {
 async function promptToOpenBrowser(url, deps = {}) {
   const ask = deps.ask || null;
   if (ask) {
-    await ask("Press ENTER to open in the browser...\n");
+    await ask("Press ENTER to open in the browser...");
     return;
   }
 
@@ -259,7 +352,7 @@ async function promptToOpenBrowser(url, deps = {}) {
     output: process.stdout,
   });
   try {
-    await rl.question("Press ENTER to open in the browser...\n");
+    await rl.question("Press ENTER to open in the browser...");
   } finally {
     rl.close();
   }
@@ -1345,14 +1438,19 @@ async function cmdLogin(flags, deps = {}) {
 async function cmdPublish(flags, deps = {}) {
   const requestJsonImpl = deps.requestJson || requestJson;
   const log = deps.log || ((message) => console.log(message));
-  const homeDir = deps.homeDir || os.homedir();
   const registry = getRegistryUrl(flags);
   const skillDir = path.resolve(flags._[0] || ".");
-  const token = await getRequiredAuthToken(registry, flags, { homeDir });
+  log(`Checking login for ${registry}...`);
+  const { token } = await ensureValidAuthToken(registry, flags, deps);
+
   const archiveName = `${path.basename(skillDir) || "skill"}.zip`;
+  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));
 
+  log("Uploading archive for package inspection...");
   const job = await requestJsonImpl(
     `${registry}/api/skills/inspect-package-jobs/upload?archive_name=${encodeURIComponent(archiveName)}`,
     {
@@ -1368,8 +1466,10 @@ async function cmdPublish(flags, deps = {}) {
   if (!jobId) {
     throw new Error("registry did not return an inspection job id");
   }
+  log(`Inspection job created: ${jobId}`);
 
   let inspection = job;
+  let lastProgressKey = "";
   while (inspection.status !== "succeeded" && inspection.status !== "failed") {
     await sleep(pollIntervalMs);
     inspection = await requestJsonImpl(
@@ -1378,16 +1478,29 @@ async function cmdPublish(flags, deps = {}) {
         headers: withBearerToken({}, token),
       },
     );
+
+    const step = String(inspection.progress?.step || inspection.result?.step || "").trim();
+    const percent = inspection.progress?.percent;
+    const progressKey = `${inspection.status}:${step}:${percent}`;
+    if (progressKey !== lastProgressKey) {
+      lastProgressKey = progressKey;
+      const progressLabel = step
+        ? `${step}${typeof percent === "number" ? ` ${percent}%` : ""}`
+        : inspection.status;
+      log(`Inspection in progress: ${progressLabel}`);
+    }
   }
 
   if (inspection.status !== "succeeded") {
     throw new Error(inspection.error || "skill archive inspection failed");
   }
+  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}`);
 
   const visibility = String(flags.access || flags.visibility || "public").trim().toLowerCase() || "public";
   const body = {
@@ -1404,6 +1517,7 @@ async function cmdPublish(flags, deps = {}) {
     body.publish_now = true;
   }
 
+  log(`Submitting review request with access=${visibility}...`);
   const result = await requestJsonImpl(`${registry}/api/skills/submit`, {
     method: "POST",
     headers: withBearerToken({
@@ -1411,6 +1525,7 @@ async function cmdPublish(flags, deps = {}) {
     }, token),
     body: JSON.stringify(body),
   });
+  log(`Review submission created: ${result.submission_id || "(no submission id returned)"}`);
 
   log(JSON.stringify({
     status: result.status,
@@ -1428,11 +1543,10 @@ async function cmdPublish(flags, deps = {}) {
 async function cmdSubmit(flags, deps = {}) {
   const requestJsonImpl = deps.requestJson || requestJson;
   const log = deps.log || ((message) => console.log(message));
-  const homeDir = deps.homeDir || os.homedir();
   const skillDirArg = flags._[0] || ".";
   const skillDir = path.resolve(skillDirArg);
   const registry = getRegistryUrl(flags);
-  const token = await getRequiredAuthToken(registry, flags, { homeDir });
+  const { token } = await ensureValidAuthToken(registry, flags, deps);
   const manifestPath = path.resolve(flags.manifest || path.join(skillDir, "skill.json"));
   const manifestRaw = await fs.readFile(manifestPath, "utf8");
   const manifest = JSON.parse(manifestRaw);

package/package.json

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