sra-skills 0.20.3 → 0.20.4

package/index.mjs

@@ -67,6 +67,7 @@ function writeIdentityCache(email, team, role, profileKey) {
   }, null, 2) + '\n');
 }
 
+// Returns: { status: 'ok', team, role } | { status: 'not_found' } | { status: 'error' }
 async function fetchRoleFromApi(email) {
   try {
     const url = `${WHOIS_API_URL}?email=${encodeURIComponent(email)}`;
@@ -78,21 +79,27 @@ async function fetchRoleFromApi(email) {
     });
     clearTimeout(timeout);
     const result = await resp.json();
-    if (!result.success) return null;
+    if (!result.success) return { status: 'not_found' };
     const data = result.data || {};
     const team = parseTeamFromDept(data.department_path || '');
     const role = (data.role || '').toLowerCase().trim();
-    if (team && role) return [team, role];
-  } catch {}
-  return null;
+    if (team && role) return { status: 'ok', team, role };
+    return { status: 'not_found' };
+  } catch {
+    return { status: 'error' };
+  }
 }
 
-async function promptProfileSelection(profilesData) {
+async function promptProfileSelection(profilesData, { email = null, reason = 'error' } = {}) {
   if (!process.stdin.isTTY || !profilesData?.profiles) return null;
   const profiles = profilesData.profiles;
   const keys = Object.keys(profiles);
   if (!keys.length) return null;
-  console.log(`\n${C.y}⚠ Could not auto-detect your role (API unavailable). Please select manually:${C.x}`);
+  const identityHint = email ? ` (identity: ${C.d}${email}${C.x})` : '';
+  const msg = reason === 'not_found'
+    ? `\n${C.y}⚠ No matching role found for this identity${identityHint}. Please select manually:${C.x}`
+    : `\n${C.y}⚠ Role detection API unavailable${identityHint}. Please select manually:${C.x}`;
+  console.log(msg);
   const chosen = await select({
     message: 'Select your team/role profile',
     choices: keys.map(k => ({ name: `${k} — ${profiles[k].label || k}`, value: k })),
@@ -112,16 +119,15 @@ async function detectRole(email, opts = {}) {
     } catch {}
   }
   const result = await fetchRoleFromApi(email);
-  if (result) {
-    const [team, role] = result;
-    const profileKey = `${team}/${role}`;
-    writeIdentityCache(email, team, role, profileKey);
+  if (result.status === 'ok') {
+    const profileKey = `${result.team}/${result.role}`;
+    writeIdentityCache(email, result.team, result.role, profileKey);
     return profileKey;
   }
   if (cache && cache.email === email) return cache.profile_key || fallbackKey || 'other';
   if (fallbackKey) return fallbackKey;
   if (interactive && profilesData) {
-    const chosen = await promptProfileSelection(profilesData);
+    const chosen = await promptProfileSelection(profilesData, { email, reason: result.status });
     if (chosen) {
       const parts = chosen.split('/');
       const team = parts[0] || '';
@@ -131,7 +137,10 @@ async function detectRole(email, opts = {}) {
     }
   }
   if (!interactive) {
-    console.log(`${C.y}⚠ Could not auto-detect role (API unavailable, no cache). Using default profile "other".${C.x}`);
+    const hint = result.status === 'not_found' && email
+      ? `no matching role found for ${email}`
+      : result.status === 'not_found' ? 'no matching role found' : 'API unavailable';
+    console.log(`${C.y}⚠ Could not auto-detect role (${hint}, no cache). Using default profile "other".${C.x}`);
   }
   return 'other';
 }
@@ -479,6 +488,21 @@ if (cmd === 'add') {
   let profileIdentity = null; // email used for auto-detection
   let skills;
 
+  // --- Skill selection (three-state model) ---
+  // Skills have three states: enabled | disabled | available (implicit).
+  //   enabled:   installed, stored in manifest.skills
+  //   disabled:  user explicitly rejected, stored in manifest.disabled_skills
+  //   available: exists in repo but user hasn't decided — not stored (implicit)
+  //
+  // `disabled` is populated ONLY when user explicitly rejects a recommended skill
+  // in an interactive prompt. Specifically:
+  //   - Fresh install: disabled = profileSkillNames − selectedSet (rejected recommendations)
+  //   - Update: disabled += rejected newProfile skills from promptSkillChanges
+  //   - Non-interactive: never populates disabled (system choice, not user intent)
+  //
+  // In legacy mode (no profile), disabled_skills = discoveredNames − selectedNames
+  // (all uninstalled = disabled, since there's no profile-based update logic).
+
   if (skillsFilter) {
     const unknown = [...skillsFilter].filter(n => !discoveredNames.has(n));
     if (unknown.length) console.warn(`Warning: requested skill(s) not found in repo: ${unknown.join(', ')}`);
@@ -493,6 +517,7 @@ if (cmd === 'add') {
   } else {
     const profilesData = loadProfiles(repoPath);
     if (!profilesData) {
+      // Legacy path (no profiles.json): disabled_skills computed at manifest write time
       if (isRepeat) {
         skills = allDiscovered.filter(s => !disabled.has(s.name));
       } else if (skipPrompt) {
@@ -501,6 +526,7 @@ if (cmd === 'add') {
         skills = await selectSkills(allDiscovered);
       }
     } else {
+      // Profile path: resolve profile key
       if (explicitProfile) {
         profileKeyUsed = explicitProfile;
         profileSource = 'manual';
@@ -519,6 +545,7 @@ if (cmd === 'add') {
       profileSkillNames = validateProfileSkills(profileSkillNames, discoveredNames);
 
       if (isRepeat) {
+        // Three-way diff: profile vs enabled vs disabled
         const diff = computeSkillDiff(allDiscovered, profileSkillNames, enabled, disabled);
         const [toEnable, toDisable, prompted] = skipPrompt
           ? [diff.newProfile, new Set(), false]
@@ -533,11 +560,19 @@ if (cmd === 'add') {
           disabled = new Set([...disabled, ...toDisable].filter(n => !toEnable.has(n) && discoveredNames.has(n)));
         }
       } else {
+        // Fresh install with profile
         if (skipPrompt) {
+          // Non-interactive: install profile defaults, don't mark others as disabled
           skills = allDiscovered.filter(s => profileSkillNames.has(s.name));
         } else {
           [skills, profileKeyUsed] = await selectSkillsWithProfile(
             allDiscovered, profileSkillNames, profileKeyUsed, profilesData);
+          // disabled = only rejected recommendations (profile-recommended but user unchecked)
+          // Skills in "Other" left unchecked are "available", not disabled
+          if (process.stdin.isTTY) {
+            const selectedSet = new Set(skills.map(s => s.name));
+            disabled = new Set([...profileSkillNames].filter(n => !selectedSet.has(n)));
+          }
         }
       }
     }
@@ -557,6 +592,9 @@ if (cmd === 'add') {
   console.log(`  Linked ${parts.join(', ')} [${tools.join(', ')}]`);
   runPostInstall(repoPath);
 
+  // Compute disabled_skills for manifest:
+  // - Profile mode: only user-rejected skills (from `disabled` set)
+  // - Legacy mode: all uninstalled skills (computed from discovered − selected)
   const selectedNames = new Set(skills.map(s => s.name));
   const disabledList = profileKeyUsed != null
     ? [...disabled].sort()
@@ -581,13 +619,17 @@ if (cmd === 'add') {
   console.log(`\n${C.b}Done.${C.x} ${name} ${C.g}${ver}${C.x}\n`);
   if (profileKeyUsed) {
     const srcLabel = profileSource === 'manual' ? 'manual' : 'auto';
-    console.log(`  ${C.b}Profile:${C.x}  ${C.g}${profileKeyUsed}${C.x} (${srcLabel})`);
+    const identityPart = profileIdentity ? `, ${C.d}${profileIdentity}${C.x}` : '';
+    console.log(`  ${C.b}Profile:${C.x}  ${C.g}${profileKeyUsed}${C.x} (${srcLabel}${identityPart})`);
   }
   if (isLocal) {
     console.log(`  ${C.b}Mode:${C.x}     ${C.y}local${C.x} → ${repoPath}`);
   }
   console.log(`  ${C.b}Tools:${C.x}    ${tools.join(', ')}`);
-  console.log(`  ${C.b}Skills:${C.x}   ${C.g}${skills.length} enabled${C.x}, ${C.d}${disabledList.length} disabled${C.x}`);
+  const skillsSummary = disabledList.length
+    ? `${C.g}${skills.length} enabled${C.x}, ${C.d}${disabledList.length} disabled${C.x}`
+    : `${C.g}${skills.length} enabled${C.x}`;
+  console.log(`  ${C.b}Skills:${C.x}   ${skillsSummary}`);
   if (isLocal) {
     let localRemoteUrl = '';
     try { localRemoteUrl = execSync('git remote get-url origin', { cwd: repoPath, encoding: 'utf8' }).trim(); } catch {}
@@ -844,7 +886,8 @@ if (cmd === 'add') {
       }
       if (repo.profile) {
         const srcLabel = repo.profile_source === 'manual' ? 'manual' : 'auto';
-        console.log(`  ${C.b}Profile:${C.x}  ${C.g}${repo.profile}${C.x} (${srcLabel})`);
+        const identityPart = repo.profile_identity ? `, ${C.d}${repo.profile_identity}${C.x}` : '';
+        console.log(`  ${C.b}Profile:${C.x}  ${C.g}${repo.profile}${C.x} (${srcLabel}${identityPart})`);
       }
 
       const totalEnabled = (repo.skills || []).length;
@@ -858,7 +901,7 @@ if (cmd === 'add') {
         if (removeCount) dp.push(`${C.y}-${removeCount}${C.x}`);
         skillsLine += ` (${dp.join(' ')})`;
       }
-      skillsLine += `, ${C.d}${totalDisabled} disabled${C.x}`;
+      if (totalDisabled) skillsLine += `, ${C.d}${totalDisabled} disabled${C.x}`;
       console.log(`  ${C.b}Skills:${C.x}   ${skillsLine}`);
 
       const totalChanges = addCount + changes.removed.length + changes.stale.length;
@@ -870,7 +913,7 @@ if (cmd === 'add') {
       } else if (totalChanges > 5) {
         let changeLine = `  Changes: ${C.g}+${addCount}${C.x} ${C.y}-${changes.removed.length}${C.x}`;
         if (changes.stale.length) changeLine += ` ${C.r}✕${changes.stale.length}${C.x}`;
-        changeLine += ` (run \`npx sra-skills skill list\` for details)`;
+        changeLine += ` (run \`npx sra-skills manage\` for details)`;
         console.log(changeLine);
       }
 

package/package.json

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