@supercorks/skills-installer 1.12.0 → 1.13.0

package/README.md

@@ -18,28 +18,26 @@ npx @supercorks/skills-installer install
 
 1. **Choose installation type** - Install skills, subagents, or both.
 
-2. **Choose installation path(s)** - Select one or more locations where resources should be installed. The installer labels each option with harness, scope, and available count, for example `.github/skills/ (copilot | local | 24 skills)`.
+2. **Choose installation path(s)** - Select one or more locations where resources should be installed. Global locations are shown before local locations. The installer labels each option with harness, scope, and available count, for example `~/.agents/skills/ (copilot/codex | global | 24 skills)`.
 
    Skills:
-   - `.github/skills/` (copilot | local)
-   - `~/.copilot/skills/` (copilot | global)
-   - `.agents/skills/` (codex | local)
-   - `~/.agents/skills/` (codex | global)
-   - `.claude/skills/` (claude | local)
+   - `~/.agents/skills/` (copilot/codex | global)
    - `~/.claude/skills/` (claude | global)
+   - `.agents/skills/` (copilot/codex | local)
+   - `.claude/skills/` (claude | local)
 
    Agents:
-   - `.github/agents/` (copilot | local)
-   - `~/.copilot/agents/` (copilot | global)
-   - `.claude/agents/` (claude | local)
+   - `~/.agents/agents/` (copilot | global)
    - `~/.claude/agents/` (claude | global)
-   - `.codex/agents/` (codex | local, installed as converted TOML agents)
    - `~/.codex/agents/` (codex | global, installed as converted TOML agents)
+   - `.agents/agents/` (copilot | local)
+   - `.claude/agents/` (claude | local)
+   - `.codex/agents/` (codex | local, installed as converted TOML agents)
    - Custom path of your choice
 
 3. **Gitignore option** - If launched from inside a git repository, optionally add the installation path to `.gitignore`
 
-4. **Select skills/subagents** - Interactive checkbox to pick what to install:
+4. **Select skills/subagents** - Interactive checkbox to pick what to install. If multiple locations are selected, the installer asks once and applies the same selection to every selected location:
    - Use `↑`/`↓` to navigate
    - Use `SPACE` to toggle selection
    - Use `→` to expand and lazy-load descriptions
@@ -60,7 +58,7 @@ npx @supercorks/skills-installer install
 - **Minimal download** - Uses `git clone --filter=blob:none` for efficient cloning
 - **Push capable** - The sparse clone preserves the full git history, allowing you to commit and push changes
 - **Auto-discovery** - Fetches the latest skill list from the repository
-- **Global and local targets** - Offers documented project/user locations for Copilot, Codex, and Claude where the resource format is compatible
+- **Global and local targets** - Offers documented project/user locations for Copilot, Codex, and Claude where the resource format is compatible, with shared generic `~/.agents/skills/` and `.agents/skills/` targets for Copilot/Codex skills
 - **Codex agent conversion** - Converts Markdown subagents into Codex TOML custom agents for `.codex/agents/` targets
 - **Recursive directory creation** - Custom paths are created automatically
 
@@ -74,7 +72,7 @@ npx @supercorks/skills-installer install
 Since the installation uses a sparse git checkout, you can pull updates:
 
 ```bash
-cd .github/skills  # or wherever you installed
+cd .agents/skills  # or wherever you installed
 git pull
 ```
 
@@ -83,7 +81,7 @@ git pull
 You can add more skills to an existing installation:
 
 ```bash
-cd .github/skills
+cd .agents/skills
 git sparse-checkout add new-skill-name
 ```
 

package/bin/install.js

@@ -57,6 +57,14 @@ function isHomePath(path) {
   return path === '~' || path.startsWith('~/');
 }
 
+function uniqueItems(items) {
+  return Array.from(new Set(items));
+}
+
+function unionSets(sets) {
+  return new Set(sets.flatMap(set => Array.from(set)));
+}
+
 /**
  * Detect existing skill installations in common paths
  * @returns {Promise<Array<{path: string, skillCount: number, skills: string[]}>>}
@@ -242,22 +250,39 @@ async function runSkillsInstall() {
   // Ask where to install (showing existing installations if any)
   const installTargets = await promptInstallPath(existingInstalls, skills.length);
 
-  for (let i = 0; i < installTargets.length; i++) {
-    const target = installTargets[i];
+  const targetContexts = [];
+  for (const [index, target] of installTargets.entries()) {
     if (installTargets.length > 1) {
-      console.log(`\n📍 Skills target ${i + 1}/${installTargets.length}: ${target.path}`);
+      console.log(`\n📍 Preparing skills target ${index + 1}/${installTargets.length}: ${target.path}`);
     }
-    await runSkillsInstallForTarget(skills, existingInstalls, target);
+    targetContexts.push(await prepareSkillsInstallTarget(existingInstalls, target));
+  }
+
+  const installedSkills = uniqueItems(targetContexts.flatMap(context => context.installedSkills));
+  const skillsNeedingUpdate = unionSets(targetContexts.map(context => context.skillsNeedingUpdate));
+
+  const selectedSkills = await promptSkillSelection(
+    skills,
+    installedSkills,
+    skillsNeedingUpdate,
+    (skillFolder) => fetchSkillMetadata(skillFolder)
+  );
+
+  for (let i = 0; i < targetContexts.length; i++) {
+    if (targetContexts.length > 1) {
+      console.log(`\n📍 Skills target ${i + 1}/${targetContexts.length}: ${targetContexts[i].installPath}`);
+    }
+    await runSkillsInstallForTarget(skills, targetContexts[i], selectedSkills);
   }
 }
 
 /**
- * Install/update skills for a specific target path
- * @param {Array<{name: string, description: string, folder: string}>} skills
+ * Prepare a specific skills target for installation/update.
  * @param {Array<{path: string, skillCount: number, skills: string[]}>} existingInstalls
  * @param {{path: string, isExisting: boolean}} target
+ * @returns {Promise<object>}
  */
-async function runSkillsInstallForTarget(skills, existingInstalls, target) {
+async function prepareSkillsInstallTarget(existingInstalls, target) {
   const { path: installPath, isExisting } = target;
   const absoluteInstallPath = resolveInstallPath(installPath);
   const gitDir = join(absoluteInstallPath, '.git');
@@ -311,13 +336,33 @@ async function runSkillsInstallForTarget(skills, existingInstalls, target) {
     shouldGitignore = await promptGitignore(installPath);
   }
 
-  // Select skills (pre-select installed skills in manage mode)
-  const selectedSkills = await promptSkillSelection(
-    skills,
+  return {
+    ...target,
+    installPath,
+    absoluteInstallPath,
     installedSkills,
-    skillsNeedingUpdate,
-    (skillFolder) => fetchSkillMetadata(skillFolder)
-  );
+    isManageMode,
+    shouldGitignore,
+    gitignorePath,
+    skillsNeedingUpdate
+  };
+}
+
+/**
+ * Install/update skills for a specific target path
+ * @param {Array<{name: string, description: string, folder: string}>} skills
+ * @param {object} targetContext
+ * @param {string[]} selectedSkills
+ */
+async function runSkillsInstallForTarget(skills, targetContext, selectedSkills) {
+  const {
+    installPath,
+    absoluteInstallPath,
+    installedSkills,
+    isManageMode,
+    shouldGitignore,
+    gitignorePath
+  } = targetContext;
 
   // Perform installation or update
   console.log('');
@@ -402,22 +447,39 @@ async function runSubagentsInstall() {
   // Ask where to install (showing existing installations if any)
   const installTargets = await promptAgentInstallPath(existingInstalls, subagents.length);
 
-  for (let i = 0; i < installTargets.length; i++) {
-    const target = installTargets[i];
+  const targetContexts = [];
+  for (const [index, target] of installTargets.entries()) {
     if (installTargets.length > 1) {
-      console.log(`\n📍 Subagents target ${i + 1}/${installTargets.length}: ${target.path}`);
+      console.log(`\n📍 Preparing subagents target ${index + 1}/${installTargets.length}: ${target.path}`);
+    }
+    targetContexts.push(await prepareSubagentsInstallTarget(existingInstalls, target));
+  }
+
+  const installedAgents = uniqueItems(targetContexts.flatMap(context => context.installedAgents));
+  const subagentsNeedingUpdate = unionSets(targetContexts.map(context => context.subagentsNeedingUpdate));
+
+  const selectedAgents = await promptSubagentSelection(
+    subagents,
+    installedAgents,
+    subagentsNeedingUpdate,
+    (filename) => fetchSubagentMetadata(filename)
+  );
+
+  for (let i = 0; i < targetContexts.length; i++) {
+    if (targetContexts.length > 1) {
+      console.log(`\n📍 Subagents target ${i + 1}/${targetContexts.length}: ${targetContexts[i].installPath}`);
     }
-    await runSubagentsInstallForTarget(subagents, existingInstalls, target);
+    await runSubagentsInstallForTarget(subagents, targetContexts[i], selectedAgents);
   }
 }
 
 /**
- * Install/update subagents for a specific target path
- * @param {Array<{name: string, description: string, filename: string}>} subagents
+ * Prepare a specific subagent target for installation/update.
  * @param {Array<{path: string, agentCount: number, agents: string[]}>} existingInstalls
  * @param {{path: string, isExisting: boolean}} target
+ * @returns {Promise<object>}
  */
-async function runSubagentsInstallForTarget(subagents, existingInstalls, target) {
+async function prepareSubagentsInstallTarget(existingInstalls, target) {
   const { path: installPath, isExisting } = target;
   const absoluteInstallPath = resolveInstallPath(installPath);
   const installMode = getAgentInstallMode(installPath);
@@ -483,13 +545,35 @@ async function runSubagentsInstallForTarget(subagents, existingInstalls, target)
     shouldGitignore = await promptGitignore(installPath);
   }
 
-  // Select subagents (pre-select installed ones in manage mode)
-  const selectedAgents = await promptSubagentSelection(
-    subagents,
+  return {
+    ...target,
+    installPath,
+    absoluteInstallPath,
+    installMode,
     installedAgents,
-    subagentsNeedingUpdate,
-    (filename) => fetchSubagentMetadata(filename)
-  );
+    isManageMode,
+    shouldGitignore,
+    gitignorePath,
+    subagentsNeedingUpdate
+  };
+}
+
+/**
+ * Install/update subagents for a specific target path
+ * @param {Array<{name: string, description: string, filename: string}>} subagents
+ * @param {object} targetContext
+ * @param {string[]} selectedAgents
+ */
+async function runSubagentsInstallForTarget(subagents, targetContext, selectedAgents) {
+  const {
+    installPath,
+    absoluteInstallPath,
+    installMode,
+    installedAgents,
+    isManageMode,
+    shouldGitignore,
+    gitignorePath
+  } = targetContext;
 
   // Perform installation or update
   console.log('');

package/lib/install-targets.js

@@ -3,15 +3,23 @@
  */
 
 export const SKILL_INSTALL_TARGETS = [
-  { path: '.github/skills/', harness: 'copilot', scope: 'local' },
-  { path: '~/.copilot/skills/', harness: 'copilot', scope: 'global' },
-  { path: '.agents/skills/', harness: 'codex', scope: 'local' },
-  { path: '~/.agents/skills/', harness: 'codex', scope: 'global' },
-  { path: '.claude/skills/', harness: 'claude', scope: 'local' },
-  { path: '~/.claude/skills/', harness: 'claude', scope: 'global' }
+  { path: '~/.agents/skills/', harness: 'copilot/codex', scope: 'global' },
+  { path: '~/.claude/skills/', harness: 'claude', scope: 'global' },
+  { path: '.agents/skills/', harness: 'copilot/codex', scope: 'local' },
+  { path: '.claude/skills/', harness: 'claude', scope: 'local' }
 ];
 
 export const LEGACY_SKILL_INSTALL_TARGETS = [
+  {
+    path: '.github/skills/',
+    harness: 'copilot',
+    scope: 'legacy local'
+  },
+  {
+    path: '~/.copilot/skills/',
+    harness: 'copilot',
+    scope: 'legacy global'
+  },
   {
     path: '~/.codex/skills/',
     harness: 'codex',
@@ -20,19 +28,24 @@ export const LEGACY_SKILL_INSTALL_TARGETS = [
 ];
 
 export const AGENT_INSTALL_TARGETS = [
-  { path: '.github/agents/', harness: 'copilot', scope: 'local', installMode: 'sparse-git' },
-  { path: '~/.copilot/agents/', harness: 'copilot', scope: 'global', installMode: 'sparse-git' },
-  { path: '.claude/agents/', harness: 'claude', scope: 'local', installMode: 'sparse-git' },
+  { path: '~/.agents/agents/', harness: 'copilot', scope: 'global', installMode: 'sparse-git' },
   { path: '~/.claude/agents/', harness: 'claude', scope: 'global', installMode: 'sparse-git' },
-  { path: '.codex/agents/', harness: 'codex', scope: 'local', installMode: 'codex-toml' },
-  { path: '~/.codex/agents/', harness: 'codex', scope: 'global', installMode: 'codex-toml' }
+  { path: '~/.codex/agents/', harness: 'codex', scope: 'global', installMode: 'codex-toml' },
+  { path: '.agents/agents/', harness: 'copilot', scope: 'local', installMode: 'sparse-git' },
+  { path: '.claude/agents/', harness: 'claude', scope: 'local', installMode: 'sparse-git' },
+  { path: '.codex/agents/', harness: 'codex', scope: 'local', installMode: 'codex-toml' }
 ];
 
 export const LEGACY_AGENT_INSTALL_TARGETS = [
   {
-    path: '.agents/agents/',
-    harness: 'codex',
+    path: '.github/agents/',
+    harness: 'copilot',
     scope: 'legacy local'
+  },
+  {
+    path: '~/.copilot/agents/',
+    harness: 'copilot',
+    scope: 'legacy global'
   }
 ];
 
@@ -44,6 +57,19 @@ export function allAgentDetectionTargets() {
   return [...AGENT_INSTALL_TARGETS, ...LEGACY_AGENT_INSTALL_TARGETS];
 }
 
+export function orderTargetsGlobalFirst(targets) {
+  return [...targets].sort((left, right) => {
+    const leftGlobal = left.scope.includes('global') ? 0 : 1;
+    const rightGlobal = right.scope.includes('global') ? 0 : 1;
+
+    if (leftGlobal !== rightGlobal) {
+      return leftGlobal - rightGlobal;
+    }
+
+    return targets.indexOf(left) - targets.indexOf(right);
+  });
+}
+
 export function getAgentInstallMode(path) {
   const exactTarget = getTargetByPath(AGENT_INSTALL_TARGETS, path);
   if (exactTarget?.installMode) {

package/lib/prompts.js

@@ -10,7 +10,8 @@ import {
   allAgentDetectionTargets,
   allSkillDetectionTargets,
   formatTargetLabel,
-  getTargetByPath
+  getTargetByPath,
+  orderTargetsGlobalFirst
 } from './install-targets.js';
 
 const SKILL_PATH_CHOICES = {
@@ -68,13 +69,29 @@ export async function promptInstallType() {
  */
 export async function promptInstallPath(existingInstalls = [], availableSkillCount = 0) {
   const choices = [];
-  const existingPaths = existingInstalls.map(i => i.path);
   const detectionTargets = allSkillDetectionTargets();
+  const existingByPath = new Map(existingInstalls.map(install => [install.path, install]));
+  const standardPaths = new Set(SKILL_INSTALL_TARGETS.map(target => target.path));
   
-  // Add existing installations at the top
-  if (existingInstalls.length > 0) {
-    existingInstalls.forEach(install => {
-      const target = getTargetByPath(detectionTargets, install.path);
+  orderTargetsGlobalFirst(SKILL_INSTALL_TARGETS).forEach(target => {
+    const install = existingByPath.get(target.path);
+    choices.push({
+      name: install
+        ? formatTargetLabel(target, install.skillCount, 'skill', { installed: true })
+        : formatTargetLabel(target, availableSkillCount, 'skill'),
+      value: target.path
+    });
+  });
+
+  const existingLegacyOrCustom = existingInstalls.filter(install => !standardPaths.has(install.path));
+  if (existingLegacyOrCustom.length > 0) {
+    choices.push(new inquirer.Separator('── Existing legacy/custom installations ──'));
+    orderTargetsGlobalFirst(existingLegacyOrCustom.map(install => getTargetByPath(detectionTargets, install.path) || {
+      path: install.path,
+      harness: 'custom',
+      scope: 'existing'
+    })).forEach(target => {
+      const install = existingByPath.get(target.path);
       choices.push({
         name: target
           ? formatTargetLabel(target, install.skillCount, 'skill', { installed: true })
@@ -82,19 +99,9 @@ export async function promptInstallPath(existingInstalls = [], availableSkillCou
         value: install.path
       });
     });
-    choices.push(new inquirer.Separator('── New installation ──'));
   }
-  
-  // Standard path options
-  SKILL_INSTALL_TARGETS.forEach(target => {
-    if (!existingPaths.includes(target.path)) {
-      choices.push({
-        name: formatTargetLabel(target, availableSkillCount, 'skill'),
-        value: target.path
-      });
-    }
-  });
-  
+
+  choices.push(new inquirer.Separator('── Other ──'));
   choices.push({ name: 'Custom path...', value: SKILL_PATH_CHOICES.CUSTOM });
 
   const { pathChoices } = await inquirer.prompt([
@@ -120,7 +127,7 @@ export async function promptInstallPath(existingInstalls = [], availableSkillCou
   pathChoices
     .filter(path => path !== SKILL_PATH_CHOICES.CUSTOM)
     .forEach(path => {
-      selected.push({ path, isExisting: existingPaths.includes(path) });
+      selected.push({ path, isExisting: existingByPath.has(path) });
     });
 
   if (selectedSet.has(SKILL_PATH_CHOICES.CUSTOM)) {
@@ -153,13 +160,30 @@ export async function promptInstallPath(existingInstalls = [], availableSkillCou
  */
 export async function promptAgentInstallPath(existingInstalls = [], availableAgentCount = 0) {
   const choices = [];
-  const existingPaths = existingInstalls.map(i => i.path);
   const detectionTargets = allAgentDetectionTargets();
+  const existingByPath = new Map(existingInstalls.map(install => [install.path, install]));
+  const standardPaths = new Set(AGENT_INSTALL_TARGETS.map(target => target.path));
   
-  // Add existing installations at the top
-  if (existingInstalls.length > 0) {
-    existingInstalls.forEach(install => {
-      const target = getTargetByPath(detectionTargets, install.path);
+  orderTargetsGlobalFirst(AGENT_INSTALL_TARGETS).forEach(target => {
+    const install = existingByPath.get(target.path);
+    choices.push({
+      name: install
+        ? formatTargetLabel(target, install.agentCount, 'agent', { installed: true })
+        : formatTargetLabel(target, availableAgentCount, 'agent'),
+      value: target.path,
+      disabled: target.disabledReason
+    });
+  });
+
+  const existingLegacyOrCustom = existingInstalls.filter(install => !standardPaths.has(install.path));
+  if (existingLegacyOrCustom.length > 0) {
+    choices.push(new inquirer.Separator('── Existing legacy/custom installations ──'));
+    orderTargetsGlobalFirst(existingLegacyOrCustom.map(install => getTargetByPath(detectionTargets, install.path) || {
+      path: install.path,
+      harness: 'custom',
+      scope: 'existing'
+    })).forEach(target => {
+      const install = existingByPath.get(target.path);
       choices.push({
         name: target
           ? formatTargetLabel(target, install.agentCount, 'agent', { installed: true })
@@ -167,20 +191,9 @@ export async function promptAgentInstallPath(existingInstalls = [], availableAge
         value: install.path
       });
     });
-    choices.push(new inquirer.Separator('── New installation ──'));
   }
-  
-  // Standard path options
-  AGENT_INSTALL_TARGETS.forEach(target => {
-    if (!existingPaths.includes(target.path)) {
-      choices.push({
-        name: formatTargetLabel(target, availableAgentCount, 'agent'),
-        value: target.path,
-        disabled: target.disabledReason
-      });
-    }
-  });
-  
+
+  choices.push(new inquirer.Separator('── Other ──'));
   choices.push({ name: 'Custom path...', value: AGENT_PATH_CHOICES.CUSTOM });
 
   const { pathChoices } = await inquirer.prompt([
@@ -206,7 +219,7 @@ export async function promptAgentInstallPath(existingInstalls = [], availableAge
   pathChoices
     .filter(path => path !== AGENT_PATH_CHOICES.CUSTOM)
     .forEach(path => {
-      selected.push({ path, isExisting: existingPaths.includes(path) });
+      selected.push({ path, isExisting: existingByPath.has(path) });
     });
 
   if (selectedSet.has(AGENT_PATH_CHOICES.CUSTOM)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supercorks/skills-installer",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Interactive CLI installer for AI agent skills and subagents",
   "type": "module",
   "bin": {