sra-skills 0.14.13 → 0.15.0

package/index.mjs

@@ -300,6 +300,7 @@ if (cmd === 'add') {
   const targets = target ? [target] : Object.keys(m.repos);
   const depsEntries = [];
   const updatedRepos = new Set();
+  const processedRepos = new Set();
   for (const name of targets) {
     const repo = m.repos[name];
     if (!repo) { console.error(`Repo "${name}" not found`); continue; }
@@ -307,30 +308,44 @@ if (cmd === 'add') {
     const isCloned = !!repo.url;  // --local installs have no url
     if (isCloned) {
       const prevRev = execSync('git rev-parse HEAD', { cwd: repo.path, encoding: 'utf8' }).trim();
-      const ref = repo.ref || 'release';
+      let ref = repo.ref || 'release';
       if (!repo.ref) repo.ref = ref;  // backfill for pre-v2.0.1 installs
       const current = execSync('git rev-parse --abbrev-ref HEAD', { cwd: repo.path, encoding: 'utf8' }).trim();
       let activeBranch = ref;
       // Try to fetch as tag first; if that fails, treat as branch
       let isTag = false;
+      let updateOk = false;
+      let fetchOk = false;
       try {
         execSync(`git fetch --depth 1 origin "refs/tags/${ref}:refs/tags/${ref}"`, { cwd: repo.path, stdio: 'pipe' });
         isTag = true;
+        fetchOk = true;
       } catch {
         try {
           execSync(`git fetch --depth 1 origin "${ref}"`, { cwd: repo.path, stdio: 'pipe' });
+          fetchOk = true;
         } catch {
           console.log(`  ⚠ Ref "${ref}" not found on remote, staying on ${current}`);
           activeBranch = current;
+          if (current !== 'HEAD') {
+            console.log(`  → Auto-correcting manifest ref: "${ref}" → "${current}"`);
+            repo.ref = current;
+            ref = current;
+            try {
+              execSync(`git fetch --depth 1 origin "${current}"`, { cwd: repo.path, stdio: 'pipe' });
+              fetchOk = true;
+            } catch {}
+          }
         }
       }
-      if (activeBranch === ref) {
+      if (fetchOk && activeBranch === ref) {
         try {
           if (isTag) {
             execSync(`git checkout "tags/${ref}" --detach`, { cwd: repo.path, stdio: 'pipe' });
           } else {
             execSync(`git checkout -B "${ref}" FETCH_HEAD`, { cwd: repo.path, stdio: 'pipe' });
           }
+          updateOk = true;
           if (current !== ref && !(current === 'HEAD' && isTag)) console.log(`  Switched to ${ref}`);
         } catch (e) {
           console.error(`  ⚠ git update failed: ${e.stderr?.toString().trim() || e.message}`);
@@ -339,8 +354,11 @@ if (cmd === 'add') {
       try { execSync('git fetch --tags', { cwd: repo.path, stdio: 'ignore' }); } catch {}
       const newRev = execSync('git rev-parse HEAD', { cwd: repo.path, encoding: 'utf8' }).trim();
       if (prevRev === newRev && !forceUpdate) {
-        console.log(`  Already up to date (${newRev.slice(0, 7)})`);
-        repo.updated_at = new Date().toISOString();
+        if (updateOk) {
+          console.log(`  Already up to date (${newRev.slice(0, 7)})`);
+          repo.updated_at = new Date().toISOString();
+          processedRepos.add(name);
+        }
         continue;
       }
       console.log(`  Updated ${prevRev.slice(0, 7)} → ${newRev.slice(0, 7)}`);
@@ -355,7 +373,6 @@ if (cmd === 'add') {
       console.log(`      "url": "${remoteUrl || '<git-remote-url>'}",`);
       console.log(`    Or: git -C ${repo.path} pull, then re-run ./scripts/install.sh`);
       repo.updated_at = new Date().toISOString();
-      continue;
     }
     const allSkills = discoverSkills(repo.path);
     const saved = repo.skills;
@@ -426,22 +443,18 @@ if (cmd === 'add') {
     const repo = Object.values(m.repos).find(r => r.path === repoPath);
     warnMissingCredentials(skills, repo?.credential_path || DEFAULT_CRED_PATH, repoPath);
   }
-  // Clean up pending files: remove updated skills, then purge any entries
-  // no longer present in the manifest (renamed/removed skills).
-  const allKnownSkills = new Set(Object.values(m.repos).flatMap(r => r.skills || []));
-  const updatedSkills = new Set(
-    [...updatedRepos].flatMap(name => m.repos[name]?.skills || [])
-  );
-  const cacheDir = join(SRA_HOME, 'update-cache');
-  for (const fname of ['bulk-pending', 'hook-pending']) {
-    const f = join(cacheDir, fname);
-    if (!existsSync(f)) continue;
-    const remaining = readFileSync(f, 'utf8').split('\n')
-      .filter(l => l && !updatedSkills.has(l) && allKnownSkills.has(l));
+  const availableFile = join(SRA_HOME, 'updates', 'available');
+  if (existsSync(availableFile)) {
+    const remaining = readFileSync(availableFile, 'utf8').split('\n')
+      .filter(l => {
+        if (!l.trim()) return false;
+        try { const n = JSON.parse(l).name; return !updatedRepos.has(n) && !processedRepos.has(n); }
+        catch { return false; }
+      });
     if (remaining.length > 0) {
-      writeFileSync(f, remaining.join('\n') + '\n');
+      writeFileSync(availableFile, remaining.join('\n') + '\n');
     } else {
-      unlinkSync(f);
+      unlinkSync(availableFile);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sra-skills",
-  "version": "0.14.13",
+  "version": "0.15.0",
   "description": "SRA agent skills installer — manage AI skill repos",
   "bin": {
     "sra": "index.mjs",