myskillshub 1.0.7 → 1.0.9

package/package.json

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

package/src/commands/publish.js

@@ -268,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 };
 }
 
@@ -312,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);
   }
 }
@@ -404,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) {
@@ -423,6 +475,7 @@ function promptPassword(question) {
       rl.close();
       resolve(String(password || '').trim());
     });
+    rl.stdoutMuted = true;
   });
 }
 
@@ -443,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 }
@@ -469,7 +522,10 @@ function createZipPackage(directory) {
       ignore: [
         '**/node_modules/**',
         '**/.git/**',
-        '**/.DS_Store'
+        '**/.DS_Store',
+        '**/*-package-*.zip',
+        '**/*-package.zip',
+        '**/.-package.zip'
       ]
     });