@trendai-crem/claude-skills 0.10.0 → 0.10.1

package/cli.js

@@ -13,6 +13,8 @@ const EXTERNAL_SOURCES = [
   { repo: 'obra/superpowers', flags: ['--all'], label: 'superpowers' },
 ];
 
+const MANIFEST_PATH = join(homedir(), '.claude', 'claude-skills-manifest.json');
+
 const run = (args, label) => {
   try {
     execFileSync('npx', args, { stdio: 'inherit' });
@@ -25,19 +27,36 @@ const run = (args, label) => {
 
 console.log('Installing team skills...\n');
 
-// 1. External skills — failures are non-fatal
-const externalResults = EXTERNAL_SOURCES.map(({ repo, flags, label }) =>
-  ({ label, ok: run(['skills', 'add', repo, ...flags, '-g', '-y'], label) })
-);
-
 // 2. Team skills — required, overrides same-named externals
 const teamSkills = readdirSync(join(__dir, 'skills'), { withFileTypes: true })
   .filter(e => e.isDirectory())
   .map(e => e.name)
   .sort();
 
+// Compute desired skills for reconcile (query external sources before installing)
+const externalSkillNames = EXTERNAL_SOURCES.flatMap(({ repo, flags }) =>
+  listExternalSkillNames(repo, flags) ?? []
+);
+const desiredSkills = new Set([...teamSkills, ...externalSkillNames]);
+
+// Reconcile stale skills via manifest (before installing, so removals show first)
+const skillManifest = readJsonObject(MANIFEST_PATH, {}, 'claude-skills-manifest.json') ?? {};
+const previousSkills = new Set(Array.isArray(skillManifest.skills) ? skillManifest.skills : []);
+const staleSkillResults = reconcileSkills(desiredSkills, previousSkills);
+
+// 1. External skills — failures are non-fatal
+const externalResults = EXTERNAL_SOURCES.map(({ repo, flags, label }) =>
+  ({ label, ok: run(['skills', 'add', repo, ...flags, '-g', '-y'], label) })
+);
+
 const teamOk = run(['skills', 'add', __dir, '--all', '-g', '-y'], 'team skills');
 
+// Write skills portion of manifest (merge to preserve plugins field written later)
+const tmpSkillManifest = join(tmpdir(), `claude-skills-manifest-${process.pid}-skills.json`);
+const mergedSkillManifest = { ...skillManifest, skills: [...desiredSkills] };
+writeFileSync(tmpSkillManifest, JSON.stringify(mergedSkillManifest, null, 2) + '\n');
+renameSync(tmpSkillManifest, MANIFEST_PATH);
+
 // 3. Marketplace plugins — failures are non-fatal
 let marketplaceResults = [];
 try {
@@ -48,6 +67,7 @@ try {
 
 // Summary
 console.log('\nResults:');
+staleSkillResults.forEach(({ skill, action, ok }) => console.log(`  ${ok ? '✓' : '✗'} ${skill} (${action})`));
 externalResults.forEach(({ label, ok }) => console.log(`  ${ok ? '✓' : '✗'} ${label}`));
 if (teamOk) {
   teamSkills.forEach(name => console.log(`  ✓ ${name}`));
@@ -90,6 +110,39 @@ function readJsonObject(filePath, fallback, label) {
   return fallback;
 }
 
+// Lists skill names available in an external repo without installing (uses --list flag).
+// Returns null if the query fails — caller should skip reconcile for that source.
+function listExternalSkillNames(repo, flags) {
+  try {
+    const output = execFileSync('npx', ['skills', 'add', repo, ...flags, '-l'], {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    return output.split('\n')
+      .filter(l => /^│    [a-z]/.test(l))
+      .map(l => l.replace(/^│\s+/, '').trim());
+  } catch {
+    return null; // can't determine list — reconcile skipped for this source
+  }
+}
+
+// Removes skills that claude-skills previously managed but are no longer in any source.
+// Only touches skills in our manifest — leaves user-created skills alone.
+function reconcileSkills(desiredSkills, previousSkills) {
+  const staleSkills = [...previousSkills].filter(s => !desiredSkills.has(s));
+  if (staleSkills.length === 0) return [];
+
+  console.log('\nRemoving stale skills (removed from config)...\n');
+  try {
+    execFileSync('npx', ['skills', 'remove', ...staleSkills, '-g', '-y'], { stdio: 'inherit' });
+    return staleSkills.map(skill => ({ skill, action: 'uninstall', ok: true }));
+  } catch (error) {
+    const exitInfo = error.status != null ? `exit ${error.status}` : error.code ?? error.message;
+    console.error(`\nFailed to remove stale skills (${exitInfo})`);
+    return staleSkills.map(skill => ({ skill, action: 'uninstall', ok: false }));
+  }
+}
+
 // Extracts the registered source for a marketplace from known_marketplaces.json.
 // Handles: plain string, object with string .source, and GitHub registry format
 // { source: { source: "github", repo: "org/repo" } }.
@@ -233,7 +286,48 @@ function installMarketplacePlugins() {
     ? rawInstalled
     : {};
 
-  return marketplaces.flatMap(entry => installFromMarketplace(entry, known, installed));
+  const desiredKeys = new Set(
+    marketplaces.flatMap(e => (e?.plugins ?? []).map(p => `${p}@${e.name}`))
+  );
+
+  // Reconcile: uninstall plugins WE previously managed that are no longer in marketplace.json.
+  // Uses a manifest so we only remove what claude-skills installed — not user-installed plugins.
+  const manifest = readJsonObject(MANIFEST_PATH, {}, 'claude-skills-manifest.json');
+  const previousKeys = new Set(Array.isArray(manifest.plugins) ? manifest.plugins : []);
+  const uninstallResults = reconcileMarketplacePlugins(desiredKeys, previousKeys, installed);
+
+  // Update manifest — merge to preserve other fields (e.g. skills written by reconcileSkills)
+  const tmpManifest = join(tmpdir(), `claude-skills-manifest-${process.pid}.json`);
+  const updatedManifest = { ...(readJsonObject(MANIFEST_PATH, {}) ?? {}), plugins: [...desiredKeys] };
+  writeFileSync(tmpManifest, JSON.stringify(updatedManifest, null, 2) + '\n');
+  renameSync(tmpManifest, MANIFEST_PATH);
+
+  const installResults = marketplaces.flatMap(entry => installFromMarketplace(entry, known, installed));
+  return [...uninstallResults, ...installResults];
+}
+
+// Uninstalls plugins that claude-skills previously managed but are no longer in marketplace.json.
+// Only touches plugins in our manifest — leaves user-installed plugins alone.
+function reconcileMarketplacePlugins(desiredKeys, previousKeys, installed) {
+  const staleKeys = [...previousKeys].filter(key =>
+    !desiredKeys.has(key) && Object.hasOwn(installed, key)
+  );
+
+  if (staleKeys.length === 0) return [];
+
+  console.log('\nRemoving stale marketplace plugins (removed from marketplace.json)...\n');
+  return staleKeys.map(key => {
+    const atIdx = key.lastIndexOf('@');
+    const plugin = atIdx !== -1 ? key.slice(0, atIdx) : key;
+    try {
+      execFileSync('claude', ['plugin', 'uninstall', key], { stdio: 'inherit' });
+      return { plugin, action: 'uninstall', ok: true };
+    } catch (error) {
+      const exitInfo = error.status != null ? `exit ${error.status}` : error.code ?? error.message;
+      console.error(`\nFailed to uninstall ${key} (${exitInfo})`);
+      return { plugin, action: 'uninstall', ok: false };
+    }
+  });
 }
 
 function setupAutoUpdate() {

package/marketplace.json

@@ -8,8 +8,7 @@
         "atlassian-tools",
         "google-style-guides",
         "l2-automation",
-        "service-doc-generator",
-        "claude-on-teams"
+        "service-doc-generator"
       ]
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trendai-crem/claude-skills",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Claude Code skills installer for the trendai-crem team",
   "license": "UNLICENSED",
   "repository": {