ctx7 0.3.3 → 0.3.5

package/dist/index.js

@@ -9,7 +9,7 @@ import figlet from "figlet";
 import pc7 from "picocolors";
 import ora3 from "ora";
 import { readdir, rm as rm2 } from "fs/promises";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 
 // src/utils/parse-input.ts
 function parseSkillInput(input2) {
@@ -115,6 +115,15 @@ async function downloadSkillFromGitHub(skill) {
   }
 }
 
+// src/constants.ts
+import { readFileSync } from "fs";
+import { fileURLToPath } from "url";
+import { dirname, join } from "path";
+var __dirname = dirname(fileURLToPath(import.meta.url));
+var pkg = JSON.parse(readFileSync(join(__dirname, "../package.json"), "utf-8"));
+var VERSION = pkg.version;
+var NAME = pkg.name;
+
 // src/utils/api.ts
 var baseUrl = "https://context7.com";
 function getBaseUrl() {
@@ -290,7 +299,12 @@ async function handleGenerateResponse(response, libraryName, onEvent) {
   return { content, libraryName: finalLibraryName, error };
 }
 function getAuthHeaders(accessToken) {
-  const headers = {};
+  const headers = {
+    "X-Context7-Source": "cli",
+    "X-Context7-Client-IDE": "ctx7-cli",
+    "X-Context7-Client-Version": VERSION,
+    "X-Context7-Transport": "cli"
+  };
   const apiKey = process.env.CONTEXT7_API_KEY;
   if (apiKey) {
     headers["Authorization"] = `Bearer ${apiKey}`;
@@ -367,7 +381,7 @@ var log = {
 import pc3 from "picocolors";
 import { select, confirm } from "@inquirer/prompts";
 import { access } from "fs/promises";
-import { join, dirname } from "path";
+import { join as join2, dirname as dirname2 } from "path";
 import { homedir } from "os";
 
 // src/utils/prompts.ts
@@ -378,14 +392,39 @@ 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) {
+function formatPopularity(count) {
+  const filled = "\u2605";
+  const empty = "\u2606";
+  const max = 4;
+  let stars;
+  if (count === void 0 || count === 0) stars = 0;
+  else if (count < 100) stars = 1;
+  else if (count < 500) stars = 2;
+  else if (count < 1e3) stars = 3;
+  else stars = 4;
+  const filledPart = filled.repeat(stars);
+  const emptyPart = empty.repeat(max - stars);
+  if (stars === 0) return pc2.dim(emptyPart);
+  return pc2.yellow(filledPart) + pc2.dim(emptyPart);
+}
+function formatInstallRange(count) {
+  if (count === void 0 || count === 0) return "Unknown";
+  if (count < 100) return "<100";
+  if (count < 500) return "<500";
+  if (count < 1e3) return "<1,000";
+  return "1,000+";
+}
+function formatTrust(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));
+  if (score >= 7) return pc2.green("High");
+  if (score >= 4) return pc2.yellow("Medium");
+  return pc2.red("Low");
+}
+function getTrustLabel(score) {
+  if (score === void 0 || score < 0) return "-";
+  if (score >= 7) return "High";
+  if (score >= 4) return "Medium";
+  return "Low";
 }
 async function checkboxWithHover(config, options) {
   const choices = config.choices.filter(
@@ -409,6 +448,7 @@ async function checkboxWithHover(config, options) {
     theme: {
       ...config.theme,
       style: {
+        answer: (text) => pc2.green(text),
         ...config.theme?.style,
         highlight: (text) => pc2.green(text),
         renderSelectedChoices: (selected, _allChoices) => {
@@ -476,9 +516,9 @@ async function detectVendorSpecificAgents(scope) {
   const pathMap = scope === "global" ? IDE_GLOBAL_PATHS : IDE_PATHS;
   const detected = [];
   for (const ide of VENDOR_SPECIFIC_AGENTS) {
-    const parentDir = dirname(pathMap[ide]);
+    const parentDir = dirname2(pathMap[ide]);
     try {
-      await access(join(baseDir, parentDir));
+      await access(join2(baseDir, parentDir));
       detected.push(ide);
     } catch {
     }
@@ -487,11 +527,11 @@ async function detectVendorSpecificAgents(scope) {
 }
 function getUniversalDir(scope) {
   if (scope === "global") {
-    return join(homedir(), UNIVERSAL_SKILLS_GLOBAL_PATH);
+    return join2(homedir(), UNIVERSAL_SKILLS_GLOBAL_PATH);
   }
-  return join(process.cwd(), UNIVERSAL_SKILLS_PATH);
+  return join2(process.cwd(), UNIVERSAL_SKILLS_PATH);
 }
-async function promptForInstallTargets(options) {
+async function promptForInstallTargets(options, forceUniversal = true) {
   if (hasExplicitIdeOption(options)) {
     const ides2 = getSelectedIdes(options);
     const scope2 = options.global ? "global" : "project";
@@ -507,7 +547,7 @@ async function promptForInstallTargets(options) {
   const detectedVendor = await detectVendorSpecificAgents(scope);
   let hasUniversalDir = false;
   try {
-    await access(join(baseDir, dirname(universalPath)));
+    await access(join2(baseDir, dirname2(universalPath)));
     hasUniversalDir = true;
   } catch {
   }
@@ -518,21 +558,25 @@ async function promptForInstallTargets(options) {
   if (detectedIdes.length > 0) {
     const pathLines = [];
     if (hasUniversalDir) {
-      pathLines.push(join(baseDir, universalPath));
+      pathLines.push(join2(baseDir, universalPath));
     }
     for (const ide of detectedVendor) {
-      pathLines.push(join(baseDir, pathMap[ide]));
+      pathLines.push(join2(baseDir, pathMap[ide]));
     }
     log.blank();
     let confirmed;
-    try {
-      confirmed = await confirm({
-        message: `Install to detected location(s)?
+    if (options.yes) {
+      confirmed = true;
+    } else {
+      try {
+        confirmed = await confirm({
+          message: `Install to detected location(s)?
 ${pc3.dim(pathLines.join("\n"))}`,
-        default: true
-      });
-    } catch {
-      return null;
+          default: true
+        });
+      } catch {
+        return null;
+      }
     }
     if (!confirmed) {
       log.warn("Installation cancelled");
@@ -542,9 +586,14 @@ ${pc3.dim(pathLines.join("\n"))}`,
   }
   const universalLabel = `Universal \u2014 ${UNIVERSAL_AGENTS_LABEL} ${pc3.dim(`(${universalPath})`)}`;
   const choices = [
+    {
+      name: `${IDE_NAMES["claude"]} ${pc3.dim(`(${pathMap["claude"]})`)}`,
+      value: "claude",
+      checked: false
+    },
     { name: universalLabel, value: "universal", checked: false }
   ];
-  for (const ide of VENDOR_SPECIFIC_AGENTS) {
+  for (const ide of VENDOR_SPECIFIC_AGENTS.filter((ide2) => ide2 !== "claude")) {
     choices.push({
       name: `${IDE_NAMES[ide]} ${pc3.dim(`(${pathMap[ide]})`)}`,
       value: ide,
@@ -564,7 +613,7 @@ ${pc3.dim(`  ${baseDir}`)}`,
           style: {
             highlight: (text) => pc3.green(text),
             message: (text, status) => {
-              if (status === "done") return pc3.dim(text.split("\n")[0]);
+              if (status === "done") return text.split("\n")[0];
               return pc3.bold(text);
             }
           }
@@ -575,7 +624,7 @@ ${pc3.dim(`  ${baseDir}`)}`,
   } catch {
     return null;
   }
-  const ides = ["universal", ...selectedIdes.filter((ide) => ide !== "universal")];
+  const ides = forceUniversal ? ["universal", ...selectedIdes.filter((ide) => ide !== "universal")] : selectedIdes;
   return { ides, scopes: [scope] };
 }
 async function promptForSingleTarget(options) {
@@ -587,8 +636,11 @@ async function promptForSingleTarget(options) {
   }
   log.blank();
   const universalLabel = `Universal ${pc3.dim(`(${UNIVERSAL_SKILLS_PATH})`)}`;
-  const choices = [{ name: universalLabel, value: "universal" }];
-  for (const ide of VENDOR_SPECIFIC_AGENTS) {
+  const choices = [
+    { name: `${IDE_NAMES["claude"]} ${pc3.dim(`(${IDE_PATHS["claude"]})`)}`, value: "claude" },
+    { name: universalLabel, value: "universal" }
+  ];
+  for (const ide of VENDOR_SPECIFIC_AGENTS.filter((ide2) => ide2 !== "claude")) {
     choices.push({
       name: `${IDE_NAMES[ide]} ${pc3.dim(`(${IDE_PATHS[ide]})`)}`,
       value: ide
@@ -640,12 +692,12 @@ function getTargetDirs(targets) {
     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));
+      dirs.push(join2(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]));
+      dirs.push(join2(baseDir, pathMap[ide]));
     }
   }
   return dirs;
@@ -655,25 +707,25 @@ function getTargetDirFromSelection(ide, scope) {
     return getUniversalDir(scope);
   }
   if (scope === "global") {
-    return join(homedir(), IDE_GLOBAL_PATHS[ide]);
+    return join2(homedir(), IDE_GLOBAL_PATHS[ide]);
   }
-  return join(process.cwd(), IDE_PATHS[ide]);
+  return join2(process.cwd(), IDE_PATHS[ide]);
 }
 
 // src/utils/installer.ts
 import { mkdir, writeFile, rm, symlink, lstat } from "fs/promises";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 async function installSkillFiles(skillName, files, targetDir) {
-  const skillDir = join2(targetDir, skillName);
+  const skillDir = join3(targetDir, skillName);
   for (const file of files) {
-    const filePath = join2(skillDir, file.path);
-    const fileDir = join2(filePath, "..");
+    const filePath = join3(skillDir, file.path);
+    const fileDir = join3(filePath, "..");
     await mkdir(fileDir, { recursive: true });
     await writeFile(filePath, file.content);
   }
 }
 async function symlinkSkill(skillName, sourcePath, targetDir) {
-  const targetPath = join2(targetDir, skillName);
+  const targetPath = join3(targetDir, skillName);
   try {
     const stats = await lstat(targetPath);
     if (stats.isSymbolicLink() || stats.isDirectory()) {
@@ -700,7 +752,7 @@ function trackEvent(event, data) {
 import pc6 from "picocolors";
 import ora2 from "ora";
 import { mkdir as mkdir2, writeFile as writeFile2, readFile, unlink } from "fs/promises";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 import { homedir as homedir3 } from "os";
 import { spawn } from "child_process";
 import { input, select as select2 } from "@inquirer/prompts";
@@ -1453,9 +1505,9 @@ async function generateCommand(options) {
       log.blank();
     };
     const openInEditor = async () => {
-      const previewDir = join4(homedir3(), ".context7", "previews");
+      const previewDir = join5(homedir3(), ".context7", "previews");
       await mkdir2(previewDir, { recursive: true });
-      previewFile = join4(previewDir, `${skillName}.md`);
+      previewFile = join5(previewDir, `${skillName}.md`);
       if (!previewFileWritten) {
         await writeFile2(previewFile, generatedContent, "utf-8");
         previewFileWritten = true;
@@ -1532,8 +1584,8 @@ async function generateCommand(options) {
     if (options.output && !targetDir.includes("/.config/") && !targetDir.startsWith(homedir3())) {
       finalDir = targetDir.replace(process.cwd(), options.output);
     }
-    const skillDir = join4(finalDir, skillName);
-    const skillPath = join4(skillDir, "SKILL.md");
+    const skillDir = join5(finalDir, skillName);
+    const skillPath = join5(skillDir, "SKILL.md");
     try {
       await mkdir2(skillDir, { recursive: true });
       await writeFile2(skillPath, generatedContent, "utf-8");
@@ -1552,7 +1604,7 @@ async function generateCommand(options) {
     log.blank();
     console.log(pc6.yellow("Fix permissions with:"));
     for (const dir of failedDirs) {
-      const parentDir = join4(dir, "..");
+      const parentDir = join5(dir, "..");
       console.log(pc6.dim(`  sudo chown -R $(whoami) "${parentDir}"`));
     }
     log.blank();
@@ -1574,7 +1626,7 @@ import { homedir as homedir4 } from "os";
 
 // src/utils/deps.ts
 import { readFile as readFile2 } from "fs/promises";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 async function readFileOrNull(path2) {
   try {
     return await readFile2(path2, "utf-8");
@@ -1586,7 +1638,7 @@ function isSkippedLocally(name) {
   return name.startsWith("@types/");
 }
 async function parsePackageJson(cwd) {
-  const content = await readFileOrNull(join5(cwd, "package.json"));
+  const content = await readFileOrNull(join6(cwd, "package.json"));
   if (!content) return [];
   try {
     const pkg2 = JSON.parse(content);
@@ -1603,7 +1655,7 @@ async function parsePackageJson(cwd) {
   }
 }
 async function parseRequirementsTxt(cwd) {
-  const content = await readFileOrNull(join5(cwd, "requirements.txt"));
+  const content = await readFileOrNull(join6(cwd, "requirements.txt"));
   if (!content) return [];
   const deps = [];
   for (const line of content.split("\n")) {
@@ -1617,7 +1669,7 @@ async function parseRequirementsTxt(cwd) {
   return deps;
 }
 async function parsePyprojectToml(cwd) {
-  const content = await readFileOrNull(join5(cwd, "pyproject.toml"));
+  const content = await readFileOrNull(join6(cwd, "pyproject.toml"));
   if (!content) return [];
   const deps = [];
   const seen = /* @__PURE__ */ new Set();
@@ -1772,13 +1824,12 @@ 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 popularityColWidth = 13;
       const choices = skillsWithRepo.map((s, index) => {
         const indexStr = pc7.dim(`${(index + 1).toString().padStart(indexWidth)}.`);
         const paddedName = s.name.padEnd(maxNameLen);
-        const installsRaw = s.installCount ? String(s.installCount) : "-";
-        const paddedInstalls = formatInstallCount(s.installCount, pc7.dim("-")) + " ".repeat(installsColWidth - installsRaw.length);
-        const trust = formatTrustScore(s.trustScore);
+        const popularity = formatPopularity(s.installCount) + " ".repeat(popularityColWidth - 4);
+        const trust = formatTrust(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);
@@ -1787,11 +1838,13 @@ async function installCommand(input2, skillName, options) {
           "",
           `${pc7.yellow("Skill:")}       ${skillLink}`,
           `${pc7.yellow("Repo:")}        ${repoLink}`,
+          `${pc7.yellow("Installs:")}    ${pc7.white(formatInstallRange(s.installCount))}`,
+          `${pc7.yellow("Trust:")}       ${s.trustScore !== void 0 && s.trustScore >= 0 ? pc7.white(s.trustScore.toFixed(1)) : pc7.dim("-")}`,
           `${pc7.yellow("Description:")}`,
           pc7.white(s.description || "No description")
         ];
         return {
-          name: `${indexStr} ${paddedName} ${paddedInstalls}${trust}`,
+          name: `${indexStr} ${paddedName} ${popularity}${trust}`,
           value: s,
           description: metadataLines.join("\n")
         };
@@ -1799,7 +1852,7 @@ async function installCommand(input2, skillName, options) {
       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 headerLine = headerPad + pc7.dim("Popularity".padEnd(popularityColWidth)) + pc7.dim("Trust");
       try {
         selectedSkills = await checkboxWithHover({
           message: `Select skills to install:
@@ -1856,7 +1909,7 @@ ${headerLine}`,
         }
         throw dirErr;
       }
-      const primarySkillDir = join6(primaryDir, skill.name);
+      const primarySkillDir = join7(primaryDir, skill.name);
       for (const targetDir of symlinkDirs) {
         try {
           await symlinkSkill(skill.name, primarySkillDir, targetDir);
@@ -1884,7 +1937,7 @@ ${headerLine}`,
     log.blank();
     log.warn("Fix permissions with:");
     for (const dir of failedDirs) {
-      const parentDir = join6(dir, "..");
+      const parentDir = join7(dir, "..");
       log.dim(`  sudo chown -R $(whoami) "${parentDir}"`);
     }
     log.blank();
@@ -1921,14 +1974,13 @@ async function searchCommand(query) {
   const nameWithRepo = (s) => `${s.name} ${pc7.dim(`(${s.project})`)}`;
   const nameWithRepoLen = (s) => `${s.name} (${s.project})`.length;
   const maxNameLen = Math.max(...data.results.map(nameWithRepoLen));
-  const installsColWidth = 10;
+  const popularityColWidth = 13;
   const choices = data.results.map((s, index) => {
     const indexStr = pc7.dim(`${(index + 1).toString().padStart(indexWidth)}.`);
     const rawLen = nameWithRepoLen(s);
     const displayName = nameWithRepo(s) + " ".repeat(maxNameLen - rawLen);
-    const installsRaw = s.installCount ? String(s.installCount) : "-";
-    const paddedInstalls = formatInstallCount(s.installCount, pc7.dim("-")) + " ".repeat(installsColWidth - installsRaw.length);
-    const trust = formatTrustScore(s.trustScore);
+    const popularity = formatPopularity(s.installCount) + " ".repeat(popularityColWidth - 4);
+    const trust = formatTrust(s.trustScore);
     const skillLink = terminalLink(
       s.name,
       `https://context7.com/skills${s.project}/${s.name}`,
@@ -1940,18 +1992,20 @@ async function searchCommand(query) {
       "",
       `${pc7.yellow("Skill:")}       ${skillLink}`,
       `${pc7.yellow("Repo:")}        ${repoLink}`,
+      `${pc7.yellow("Installs:")}    ${pc7.white(formatInstallRange(s.installCount))}`,
+      `${pc7.yellow("Trust:")}       ${s.trustScore !== void 0 && s.trustScore >= 0 ? pc7.white(s.trustScore.toFixed(1)) : pc7.dim("-")}`,
       `${pc7.yellow("Description:")}`,
       pc7.white(s.description || "No description")
     ];
     return {
-      name: `${indexStr} ${displayName} ${paddedInstalls}${trust}`,
+      name: `${indexStr} ${displayName} ${popularity}${trust}`,
       value: s,
       description: metadataLines.join("\n")
     };
   });
   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 headerLine = headerPad + pc7.dim("Popularity".padEnd(popularityColWidth)) + pc7.dim("Trust");
   let selectedSkills;
   try {
     selectedSkills = await checkboxWithHover({
@@ -2008,7 +2062,7 @@ ${headerLine}`,
         }
         throw dirErr;
       }
-      const primarySkillDir = join6(primaryDir, skill.name);
+      const primarySkillDir = join7(primaryDir, skill.name);
       for (const targetDir of symlinkDirs) {
         try {
           await symlinkSkill(skill.name, primarySkillDir, targetDir);
@@ -2036,7 +2090,7 @@ ${headerLine}`,
     log.blank();
     log.warn("Fix permissions with:");
     for (const dir of failedDirs) {
-      const parentDir = join6(dir, "..");
+      const parentDir = join7(dir, "..");
       log.dim(`  sudo chown -R $(whoami) "${parentDir}"`);
     }
     log.blank();
@@ -2063,7 +2117,7 @@ async function listCommand(options) {
   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 dir = ide === "universal" ? join7(baseDir, scope === "global" ? UNIVERSAL_SKILLS_GLOBAL_PATH : UNIVERSAL_SKILLS_PATH) : join7(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) {
@@ -2072,14 +2126,14 @@ async function listCommand(options) {
     }
   } else {
     const universalPath = scope === "global" ? UNIVERSAL_SKILLS_GLOBAL_PATH : UNIVERSAL_SKILLS_PATH;
-    const universalDir = join6(baseDir, universalPath);
+    const universalDir = join7(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 dir = join7(baseDir, pathMap[ide]);
       const skills = await scanDir(dir);
       if (skills.length > 0) {
         results.push({ label: IDE_NAMES[ide], path: pathMap[ide], skills });
@@ -2107,7 +2161,7 @@ async function removeCommand(name, options) {
     return;
   }
   const skillsDir = getTargetDirFromSelection(target.ide, target.scope);
-  const skillPath = join6(skillsDir, name);
+  const skillPath = join7(skillsDir, name);
   try {
     await rm2(skillPath, { recursive: true });
     log.success(`Removed skill: ${name}`);
@@ -2195,18 +2249,17 @@ async function suggestCommand(options) {
   const nameWithRepo = (s) => `${s.name} ${pc7.dim(`(${s.project})`)}`;
   const nameWithRepoLen = (s) => `${s.name} (${s.project})`.length;
   const maxNameLen = Math.max(...skills.map(nameWithRepoLen));
-  const installsColWidth = 10;
-  const trustColWidth = 12;
+  const popularityColWidth = 13;
+  const trustColWidth = 8;
   const maxMatchedLen = Math.max(...skills.map((s) => s.matchedDep.length));
   const indexWidth = skills.length.toString().length;
   const choices = skills.map((s, index) => {
     const indexStr = pc7.dim(`${(index + 1).toString().padStart(indexWidth)}.`);
     const rawLen = nameWithRepoLen(s);
     const displayName = nameWithRepo(s) + " ".repeat(maxNameLen - rawLen);
-    const installsRaw = s.installCount ? String(s.installCount) : "-";
-    const paddedInstalls = formatInstallCount(s.installCount, pc7.dim("-")) + " ".repeat(installsColWidth - installsRaw.length);
-    const trustRaw = s.trustScore !== void 0 && s.trustScore >= 0 ? s.trustScore.toFixed(1) : "-";
-    const trust = formatTrustScore(s.trustScore) + " ".repeat(trustColWidth - trustRaw.length);
+    const popularity = formatPopularity(s.installCount) + " ".repeat(popularityColWidth - 4);
+    const trustLabel = getTrustLabel(s.trustScore);
+    const trust = formatTrust(s.trustScore) + " ".repeat(trustColWidth - trustLabel.length);
     const matched = pc7.yellow(s.matchedDep.padEnd(maxMatchedLen));
     const skillLink = terminalLink(
       s.name,
@@ -2219,19 +2272,21 @@ async function suggestCommand(options) {
       "",
       `${pc7.yellow("Skill:")}       ${skillLink}`,
       `${pc7.yellow("Repo:")}        ${repoLink}`,
+      `${pc7.yellow("Installs:")}    ${pc7.white(formatInstallRange(s.installCount))}`,
+      `${pc7.yellow("Trust:")}       ${s.trustScore !== void 0 && s.trustScore >= 0 ? pc7.white(s.trustScore.toFixed(1)) : pc7.dim("-")}`,
       `${pc7.yellow("Relevant:")}    ${pc7.white(s.matchedDep)}`,
       `${pc7.yellow("Description:")}`,
       pc7.white(s.description || "No description")
     ];
     return {
-      name: `${indexStr} ${displayName} ${paddedInstalls}${trust}${matched}`,
+      name: `${indexStr} ${displayName} ${popularity}${trust}${matched}`,
       value: s,
       description: metadataLines.join("\n")
     };
   });
   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 headerLine = headerPad + pc7.dim("Popularity".padEnd(popularityColWidth)) + pc7.dim("Trust".padEnd(trustColWidth)) + pc7.dim("Relevant");
   let selectedSkills;
   try {
     selectedSkills = await checkboxWithHover({
@@ -2287,7 +2342,7 @@ ${headerLine}`,
         }
         throw dirErr;
       }
-      const primarySkillDir = join6(primaryDir, skill.name);
+      const primarySkillDir = join7(primaryDir, skill.name);
       for (const targetDir of symlinkDirs) {
         try {
           await symlinkSkill(skill.name, primarySkillDir, targetDir);
@@ -2315,7 +2370,7 @@ ${headerLine}`,
     log.blank();
     log.warn("Fix permissions with:");
     for (const dir of failedDirs) {
-      const parentDir = join6(dir, "..");
+      const parentDir = join7(dir, "..");
       log.dim(`  sudo chown -R $(whoami) "${parentDir}"`);
     }
     log.blank();
@@ -2330,13 +2385,14 @@ ${headerLine}`,
 // src/commands/setup.ts
 import pc8 from "picocolors";
 import ora4 from "ora";
+import { select as select3 } from "@inquirer/prompts";
 import { mkdir as mkdir4, writeFile as writeFile4 } from "fs/promises";
-import { dirname as dirname3, join as join8 } from "path";
+import { dirname as dirname4, join as join9 } from "path";
 import { randomBytes as randomBytes2 } from "crypto";
 
 // src/setup/agents.ts
 import { access as access2 } from "fs/promises";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 import { homedir as homedir5 } from "os";
 var SETUP_AGENT_NAMES = {
   claude: "Claude Code",
@@ -2363,43 +2419,43 @@ var agents = {
     displayName: "Claude Code",
     mcp: {
       projectPath: ".mcp.json",
-      globalPath: join7(homedir5(), ".claude.json"),
+      globalPath: join8(homedir5(), ".claude.json"),
       configKey: "mcpServers",
       buildEntry: (auth) => withHeaders({ type: "http", url: mcpUrl(auth) }, auth)
     },
     rule: {
-      dir: (scope) => scope === "global" ? join7(homedir5(), ".claude", "rules") : join7(".claude", "rules"),
+      dir: (scope) => scope === "global" ? join8(homedir5(), ".claude", "rules") : join8(".claude", "rules"),
       filename: "context7.md"
     },
     skill: {
-      name: "documentation-lookup",
-      dir: (scope) => scope === "global" ? join7(homedir5(), ".claude", "skills") : join7(".claude", "skills")
+      name: "context7-mcp",
+      dir: (scope) => scope === "global" ? join8(homedir5(), ".claude", "skills") : join8(".claude", "skills")
     },
     detect: {
       projectPaths: [".mcp.json", ".claude"],
-      globalPaths: [join7(homedir5(), ".claude")]
+      globalPaths: [join8(homedir5(), ".claude")]
     }
   },
   cursor: {
     name: "cursor",
     displayName: "Cursor",
     mcp: {
-      projectPath: join7(".cursor", "mcp.json"),
-      globalPath: join7(homedir5(), ".cursor", "mcp.json"),
+      projectPath: join8(".cursor", "mcp.json"),
+      globalPath: join8(homedir5(), ".cursor", "mcp.json"),
       configKey: "mcpServers",
       buildEntry: (auth) => withHeaders({ url: mcpUrl(auth) }, auth)
     },
     rule: {
-      dir: (scope) => scope === "global" ? join7(homedir5(), ".cursor", "rules") : join7(".cursor", "rules"),
+      dir: (scope) => scope === "global" ? join8(homedir5(), ".cursor", "rules") : join8(".cursor", "rules"),
       filename: "context7.mdc"
     },
     skill: {
-      name: "documentation-lookup",
-      dir: (scope) => scope === "global" ? join7(homedir5(), ".cursor", "skills") : join7(".cursor", "skills")
+      name: "context7-mcp",
+      dir: (scope) => scope === "global" ? join8(homedir5(), ".cursor", "skills") : join8(".cursor", "skills")
     },
     detect: {
       projectPaths: [".cursor"],
-      globalPaths: [join7(homedir5(), ".cursor")]
+      globalPaths: [join8(homedir5(), ".cursor")]
     }
   },
   opencode: {
@@ -2407,22 +2463,22 @@ var agents = {
     displayName: "OpenCode",
     mcp: {
       projectPath: ".opencode.json",
-      globalPath: join7(homedir5(), ".config", "opencode", "opencode.json"),
+      globalPath: join8(homedir5(), ".config", "opencode", "opencode.json"),
       configKey: "mcp",
       buildEntry: (auth) => withHeaders({ type: "remote", url: mcpUrl(auth), enabled: true }, auth)
     },
     rule: {
-      dir: (scope) => scope === "global" ? join7(homedir5(), ".config", "opencode", "rules") : join7(".opencode", "rules"),
+      dir: (scope) => scope === "global" ? join8(homedir5(), ".config", "opencode", "rules") : join8(".opencode", "rules"),
       filename: "context7.md",
-      instructionsGlob: (scope) => scope === "global" ? join7(homedir5(), ".config", "opencode", "rules", "*.md") : ".opencode/rules/*.md"
+      instructionsGlob: (scope) => scope === "global" ? join8(homedir5(), ".config", "opencode", "rules", "*.md") : ".opencode/rules/*.md"
     },
     skill: {
-      name: "documentation-lookup",
-      dir: (scope) => scope === "global" ? join7(homedir5(), ".agents", "skills") : join7(".agents", "skills")
+      name: "context7-mcp",
+      dir: (scope) => scope === "global" ? join8(homedir5(), ".agents", "skills") : join8(".agents", "skills")
     },
     detect: {
       projectPaths: [".opencode.json"],
-      globalPaths: [join7(homedir5(), ".config", "opencode")]
+      globalPaths: [join8(homedir5(), ".config", "opencode")]
     }
   }
 };
@@ -2443,7 +2499,7 @@ async function detectAgents(scope) {
   for (const agent of Object.values(agents)) {
     const paths = scope === "global" ? agent.detect.globalPaths : agent.detect.projectPaths;
     for (const p of paths) {
-      const fullPath = scope === "global" ? p : join7(process.cwd(), p);
+      const fullPath = scope === "global" ? p : join8(process.cwd(), p);
       if (await pathExists(fullPath)) {
         detected.push(agent.name);
         break;
@@ -2454,60 +2510,6 @@ async function detectAgents(scope) {
 }
 
 // src/setup/templates.ts
-var SKILL_CONTENT = `---
-name: documentation-lookup
-description: This skill should be used when the user asks about libraries, frameworks, API references, or needs code examples. Activates for setup questions, code generation involving libraries, or mentions of specific frameworks like React, Vue, Next.js, Prisma, Supabase, etc.
----
-
-When the user asks about libraries, frameworks, or needs code examples, use Context7 to fetch current documentation instead of relying on training data.
-
-## When to Use This Skill
-
-Activate this skill when the user:
-
-- Asks setup or configuration questions ("How do I configure Next.js middleware?")
-- Requests code involving libraries ("Write a Prisma query for...")
-- Needs API references ("What are the Supabase auth methods?")
-- Mentions specific frameworks (React, Vue, Svelte, Express, Tailwind, etc.)
-
-## How to Fetch Documentation
-
-### Step 1: Resolve the Library ID
-
-Call \`resolve-library-id\` with:
-
-- \`libraryName\`: The library name extracted from the user's question
-- \`query\`: The user's full question (improves relevance ranking)
-
-### Step 2: Select the Best Match
-
-From the resolution results, choose based on:
-
-- Exact or closest name match to what the user asked for
-- Higher benchmark scores indicate better documentation quality
-- If the user mentioned a version (e.g., "React 19"), prefer version-specific IDs
-
-### Step 3: Fetch the Documentation
-
-Call \`query-docs\` with:
-
-- \`libraryId\`: The selected Context7 library ID (e.g., \`/vercel/next.js\`)
-- \`query\`: The user's specific question
-
-### Step 4: Use the Documentation
-
-Incorporate the fetched documentation into your response:
-
-- Answer the user's question using current, accurate information
-- Include relevant code examples from the docs
-- Cite the library version when relevant
-
-## Guidelines
-
-- **Be specific**: Pass the user's full question as the query for better results
-- **Version awareness**: When users mention versions ("Next.js 15", "React 19"), use version-specific library IDs if available from the resolution step
-- **Prefer official sources**: When multiple matches exist, prefer official/primary packages over community forks
-`;
 var RULE_CONTENT = `---
 alwaysApply: true
 ---
@@ -2524,7 +2526,7 @@ When working with libraries, frameworks, or APIs \u2014 use Context7 MCP to fetc
 
 // src/setup/mcp-writer.ts
 import { readFile as readFile3, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
-import { dirname as dirname2 } from "path";
+import { dirname as dirname3 } from "path";
 async function readJsonConfig(filePath) {
   let raw;
   try {
@@ -2558,7 +2560,7 @@ function mergeInstructions(config, glob) {
   return { ...config, instructions: [...instructions, glob] };
 }
 async function writeJsonConfig(filePath, config) {
-  await mkdir3(dirname2(filePath), { recursive: true });
+  await mkdir3(dirname3(filePath), { recursive: true });
   await writeFile3(filePath, JSON.stringify(config, null, 2) + "\n", "utf-8");
 }
 
@@ -2577,7 +2579,7 @@ function getSelectedAgents(options) {
   return agents2;
 }
 function registerSetupCommand(program2) {
-  program2.command("setup").description("Set up Context7 MCP and rule for your AI coding agent").option("--claude", "Set up for Claude Code").option("--cursor", "Set up for Cursor").option("--opencode", "Set up for OpenCode").option("-p, --project", "Configure for current project instead of globally").option("-y, --yes", "Skip confirmation prompts").option("--api-key <key>", "Use API key authentication").option("--oauth", "Use OAuth endpoint (IDE handles auth flow)").action(async (options) => {
+  program2.command("setup").description("Set up Context7 for your AI coding agent").option("--claude", "Set up for Claude Code").option("--cursor", "Set up for Cursor").option("--universal", "Set up for Universal (.agents/skills)").option("--antigravity", "Set up for Antigravity (.agent/skills)").option("--opencode", "Set up for OpenCode").option("--mcp", "Set up MCP server mode").option("--cli", "Set up CLI + Skills mode (no MCP server)").option("-p, --project", "Configure for current project instead of globally").option("-y, --yes", "Skip confirmation prompts").option("--api-key <key>", "Use API key authentication").option("--oauth", "Use OAuth endpoint (IDE handles auth flow)").action(async (options) => {
     await setupCommand(options);
   });
 }
@@ -2617,9 +2619,49 @@ async function resolveAuth(options) {
   if (!apiKey) return null;
   return { mode: "api-key", apiKey };
 }
+async function resolveMode(options) {
+  if (options.cli) return "cli";
+  if (options.mcp || options.yes || options.oauth || options.apiKey) return "mcp";
+  return select3({
+    message: "How should your agent access Context7?",
+    choices: [
+      {
+        name: `CLI + Skills
+    ${pc8.dim("Installs a find-docs skill that guides your agent to fetch up-to-date library docs using ")}${pc8.dim(pc8.bold("ctx7"))}${pc8.dim(" CLI commands")}`,
+        value: "cli"
+      },
+      {
+        name: `MCP server
+    ${pc8.dim("Agent calls Context7 tools via MCP protocol to retrieve up-to-date library docs")}`,
+        value: "mcp"
+      }
+    ],
+    theme: {
+      style: {
+        highlight: (text) => pc8.green(text),
+        answer: (text) => pc8.green(text.split("\n")[0].trim())
+      }
+    }
+  });
+}
+async function resolveCliAuth(apiKey) {
+  if (apiKey) {
+    saveTokens({ access_token: apiKey, token_type: "bearer" });
+    log.blank();
+    log.plain(`${pc8.green("\u2714")} Authenticated`);
+    return;
+  }
+  const existingTokens = loadTokens();
+  if (existingTokens && !isTokenExpired(existingTokens)) {
+    log.blank();
+    log.plain(`${pc8.green("\u2714")} Authenticated`);
+    return;
+  }
+  await performLogin();
+}
 async function isAlreadyConfigured(agentName, scope) {
   const agent = getAgent(agentName);
-  const mcpPath = scope === "global" ? agent.mcp.globalPath : join8(process.cwd(), agent.mcp.projectPath);
+  const mcpPath = scope === "global" ? agent.mcp.globalPath : join9(process.cwd(), agent.mcp.projectPath);
   try {
     const existing = await readJsonConfig(mcpPath);
     const section = existing[agent.mcp.configKey] ?? {};
@@ -2628,10 +2670,10 @@ async function isAlreadyConfigured(agentName, scope) {
     return false;
   }
 }
-async function promptAgents(scope) {
+async function promptAgents(scope, mode) {
   const choices = await Promise.all(
     ALL_AGENT_NAMES.map(async (name) => {
-      const configured = await isAlreadyConfigured(name, scope);
+      const configured = mode === "mcp" ? await isAlreadyConfigured(name, scope) : false;
       return {
         name: SETUP_AGENT_NAMES[name],
         value: name,
@@ -2643,10 +2685,11 @@ async function promptAgents(scope) {
     log.info("Context7 is already configured for all detected agents.");
     return null;
   }
+  const message = mode === "cli" ? "Install find-docs skill for which agents?" : "Which agents do you want to set up?";
   try {
     return await checkboxWithHover(
       {
-        message: "Which agents do you want to set up?",
+        message,
         choices,
         loop: false,
         theme: CHECKBOX_THEME
@@ -2657,13 +2700,13 @@ async function promptAgents(scope) {
     return null;
   }
 }
-async function resolveAgents(options, scope) {
+async function resolveAgents(options, scope, mode = "mcp") {
   const explicit = getSelectedAgents(options);
   if (explicit.length > 0) return explicit;
   const detected = await detectAgents(scope);
   if (detected.length > 0 && options.yes) return detected;
   log.blank();
-  const selected = await promptAgents(scope);
+  const selected = await promptAgents(scope, mode);
   if (!selected) {
     log.warn("Setup cancelled");
     return [];
@@ -2672,7 +2715,7 @@ async function resolveAgents(options, scope) {
 }
 async function setupAgent(agentName, auth, scope) {
   const agent = getAgent(agentName);
-  const mcpPath = scope === "global" ? agent.mcp.globalPath : join8(process.cwd(), agent.mcp.projectPath);
+  const mcpPath = scope === "global" ? agent.mcp.globalPath : join9(process.cwd(), agent.mcp.projectPath);
   let mcpStatus;
   try {
     const existing = await readJsonConfig(mcpPath);
@@ -2694,21 +2737,24 @@ async function setupAgent(agentName, auth, scope) {
   } catch (err) {
     mcpStatus = `failed: ${err instanceof Error ? err.message : String(err)}`;
   }
-  const rulePath = scope === "global" ? join8(agent.rule.dir("global"), agent.rule.filename) : join8(process.cwd(), agent.rule.dir("project"), agent.rule.filename);
+  const rulePath = scope === "global" ? join9(agent.rule.dir("global"), agent.rule.filename) : join9(process.cwd(), agent.rule.dir("project"), agent.rule.filename);
   let ruleStatus;
   try {
-    await mkdir4(dirname3(rulePath), { recursive: true });
+    await mkdir4(dirname4(rulePath), { recursive: true });
     await writeFile4(rulePath, RULE_CONTENT, "utf-8");
     ruleStatus = "installed";
   } catch (err) {
     ruleStatus = `failed: ${err instanceof Error ? err.message : String(err)}`;
   }
-  const skillDir = scope === "global" ? agent.skill.dir("global") : join8(process.cwd(), agent.skill.dir("project"));
-  const skillPath = join8(skillDir, agent.skill.name, "SKILL.md");
+  const skillDir = scope === "global" ? agent.skill.dir("global") : join9(process.cwd(), agent.skill.dir("project"));
+  const skillPath = join9(skillDir, agent.skill.name, "SKILL.md");
   let skillStatus;
   try {
-    await mkdir4(dirname3(skillPath), { recursive: true });
-    await writeFile4(skillPath, SKILL_CONTENT, "utf-8");
+    const downloadData = await downloadSkill("/upstash/context7", agent.skill.name);
+    if (downloadData.error || downloadData.files.length === 0) {
+      throw new Error(downloadData.error || "no files");
+    }
+    await installSkillFiles(agent.skill.name, downloadData.files, skillDir);
     skillStatus = "installed";
   } catch (err) {
     skillStatus = `failed: ${err instanceof Error ? err.message : String(err)}`;
@@ -2723,11 +2769,7 @@ async function setupAgent(agentName, auth, scope) {
     skillPath
   };
 }
-async function setupCommand(options) {
-  trackEvent("command", { name: "setup" });
-  const scope = options.project ? "project" : "global";
-  const agents2 = await resolveAgents(options, scope);
-  if (agents2.length === 0) return;
+async function setupMcp(agents2, options, scope) {
   const auth = await resolveAuth(options);
   if (!auth) {
     log.warn("Setup cancelled");
@@ -2756,6 +2798,62 @@ async function setupCommand(options) {
   }
   log.blank();
   trackEvent("setup", { agents: agents2, scope, authMode: auth.mode });
+  trackEvent("install", { skills: ["/upstash/context7/context7-mcp"], ides: agents2 });
+}
+async function setupCli(options) {
+  await resolveCliAuth(options.apiKey);
+  const targets = await promptForInstallTargets({ ...options, global: !options.project }, false);
+  if (!targets) {
+    log.warn("Setup cancelled");
+    return;
+  }
+  log.blank();
+  const spinner = ora4("Downloading find-docs skill...").start();
+  const downloadData = await downloadSkill("/upstash/context7", "find-docs");
+  if (downloadData.error || downloadData.files.length === 0) {
+    spinner.fail(`Failed to download find-docs skill: ${downloadData.error || "no files"}`);
+    return;
+  }
+  spinner.succeed("Downloaded find-docs skill");
+  const targetDirs = getTargetDirs(targets);
+  const installSpinner = ora4("Installing find-docs skill...").start();
+  for (const dir of targetDirs) {
+    installSpinner.text = `Installing to ${dir}...`;
+    await installSkillFiles("find-docs", downloadData.files, dir);
+  }
+  installSpinner.stop();
+  log.blank();
+  log.plain(`${pc8.green("\u2714")} Context7 CLI setup complete`);
+  log.blank();
+  for (const dir of targetDirs) {
+    log.itemAdd(
+      `find-docs  ${pc8.dim("Guides your agent to fetch up-to-date library docs on demand using ctx7 CLI commands")}`
+    );
+    log.plain(`    ${pc8.dim(dir)}`);
+  }
+  log.blank();
+  log.plain(`  ${pc8.bold("Next steps")}`);
+  log.plain(`    Ask your agent: ${pc8.cyan(`"Use ctx7 CLI to look up React hooks"`)}`);
+  log.blank();
+  trackEvent("setup", { mode: "cli" });
+  trackEvent("install", { skills: ["/upstash/context7/find-docs"], ides: targets.ides });
+}
+async function setupCommand(options) {
+  trackEvent("command", { name: "setup" });
+  try {
+    const mode = await resolveMode(options);
+    if (mode === "mcp") {
+      const scope = options.project ? "project" : "global";
+      const agents2 = await resolveAgents(options, scope, mode);
+      if (agents2.length === 0) return;
+      await setupMcp(agents2, options, scope);
+    } else {
+      await setupCli(options);
+    }
+  } catch (err) {
+    if (err instanceof Error && err.name === "ExitPromptError") process.exit(0);
+    throw err;
+  }
 }
 
 // src/commands/docs.ts
@@ -2846,9 +2944,9 @@ async function resolveCommand(library, query, options) {
 }
 async function queryCommand(libraryId, query, options) {
   trackEvent("command", { name: "docs" });
-  if (!libraryId.startsWith("/")) {
-    log.error(`Invalid library ID: ${libraryId}`);
-    log.info(`Library IDs start with "/" (e.g., /facebook/react)`);
+  if (!libraryId.startsWith("/") || !/^\/[^/]+\/[^/]/.test(libraryId)) {
+    log.error(`Invalid library ID: "${libraryId}"`);
+    log.info(`Expected format: /owner/repo or /owner/repo/version (e.g., /facebook/react)`);
     log.info(`Run "ctx7 library <name>" to find the correct ID`);
     process.exitCode = 1;
     return;
@@ -2927,15 +3025,6 @@ function registerDocsCommands(program2) {
   });
 }
 
-// src/constants.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { fileURLToPath } from "url";
-import { dirname as dirname4, join as join9 } from "path";
-var __dirname = dirname4(fileURLToPath(import.meta.url));
-var pkg = JSON.parse(readFileSync2(join9(__dirname, "../package.json"), "utf-8"));
-var VERSION = pkg.version;
-var NAME = pkg.name;
-
 // src/index.ts
 var brand = {
   primary: pc10.green,