cursor-kit-cli 1.2.0-beta → 1.2.0-beta.3

package/dist/cli.js

@@ -50,7 +50,7 @@ import pc2 from "picocolors";
 import { join as join3 } from "path";
 
 // src/utils/fs.ts
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, rmSync, statSync } from "fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, rmSync, statSync, cpSync } from "fs";
 import { dirname, join, resolve } from "path";
 function ensureDir(path) {
   if (!existsSync(path)) {
@@ -75,6 +75,9 @@ function removeFile(path) {
     rmSync(path, { recursive: true });
   }
 }
+function copyDir(src, dest) {
+  cpSync(src, dest, { recursive: true });
+}
 function listFiles(dir, extension) {
   if (!dirExists(dir)) return [];
   const files = readdirSync(dir);
@@ -83,6 +86,13 @@ function listFiles(dir, extension) {
   }
   return files;
 }
+function listDirs(dir) {
+  if (!dirExists(dir)) return [];
+  return readdirSync(dir).filter((item) => {
+    const itemPath = join(dir, item);
+    return statSync(itemPath).isDirectory();
+  });
+}
 function getCursorDir(cwd = process.cwd()) {
   return join(cwd, ".cursor");
 }
@@ -92,10 +102,17 @@ function getCommandsDir(cwd = process.cwd()) {
 function getRulesDir(cwd = process.cwd()) {
   return join(getCursorDir(cwd), "rules");
 }
+function getSkillsDir(cwd = process.cwd()) {
+  return join(getCursorDir(cwd), "skills");
+}
 function getConflictingFiles(dir, files) {
   if (!dirExists(dir)) return [];
   return files.filter((file) => fileExists(join(dir, file)));
 }
+function getConflictingDirs(dir, dirs) {
+  if (!dirExists(dir)) return [];
+  return dirs.filter((d) => dirExists(join(dir, d)));
+}
 
 // src/utils/templates.ts
 import { join as join2, dirname as dirname2 } from "path";
@@ -107,7 +124,8 @@ var REPO_REF = "master";
 var REPO_RAW_URL = "https://raw.githubusercontent.com/duongductrong/cursor-kit/master";
 var TEMPLATE_PATHS = {
   commands: "templates/commands",
-  rules: "templates/rules"
+  rules: "templates/rules",
+  skills: "templates/skills"
 };
 
 // src/utils/templates.ts
@@ -127,12 +145,14 @@ function getLocalManifest() {
   }
   const commandsDir = join2(templatesDir, "commands");
   const rulesDir = join2(templatesDir, "rules");
-  if (!dirExists(commandsDir) && !dirExists(rulesDir)) {
+  const skillsDir = join2(templatesDir, "skills");
+  if (!dirExists(commandsDir) && !dirExists(rulesDir) && !dirExists(skillsDir)) {
     return null;
   }
   return {
     commands: dirExists(commandsDir) ? listFiles(commandsDir, ".md") : [],
-    rules: dirExists(rulesDir) ? listFiles(rulesDir, ".mdc") : []
+    rules: dirExists(rulesDir) ? listFiles(rulesDir, ".mdc") : [],
+    skills: dirExists(skillsDir) ? listDirs(skillsDir) : []
   };
 }
 function getLocalTemplateContent(type, filename) {
@@ -143,6 +163,22 @@ function getLocalTemplateContent(type, filename) {
   }
   return null;
 }
+function getLocalSkillDir(skillName) {
+  const templatesDir = getLocalTemplatesDir();
+  const skillPath = join2(templatesDir, "skills", skillName);
+  if (dirExists(skillPath)) {
+    return skillPath;
+  }
+  return null;
+}
+function copyLocalSkill(skillName, targetDir) {
+  const sourcePath = getLocalSkillDir(skillName);
+  if (!sourcePath) return false;
+  const destPath = join2(targetDir, skillName);
+  ensureDir(destPath);
+  copyDir(sourcePath, destPath);
+  return true;
+}
 async function fetchTemplateManifest() {
   const localManifest = getLocalManifest();
   if (localManifest) {
@@ -186,9 +222,13 @@ function getTemplateLabel(filename) {
   const nameWithoutExt = filename.replace(/\.(md|mdc)$/, "");
   return nameWithoutExt.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
 }
+function getSkillLabel(skillName) {
+  return skillName.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+}
 
 // src/commands/init.ts
 async function selectTemplates(type, availableTemplates) {
+  const labelFn = type === "skills" ? getSkillLabel : getTemplateLabel;
   const selectionMode = await p.select({
     message: `How would you like to add ${type}?`,
     options: [
@@ -212,7 +252,7 @@ async function selectTemplates(type, availableTemplates) {
     message: `Select ${type} to add:`,
     options: availableTemplates.map((template) => ({
       value: template,
-      label: getTemplateLabel(template),
+      label: labelFn(template),
       hint: template
     })),
     required: true
@@ -276,10 +316,36 @@ async function installTemplates(type, targetDir, selectedTemplates, conflictStra
   }
   return result;
 }
+async function installSkills(targetDir, selectedSkills, conflictStrategy) {
+  const result = { added: [], skipped: [] };
+  const conflictingDirs = getConflictingDirs(targetDir, selectedSkills);
+  let skillsToInstall;
+  if (conflictStrategy === "merge") {
+    skillsToInstall = selectedSkills.filter(
+      (s) => !conflictingDirs.includes(s)
+    );
+    result.skipped = conflictingDirs.filter(
+      (d) => selectedSkills.includes(d)
+    );
+  } else {
+    skillsToInstall = selectedSkills;
+  }
+  if (skillsToInstall.length === 0) {
+    return result;
+  }
+  ensureDir(targetDir);
+  for (const skillName of skillsToInstall) {
+    const success = copyLocalSkill(skillName, targetDir);
+    if (success) {
+      result.added.push(skillName);
+    }
+  }
+  return result;
+}
 var initCommand = defineCommand({
   meta: {
     name: "init",
-    description: "Initialize .cursor/commands and .cursor/rules in your project"
+    description: "Initialize .cursor/commands, .cursor/rules, and .cursor/skills in your project"
   },
   args: {
     force: {
@@ -300,6 +366,12 @@ var initCommand = defineCommand({
       description: "Only initialize rules",
       default: false
     },
+    skills: {
+      type: "boolean",
+      alias: "s",
+      description: "Only initialize skills",
+      default: false
+    },
     all: {
       type: "boolean",
       alias: "a",
@@ -312,9 +384,11 @@ var initCommand = defineCommand({
     const cursorDir = getCursorDir(cwd);
     const commandsDir = getCommandsDir(cwd);
     const rulesDir = getRulesDir(cwd);
-    const initBoth = !args.commands && !args.rules;
-    const shouldInitCommands = initBoth || args.commands;
-    const shouldInitRules = initBoth || args.rules;
+    const skillsDir = getSkillsDir(cwd);
+    const initAll = !args.commands && !args.rules && !args.skills;
+    const shouldInitCommands = initAll || args.commands;
+    const shouldInitRules = initAll || args.rules;
+    const shouldInitSkills = initAll || args.skills;
     p.intro(pc2.bgCyan(pc2.black(" cursor-kit init ")));
     const s = p.spinner();
     let manifest;
@@ -397,6 +471,36 @@ var initCommand = defineCommand({
         );
         s.stop("Rules installed");
       }
+      if (shouldInitSkills) {
+        let selectedSkills;
+        if (args.all) {
+          selectedSkills = manifest.skills;
+        } else {
+          const selection = await selectTemplates("skills", manifest.skills);
+          if (p.isCancel(selection)) {
+            p.cancel("Operation cancelled");
+            process.exit(0);
+          }
+          selectedSkills = selection;
+        }
+        const conflictingSkills = getConflictingDirs(skillsDir, selectedSkills);
+        let skillStrategy = "overwrite";
+        if (conflictingSkills.length > 0 && !args.force) {
+          const strategy = await handleConflicts("skills", conflictingSkills);
+          if (p.isCancel(strategy) || strategy === "cancel") {
+            p.cancel("Operation cancelled");
+            process.exit(0);
+          }
+          skillStrategy = strategy;
+        }
+        s.start("Installing skills...");
+        results.skills = await installSkills(
+          skillsDir,
+          selectedSkills,
+          skillStrategy
+        );
+        s.stop("Skills installed");
+      }
       printDivider();
       console.log();
       if (results.commands) {
@@ -427,8 +531,22 @@ var initCommand = defineCommand({
           }
         }
       }
-      const totalAdded = (results.commands?.added.length ?? 0) + (results.rules?.added.length ?? 0);
-      const totalSkipped = (results.commands?.skipped.length ?? 0) + (results.rules?.skipped.length ?? 0);
+      if (results.skills) {
+        const { added, skipped } = results.skills;
+        if (added.length > 0 || skipped.length > 0) {
+          printSuccess(
+            `Skills: ${highlight(added.length.toString())} added${skipped.length > 0 ? `, ${pc2.yellow(skipped.length.toString())} skipped` : ""}`
+          );
+          for (const f of added) {
+            console.log(pc2.dim(`   \u2514\u2500 ${pc2.green("+")} ${f}`));
+          }
+          for (const f of skipped) {
+            console.log(pc2.dim(`   \u2514\u2500 ${pc2.yellow("\u25CB")} ${f} (kept existing)`));
+          }
+        }
+      }
+      const totalAdded = (results.commands?.added.length ?? 0) + (results.rules?.added.length ?? 0) + (results.skills?.added.length ?? 0);
+      const totalSkipped = (results.commands?.skipped.length ?? 0) + (results.rules?.skipped.length ?? 0) + (results.skills?.skipped.length ?? 0);
       if (totalAdded === 0 && totalSkipped > 0) {
         console.log();
         p.outro(pc2.yellow("No new templates added (all selected files already exist)"));
@@ -447,10 +565,10 @@ var initCommand = defineCommand({
 });
 
 // src/commands/add.ts
-import { defineCommand as defineCommand2 } from "citty";
 import * as p2 from "@clack/prompts";
-import pc3 from "picocolors";
+import { defineCommand as defineCommand2 } from "citty";
 import { join as join4 } from "path";
+import pc3 from "picocolors";
 var COMMAND_TEMPLATE = `You are a helpful assistant. Describe what this command does.
 
 ## Instructions
@@ -477,31 +595,69 @@ Describe the rule behavior here.
 - Guideline 1
 - Guideline 2
 `;
+var SKILL_TEMPLATE = `---
+description: Describe when this skill should be activated
+globs:
+alwaysApply: false
+---
+
+# Skill Name
+
+Brief description of what this skill enables.
+
+## Core Capabilities
+
+- Capability 1
+- Capability 2
+
+## When to Use
+
+Use this skill when:
+- Condition 1
+- Condition 2
+
+## References
+
+For detailed guidance, see the references folder:
+- [Reference 1](./references/example.md) - Description
+`;
+var SKILL_REFERENCE_TEMPLATE = `# Reference Title
+
+Detailed reference content goes here.
+
+## Section 1
+
+Content...
+
+## Section 2
+
+Content...
+`;
 function generateSlug(name) {
   return name.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").trim();
 }
 var addCommand = defineCommand2({
   meta: {
     name: "add",
-    description: "Add a new command or rule"
+    description: "Add a new command, rule, or skill"
   },
   args: {
     type: {
       type: "string",
       alias: "t",
-      description: "Type: 'command' or 'rule'"
+      description: "Type: 'command', 'rule', or 'skill'"
     },
     name: {
       type: "string",
       alias: "n",
-      description: "Name of the command or rule"
+      description: "Name of the command, rule, or skill"
     }
   },
   async run({ args }) {
     p2.intro(pc3.bgCyan(pc3.black(" cursor-kit add ")));
     let itemType;
     let itemName;
-    if (args.type && ["command", "rule"].includes(args.type)) {
+    if (args.type && ["command", "rule", "skill"].includes(args.type)) {
       itemType = args.type;
     } else {
       const typeResult = await p2.select({
@@ -516,6 +672,11 @@ var addCommand = defineCommand2({
             value: "rule",
             label: "Rule",
             hint: "Project-specific AI behavior rules"
+          },
+          {
+            value: "skill",
+            label: "Skill",
+            hint: "Comprehensive guide with references"
           }
         ]
       });
@@ -530,7 +691,7 @@ var addCommand = defineCommand2({
     } else {
       const nameResult = await p2.text({
         message: `Enter ${itemType} name:`,
-        placeholder: itemType === "command" ? "my-command" : "my-rule",
+        placeholder: itemType === "command" ? "my-command" : itemType === "rule" ? "my-rule" : "my-skill",
         validate: (value) => {
           if (!value.trim()) return "Name is required";
           if (value.length < 2) return "Name must be at least 2 characters";
@@ -545,12 +706,22 @@ var addCommand = defineCommand2({
     }
     const slug = generateSlug(itemName);
     const isCommand = itemType === "command";
-    const targetDir = isCommand ? getCommandsDir() : getRulesDir();
-    const extension = isCommand ? ".md" : ".mdc";
-    const filePath = join4(targetDir, `${slug}${extension}`);
-    if (fileExists(filePath)) {
+    const isSkill = itemType === "skill";
+    let targetPath;
+    let displayPath;
+    if (isSkill) {
+      const skillsDir = getSkillsDir();
+      targetPath = join4(skillsDir, slug);
+      displayPath = targetPath;
+    } else {
+      const targetDir = isCommand ? getCommandsDir() : getRulesDir();
+      const extension = isCommand ? ".md" : ".mdc";
+      targetPath = join4(targetDir, `${slug}${extension}`);
+      displayPath = targetPath;
+    }
+    if (isSkill ? dirExists(targetPath) : fileExists(targetPath)) {
       const shouldOverwrite = await p2.confirm({
-        message: `${highlight(slug + extension)} already exists. Overwrite?`,
+        message: `${highlight(isSkill ? slug : slug + (isCommand ? ".md" : ".mdc"))} already exists. Overwrite?`,
         initialValue: false
       });
       if (p2.isCancel(shouldOverwrite) || !shouldOverwrite) {
@@ -561,12 +732,25 @@ var addCommand = defineCommand2({
     const s = p2.spinner();
     s.start(`Creating ${itemType}...`);
     try {
-      ensureDir(targetDir);
-      const template = isCommand ? COMMAND_TEMPLATE : RULE_TEMPLATE;
-      writeFile(filePath, template);
+      if (isSkill) {
+        ensureDir(targetPath);
+        ensureDir(join4(targetPath, "references"));
+        writeFile(join4(targetPath, "SKILL.mdc"), SKILL_TEMPLATE);
+        writeFile(join4(targetPath, "references", "example.md"), SKILL_REFERENCE_TEMPLATE);
+      } else {
+        const targetDir = isCommand ? getCommandsDir() : getRulesDir();
+        ensureDir(targetDir);
+        const template = isCommand ? COMMAND_TEMPLATE : RULE_TEMPLATE;
+        writeFile(targetPath, template);
+      }
       s.stop(`${itemType.charAt(0).toUpperCase() + itemType.slice(1)} created`);
       console.log();
-      console.log(pc3.dim("  File: ") + highlight(filePath));
+      if (isSkill) {
+        console.log(pc3.dim("  Directory: ") + highlight(displayPath));
+        console.log(pc3.dim("  Main file: ") + highlight(join4(displayPath, "SKILL.mdc")));
+      } else {
+        console.log(pc3.dim("  File: ") + highlight(displayPath));
+      }
       console.log();
       p2.outro(
         pc3.green(`\u2728 ${itemType.charAt(0).toUpperCase() + itemType.slice(1)} created! Edit the file to customize it.`)
@@ -602,6 +786,12 @@ var pullCommand = defineCommand3({
       description: "Only pull rules",
       default: false
     },
+    skills: {
+      type: "boolean",
+      alias: "s",
+      description: "Only pull skills",
+      default: false
+    },
     force: {
       type: "boolean",
       alias: "f",
@@ -610,15 +800,18 @@ var pullCommand = defineCommand3({
     }
   },
   async run({ args }) {
-    const pullBoth = !args.commands && !args.rules;
-    const shouldPullCommands = pullBoth || args.commands;
-    const shouldPullRules = pullBoth || args.rules;
+    const pullAll = !args.commands && !args.rules && !args.skills;
+    const shouldPullCommands = pullAll || args.commands;
+    const shouldPullRules = pullAll || args.rules;
+    const shouldPullSkills = pullAll || args.skills;
     p3.intro(pc4.bgCyan(pc4.black(" cursor-kit pull ")));
     const commandsDir = getCommandsDir();
     const rulesDir = getRulesDir();
+    const skillsDir = getSkillsDir();
     const existingCommands = listFiles(commandsDir, ".md");
     const existingRules = listFiles(rulesDir, ".mdc");
-    const hasExisting = existingCommands.length > 0 || existingRules.length > 0;
+    const existingSkills = listDirs(skillsDir);
+    const hasExisting = existingCommands.length > 0 || existingRules.length > 0 || existingSkills.length > 0;
     if (hasExisting && !args.force) {
       printInfo("Current status:");
       if (existingCommands.length > 0) {
@@ -627,6 +820,9 @@ var pullCommand = defineCommand3({
       if (existingRules.length > 0) {
         console.log(pc4.dim(`  Rules: ${existingRules.length} files`));
       }
+      if (existingSkills.length > 0) {
+        console.log(pc4.dim(`  Skills: ${existingSkills.length} directories`));
+      }
       console.log();
       const shouldContinue = await p3.confirm({
         message: "This will merge with existing files. Continue?",
@@ -656,10 +852,19 @@ var pullCommand = defineCommand3({
         });
         s.stop("Rules updated");
       }
+      if (shouldPullSkills) {
+        s.start("Pulling skills...");
+        await downloadTemplate(`${REPO_URL}/templates/skills#${REPO_REF}`, {
+          dir: skillsDir,
+          force: true
+        });
+        s.stop("Skills updated");
+      }
       printDivider();
       console.log();
       const newCommands = listFiles(commandsDir, ".md");
       const newRules = listFiles(rulesDir, ".mdc");
+      const newSkills = listDirs(skillsDir);
       if (shouldPullCommands) {
         const added = newCommands.length - existingCommands.length;
         printSuccess(
@@ -672,6 +877,12 @@ var pullCommand = defineCommand3({
           `Rules: ${highlight(newRules.length.toString())} total` + (added > 0 ? pc4.green(` (+${added} new)`) : "")
         );
       }
+      if (shouldPullSkills) {
+        const added = newSkills.length - existingSkills.length;
+        printSuccess(
+          `Skills: ${highlight(newSkills.length.toString())} total` + (added > 0 ? pc4.green(` (+${added} new)`) : "")
+        );
+      }
       console.log();
       p3.outro(pc4.green("\u2728 Successfully pulled latest updates!"));
     } catch (error) {
@@ -683,10 +894,10 @@ var pullCommand = defineCommand3({
 });
 
 // src/commands/list.ts
-import { defineCommand as defineCommand4 } from "citty";
 import * as p4 from "@clack/prompts";
-import pc5 from "picocolors";
+import { defineCommand as defineCommand4 } from "citty";
 import { join as join5 } from "path";
+import pc5 from "picocolors";
 function extractDescription(content, isCommand) {
   if (isCommand) {
     const firstLine = content.trim().split("\n")[0];
@@ -713,10 +924,31 @@ function getItems(dir, extension, isCommand) {
     };
   });
 }
+function getSkills(dir) {
+  const skillDirs = listDirs(dir);
+  return skillDirs.map((skillName) => {
+    const skillPath = join5(dir, skillName);
+    const skillFile = join5(skillPath, "SKILL.mdc");
+    const altSkillFile = join5(skillPath, "SKILL.md");
+    let description;
+    if (fileExists(skillFile)) {
+      const content = readFile(skillFile);
+      description = extractDescription(content, false);
+    } else if (fileExists(altSkillFile)) {
+      const content = readFile(altSkillFile);
+      description = extractDescription(content, false);
+    }
+    return {
+      name: skillName,
+      path: skillPath,
+      description
+    };
+  });
+}
 var listCommand = defineCommand4({
   meta: {
     name: "list",
-    description: "List all commands and rules"
+    description: "List all commands, rules, and skills"
   },
   args: {
     commands: {
@@ -731,6 +963,12 @@ var listCommand = defineCommand4({
       description: "Only list rules",
       default: false
     },
+    skills: {
+      type: "boolean",
+      alias: "s",
+      description: "Only list skills",
+      default: false
+    },
     verbose: {
       type: "boolean",
       alias: "v",
@@ -739,18 +977,23 @@ var listCommand = defineCommand4({
     }
   },
   async run({ args }) {
-    const listBoth = !args.commands && !args.rules;
-    const shouldListCommands = listBoth || args.commands;
-    const shouldListRules = listBoth || args.rules;
+    const listAll = !args.commands && !args.rules && !args.skills;
+    const shouldListCommands = listAll || args.commands;
+    const shouldListRules = listAll || args.rules;
+    const shouldListSkills = listAll || args.skills;
     p4.intro(pc5.bgCyan(pc5.black(" cursor-kit list ")));
     const commandsDir = getCommandsDir();
     const rulesDir = getRulesDir();
+    const skillsDir = getSkillsDir();
     const commands = shouldListCommands ? getItems(commandsDir, ".md", true) : [];
     const rules = shouldListRules ? getItems(rulesDir, ".mdc", false) : [];
-    if (commands.length === 0 && rules.length === 0) {
+    const skills = shouldListSkills ? getSkills(skillsDir) : [];
+    if (commands.length === 0 && rules.length === 0 && skills.length === 0) {
       console.log();
-      console.log(pc5.yellow("  No commands or rules found."));
-      console.log(pc5.dim("  Run ") + highlight("cursor-kit init") + pc5.dim(" to get started."));
+      console.log(pc5.yellow("  No commands, rules, or skills found."));
+      console.log(
+        pc5.dim("  Run ") + highlight("cursor-kit init") + pc5.dim(" to get started.")
+      );
       console.log();
       p4.outro(pc5.dim("Nothing to show"));
       return;
@@ -758,7 +1001,9 @@ var listCommand = defineCommand4({
     printDivider();
     if (shouldListCommands && commands.length > 0) {
       console.log();
-      console.log(pc5.bold(pc5.cyan("  \u{1F4DC} Commands")) + pc5.dim(` (${commands.length})`));
+      console.log(
+        pc5.bold(pc5.cyan("  \u{1F4DC} Commands")) + pc5.dim(` (${commands.length})`)
+      );
       console.log();
       commands.forEach((cmd) => {
         console.log(`  ${pc5.green("\u25CF")} ${highlight(cmd.name)}`);
@@ -772,7 +1017,9 @@ var listCommand = defineCommand4({
     }
     if (shouldListRules && rules.length > 0) {
       console.log();
-      console.log(pc5.bold(pc5.cyan("  \u{1F4CB} Rules")) + pc5.dim(` (${rules.length})`));
+      console.log(
+        pc5.bold(pc5.cyan("  \u{1F4CB} Rules")) + pc5.dim(` (${rules.length})`)
+      );
       console.log();
       rules.forEach((rule) => {
         console.log(`  ${pc5.green("\u25CF")} ${highlight(rule.name)}`);
@@ -784,9 +1031,25 @@ var listCommand = defineCommand4({
         }
       });
     }
+    if (shouldListSkills && skills.length > 0) {
+      console.log();
+      console.log(
+        pc5.bold(pc5.cyan("  \u{1F3AF} Skills")) + pc5.dim(` (${skills.length})`)
+      );
+      console.log();
+      skills.forEach((skill) => {
+        console.log(`  ${pc5.green("\u25CF")} ${highlight(skill.name)}`);
+        if (skill.description) {
+          console.log(pc5.dim(`    ${skill.description}`));
+        }
+        if (args.verbose) {
+          console.log(pc5.dim(`    ${skill.path}`));
+        }
+      });
+    }
     console.log();
     printDivider();
-    const total = commands.length + rules.length;
+    const total = commands.length + rules.length + skills.length;
     p4.outro(pc5.dim(`Total: ${total} item${total !== 1 ? "s" : ""}`));
   }
 });
@@ -799,18 +1062,18 @@ import { join as join6 } from "path";
 var removeCommand = defineCommand5({
   meta: {
     name: "remove",
-    description: "Remove a command or rule"
+    description: "Remove a command, rule, or skill"
   },
   args: {
     type: {
       type: "string",
       alias: "t",
-      description: "Type: 'command' or 'rule'"
+      description: "Type: 'command', 'rule', or 'skill'"
     },
     name: {
       type: "string",
       alias: "n",
-      description: "Name of the command or rule to remove"
+      description: "Name of the command, rule, or skill to remove"
     },
     force: {
       type: "boolean",
@@ -823,18 +1086,20 @@ var removeCommand = defineCommand5({
     p5.intro(pc6.bgCyan(pc6.black(" cursor-kit remove ")));
     const commandsDir = getCommandsDir();
     const rulesDir = getRulesDir();
+    const skillsDir = getSkillsDir();
     const commands = listFiles(commandsDir, ".md").map((f) => f.replace(".md", ""));
     const rules = listFiles(rulesDir, ".mdc").map((f) => f.replace(".mdc", ""));
-    if (commands.length === 0 && rules.length === 0) {
+    const skills = listDirs(skillsDir);
+    if (commands.length === 0 && rules.length === 0 && skills.length === 0) {
       console.log();
-      console.log(pc6.yellow("  No commands or rules to remove."));
+      console.log(pc6.yellow("  No commands, rules, or skills to remove."));
       console.log();
       p5.outro(pc6.dim("Nothing to do"));
       return;
     }
     let itemType;
     let itemName;
-    if (args.type && ["command", "rule"].includes(args.type)) {
+    if (args.type && ["command", "rule", "skill"].includes(args.type)) {
       itemType = args.type;
     } else {
       const typeOptions = [];
@@ -852,6 +1117,13 @@ var removeCommand = defineCommand5({
           hint: `${rules.length} available`
         });
       }
+      if (skills.length > 0) {
+        typeOptions.push({
+          value: "skill",
+          label: "Skill",
+          hint: `${skills.length} available`
+        });
+      }
       const typeResult = await p5.select({
         message: "What do you want to remove?",
         options: typeOptions
@@ -863,9 +1135,11 @@ var removeCommand = defineCommand5({
       itemType = typeResult;
     }
     const isCommand = itemType === "command";
-    const items = isCommand ? commands : rules;
-    const dir = isCommand ? commandsDir : rulesDir;
-    const extension = isCommand ? ".md" : ".mdc";
+    const isRule = itemType === "rule";
+    const isSkill = itemType === "skill";
+    const items = isCommand ? commands : isRule ? rules : skills;
+    const dir = isCommand ? commandsDir : isRule ? rulesDir : skillsDir;
+    const extension = isCommand ? ".md" : isRule ? ".mdc" : "";
     if (items.length === 0) {
       p5.cancel(`No ${itemType}s found`);
       process.exit(0);
@@ -887,14 +1161,16 @@ var removeCommand = defineCommand5({
       }
       itemName = nameResult;
     }
-    const filePath = join6(dir, `${itemName}${extension}`);
-    if (!fileExists(filePath)) {
+    const targetPath = isSkill ? join6(dir, itemName) : join6(dir, `${itemName}${extension}`);
+    const exists = isSkill ? dirExists(targetPath) : fileExists(targetPath);
+    if (!exists) {
       p5.cancel(`${itemType} '${itemName}' not found`);
       process.exit(1);
     }
     if (!args.force) {
+      const displayName = isSkill ? itemName : itemName + extension;
       const shouldDelete = await p5.confirm({
-        message: `Are you sure you want to delete ${highlight(itemName + extension)}?`,
+        message: `Are you sure you want to delete ${highlight(displayName)}?${isSkill ? " (This will remove the entire skill directory)" : ""}`,
         initialValue: false
       });
       if (p5.isCancel(shouldDelete) || !shouldDelete) {
@@ -903,9 +1179,10 @@ var removeCommand = defineCommand5({
       }
     }
     try {
-      removeFile(filePath);
+      removeFile(targetPath);
+      const displayName = isSkill ? itemName : itemName + extension;
       console.log();
-      printSuccess(`Removed ${highlight(itemName + extension)}`);
+      printSuccess(`Removed ${highlight(displayName)}`);
       console.log();
       p5.outro(pc6.green("\u2728 Done!"));
     } catch (error) {
@@ -978,7 +1255,7 @@ var instanceCommand = defineCommand6({
     action: {
       type: "string",
       alias: "a",
-      description: "Action: 'create' or 'remove'"
+      description: "Action: 'create', 'reinstall', or 'remove'"
     },
     name: {
       type: "string",
@@ -1027,7 +1304,8 @@ var instanceCommand = defineCommand6({
     const binPath = getBinPath();
     const createScript = join7(binPath, "cursor-new-instance");
     const removeScript = join7(binPath, "cursor-remove-instance");
-    const scriptsExist = existsSync2(createScript) && existsSync2(removeScript);
+    const reinstallScript = join7(binPath, "cursor-reinstall-instance.sh");
+    const scriptsExist = existsSync2(createScript) && existsSync2(removeScript) && existsSync2(reinstallScript);
     if (!scriptsExist) {
       s.stop("Prerequisites check failed");
       console.log();
@@ -1051,7 +1329,7 @@ var instanceCommand = defineCommand6({
     const existingInstances = getExistingInstances();
     let action;
     let instanceName;
-    if (args.action && ["create", "remove"].includes(args.action)) {
+    if (args.action && ["create", "remove", "reinstall"].includes(args.action)) {
       action = args.action;
     } else {
       const actionResult = await p6.select({
@@ -1062,6 +1340,11 @@ var instanceCommand = defineCommand6({
             label: "Create new instance",
             hint: "Clone Cursor with separate identity"
           },
+          {
+            value: "reinstall",
+            label: "Reinstall instance",
+            hint: existingInstances.length > 0 ? "Fix broken instance after Cursor update" : "No instances to reinstall"
+          },
           {
             value: "remove",
             label: "Remove instance",
@@ -1077,9 +1360,10 @@ var instanceCommand = defineCommand6({
     }
     if (args.name) {
       instanceName = args.name;
-    } else if (action === "remove" && existingInstances.length > 0) {
+    } else if ((action === "remove" || action === "reinstall") && existingInstances.length > 0) {
+      const actionLabel2 = action === "remove" ? "remove" : "reinstall";
       const instanceResult = await p6.select({
-        message: "Select instance to remove:",
+        message: `Select instance to ${actionLabel2}:`,
         options: existingInstances.map((inst) => ({
           value: inst.name,
           label: inst.name,
@@ -1091,9 +1375,9 @@ var instanceCommand = defineCommand6({
         process.exit(0);
       }
       instanceName = instanceResult;
-    } else if (action === "remove" && existingInstances.length === 0) {
+    } else if ((action === "remove" || action === "reinstall") && existingInstances.length === 0) {
       console.log();
-      printInfo("No custom Cursor instances found to remove.");
+      printInfo(`No custom Cursor instances found to ${action}.`);
       console.log();
       p6.outro(pc7.dim("Nothing to do"));
       return;
@@ -1121,12 +1405,18 @@ var instanceCommand = defineCommand6({
     console.log();
     console.log(pc7.bold(pc7.cyan("  \u{1F4CB} Summary")));
     console.log();
-    console.log(`  ${pc7.dim("Action:")}    ${action === "create" ? pc7.green("Create") : pc7.yellow("Remove")}`);
+    const actionColor = action === "create" ? pc7.green : action === "reinstall" ? pc7.blue : pc7.yellow;
+    const actionLabel = action === "create" ? "Create" : action === "reinstall" ? "Reinstall" : "Remove";
+    console.log(`  ${pc7.dim("Action:")}    ${actionColor(actionLabel)}`);
     console.log(`  ${pc7.dim("Instance:")}  ${highlight(instanceName)}`);
-    if (action === "create") {
+    if (action === "create" || action === "reinstall") {
       const slug = instanceName.toLowerCase().replace(/[^a-z0-9]/g, "");
       console.log(`  ${pc7.dim("Bundle ID:")} ${pc7.dim("com.cursor.")}${highlight(slug)}`);
       console.log(`  ${pc7.dim("Location:")}  ${pc7.dim("~/Applications/")}${highlight(instanceName + ".app")}`);
+      if (action === "reinstall") {
+        const dataDir = join7(process.env.HOME ?? "", "Library", "Application Support", instanceName.replace(/ /g, ""));
+        console.log(`  ${pc7.dim("Data:")}      ${pc7.green("\u2713")} ${pc7.dim("Preserved at")} ${pc7.dim(dataDir)}`);
+      }
     } else {
       const targetPath = join7(process.env.HOME ?? "", "Applications", `${instanceName}.app`);
       console.log(`  ${pc7.dim("Path:")}      ${pc7.dim(targetPath)}`);
@@ -1135,8 +1425,8 @@ var instanceCommand = defineCommand6({
     printDivider();
     console.log();
     const shouldContinue = await p6.confirm({
-      message: action === "create" ? "Create this Cursor instance?" : "Remove this Cursor instance? This cannot be undone.",
-      initialValue: action === "create"
+      message: action === "create" ? "Create this Cursor instance?" : action === "reinstall" ? "Reinstall this instance? (User data will be preserved)" : "Remove this Cursor instance? This cannot be undone.",
+      initialValue: action !== "remove"
     });
     if (p6.isCancel(shouldContinue) || !shouldContinue) {
       p6.cancel("Operation cancelled");
@@ -1145,8 +1435,8 @@ var instanceCommand = defineCommand6({
     console.log();
     printDivider();
     console.log();
-    const scriptPath = action === "create" ? createScript : removeScript;
-    const scriptArgs = action === "remove" ? ["--yes", instanceName] : [instanceName];
+    const scriptPath = action === "create" ? createScript : action === "reinstall" ? reinstallScript : removeScript;
+    const scriptArgs = action === "remove" || action === "reinstall" ? ["--yes", instanceName] : [instanceName];
     const exitCode = await runScript(scriptPath, scriptArgs);
     console.log();
     printDivider();
@@ -1159,6 +1449,13 @@ var instanceCommand = defineCommand6({
         console.log(pc7.dim("  \u2022 The new instance should launch automatically"));
         console.log(pc7.dim("  \u2022 Sign in with a different Cursor account"));
         console.log(pc7.dim("  \u2022 Find it in ~/Applications/"));
+      } else if (action === "reinstall") {
+        printSuccess(`Instance ${highlight(instanceName)} reinstalled successfully!`);
+        console.log();
+        console.log(pc7.dim("  The instance has been:"));
+        console.log(pc7.dim("  \u2022 Refreshed with the latest Cursor version"));
+        console.log(pc7.dim("  \u2022 Relaunched with your preserved data"));
+        console.log(pc7.dim("  \u2022 Ready to use with your existing account"));
       } else {
         printSuccess(`Instance ${highlight(instanceName)} removed successfully!`);
       }