myskillshub 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myskillshub",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "CLI tool for SkillHub skill management",
   "main": "src/index.js",
   "bin": {

package/src/commands/publish.js

@@ -12,6 +12,7 @@ const FormData = require('form-data');
 const { createWriteStream } = require('fs');
 
 const program = new Command();
+const DEFAULT_CATEGORY_SLUG = 'dev-tools';
 
 program
   .name('publish')
@@ -73,7 +74,7 @@ program
       console.log(chalk.cyan(`Skill URL: ${options.apiUrl}/skills/${result.slug}`));
 
     } catch (error) {
-      spinner.fail(chalk.red(`Publish failed: ${error.message}`));
+      spinner.fail(chalk.red(`Publish failed: ${formatErrorMessage(error)}`));
       if (options.verbose) {
         console.error(error);
       }
@@ -229,18 +230,25 @@ async function resolveCategoryId(apiUrl, options, frontmatter) {
     }
   }
 
-  const slugCandidate = options.categorySlug || frontmatter.category_slug || frontmatter.category;
-  if (!slugCandidate) {
-    throw new Error('category_id is required. Use --category-id <id> or --category-slug <slug>.');
-  }
+  const slugCandidate = options.categorySlug
+    || frontmatter.category_slug
+    || frontmatter.category
+    || DEFAULT_CATEGORY_SLUG;
 
-  const response = await axios.get(`${apiUrl}/api/categories/${encodeURIComponent(String(slugCandidate).trim())}`);
-  const category = response.data?.data?.category;
-  if (!response.data?.success || !category?.id) {
-    throw new Error(`Failed to resolve category slug: ${slugCandidate}`);
-  }
+  try {
+    const response = await axios.get(`${apiUrl}/api/categories/${encodeURIComponent(String(slugCandidate).trim())}`);
+    const category = response.data?.data?.category;
+    if (!response.data?.success || !category?.id) {
+      throw new Error(`Failed to resolve category slug: ${slugCandidate}`);
+    }
 
-  return category.id;
+    return category.id;
+  } catch (error) {
+    if (error.response?.status === 404 && slugCandidate === DEFAULT_CATEGORY_SLUG) {
+      throw new Error(`Default category "${DEFAULT_CATEGORY_SLUG}" not found. Use --category-id or --category-slug.`);
+    }
+    throw new Error(`Failed to resolve category slug: ${slugCandidate}. ${formatErrorMessage(error)}`);
+  }
 }
 
 async function getAuthCookie(apiUrl, options, spinner) {
@@ -260,9 +268,38 @@ async function getAuthCookie(apiUrl, options, spinner) {
     }
   }
 
-  const credentials = await resolveCredentials(options, spinner);
-  const cookie = await loginAndGetCookie(normalizedApiUrl, credentials.username, credentials.password);
+  let usedStoredCredentials = false;
+  let credentials = hasCompleteExplicitCredentials
+    ? { username: resolvedUsername, password: resolvedPassword }
+    : null;
+
+  if (!credentials) {
+    const storedCredentials = getCachedCredentials(normalizedApiUrl);
+    if (storedCredentials) {
+      credentials = storedCredentials;
+      usedStoredCredentials = true;
+    }
+  }
+
+  if (!credentials) {
+    credentials = await resolveCredentials(options, spinner);
+  }
+
+  let cookie;
+  try {
+    cookie = await loginAndGetCookie(normalizedApiUrl, credentials.username, credentials.password);
+  } catch (error) {
+    if (usedStoredCredentials) {
+      // Stored credentials may be stale, fallback to interactive prompt once.
+      credentials = await resolveCredentials(options, spinner);
+      cookie = await loginAndGetCookie(normalizedApiUrl, credentials.username, credentials.password);
+    } else {
+      throw error;
+    }
+  }
+
   saveCachedCookie(normalizedApiUrl, cookie);
+  saveCachedCredentials(normalizedApiUrl, credentials.username, credentials.password);
   return { cookie, fromCache: false };
 }
 
@@ -304,20 +341,43 @@ function getCachedCookie(apiUrl) {
   return store.sessions?.[apiUrl]?.cookie || null;
 }
 
-function saveCachedCookie(apiUrl, cookie) {
+function getCachedCredentials(apiUrl) {
+  const store = readSessionStore();
+  const username = store.sessions?.[apiUrl]?.username || '';
+  const password = store.sessions?.[apiUrl]?.password || '';
+  if (!username || !password) {
+    return null;
+  }
+  return { username, password };
+}
+
+function saveSessionData(apiUrl, patch) {
   const store = readSessionStore();
   store.sessions = store.sessions || {};
   store.sessions[apiUrl] = {
-    cookie,
-    updatedAt: new Date().toISOString()
+    ...(store.sessions[apiUrl] || {}),
+    ...patch,
+    updatedAt: new Date().toISOString(),
   };
   writeSessionStore(store);
 }
 
+function saveCachedCookie(apiUrl, cookie) {
+  saveSessionData(apiUrl, { cookie });
+}
+
+function saveCachedCredentials(apiUrl, username, password) {
+  saveSessionData(apiUrl, { username, password });
+}
+
 function removeCachedCookie(apiUrl) {
   const store = readSessionStore();
   if (store.sessions && store.sessions[apiUrl]) {
-    delete store.sessions[apiUrl];
+    delete store.sessions[apiUrl].cookie;
+    store.sessions[apiUrl].updatedAt = new Date().toISOString();
+    if (!store.sessions[apiUrl].username || !store.sessions[apiUrl].password) {
+      delete store.sessions[apiUrl];
+    }
     writeSessionStore(store);
   }
 }
@@ -396,7 +456,7 @@ function promptPassword(question) {
       terminal: true
     });
 
-    rl.stdoutMuted = true;
+    rl.stdoutMuted = false;
     const originalWriteToOutput = rl._writeToOutput;
     rl._writeToOutput = function writeToOutput(stringToWrite) {
       if (rl.stdoutMuted) {
@@ -415,6 +475,7 @@ function promptPassword(question) {
       rl.close();
       resolve(String(password || '').trim());
     });
+    rl.stdoutMuted = true;
   });
 }
 
@@ -435,7 +496,7 @@ async function loginAndGetCookie(apiUrl, username, password) {
 function createZipPackage(directory) {
   return new Promise((resolve, reject) => {
     const baseName = path.basename(path.resolve(directory));
-    const zipPath = path.join(process.cwd(), `${baseName}-package-${Date.now()}.zip`);
+    const zipPath = path.join(os.tmpdir(), `${baseName}-package-${Date.now()}.zip`);
     const output = createWriteStream(zipPath);
     const archive = archiver('zip', {
       zlib: { level: 9 }
@@ -461,7 +522,10 @@ function createZipPackage(directory) {
       ignore: [
         '**/node_modules/**',
         '**/.git/**',
-        '**/.DS_Store'
+        '**/.DS_Store',
+        '**/*-package-*.zip',
+        '**/*-package.zip',
+        '**/.-package.zip'
       ]
     });
 
@@ -493,4 +557,28 @@ async function uploadSkill(zipPath, skillData, categoryId, apiUrl, authCookie) {
   }
 }
 
+function formatErrorMessage(error) {
+  if (!error) {
+    return 'Unknown error';
+  }
+
+  const status = error.response?.status;
+  const apiError = error.response?.data?.error;
+  const directMessage = error.response?.data?.message;
+
+  if (apiError?.message) {
+    return status ? `HTTP ${status}: ${apiError.message}` : apiError.message;
+  }
+
+  if (directMessage) {
+    return status ? `HTTP ${status}: ${directMessage}` : directMessage;
+  }
+
+  if (status) {
+    return `HTTP ${status}: ${error.message}`;
+  }
+
+  return error.message || 'Unknown error';
+}
+
 module.exports = program;