@npeercy/skills 0.1.7 → 0.1.9

package/bin/skills.js

@@ -16,7 +16,7 @@ const USAGE = `skill-sharer — CLI skill manager for coding agents
 Usage: skills <command> [options]
 
 Setup:
-  init [--server <url>] [--token <token>] [--no-import]   Setup skill-sharer
+  init [--server <url>] [--token <token>]                 Setup skill-sharer (local-only; never publishes)
   login [--server <url>] [--token <token>]               Set/refresh token (prompts if missing)
   logout                                                  Remove stored token
 
@@ -85,9 +85,9 @@ async function main() {
         const { values } = parseArgs({ args: rest, options: {
           server: { type: 'string' },
           token: { type: 'string' },
-          'no-import': { type: 'boolean', default: false },
+          'no-import': { type: 'boolean', default: false }, // deprecated compatibility; init never imports
         }, allowPositionals: false });
-        await cmdInit({ server: values.server, token: values.token, noImport: values['no-import'] });
+        await cmdInit({ server: values.server, token: values.token });
         break;
       }
       case 'login': {

package/lib/skills.js

@@ -77,10 +77,9 @@ async function resolveSkillId(input, config) {
 }
 
 function linkNameForSkill(skillId) {
-  if (skillId.startsWith('__builtin__/local/')) {
-    return `builtin--${splitSkillId(skillId).name}`;
-  }
-  return symlinkName(skillId);
+  // Use bare skill name so directory matches name: field in SKILL.md.
+  // Pi expects these to match; mismatches show as "[Skill conflicts]".
+  return splitSkillId(skillId).name;
 }
 
 async function promptForToken(serverUrl) {
@@ -262,12 +261,20 @@ export function getLocalDiagnostics() {
   const unmanaged = discoverUnmanaged(agents, st);
   const conflicts = discoverAgentNameConflicts(agents);
 
+  const installedBuiltinIds = new Set(
+    Object.keys(st.installed).filter(id => id.startsWith('__builtin__/local/')),
+  );
+  const missingBuiltins = bundled.filter(b => !installedBuiltinIds.has(b.id));
+
   return {
     state: st,
     agents,
     managedCount: Object.keys(st.installed).length,
     bundledBuiltinsCount: bundled.length,
-    hasBuiltinsInstalled: Object.keys(st.installed).some(id => id.startsWith('__builtin__/local/')),
+    installedBuiltinsCount: installedBuiltinIds.size,
+    missingBuiltinsCount: missingBuiltins.length,
+    hasBuiltinsInstalled: missingBuiltins.length === 0,
+    missingBuiltins,
     unmanagedCount: unmanaged.size,
     conflictCount: conflicts.length,
     unmanaged,
@@ -275,7 +282,7 @@ export function getLocalDiagnostics() {
   };
 }
 
-async function installBuiltins(agents) {
+async function installBuiltins(agents, { quiet = false } = {}) {
   const st = loadState();
 
   const installed = [];
@@ -344,14 +351,14 @@ async function installBuiltins(agents) {
 
   saveState(st);
 
-  if (installed.length > 0) {
+  if (!quiet && installed.length > 0) {
     console.log('\nInstalled built-in skills:');
     for (const name of installed) {
       console.log(`  ✓ ${name} → ${Object.keys(agents).join(', ') || '(no agents detected)'}`);
     }
   }
 
-  if (skipped.length > 0) {
+  if (!quiet && skipped.length > 0) {
     console.log('\nSkipped built-ins to avoid skill-name conflicts in agents:');
     for (const s of skipped) {
       const where = s.conflicts.map(c => `${c.agent}/${c.entryName}`).join(', ');
@@ -359,6 +366,22 @@ async function installBuiltins(agents) {
     }
     console.log('  Tip: remove/rename duplicates if you want bundled docs linked automatically.');
   }
+
+  return { installed, skipped };
+}
+
+export async function ensureBuiltinsInstalled({ quiet = true } = {}) {
+  const d = getLocalDiagnostics();
+  if (d.missingBuiltinsCount === 0) {
+    return { changed: false, installed: [], skipped: [] };
+  }
+
+  const result = await installBuiltins(d.agents, { quiet });
+  return {
+    changed: result.installed.length > 0,
+    installed: result.installed,
+    skipped: result.skipped,
+  };
 }
 
 // --- Commands ---
@@ -405,14 +428,17 @@ export async function cmdInit(args) {
     throw new Error(`Token invalid: ${e.message}`);
   }
 
-  // Import existing skills
-  if (!args.noImport) {
-    await cmdImport({ all: true, quiet: false });
-  }
-
-  // Install built-ins
+  // Install built-ins (safe local setup)
   await installBuiltins(agents);
 
+  const unmanaged = discoverUnmanaged(agents, loadState());
+
+  console.log('\nSetup complete.');
+  console.log('Next command: skills');
+  if (unmanaged.size > 0) {
+    console.log(`Optional publish step: skills import   (found ${unmanaged.size} unmanaged local skill(s))`);
+  }
+
   console.log('\nReady! Ask your agent to "install a skill" or "create a new skill".');
 }
 
@@ -437,10 +463,9 @@ export async function cmdLogin(args) {
   console.log(`  Your publish namespace is: ${me.org}/${me.user}/<skillname>`);
 
   // First-time setup guidance
-  const st = loadState();
-  const agents = detectAgents();
-  const unmanaged = discoverUnmanaged(agents, st);
-  const hasBuiltins = Object.keys(st.installed).some(id => id.startsWith('__builtin__/local/'));
+  const diag = getLocalDiagnostics();
+  const unmanaged = diag.unmanaged;
+  const hasBuiltins = diag.hasBuiltinsInstalled;
 
   if (!hasBuiltins || unmanaged.size > 0) {
     console.log('\nSetup not complete yet.');
@@ -449,12 +474,18 @@ export async function cmdLogin(args) {
 
     const doSetup = await promptYesNo('Run guided setup now? (recommended)', true);
     if (doSetup) {
-      await cmdInit({ server: cfg.server, token: cfg.token, noImport: false });
+      await cmdInit({ server: cfg.server, token: cfg.token });
+      if (unmanaged.size > 0) {
+        const doImport = await promptYesNo('Import unmanaged local skills to registry now?', false);
+        if (doImport) {
+          await cmdImport({ all: true, quiet: false });
+        }
+      }
       return;
     }
 
     console.log('\nNext steps:');
-    if (!hasBuiltins) console.log('  skills init --no-import');
+    if (!hasBuiltins) console.log('  skills init');
     if (unmanaged.size > 0) console.log('  skills import');
   }
 }

package/lib/startup.js

@@ -1,5 +1,7 @@
-import { loadConfig, saveConfig } from './config.js';
-import { getLocalDiagnostics } from './skills.js';
+import { existsSync, readdirSync, lstatSync, readlinkSync, unlinkSync, symlinkSync, mkdirSync } from 'fs';
+import { join, resolve, dirname } from 'path';
+import { loadConfig, saveConfig, loadState, saveState, detectAgents } from './config.js';
+import { ensureBuiltinsInstalled, getLocalDiagnostics } from './skills.js';
 
 function cmpSemver(a, b) {
   const pa = String(a || '').split('.').map(n => parseInt(n, 10) || 0);
@@ -52,6 +54,72 @@ async function runUpdateCheck(currentVersion, { silent = false } = {}) {
   }
 }
 
+function migrateOldSymlinks() {
+  // Migrate from old naming (org--user--name, builtin--name) to bare skill name.
+  // Pi expects directory name == name: field in SKILL.md.
+  const st = loadState();
+  const agents = detectAgents();
+  let migrated = 0;
+
+  for (const [id, rec] of Object.entries(st.installed)) {
+    const parts = id.split('/');
+    const bareName = parts[parts.length - 1]; // the skill name
+
+    // Figure out old link name
+    let oldLinkName;
+    if (id.startsWith('__builtin__/local/')) {
+      oldLinkName = `builtin--${bareName}`;
+    } else {
+      oldLinkName = id.replace(/\//g, '--');
+    }
+
+    // If old == new, nothing to do
+    if (oldLinkName === bareName) continue;
+
+    for (const agentName of (rec.agents || [])) {
+      const agentPath = agents[agentName];
+      if (!agentPath || !existsSync(agentPath)) continue;
+
+      const oldLink = join(agentPath, oldLinkName);
+      const newLink = join(agentPath, bareName);
+
+      // Remove old symlink if it exists
+      try {
+        if (lstatSync(oldLink).isSymbolicLink()) {
+          unlinkSync(oldLink);
+        }
+      } catch { /* doesn't exist */ }
+
+      // Create new symlink if not already there
+      if (!existsSync(newLink) && rec.path && existsSync(rec.path)) {
+        try {
+          mkdirSync(agentPath, { recursive: true });
+          symlinkSync(rec.path, newLink);
+          migrated++;
+        } catch { /* best effort */ }
+      }
+    }
+  }
+
+  return migrated;
+}
+
+async function runAutoHeal(command, { jsonMode = false } = {}) {
+  if (process.env.SKILLS_NO_STARTUP_HEAL === '1') return;
+  if (['init'].includes(command)) return;
+
+  // Migrate old-style symlinks (org--user--name → bare name)
+  const migrated = migrateOldSymlinks();
+  if (!jsonMode && migrated > 0) {
+    console.log(`✓ Startup heal: migrated ${migrated} symlink(s) to match Pi naming.`);
+  }
+
+  const result = await ensureBuiltinsInstalled({ quiet: true });
+  if (!jsonMode && result.changed) {
+    console.log(`✓ Startup heal: installed ${result.installed.length} missing built-in skill(s).`);
+  }
+}
+
 function printSetupWarnings(command, startupInfo, { jsonMode = false } = {}) {
   if (jsonMode) return;
 
@@ -60,7 +128,7 @@ function printSetupWarnings(command, startupInfo, { jsonMode = false } = {}) {
 
   const warnings = [];
   if (!startupInfo.hasBuiltinsInstalled && startupInfo.bundledBuiltinsCount > 0) {
-    warnings.push('Built-in skills are not installed. Run: skills init --no-import');
+    warnings.push('Built-in skills are not installed. Run: skills init');
   }
   if (startupInfo.unmanagedCount > 0) {
     warnings.push(`Found ${startupInfo.unmanagedCount} unmanaged local skill(s). Run: skills import`);
@@ -80,6 +148,7 @@ function printSetupWarnings(command, startupInfo, { jsonMode = false } = {}) {
 
 export async function runStartupChecks({ currentVersion, command, jsonMode = false }) {
   await runUpdateCheck(currentVersion, { silent: jsonMode });
+  await runAutoHeal(command, { jsonMode });
   const startupInfo = getLocalDiagnostics();
   printSetupWarnings(command, startupInfo, { jsonMode });
   return startupInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npeercy/skills",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "CLI-first skill marketplace for coding agents",
   "type": "module",
   "bin": {