@izkac/forgekit 0.1.2 → 0.1.4

package/README.md

@@ -15,17 +15,19 @@ npm i -g @izkac/forgekit
 forgekit install
 ```
 
-Interactive install lets you pick **one or more** skills (comma-separated, e.g. `1,3`) or all. Same for agent environments.
+Interactive install uses arrow-key checkboxes — space to toggle, **`a` to select all**, enter to confirm. Pickers come pre-checked with what you already have installed; choosing the full set reconciles (new picks install, deselected ones are removed).
+
+Supported environments: Claude Code, Cursor, Codex CLI, GitHub Copilot, Gemini CLI, Windsurf, opencode — each into its global Agent-Skills directory.
 
 Non-interactive:
 
 ```bash
-forgekit install --skills forge,thorough-code-review --agents cursor,claude --force
+forgekit install --skills forge,thorough-code-review --agents cursor,claude,copilot --force
 ```
 
 ## Docs
 
-- After install, full Forge reference: `~/.cursor/skills/forge/docs/forge.md` (or `~/.claude/…` / `~/.codex/…`)
+- After install, full Forge reference: `~/.claude/skills/forge/docs/forge.md` (or the matching dir for your environment)
 - [How to use Forgekit](https://github.com/izkac/forgekit/blob/main/docs/usage.md)
 - [Repository README](https://github.com/izkac/forgekit#readme)
 

package/bin/forge.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * Forge CLI — session orchestration, prefs, models, project init.
  *

package/package.json

@@ -1,46 +1,49 @@
-{
-  "name": "@izkac/forgekit",
-  "version": "0.1.2",
-  "description": "Forgekit CLIs — forgekit (install), forge (workflow), review (code review)",
-  "type": "module",
-  "bin": {
-    "forgekit": "./bin/forgekit.mjs",
-    "forge": "./bin/forge.mjs",
-    "review": "./bin/review.mjs"
-  },
-  "files": [
-    "bin",
-    "src",
-    "vendor",
-    "scripts"
-  ],
-  "scripts": {
-    "prepack": "node scripts/prepack.mjs",
-    "test": "node scripts/run-tests.mjs",
-    "lint": "eslint src bin scripts"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/izkac/forgekit.git",
-    "directory": "packages/cli"
-  },
-  "homepage": "https://github.com/izkac/forgekit#readme",
-  "bugs": {
-    "url": "https://github.com/izkac/forgekit/issues"
-  },
-  "keywords": [
-    "forge",
-    "openspec",
-    "agent-skills",
-    "cursor",
-    "claude",
-    "codex"
-  ],
-  "license": "MIT"
-}
+{
+  "name": "@izkac/forgekit",
+  "version": "0.1.4",
+  "description": "Forgekit CLIs — forgekit (install), forge (workflow), review (code review)",
+  "type": "module",
+  "bin": {
+    "forgekit": "./bin/forgekit.mjs",
+    "forge": "./bin/forge.mjs",
+    "review": "./bin/review.mjs"
+  },
+  "files": [
+    "bin",
+    "src",
+    "vendor",
+    "scripts"
+  ],
+  "scripts": {
+    "prepack": "node scripts/prepack.mjs",
+    "test": "node scripts/run-tests.mjs",
+    "lint": "eslint src bin scripts"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/izkac/forgekit.git",
+    "directory": "packages/cli"
+  },
+  "homepage": "https://github.com/izkac/forgekit#readme",
+  "bugs": {
+    "url": "https://github.com/izkac/forgekit/issues"
+  },
+  "keywords": [
+    "forge",
+    "openspec",
+    "agent-skills",
+    "cursor",
+    "claude",
+    "codex"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "@inquirer/prompts": "^8.5.2"
+  }
+}

package/src/init.mjs

@@ -11,10 +11,9 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import readline from 'node:readline/promises';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { spawnSync } from 'node:child_process';
-import { stdin as input, stdout as output } from 'node:process';
+import { checkbox, confirm, input } from '@inquirer/prompts';
 import {
   DEFAULT_ADR_DIR,
   disableProjectAdr,
@@ -22,7 +21,6 @@ import {
   normalizeAdrDir,
   scaffoldAdr,
 } from './adr.mjs';
-import { parseMenuSelection } from './menu-select.mjs';
 import {
   DEFAULT_SPECS_DIR,
   hasOpenSpecConfig,
@@ -391,27 +389,36 @@ export function initProject(selected, opts) {
   return report;
 }
 
-async function promptAgents() {
-  const rl = readline.createInterface({ input, output });
-  const map = { 1: 'cursor', 2: 'claude', 3: 'codex' };
-  const allIds = ['cursor', 'claude', 'codex'];
-  const allNum = '4';
-  try {
-    process.stdout.write(`Init Forge project wiring for which environments?\n`);
-    process.stdout.write(`(pick one or more — e.g. 1 or 1,3 — or ${allNum} for all)\n`);
-    process.stdout.write(`  1) Cursor\n`);
-    process.stdout.write(`  2) Claude Code\n`);
-    process.stdout.write(`  3) Codex CLI\n`);
-    process.stdout.write(`  ${allNum}) All\n`);
-    for (;;) {
-      const answer = await rl.question(`Choice(s) [1-${allNum}]: `);
-      const parsed = parseMenuSelection(answer, map, allIds, allNum);
-      if (parsed.ok) return parsed.ids;
-      process.stdout.write(`${parsed.error}\n`);
-    }
-  } finally {
-    rl.close();
-  }
+/**
+ * Environments this project already has Forge wiring for (marker dir present).
+ * @param {string} cwd
+ * @returns {Set<string>}
+ */
+function wiredAgents(cwd) {
+  const markers = {
+    cursor: path.join(cwd, '.cursor', 'commands'),
+    claude: path.join(cwd, '.claude', 'commands'),
+    codex: path.join(cwd, '.codex', 'rules'),
+  };
+  return new Set(
+    Object.entries(markers)
+      .filter(([, dir]) => fs.existsSync(dir))
+      .map(([id]) => id),
+  );
+}
+
+/** @param {string} cwd */
+async function promptAgents(cwd) {
+  const wired = wiredAgents(cwd);
+  return checkbox({
+    message: 'Init Forge project wiring for which environments?',
+    choices: [
+      { value: 'cursor', name: 'Cursor', checked: wired.has('cursor') },
+      { value: 'claude', name: 'Claude Code', checked: wired.has('claude') },
+      { value: 'codex', name: 'Codex CLI', checked: wired.has('codex') },
+    ],
+    required: true,
+  });
 }
 
 /**
@@ -419,19 +426,11 @@ async function promptAgents() {
  * @returns {Promise<boolean>} true = user accepted OpenSpec setup
  */
 async function promptOpenSpecSetup() {
-  const rl = readline.createInterface({ input, output });
-  try {
-    const yn = (
-      await rl.question(
-        'OpenSpec is not set up in this project. Install and set it up now? [Y/n] (n = built-in specs engine) ',
-      )
-    )
-      .trim()
-      .toLowerCase();
-    return !(yn === 'n' || yn === 'no');
-  } finally {
-    rl.close();
-  }
+  return confirm({
+    message:
+      'OpenSpec is not set up in this project. Install and set it up now? (No = built-in specs engine)',
+    default: true,
+  });
 }
 
 /**
@@ -490,25 +489,16 @@ async function resolveInitPlanEngine(opts) {
  * @returns {Promise<{ enabled: boolean, dir: string }>}
  */
 async function promptAdrForInit(defaultDir = DEFAULT_ADR_DIR) {
-  const rl = readline.createInterface({ input, output });
-  let enabled = false;
-  try {
-    const yn = (
-      await rl.question(
-        'Use Architecture Decision Records (ADRs) in this project? [y/N] ',
-      )
-    )
-      .trim()
-      .toLowerCase();
-    enabled = yn === 'y' || yn === 'yes';
-    if (!enabled) return { enabled: false, dir: defaultDir };
-    const dirAnswer = (
-      await rl.question(`ADR directory inside the repo [${defaultDir}]: `)
-    ).trim();
-    return { enabled: true, dir: normalizeAdrDir(dirAnswer || defaultDir) };
-  } finally {
-    rl.close();
-  }
+  const enabled = await confirm({
+    message: 'Use Architecture Decision Records (ADRs) in this project?',
+    default: false,
+  });
+  if (!enabled) return { enabled: false, dir: defaultDir };
+  const dir = await input({
+    message: 'ADR directory inside the repo',
+    default: defaultDir,
+  });
+  return { enabled: true, dir: normalizeAdrDir(dir.trim() || defaultDir) };
 }
 
 async function main(argv = process.argv.slice(2)) {
@@ -526,7 +516,7 @@ async function main(argv = process.argv.slice(2)) {
       );
       return 1;
     }
-    selected = await promptAgents();
+    selected = await promptAgents(opts.cwd);
   }
 
   const planEngine = await resolveInitPlanEngine({
@@ -566,6 +556,7 @@ if (isDirect) {
   main()
     .then((code) => process.exit(code))
     .catch((err) => {
+      if (err?.name === 'ExitPromptError') process.exit(130);
       process.stderr.write(`${err.message || err}\n`);
       process.exit(1);
     });

package/src/install.mjs

@@ -16,9 +16,8 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import readline from 'node:readline/promises';
 import { pathToFileURL } from 'node:url';
-import { stdin as input, stdout as output } from 'node:process';
+import { checkbox, input, select } from '@inquirer/prompts';
 import {
   ADR_SKILLS,
   DEFAULT_ADR_DIR,
@@ -28,7 +27,6 @@ import {
   scaffoldAdr,
   disableProjectAdr,
 } from './adr.mjs';
-import { parseMenuSelection } from './menu-select.mjs';
 import { saveUserPlanEngine } from './plan-engine.mjs';
 import { hashDirectory, packageVersion, resolveAsset } from './paths.mjs';
 
@@ -60,20 +58,42 @@ export const SKILLS = {
 
 export const SKILL_IDS = Object.freeze(Object.keys(SKILLS));
 
-/** @type {Record<string, { label: string, skillDir: (home: string, skillId: string) => string }>} */
+/**
+ * Supported environments and their user-level skills directory.
+ * Paths follow each tool's global Agent-Skills (SKILL.md) convention.
+ * @type {Record<string, { label: string, skillDir: (home: string, skillId: string) => string }>}
+ */
 export const AGENTS = {
-  cursor: {
-    label: 'Cursor',
-    skillDir: (home, skillId) => path.join(home, '.cursor', 'skills', skillId),
-  },
   claude: {
     label: 'Claude Code',
     skillDir: (home, skillId) => path.join(home, '.claude', 'skills', skillId),
   },
+  cursor: {
+    label: 'Cursor',
+    skillDir: (home, skillId) => path.join(home, '.cursor', 'skills', skillId),
+  },
   codex: {
     label: 'Codex CLI',
     skillDir: (home, skillId) => path.join(home, '.codex', 'skills', skillId),
   },
+  copilot: {
+    label: 'GitHub Copilot',
+    skillDir: (home, skillId) => path.join(home, '.copilot', 'skills', skillId),
+  },
+  gemini: {
+    label: 'Gemini CLI',
+    skillDir: (home, skillId) => path.join(home, '.gemini', 'skills', skillId),
+  },
+  windsurf: {
+    label: 'Windsurf',
+    skillDir: (home, skillId) =>
+      path.join(home, '.codeium', 'windsurf', 'skills', skillId),
+  },
+  opencode: {
+    label: 'opencode',
+    skillDir: (home, skillId) =>
+      path.join(home, '.config', 'opencode', 'skills', skillId),
+  },
 };
 
 export const AGENT_IDS = Object.freeze(Object.keys(AGENTS));
@@ -103,6 +123,7 @@ export function parseArgs(argv) {
     list: false,
     help: false,
     force: false,
+    prune: false,
     update: false,
     uninstall: false,
     /** @type {boolean | null} null = unset (prompt / infer) */
@@ -129,10 +150,15 @@ export function parseArgs(argv) {
     else if (arg === '--update') opts.update = true;
     else if (arg === '--uninstall') opts.uninstall = true;
     else if (arg === '--force' || arg === '-f') opts.force = true;
+    else if (arg === '--prune') opts.prune = true;
     else if (arg === '--help' || arg === '-h') opts.help = true;
     else if (arg === '--cursor') opts.agents.push('cursor');
     else if (arg === '--claude' || arg === '--claude-code') opts.agents.push('claude');
     else if (arg === '--codex') opts.agents.push('codex');
+    else if (arg === '--copilot') opts.agents.push('copilot');
+    else if (arg === '--gemini') opts.agents.push('gemini');
+    else if (arg === '--windsurf') opts.agents.push('windsurf');
+    else if (arg === '--opencode') opts.agents.push('opencode');
     else if (arg === '--adr') opts.adr = true;
     else if (arg === '--no-adr') opts.adr = false;
     else if (arg === '--adr-dir') opts.adrDir = argv[++i];
@@ -166,8 +192,10 @@ Options:
   --agents <ids>    Comma list: ${AGENT_IDS.join(', ')}
   --all-skills      Install every known skill
   --all-agents      Install for every agent environment
-  --cursor/--claude/--codex
+  --cursor/--claude/--codex/--copilot/--gemini/--windsurf/--opencode
                     Shorthand agent flags (same as --agents)
+  --prune           Reconcile: also remove installed skill×env pairs
+                    outside the selection (implied by the full picker)
   --openspec        Prefer OpenSpec as the planning engine (save user default)
   --no-openspec     Prefer the built-in specs engine (save user default)
   --adr             Enable ADRs (install ADR skills; save user default)
@@ -182,9 +210,12 @@ Options:
   --force, -f       Overwrite existing skill directories
   --help
 
-Interactive (TTY) when skills and/or agents are omitted. You are also asked
-whether to plan with OpenSpec (vs the built-in specs engine), whether to use
-ADRs, and for the ADR path inside the repo (default ${DEFAULT_ADR_DIR}).
+Interactive (TTY) when skills and/or agents are omitted: arrow-key pickers
+(space to toggle, <a> for all) pre-checked with what you already have
+installed. Choosing the full set reconciles — newly picked pairs install,
+deselected ones are removed. You are also asked whether to plan with OpenSpec
+(vs the built-in specs engine). ADRs are enabled by picking an ADR skill; the
+ADR path (default ${DEFAULT_ADR_DIR}) is only asked then.
 
 Aliases:
   forge install […]   → forgekit install --skills forge […]
@@ -357,6 +388,54 @@ export function uninstallSkillsFromAgents(skillIds, agentIds, opts = {}) {
   return results;
 }
 
+/**
+ * Every forgekit-managed skill×agent install currently on disk (has our stamp).
+ * This is the "memory" of what was installed — no separate state file needed.
+ * @param {string} [home]
+ * @returns {{ skill: string, agent: string, dest: string }[]}
+ */
+export function installedManagedPairs(home = os.homedir()) {
+  /** @type {{ skill: string, agent: string, dest: string }[]} */
+  const pairs = [];
+  for (const skill of SKILL_IDS) {
+    for (const agent of AGENT_IDS) {
+      const dest = AGENTS[agent].skillDir(home, skill);
+      if (fs.existsSync(dest) && readInstallStamp(dest)) {
+        pairs.push({ skill, agent, dest });
+      }
+    }
+  }
+  return pairs;
+}
+
+/**
+ * Install the selected skills×agents and, when pruning, remove any managed
+ * install that falls outside the new selection.
+ * @param {string[]} skillIds
+ * @param {string[]} agentIds
+ * @param {{ home?: string, force?: boolean, prune?: boolean }} [opts]
+ */
+export function reconcileInstall(skillIds, agentIds, opts = {}) {
+  const home = opts.home ?? os.homedir();
+  const desired = new Set();
+  for (const s of skillIds) for (const a of agentIds) desired.add(`${s}::${a}`);
+  /** @type {{ skill: string, agent: string, dest: string, status: string }[]} */
+  const removed = [];
+  if (opts.prune) {
+    for (const p of installedManagedPairs(home)) {
+      if (!desired.has(`${p.skill}::${p.agent}`)) {
+        removeDirRecursive(p.dest);
+        removed.push({ ...p, status: 'removed' });
+      }
+    }
+  }
+  const results = installSkillsToAgents(skillIds, agentIds, {
+    home,
+    force: opts.force ?? true,
+  });
+  return { results, removed };
+}
+
 /**
  * Reinstall skills that are outdated or unversioned for agents that already have them.
  * @param {{ home?: string, skills?: string[], agents?: string[] }} [opts]
@@ -415,42 +494,34 @@ export function listInstallStatus(opts = {}) {
 }
 
 /**
- * @param {string} question
- * @param {Record<string, string>} map  number → id
- * @param {string[]} allIds
+ * @param {string} message
+ * @param {string[]} ids
+ * @param {string[]} [checkedIds] pre-selected (remembered from prior install)
  * @returns {Promise<string[]>}
  */
-async function promptMulti(question, map, allIds) {
-  const rl = readline.createInterface({ input, output });
-  try {
-    const entries = Object.entries(map);
-    const allNum = String(entries.length + 1);
-    process.stdout.write(`${question}\n`);
-    process.stdout.write(`(pick one or more — e.g. 1 or 1,3 — or ${allNum} for all)\n`);
-    for (const [num, id] of entries) {
-      const label = SKILLS[id]?.label ?? AGENTS[id]?.label ?? id;
-      process.stdout.write(`  ${num}) ${label}\n`);
-    }
-    process.stdout.write(`  ${allNum}) All\n`);
-    for (;;) {
-      const answer = await rl.question(`Choice(s) [1-${allNum}]: `);
-      const parsed = parseMenuSelection(answer, map, allIds, allNum);
-      if (parsed.ok) return parsed.ids;
-      process.stdout.write(`${parsed.error}\n`);
-    }
-  } finally {
-    rl.close();
-  }
+async function promptMulti(message, ids, checkedIds = []) {
+  const checked = new Set(checkedIds);
+  return checkbox({
+    message,
+    choices: ids.map((id) => ({
+      value: id,
+      name: SKILLS[id]?.label ?? AGENTS[id]?.label ?? id,
+      checked: checked.has(id),
+    })),
+    required: true,
+  });
 }
 
-async function promptSkills() {
-  const map = Object.fromEntries(SKILL_IDS.map((id, i) => [String(i + 1), id]));
-  return promptMulti('Install which skills?', map, SKILL_IDS);
+/** @param {string[]} [checkedIds] */
+async function promptSkills(checkedIds) {
+  // First run (nothing installed): default to all skills, so <enter> = install everything.
+  const defaults = checkedIds?.length ? checkedIds : [...SKILL_IDS];
+  return promptMulti('Install which skills?', SKILL_IDS, defaults);
 }
 
-async function promptAgents() {
-  const map = Object.fromEntries(AGENT_IDS.map((id, i) => [String(i + 1), id]));
-  return promptMulti('Install for which environments?', map, AGENT_IDS);
+/** @param {string[]} [checkedIds] */
+async function promptAgents(checkedIds) {
+  return promptMulti('Install for which environments?', AGENT_IDS, checkedIds ?? []);
 }
 
 /**
@@ -458,57 +529,24 @@ async function promptAgents() {
  * @returns {Promise<string>}
  */
 export async function promptAdrDir(defaultDir = DEFAULT_ADR_DIR) {
-  const rl = readline.createInterface({ input, output });
-  try {
-    const dirAnswer = (
-      await rl.question(`ADR directory inside each repo [${defaultDir}]: `)
-    ).trim();
-    return normalizeAdrDir(dirAnswer || defaultDir);
-  } finally {
-    rl.close();
-  }
-}
-
-/**
- * @returns {Promise<{ enabled: boolean, dir: string }>}
- */
-export async function promptAdrOptions() {
-  const rl = readline.createInterface({ input, output });
-  let enabled = false;
-  try {
-    const yn = (
-      await rl.question(
-        'Use Architecture Decision Records (ADRs) after OpenSpec archive? [y/N] ',
-      )
-    )
-      .trim()
-      .toLowerCase();
-    enabled = yn === 'y' || yn === 'yes';
-  } finally {
-    rl.close();
-  }
-  if (!enabled) return { enabled: false, dir: DEFAULT_ADR_DIR };
-  const dir = await promptAdrDir(DEFAULT_ADR_DIR);
-  return { enabled: true, dir };
+  const dir = await input({
+    message: 'ADR directory inside each repo',
+    default: defaultDir,
+  });
+  return normalizeAdrDir(dir.trim() || defaultDir);
 }
 
 /**
  * @returns {Promise<boolean>} true = OpenSpec, false = built-in specs engine
  */
 export async function promptOpenSpec() {
-  const rl = readline.createInterface({ input, output });
-  try {
-    const yn = (
-      await rl.question(
-        'Plan with OpenSpec (vendor CLI)? [Y/n] (n = built-in specs engine) ',
-      )
-    )
-      .trim()
-      .toLowerCase();
-    return !(yn === 'n' || yn === 'no');
-  } finally {
-    rl.close();
-  }
+  return select({
+    message: 'Planning engine?',
+    choices: [
+      { value: true, name: 'OpenSpec (vendor CLI)' },
+      { value: false, name: 'Built-in specs engine' },
+    ],
+  });
 }
 
 /**
@@ -541,45 +579,38 @@ export function inferAdrFromSkills(skills, adrFlag) {
 }
 
 /**
- * Resolve ADR enablement + directory from flags / prompts.
+ * Resolve ADR enablement + directory. ADRs turn on when an ADR skill is picked
+ * (or --adr); the path is only asked when enabled — never a standalone prompt.
  * @param {{ adr: boolean | null, adrDir: string | null, skills: string[] }} opts
  * @returns {Promise<{ enabled: boolean, dir: string }>}
  */
 export async function resolveAdrInstallOptions(opts) {
-  const adrDecision = inferAdrFromSkills(opts.skills, opts.adr);
-  /** @type {{ enabled: boolean, dir: string }} */
-  let adrOpts = { enabled: false, dir: DEFAULT_ADR_DIR };
-
-  if (adrDecision === null && process.stdin.isTTY) {
-    adrOpts = await promptAdrOptions();
-  } else if (adrDecision === true) {
-    adrOpts.enabled = true;
-    adrOpts.dir = opts.adrDir
-      ? normalizeAdrDir(opts.adrDir)
-      : process.stdin.isTTY
-        ? await promptAdrDir(DEFAULT_ADR_DIR)
-        : DEFAULT_ADR_DIR;
-  } else if (adrDecision === false) {
-    adrOpts = {
+  const enabled = inferAdrFromSkills(opts.skills, opts.adr) === true;
+  if (!enabled) {
+    return {
       enabled: false,
       dir: opts.adrDir ? normalizeAdrDir(opts.adrDir) : DEFAULT_ADR_DIR,
     };
   }
-
-  if (opts.adrDir && adrOpts.enabled) {
-    adrOpts.dir = normalizeAdrDir(opts.adrDir);
-  }
-  return adrOpts;
+  const dir = opts.adrDir
+    ? normalizeAdrDir(opts.adrDir)
+    : process.stdin.isTTY
+      ? await promptAdrDir(DEFAULT_ADR_DIR)
+      : DEFAULT_ADR_DIR;
+  return { enabled: true, dir };
 }
 
 /**
- * @param {string[]} skills
- * @param {string[]} agents
- * @returns {Promise<{ skills: string[], agents: string[] } | number>}
+ * @param {string[]} skillsIn
+ * @param {string[]} agentsIn
+ * @returns {Promise<{ skills: string[], agents: string[], skillsPrompted: boolean, agentsPrompted: boolean } | number>}
  */
 async function resolveSkillsAndAgents(skillsIn, agentsIn) {
   let skills = [...skillsIn];
   let agents = [...agentsIn];
+  let skillsPrompted = false;
+  let agentsPrompted = false;
+  const installed = installedManagedPairs();
 
   if (skills.length === 0) {
     if (!process.stdin.isTTY) {
@@ -588,7 +619,8 @@ async function resolveSkillsAndAgents(skillsIn, agentsIn) {
       );
       return 1;
     }
-    skills = await promptSkills();
+    skills = await promptSkills([...new Set(installed.map((p) => p.skill))]);
+    skillsPrompted = true;
   }
 
   for (const id of skills) {
@@ -605,7 +637,8 @@ async function resolveSkillsAndAgents(skillsIn, agentsIn) {
       );
       return 1;
     }
-    agents = await promptAgents();
+    agents = await promptAgents([...new Set(installed.map((p) => p.agent))]);
+    agentsPrompted = true;
   }
 
   for (const id of agents) {
@@ -615,7 +648,7 @@ async function resolveSkillsAndAgents(skillsIn, agentsIn) {
     }
   }
 
-  return { skills, agents };
+  return { skills, agents, skillsPrompted, agentsPrompted };
 }
 
 /**
@@ -665,6 +698,10 @@ export async function runInstall(argv = process.argv.slice(2)) {
   if (typeof resolved === 'number') return resolved;
   skills = resolved.skills;
   agents = resolved.agents;
+  // Reconcile (add new, drop deselected) only when the user chose the full set
+  // via the pickers — flag-scoped runs (e.g. `forge install`) stay additive.
+  const prune =
+    opts.prune || (resolved.skillsPrompted && resolved.agentsPrompted);
 
   if (opts.uninstall) {
     const results = uninstallSkillsFromAgents(skills, agents);
@@ -695,7 +732,9 @@ export async function runInstall(argv = process.argv.slice(2)) {
     adr: { enabled: adrOpts.enabled, dir: adrOpts.dir },
   });
 
-  const results = installSkillsToAgents(skills, agents, { force: opts.force });
+  const { results, removed } = prune
+    ? reconcileInstall(skills, agents, { force: true, prune: true })
+    : { results: installSkillsToAgents(skills, agents, { force: opts.force }), removed: [] };
   const sources = new Map();
   for (const r of results) {
     if (r.skillSource) sources.set(r.skill, r.skillSource);
@@ -703,6 +742,9 @@ export async function runInstall(argv = process.argv.slice(2)) {
   for (const [skill, src] of sources) {
     process.stdout.write(`Skill ${skill}: ${src}\n`);
   }
+  for (const r of removed) {
+    process.stdout.write(`${r.skill} × ${r.agent}: removed (deselected) → ${r.dest}\n`);
+  }
   for (const r of results) {
     process.stdout.write(
       `${r.skill} × ${r.agent}: ${r.status}${r.message ? ` — ${r.message}` : ''} → ${r.dest}\n`,
@@ -763,6 +805,7 @@ if (isDirect) {
   runInstall()
     .then((code) => process.exit(code))
     .catch((err) => {
+      if (err?.name === 'ExitPromptError') process.exit(130);
       process.stderr.write(`${err.message || err}\n`);
       process.exit(1);
     });

package/src/install.test.mjs

@@ -6,13 +6,17 @@ import path from 'node:path';
 import {
   parseArgs,
   installSkillsToAgents,
+  reconcileInstall,
+  installedManagedPairs,
   listInstallStatus,
   uninstallSkillsFromAgents,
   updateOutdatedSkills,
   readInstallStamp,
+  resolveAdrInstallOptions,
   FORGEKIT_STAMP,
   SKILL_IDS,
   AGENT_IDS,
+  AGENTS,
 } from './install.mjs';
 
 test('parseArgs supports multi skills and agents', () => {
@@ -89,6 +93,78 @@ test('uninstallSkillsFromAgents removes installed dirs', () => {
   }
 });
 
+test('expanded environments resolve to their global skills dirs', () => {
+  const home = '/home/u';
+  assert.ok(AGENT_IDS.includes('copilot'));
+  assert.ok(AGENT_IDS.includes('windsurf'));
+  assert.equal(
+    AGENTS.copilot.skillDir(home, 'forge'),
+    path.join(home, '.copilot', 'skills', 'forge'),
+  );
+  assert.equal(
+    AGENTS.windsurf.skillDir(home, 'forge'),
+    path.join(home, '.codeium', 'windsurf', 'skills', 'forge'),
+  );
+  assert.equal(
+    AGENTS.opencode.skillDir(home, 'forge'),
+    path.join(home, '.config', 'opencode', 'skills', 'forge'),
+  );
+});
+
+test('reconcileInstall prunes deselected pairs and remembers installs', () => {
+  const home = fs.mkdtempSync(path.join(os.tmpdir(), 'forgekit-recon-'));
+  try {
+    // Start: forge on cursor + claude.
+    reconcileInstall(['forge'], ['cursor', 'claude'], { home, prune: true });
+    let managed = installedManagedPairs(home);
+    assert.equal(managed.length, 2);
+
+    // Re-select: forge on cursor only → claude pair pruned.
+    const { removed } = reconcileInstall(['forge'], ['cursor'], {
+      home,
+      prune: true,
+    });
+    assert.equal(removed.length, 1);
+    assert.equal(removed[0].agent, 'claude');
+    managed = installedManagedPairs(home);
+    assert.deepEqual(
+      managed.map((p) => `${p.skill}:${p.agent}`),
+      ['forge:cursor'],
+    );
+    assert.ok(!fs.existsSync(path.join(home, '.claude', 'skills', 'forge')));
+  } finally {
+    fs.rmSync(home, { recursive: true, force: true });
+  }
+});
+
+test('reconcileInstall without prune is additive (no removals)', () => {
+  const home = fs.mkdtempSync(path.join(os.tmpdir(), 'forgekit-recon2-'));
+  try {
+    reconcileInstall(['forge'], ['cursor', 'claude'], { home, prune: true });
+    const { removed } = reconcileInstall(['forge'], ['cursor'], { home });
+    assert.equal(removed.length, 0);
+    assert.equal(installedManagedPairs(home).length, 2);
+  } finally {
+    fs.rmSync(home, { recursive: true, force: true });
+  }
+});
+
+test('resolveAdrInstallOptions: no ADR skill selected → disabled, no path prompt', async () => {
+  const off = await resolveAdrInstallOptions({
+    adr: null,
+    adrDir: null,
+    skills: ['forge'],
+  });
+  assert.equal(off.enabled, false);
+  const on = await resolveAdrInstallOptions({
+    adr: null,
+    adrDir: 'docs/decisions',
+    skills: ['forge', 'archive-to-adr'],
+  });
+  assert.equal(on.enabled, true);
+  assert.equal(on.dir, 'docs/decisions');
+});
+
 test('updateOutdatedSkills refreshes unversioned installs', () => {
   const home = fs.mkdtempSync(path.join(os.tmpdir(), 'forgekit-upd-'));
   try {

package/src/menu-select.mjs

@@ -1,49 +0,0 @@
-/**
- * Shared numbered-menu selection (one, many, or all).
- */
-
-/**
- * Parse a menu answer into selected ids.
- * Accepts one number, several (comma/space), or the All option.
- *
- * @param {string} answer
- * @param {Record<string, string>} map  number → id
- * @param {string[]} allIds
- * @param {string} allNum
- * @returns {{ ok: true, ids: string[] } | { ok: false, error: string }}
- */
-export function parseMenuSelection(answer, map, allIds, allNum) {
-  const raw = String(answer ?? '').trim();
-  if (!raw) {
-    return {
-      ok: false,
-      error: `Enter one or more numbers (e.g. 1 or 1,3) or ${allNum} for all`,
-    };
-  }
-  if (raw === allNum || /^all$/i.test(raw)) {
-    return { ok: true, ids: [...allIds] };
-  }
-  const tokens = raw.split(/[,\s]+/).filter(Boolean);
-  /** @type {string[]} */
-  const ids = [];
-  /** @type {string[]} */
-  const bad = [];
-  for (const t of tokens) {
-    if (t === allNum || /^all$/i.test(t)) {
-      return { ok: true, ids: [...allIds] };
-    }
-    const id = map[t];
-    if (!id) bad.push(t);
-    else if (!ids.includes(id)) ids.push(id);
-  }
-  if (bad.length) {
-    return {
-      ok: false,
-      error: `Unknown choice(s): ${bad.join(', ')}. Use listed numbers or ${allNum} for all`,
-    };
-  }
-  if (ids.length === 0) {
-    return { ok: false, error: 'Nothing selected' };
-  }
-  return { ok: true, ids };
-}

package/src/menu-select.test.mjs

@@ -1,52 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { parseMenuSelection } from './menu-select.mjs';
-
-const map = { 1: 'forge', 2: 'review', 3: 'adr', 4: 'git' };
-const allIds = ['forge', 'review', 'adr', 'git'];
-const allNum = '5';
-
-test('parseMenuSelection: single choice', () => {
-  assert.deepEqual(parseMenuSelection('1', map, allIds, allNum), {
-    ok: true,
-    ids: ['forge'],
-  });
-});
-
-test('parseMenuSelection: multiple comma-separated', () => {
-  assert.deepEqual(parseMenuSelection('1,3', map, allIds, allNum), {
-    ok: true,
-    ids: ['forge', 'adr'],
-  });
-});
-
-test('parseMenuSelection: multiple space-separated', () => {
-  assert.deepEqual(parseMenuSelection('2 4', map, allIds, allNum), {
-    ok: true,
-    ids: ['review', 'git'],
-  });
-});
-
-test('parseMenuSelection: all via number or word', () => {
-  assert.deepEqual(parseMenuSelection('5', map, allIds, allNum), {
-    ok: true,
-    ids: [...allIds],
-  });
-  assert.deepEqual(parseMenuSelection('all', map, allIds, allNum), {
-    ok: true,
-    ids: [...allIds],
-  });
-});
-
-test('parseMenuSelection: empty and unknown rejected', () => {
-  assert.equal(parseMenuSelection('', map, allIds, allNum).ok, false);
-  assert.equal(parseMenuSelection('9', map, allIds, allNum).ok, false);
-  assert.equal(parseMenuSelection('1,9', map, allIds, allNum).ok, false);
-});
-
-test('parseMenuSelection: dedupes repeats', () => {
-  assert.deepEqual(parseMenuSelection('1,1,2', map, allIds, allNum), {
-    ok: true,
-    ids: ['forge', 'review'],
-  });
-});