ctx7 0.2.3 → 0.2.4

package/dist/index.js

@@ -305,113 +305,171 @@ var log = {
 };
 
 // src/utils/ide.ts
-import pc2 from "picocolors";
-import { select, checkbox, confirm } from "@inquirer/prompts";
+import pc3 from "picocolors";
+import { select, confirm } from "@inquirer/prompts";
 import { access } from "fs/promises";
-import { join } from "path";
+import { join, dirname } from "path";
 import { homedir } from "os";
 
+// src/utils/prompts.ts
+import pc2 from "picocolors";
+import { checkbox } from "@inquirer/prompts";
+import readline from "readline";
+function terminalLink(text, url, color) {
+  const colorFn = color ?? ((s) => s);
+  return `\x1B]8;;${url}\x07${colorFn(text)}\x1B]8;;\x07 ${pc2.white("\u2197")}`;
+}
+function formatInstallCount(count, placeholder = "") {
+  if (count === void 0 || count === 0) return placeholder;
+  return pc2.yellow(String(count));
+}
+function formatTrustScore(score) {
+  if (score === void 0 || score < 0) return pc2.dim("-");
+  if (score < 3) return pc2.red(score.toFixed(1));
+  return pc2.yellow(score.toFixed(1));
+}
+async function checkboxWithHover(config, options) {
+  const choices = config.choices.filter(
+    (c) => typeof c === "object" && c !== null && !("type" in c && c.type === "separator")
+  );
+  const values = choices.map((c) => c.value);
+  const totalItems = values.length;
+  let cursorPosition = 0;
+  const getName = options?.getName ?? ((v) => v.name);
+  const keypressHandler = (_str, key) => {
+    if (key.name === "up" && cursorPosition > 0) {
+      cursorPosition--;
+    } else if (key.name === "down" && cursorPosition < totalItems - 1) {
+      cursorPosition++;
+    }
+  };
+  readline.emitKeypressEvents(process.stdin);
+  process.stdin.on("keypress", keypressHandler);
+  const customConfig = {
+    ...config,
+    theme: {
+      ...config.theme,
+      style: {
+        ...config.theme?.style,
+        highlight: (text) => pc2.green(text),
+        renderSelectedChoices: (selected, _allChoices) => {
+          if (selected.length === 0) {
+            return pc2.dim(getName(values[cursorPosition]));
+          }
+          return selected.map((c) => getName(c.value)).join(", ");
+        }
+      }
+    }
+  };
+  try {
+    const selected = await checkbox(customConfig);
+    if (selected.length === 0) {
+      return [values[cursorPosition]];
+    }
+    return selected;
+  } finally {
+    process.stdin.removeListener("keypress", keypressHandler);
+  }
+}
+
 // src/types.ts
 var IDE_PATHS = {
   claude: ".claude/skills",
   cursor: ".cursor/skills",
-  codex: ".codex/skills",
-  opencode: ".opencode/skills",
-  amp: ".agents/skills",
-  antigravity: ".agent/skills"
+  antigravity: ".agent/skills",
+  universal: ".agents/skills"
 };
 var IDE_GLOBAL_PATHS = {
   claude: ".claude/skills",
   cursor: ".cursor/skills",
-  codex: ".codex/skills",
-  opencode: ".config/opencode/skills",
-  amp: ".config/agents/skills",
-  antigravity: ".agent/skills"
+  antigravity: ".agent/skills",
+  universal: ".config/agents/skills"
 };
 var IDE_NAMES = {
   claude: "Claude Code",
   cursor: "Cursor",
-  codex: "Codex",
-  opencode: "OpenCode",
-  amp: "Amp",
-  antigravity: "Antigravity"
+  antigravity: "Antigravity",
+  universal: "Universal"
 };
+var UNIVERSAL_SKILLS_PATH = ".agents/skills";
+var UNIVERSAL_SKILLS_GLOBAL_PATH = ".config/agents/skills";
+var UNIVERSAL_AGENTS_LABEL = "Amp, Codex, Gemini CLI, GitHub Copilot, OpenCode + more";
+var VENDOR_SPECIFIC_AGENTS = ["claude", "cursor", "antigravity"];
 var DEFAULT_CONFIG = {
-  defaultIde: "claude",
+  defaultIde: "universal",
   defaultScope: "project"
 };
 
 // src/utils/ide.ts
-import { dirname } from "path";
 function getSelectedIdes(options) {
   const ides = [];
   if (options.claude) ides.push("claude");
   if (options.cursor) ides.push("cursor");
-  if (options.codex) ides.push("codex");
-  if (options.opencode) ides.push("opencode");
-  if (options.amp) ides.push("amp");
+  if (options.universal) ides.push("universal");
   if (options.antigravity) ides.push("antigravity");
   return ides;
 }
 function hasExplicitIdeOption(options) {
-  return !!(options.claude || options.cursor || options.codex || options.opencode || options.amp || options.antigravity);
-}
-async function detectInstalledIdes(preferredScope) {
-  const allIdes = Object.keys(IDE_PATHS);
-  if (preferredScope === "global") {
-    const globalIdes = [];
-    for (const ide of allIdes) {
-      const detectionPath = dirname(IDE_GLOBAL_PATHS[ide]);
-      const globalParent = join(homedir(), detectionPath);
-      try {
-        await access(globalParent);
-        globalIdes.push(ide);
-      } catch {
-      }
-    }
-    if (globalIdes.length > 0) {
-      return { ides: globalIdes, scope: "global" };
-    }
-    return null;
-  }
-  const projectIdes = [];
-  for (const ide of allIdes) {
-    const detectionPath = dirname(IDE_PATHS[ide]);
-    const projectParent = join(process.cwd(), detectionPath);
+  return !!(options.claude || options.cursor || options.universal || options.antigravity);
+}
+async function detectVendorSpecificAgents(scope) {
+  const baseDir = scope === "global" ? homedir() : process.cwd();
+  const pathMap = scope === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS;
+  const detected = [];
+  for (const ide of VENDOR_SPECIFIC_AGENTS) {
+    const parentDir = dirname(pathMap[ide]);
     try {
-      await access(projectParent);
-      projectIdes.push(ide);
+      await access(join(baseDir, parentDir));
+      detected.push(ide);
     } catch {
     }
   }
-  if (projectIdes.length > 0) {
-    return { ides: projectIdes, scope: "project" };
+  return detected;
+}
+function getUniversalDir(scope) {
+  if (scope === "global") {
+    return join(homedir(), UNIVERSAL_SKILLS_GLOBAL_PATH);
   }
-  return null;
+  return join(process.cwd(), UNIVERSAL_SKILLS_PATH);
 }
 async function promptForInstallTargets(options) {
   if (hasExplicitIdeOption(options)) {
-    const ides = getSelectedIdes(options);
+    const ides2 = getSelectedIdes(options);
     const scope2 = options.global ? "global" : "project";
     return {
-      ides: ides.length > 0 ? ides : [DEFAULT_CONFIG.defaultIde],
+      ides: ides2.length > 0 ? ides2 : [DEFAULT_CONFIG.defaultIde],
       scopes: [scope2]
     };
   }
-  const preferredScope = options.global ? "global" : void 0;
-  const detected = await detectInstalledIdes(preferredScope);
-  if (detected) {
-    const scope2 = options.global ? "global" : detected.scope;
-    const pathMap2 = scope2 === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS;
-    const baseDir2 = scope2 === "global" ? homedir() : process.cwd();
-    const paths = detected.ides.map((ide) => join(baseDir2, pathMap2[ide]));
-    const pathList = paths.join("\n");
+  const scope = options.global ? "global" : "project";
+  const baseDir = scope === "global" ? homedir() : process.cwd();
+  const pathMap = scope === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS;
+  const universalPath = scope === "global" ? UNIVERSAL_SKILLS_GLOBAL_PATH : UNIVERSAL_SKILLS_PATH;
+  const detectedVendor = await detectVendorSpecificAgents(scope);
+  let hasUniversalDir = false;
+  try {
+    await access(join(baseDir, dirname(universalPath)));
+    hasUniversalDir = true;
+  } catch {
+  }
+  const detectedIdes = [
+    ...hasUniversalDir ? ["universal"] : [],
+    ...detectedVendor
+  ];
+  if (detectedIdes.length > 0) {
+    const pathLines = [];
+    if (hasUniversalDir) {
+      pathLines.push(join(baseDir, universalPath));
+    }
+    for (const ide of detectedVendor) {
+      pathLines.push(join(baseDir, pathMap[ide]));
+    }
     log.blank();
     let confirmed;
     try {
       confirmed = await confirm({
         message: `Install to detected location(s)?
-${pc2.dim(pathList)}`,
+${pc3.dim(pathLines.join("\n"))}`,
         default: true
       });
     } catch {
@@ -421,35 +479,45 @@ ${pc2.dim(pathList)}`,
       log.warn("Installation cancelled");
       return null;
     }
-    return { ides: detected.ides, scopes: [scope2] };
+    return { ides: detectedIdes, scopes: [scope] };
+  }
+  const universalLabel = `Universal \u2014 ${UNIVERSAL_AGENTS_LABEL} ${pc3.dim(`(${universalPath})`)}`;
+  const choices = [
+    { name: universalLabel, value: "universal", checked: true }
+  ];
+  for (const ide of VENDOR_SPECIFIC_AGENTS) {
+    choices.push({
+      name: `${IDE_NAMES[ide]} ${pc3.dim(`(${pathMap[ide]})`)}`,
+      value: ide,
+      checked: false
+    });
   }
   log.blank();
-  const scope = options.global ? "global" : "project";
-  const pathMap = scope === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS;
-  const baseDir = scope === "global" ? homedir() : process.cwd();
-  const ideChoices = Object.keys(IDE_NAMES).map((ide) => ({
-    name: `${IDE_NAMES[ide]} ${pc2.dim(`(${pathMap[ide]})`)}`,
-    value: ide,
-    checked: ide === DEFAULT_CONFIG.defaultIde
-  }));
   let selectedIdes;
   try {
-    selectedIdes = await checkbox({
-      message: `Which clients do you want to install the skill(s) for?
-${pc2.dim(baseDir)}`,
-      choices: ideChoices,
-      required: true,
-      loop: false,
-      theme: { style: { highlight: (text) => pc2.green(text) } }
-    });
+    selectedIdes = await checkboxWithHover(
+      {
+        message: `Which agents do you want to install to?
+${pc3.dim(`  ${baseDir}`)}`,
+        choices,
+        loop: false,
+        theme: {
+          style: {
+            highlight: (text) => pc3.green(text),
+            message: (text, status) => {
+              if (status === "done") return pc3.dim(text.split("\n")[0]);
+              return pc3.bold(text);
+            }
+          }
+        }
+      },
+      { getName: (ide) => IDE_NAMES[ide] }
+    );
   } catch {
     return null;
   }
-  if (selectedIdes.length === 0) {
-    log.warn("You must select at least one client");
-    return null;
-  }
-  return { ides: selectedIdes, scopes: [scope] };
+  const ides = ["universal", ...selectedIdes.filter((ide) => ide !== "universal")];
+  return { ides, scopes: [scope] };
 }
 async function promptForSingleTarget(options) {
   if (hasExplicitIdeOption(options)) {
@@ -459,18 +527,22 @@ async function promptForSingleTarget(options) {
     return { ide, scope };
   }
   log.blank();
-  const ideChoices = Object.keys(IDE_NAMES).map((ide) => ({
-    name: `${IDE_NAMES[ide]} ${pc2.dim(`(${IDE_PATHS[ide]})`)}`,
-    value: ide
-  }));
+  const universalLabel = `Universal ${pc3.dim(`(${UNIVERSAL_SKILLS_PATH})`)}`;
+  const choices = [{ name: universalLabel, value: "universal" }];
+  for (const ide of VENDOR_SPECIFIC_AGENTS) {
+    choices.push({
+      name: `${IDE_NAMES[ide]} ${pc3.dim(`(${IDE_PATHS[ide]})`)}`,
+      value: ide
+    });
+  }
   let selectedIde;
   try {
     selectedIde = await select({
-      message: "Which client?",
-      choices: ideChoices,
+      message: "Which location?",
+      choices,
       default: DEFAULT_CONFIG.defaultIde,
       loop: false,
-      theme: { style: { highlight: (text) => pc2.green(text) } }
+      theme: { style: { highlight: (text) => pc3.green(text) } }
     });
   } catch {
     return null;
@@ -484,17 +556,17 @@ async function promptForSingleTarget(options) {
         message: "Which scope?",
         choices: [
           {
-            name: `Project ${pc2.dim("(current directory)")}`,
+            name: `Project ${pc3.dim("(current directory)")}`,
             value: "project"
           },
           {
-            name: `Global ${pc2.dim("(home directory)")}`,
+            name: `Global ${pc3.dim("(home directory)")}`,
             value: "global"
           }
         ],
         default: DEFAULT_CONFIG.defaultScope,
         loop: false,
-        theme: { style: { highlight: (text) => pc2.green(text) } }
+        theme: { style: { highlight: (text) => pc3.green(text) } }
       });
     } catch {
       return null;
@@ -503,91 +575,32 @@ async function promptForSingleTarget(options) {
   return { ide: selectedIde, scope: selectedScope };
 }
 function getTargetDirs(targets) {
-  const sortedIdes = [...targets.ides].sort((a, b) => {
-    if (a === "claude") return -1;
-    if (b === "claude") return 1;
-    return 0;
-  });
+  const hasUniversal = targets.ides.some((ide) => ide === "universal");
   const dirs = [];
-  for (const ide of sortedIdes) {
-    for (const scope of targets.scopes) {
-      if (scope === "global") {
-        dirs.push(join(homedir(), IDE_GLOBAL_PATHS[ide]));
-      } else {
-        dirs.push(join(process.cwd(), IDE_PATHS[ide]));
-      }
+  for (const scope of targets.scopes) {
+    const baseDir = scope === "global" ? homedir() : process.cwd();
+    if (hasUniversal) {
+      const uniPath = scope === "global" ? UNIVERSAL_SKILLS_GLOBAL_PATH : UNIVERSAL_SKILLS_PATH;
+      dirs.push(join(baseDir, uniPath));
+    }
+    for (const ide of targets.ides) {
+      if (ide === "universal") continue;
+      const pathMap = scope === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS;
+      dirs.push(join(baseDir, pathMap[ide]));
     }
   }
   return dirs;
 }
 function getTargetDirFromSelection(ide, scope) {
+  if (ide === "universal") {
+    return getUniversalDir(scope);
+  }
   if (scope === "global") {
     return join(homedir(), IDE_GLOBAL_PATHS[ide]);
   }
   return join(process.cwd(), IDE_PATHS[ide]);
 }
 
-// src/utils/prompts.ts
-import pc3 from "picocolors";
-import { checkbox as checkbox2 } from "@inquirer/prompts";
-import readline from "readline";
-function terminalLink(text, url, color) {
-  const colorFn = color ?? ((s) => s);
-  return `\x1B]8;;${url}\x07${colorFn(text)}\x1B]8;;\x07 ${pc3.white("\u2197")}`;
-}
-function formatInstallCount(count, placeholder = "") {
-  if (count === void 0 || count === 0) return placeholder;
-  return pc3.yellow(String(count));
-}
-function formatTrustScore(score) {
-  if (score === void 0 || score < 0) return pc3.dim("-");
-  if (score < 3) return pc3.red(score.toFixed(1));
-  return pc3.yellow(score.toFixed(1));
-}
-async function checkboxWithHover(config, options) {
-  const choices = config.choices.filter(
-    (c) => typeof c === "object" && c !== null && !("type" in c && c.type === "separator")
-  );
-  const values = choices.map((c) => c.value);
-  const totalItems = values.length;
-  let cursorPosition = 0;
-  const getName = options?.getName ?? ((v) => v.name);
-  const keypressHandler = (_str, key) => {
-    if (key.name === "up" && cursorPosition > 0) {
-      cursorPosition--;
-    } else if (key.name === "down" && cursorPosition < totalItems - 1) {
-      cursorPosition++;
-    }
-  };
-  readline.emitKeypressEvents(process.stdin);
-  process.stdin.on("keypress", keypressHandler);
-  const customConfig = {
-    ...config,
-    theme: {
-      ...config.theme,
-      style: {
-        ...config.theme?.style,
-        highlight: (text) => pc3.green(text),
-        renderSelectedChoices: (selected, _allChoices) => {
-          if (selected.length === 0) {
-            return pc3.dim(getName(values[cursorPosition]));
-          }
-          return selected.map((c) => getName(c.value)).join(", ");
-        }
-      }
-    }
-  };
-  try {
-    const selected = await checkbox2(customConfig);
-    if (selected.length === 0) {
-      return [values[cursorPosition]];
-    }
-    return selected;
-  } finally {
-    process.stdin.removeListener("keypress", keypressHandler);
-  }
-}
-
 // src/utils/installer.ts
 import { mkdir, writeFile, rm, symlink, lstat } from "fs/promises";
 import { join as join2 } from "path";
@@ -1062,7 +1075,7 @@ var selectOrInput_default = selectOrInput;
 
 // src/commands/generate.ts
 function registerGenerateCommand(skillCommand) {
-  skillCommand.command("generate").alias("gen").alias("g").option("-o, --output <dir>", "Output directory (default: current directory)").option("--all", "Generate for all detected IDEs").option("--global", "Generate in global skills directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--codex", "Codex (.codex/skills/)").option("--opencode", "OpenCode (.opencode/skills/)").option("--amp", "Amp (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Generate a skill for a library using AI").action(async (options) => {
+  skillCommand.command("generate").alias("gen").alias("g").option("-o, --output <dir>", "Output directory (default: current directory)").option("--all", "Generate for all detected IDEs").option("--global", "Generate in global skills directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--universal", "Universal (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Generate a skill for a library using AI").action(async (options) => {
     await generateCommand(options);
   });
 }
@@ -1582,48 +1595,56 @@ async function detectProjectDependencies(cwd) {
 // src/commands/skill.ts
 function logInstallSummary(targets, targetDirs, skillNames) {
   log.blank();
+  const hasUniversal = targets.ides.some((ide) => ide === "universal");
+  const vendorIdes = targets.ides.filter((ide) => ide !== "universal");
   let dirIndex = 0;
-  for (const ide of targets.ides) {
-    for (let i = 0; i < targets.scopes.length; i++) {
-      const dir = targetDirs[dirIndex++];
-      log.dim(`${IDE_NAMES[ide]}: ${dir}`);
-      for (const name of skillNames) {
-        log.itemAdd(name);
-      }
+  if (hasUniversal && dirIndex < targetDirs.length) {
+    log.plain(`${pc7.bold("Universal")} ${pc7.dim(targetDirs[dirIndex])}`);
+    for (const name of skillNames) {
+      log.itemAdd(name);
+    }
+    dirIndex++;
+  }
+  for (const ide of vendorIdes) {
+    if (dirIndex >= targetDirs.length) break;
+    log.plain(`${pc7.bold(IDE_NAMES[ide])} ${pc7.dim(targetDirs[dirIndex])}`);
+    for (const name of skillNames) {
+      log.itemAdd(name);
     }
+    dirIndex++;
   }
   log.blank();
 }
 function registerSkillCommands(program2) {
   const skill = program2.command("skills").alias("skill").description("Manage AI coding skills");
   registerGenerateCommand(skill);
-  skill.command("install").alias("i").alias("add").argument("<repository>", "GitHub repository (/owner/repo)").argument("[skill]", "Specific skill name to install").option("--all", "Install all skills without prompting").option("--global", "Install globally instead of current directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--codex", "Codex (.codex/skills/)").option("--opencode", "OpenCode (.opencode/skills/)").option("--amp", "Amp (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Install skills from a repository").action(async (project, skillName, options) => {
+  skill.command("install").alias("i").alias("add").argument("<repository>", "GitHub repository (/owner/repo)").argument("[skill]", "Specific skill name to install").option("--all", "Install all skills without prompting").option("--global", "Install globally instead of current directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--universal", "Universal (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Install skills from a repository").action(async (project, skillName, options) => {
     await installCommand(project, skillName, options);
   });
   skill.command("search").alias("s").argument("<keywords...>", "Search keywords").description("Search for skills across all indexed repositories").action(async (keywords) => {
     await searchCommand(keywords.join(" "));
   });
-  skill.command("list").alias("ls").option("--global", "List global skills").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--codex", "Codex (.codex/skills/)").option("--opencode", "OpenCode (.opencode/skills/)").option("--amp", "Amp (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("List installed skills").action(async (options) => {
+  skill.command("list").alias("ls").option("--global", "List global skills").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--universal", "Universal (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("List installed skills").action(async (options) => {
     await listCommand(options);
   });
-  skill.command("remove").alias("rm").alias("delete").argument("<name>", "Skill name to remove").option("--global", "Remove from global skills").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--codex", "Codex (.codex/skills/)").option("--opencode", "OpenCode (.opencode/skills/)").option("--amp", "Amp (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Remove an installed skill").action(async (name, options) => {
+  skill.command("remove").alias("rm").alias("delete").argument("<name>", "Skill name to remove").option("--global", "Remove from global skills").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--universal", "Universal (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Remove an installed skill").action(async (name, options) => {
     await removeCommand(name, options);
   });
   skill.command("info").argument("<repository>", "GitHub repository (/owner/repo)").description("Show skills in a repository").action(async (project) => {
     await infoCommand(project);
   });
-  skill.command("suggest").option("--global", "Install globally instead of current directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--codex", "Codex (.codex/skills/)").option("--opencode", "OpenCode (.opencode/skills/)").option("--amp", "Amp (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Suggest skills based on your project dependencies").action(async (options) => {
+  skill.command("suggest").option("--global", "Install globally instead of current directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--universal", "Universal (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Suggest skills based on your project dependencies").action(async (options) => {
     await suggestCommand(options);
   });
 }
 function registerSkillAliases(program2) {
-  program2.command("si", { hidden: true }).argument("<repository>", "GitHub repository (/owner/repo)").argument("[skill]", "Specific skill name to install").option("--all", "Install all skills without prompting").option("--global", "Install globally instead of current directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--codex", "Codex (.codex/skills/)").option("--opencode", "OpenCode (.opencode/skills/)").option("--amp", "Amp (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Install skills (alias for: skills install)").action(async (project, skillName, options) => {
+  program2.command("si", { hidden: true }).argument("<repository>", "GitHub repository (/owner/repo)").argument("[skill]", "Specific skill name to install").option("--all", "Install all skills without prompting").option("--global", "Install globally instead of current directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--universal", "Universal (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Install skills (alias for: skills install)").action(async (project, skillName, options) => {
     await installCommand(project, skillName, options);
   });
   program2.command("ss", { hidden: true }).argument("<keywords...>", "Search keywords").description("Search for skills (alias for: skills search)").action(async (keywords) => {
     await searchCommand(keywords.join(" "));
   });
-  program2.command("ssg", { hidden: true }).option("--global", "Install globally instead of current directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--codex", "Codex (.codex/skills/)").option("--opencode", "OpenCode (.opencode/skills/)").option("--amp", "Amp (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Suggest skills (alias for: skills suggest)").action(async (options) => {
+  program2.command("ssg", { hidden: true }).option("--global", "Install globally instead of current directory").option("--claude", "Claude Code (.claude/skills/)").option("--cursor", "Cursor (.cursor/skills/)").option("--universal", "Universal (.agents/skills/)").option("--antigravity", "Antigravity (.agent/skills/)").description("Suggest skills (alias for: skills suggest)").action(async (options) => {
     await suggestCommand(options);
   });
 }
@@ -1686,10 +1707,13 @@ async function installCommand(input2, skillName, options) {
     } else {
       const indexWidth = data.skills.length.toString().length;
       const maxNameLen = Math.max(...data.skills.map((s) => s.name.length));
+      const installsColWidth = 10;
       const choices = skillsWithRepo.map((s, index) => {
         const indexStr = pc7.dim(`${(index + 1).toString().padStart(indexWidth)}.`);
         const paddedName = s.name.padEnd(maxNameLen);
-        const installs = formatInstallCount(s.installCount);
+        const installsRaw = s.installCount ? String(s.installCount) : "-";
+        const paddedInstalls = formatInstallCount(s.installCount, pc7.dim("-")) + " ".repeat(installsColWidth - installsRaw.length);
+        const trust = formatTrustScore(s.trustScore);
         const skillUrl = `https://context7.com/skills${s.project}/${s.name}`;
         const skillLink = terminalLink(s.name, skillUrl, pc7.white);
         const repoLink = terminalLink(s.project, `https://github.com${s.project}`, pc7.white);
@@ -1702,20 +1726,30 @@ async function installCommand(input2, skillName, options) {
           pc7.white(s.description || "No description")
         ];
         return {
-          name: installs ? `${indexStr} ${paddedName} ${installs}` : `${indexStr} ${paddedName}`,
+          name: `${indexStr} ${paddedName} ${paddedInstalls}${trust}`,
           value: s,
           description: metadataLines.join("\n")
         };
       });
       log.blank();
-      const installsOffset = 4 + indexWidth + 1 + 1 + maxNameLen + 1 - 3;
-      const message = "Select skills:" + " ".repeat(Math.max(1, installsOffset - 14)) + pc7.dim("installs");
+      const checkboxPrefixWidth = 3;
+      const headerPad = " ".repeat(checkboxPrefixWidth + indexWidth + 1 + 1 + maxNameLen + 1);
+      const headerLine = headerPad + pc7.dim("Installs".padEnd(installsColWidth)) + pc7.dim("Trust(0-10)");
       try {
         selectedSkills = await checkboxWithHover({
-          message,
+          message: `Select skills to install:
+${headerLine}`,
           choices,
           pageSize: 15,
-          loop: false
+          loop: false,
+          theme: {
+            style: {
+              message: (text, status) => {
+                if (status === "done") return pc7.dim(text.split("\n")[0]);
+                return pc7.bold(text);
+              }
+            }
+          }
         });
       } catch {
         log.warn("Installation cancelled");
@@ -1817,6 +1851,7 @@ async function searchCommand(query) {
   }
   spinner.succeed(`Found ${data.results.length} skill(s)`);
   trackEvent("search_query", { query, resultCount: data.results.length });
+  log.blank();
   const indexWidth = data.results.length.toString().length;
   const maxNameLen = Math.max(...data.results.map((s) => s.name.length));
   const installsColWidth = 10;
@@ -1846,18 +1881,25 @@ async function searchCommand(query) {
       description: metadataLines.join("\n")
     };
   });
-  log.blank();
   const checkboxPrefixWidth = 3;
   const headerPad = " ".repeat(checkboxPrefixWidth + indexWidth + 1 + 1 + maxNameLen + 1);
   const headerLine = headerPad + pc7.dim("Installs".padEnd(installsColWidth)) + pc7.dim("Trust(0-10)");
-  const message = "Select skills to install:\n" + headerLine;
   let selectedSkills;
   try {
     selectedSkills = await checkboxWithHover({
-      message,
+      message: `Select skills to install:
+${headerLine}`,
       choices,
       pageSize: 15,
-      loop: false
+      loop: false,
+      theme: {
+        style: {
+          message: (text, status) => {
+            if (status === "done") return pc7.dim(text.split("\n")[0]);
+            return pc7.bold(text);
+          }
+        }
+      }
     });
   } catch {
     log.warn("Installation cancelled");
@@ -1940,19 +1982,40 @@ async function searchCommand(query) {
 async function listCommand(options) {
   trackEvent("command", { name: "list" });
   const scope = options.global ? "global" : "project";
-  const pathMap = scope === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS;
   const baseDir = scope === "global" ? homedir4() : process.cwd();
-  const idesToCheck = hasExplicitIdeOption(options) ? getSelectedIdes(options) : Object.keys(IDE_NAMES);
   const results = [];
-  for (const ide of idesToCheck) {
-    const skillsDir = join6(baseDir, pathMap[ide]);
+  async function scanDir(dir) {
     try {
-      const entries = await readdir(skillsDir, { withFileTypes: true });
-      const skillFolders = entries.filter((e) => e.isDirectory() || e.isSymbolicLink()).map((e) => e.name);
-      if (skillFolders.length > 0) {
-        results.push({ ide, skills: skillFolders });
-      }
+      const entries = await readdir(dir, { withFileTypes: true });
+      return entries.filter((e) => e.isDirectory() || e.isSymbolicLink()).map((e) => e.name);
     } catch {
+      return [];
+    }
+  }
+  if (hasExplicitIdeOption(options)) {
+    const ides = getSelectedIdes(options);
+    for (const ide of ides) {
+      const dir = ide === "universal" ? join6(baseDir, scope === "global" ? UNIVERSAL_SKILLS_GLOBAL_PATH : UNIVERSAL_SKILLS_PATH) : join6(baseDir, (scope === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS)[ide]);
+      const label = ide === "universal" ? UNIVERSAL_AGENTS_LABEL : IDE_NAMES[ide];
+      const skills = await scanDir(dir);
+      if (skills.length > 0) {
+        results.push({ label, path: dir, skills });
+      }
+    }
+  } else {
+    const universalPath = scope === "global" ? UNIVERSAL_SKILLS_GLOBAL_PATH : UNIVERSAL_SKILLS_PATH;
+    const universalDir = join6(baseDir, universalPath);
+    const universalSkills = await scanDir(universalDir);
+    if (universalSkills.length > 0) {
+      results.push({ label: UNIVERSAL_AGENTS_LABEL, path: universalPath, skills: universalSkills });
+    }
+    for (const ide of VENDOR_SPECIFIC_AGENTS) {
+      const pathMap = scope === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS;
+      const dir = join6(baseDir, pathMap[ide]);
+      const skills = await scanDir(dir);
+      if (skills.length > 0) {
+        results.push({ label: IDE_NAMES[ide], path: pathMap[ide], skills });
+      }
     }
   }
   if (results.length === 0) {
@@ -1960,10 +2023,8 @@ async function listCommand(options) {
     return;
   }
   log.blank();
-  for (const { ide, skills } of results) {
-    const ideName = IDE_NAMES[ide];
-    const path2 = pathMap[ide];
-    log.plain(`${pc7.bold(ideName)} ${pc7.dim(path2)}`);
+  for (const { label, path: path2, skills } of results) {
+    log.plain(`${pc7.bold(label)} ${pc7.dim(path2)}`);
     for (const skill of skills) {
       log.plain(`  ${pc7.green(skill)}`);
     }
@@ -2100,14 +2161,22 @@ async function suggestCommand(options) {
   const checkboxPrefixWidth = 3;
   const headerPad = " ".repeat(checkboxPrefixWidth + indexWidth + 1 + 1 + maxNameLen + 1);
   const headerLine = headerPad + pc7.dim("Installs".padEnd(installsColWidth)) + pc7.dim("Trust(0-10)".padEnd(trustColWidth)) + pc7.dim("Relevant");
-  const message = "Select skills to install:\n" + headerLine;
   let selectedSkills;
   try {
     selectedSkills = await checkboxWithHover({
-      message,
+      message: `Select skills to install:
+${headerLine}`,
       choices,
       pageSize: 15,
-      loop: false
+      loop: false,
+      theme: {
+        style: {
+          message: (text, status) => {
+            if (status === "done") return pc7.dim(text.split("\n")[0]);
+            return pc7.bold(text);
+          }
+        }
+      }
     });
   } catch {
     log.warn("Installation cancelled");