ctx7 0.3.8 → 0.3.10

package/dist/index.js

@@ -1,11 +1,4 @@
 #!/usr/bin/env node
-import {
-  appendTomlServer,
-  mergeServerEntry,
-  readJsonConfig,
-  resolveMcpPath,
-  writeJsonConfig
-} from "./chunk-WKOIWR6Y.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -36,6 +29,7 @@ function parseSkillInput(input2) {
 }
 
 // src/utils/github.ts
+import { execSync } from "child_process";
 var GITHUB_API = "https://api.github.com";
 var GITHUB_RAW = "https://raw.githubusercontent.com";
 function parseGitHubUrl(url) {
@@ -76,6 +70,115 @@ function parseGitHubUrl(url) {
     return null;
   }
 }
+function getGitHubToken() {
+  const envToken = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+  if (envToken) return envToken;
+  try {
+    return execSync("gh auth token", { stdio: ["pipe", "pipe", "ignore"] }).toString().trim();
+  } catch {
+    return void 0;
+  }
+}
+function parseSkillFrontmatter(content) {
+  const frontmatterMatch = content.match(/^---\s*\n([\s\S]*?)\n---/);
+  if (!frontmatterMatch) return null;
+  const frontmatter = frontmatterMatch[1];
+  const nameMatch = frontmatter.match(/^name:\s*(.+)$/m);
+  if (!nameMatch) return null;
+  const name = nameMatch[1].trim().replace(/^["']|["']$/g, "").toLowerCase();
+  let description = "";
+  const multiLineMatch = frontmatter.match(/^description:\s*([|>])-?\s*$/m);
+  if (multiLineMatch) {
+    const descLineIndex = frontmatter.indexOf("description:");
+    const lines = frontmatter.slice(descLineIndex).split("\n").slice(1);
+    const indentedLines = [];
+    for (const line of lines) {
+      if (line.trim() === "") {
+        indentedLines.push("");
+        continue;
+      }
+      if (/^\s+/.test(line)) {
+        indentedLines.push(line);
+      } else {
+        break;
+      }
+    }
+    const firstNonEmpty = indentedLines.find((l) => l.trim().length > 0);
+    const indent = firstNonEmpty?.match(/^(\s+)/)?.[1].length ?? 0;
+    description = indentedLines.map((line) => line.slice(indent)).join(" ").replace(/\s+/g, " ").trim();
+  } else {
+    const singleMatch = frontmatter.match(/^description:\s*(.+)$/m);
+    if (singleMatch) {
+      const value = singleMatch[1].trim();
+      if (!["|", ">", "|-", ">-"].includes(value)) {
+        description = value.replace(/^["']|["']$/g, "");
+      }
+    }
+  }
+  if (!description) return null;
+  return { name, description };
+}
+function getGitHubHeaders() {
+  const ghToken = getGitHubToken();
+  return {
+    Accept: "application/vnd.github.v3+json",
+    "User-Agent": "context7-cli",
+    ...ghToken && { Authorization: `token ${ghToken}` }
+  };
+}
+async function fetchRepoTree(owner, repo, branch, headers) {
+  const treeUrl = `${GITHUB_API}/repos/${owner}/${repo}/git/trees/${branch}?recursive=1`;
+  const response = await fetch(treeUrl, { headers });
+  if (!response.ok) return null;
+  return await response.json();
+}
+async function fetchDefaultBranch(owner, repo, headers) {
+  const response = await fetch(`${GITHUB_API}/repos/${owner}/${repo}`, { headers });
+  if (!response.ok) return { status: response.status };
+  const data = await response.json();
+  return { branch: data.default_branch };
+}
+async function listSkillsFromGitHub(project) {
+  try {
+    const parts = project.split("/").filter(Boolean);
+    if (parts.length < 2) return { status: "error", error: "Invalid project format" };
+    const [owner, repo] = parts;
+    const headers = getGitHubHeaders();
+    const branchResult = await fetchDefaultBranch(owner, repo, headers);
+    if ("status" in branchResult) return { status: "repo_not_found" };
+    const treeData = await fetchRepoTree(owner, repo, branchResult.branch, headers);
+    if (!treeData) return { status: "error", error: "Could not fetch repository tree" };
+    const skillMdFiles = treeData.tree.filter(
+      (item) => item.type === "blob" && item.path.toLowerCase().endsWith("skill.md")
+    );
+    const skills = [];
+    for (const item of skillMdFiles) {
+      const rawUrl = `${GITHUB_RAW}/${owner}/${repo}/${branchResult.branch}/${item.path}`;
+      const response = await fetch(rawUrl, { headers });
+      if (!response.ok) continue;
+      const content = await response.text();
+      const meta = parseSkillFrontmatter(content);
+      if (!meta) continue;
+      const skillDir = item.path.split("/").slice(0, -1).join("/");
+      skills.push({
+        name: meta.name,
+        description: meta.description,
+        url: `https://github.com/${owner}/${repo}/tree/${branchResult.branch}/${skillDir}`,
+        project
+      });
+    }
+    return { status: "ok", skills };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { status: "error", error: message };
+  }
+}
+async function getSkillFromGitHub(project, skillName) {
+  const result = await listSkillsFromGitHub(project);
+  if (result.status !== "ok") return result;
+  const skill = result.skills.find((s) => s.name === skillName.toLowerCase());
+  return { ...result, skill };
+}
 async function downloadSkillFromGitHub(skill) {
   try {
     const parsed = parseGitHubUrl(skill.url);
@@ -83,17 +186,11 @@ async function downloadSkillFromGitHub(skill) {
       return { files: [], error: `Invalid GitHub URL: ${skill.url}` };
     }
     const { owner, repo, branch, path: skillPath } = parsed;
-    const treeUrl = `${GITHUB_API}/repos/${owner}/${repo}/git/trees/${branch}?recursive=1`;
-    const treeResponse = await fetch(treeUrl, {
-      headers: {
-        Accept: "application/vnd.github.v3+json",
-        "User-Agent": "context7-cli"
-      }
-    });
-    if (!treeResponse.ok) {
-      return { files: [], error: `GitHub API error: ${treeResponse.status}` };
+    const ghHeaders = getGitHubHeaders();
+    const treeData = await fetchRepoTree(owner, repo, branch, ghHeaders);
+    if (!treeData) {
+      return { files: [], error: `GitHub API error` };
     }
-    const treeData = await treeResponse.json();
     const skillFiles = treeData.tree.filter(
       (item) => item.type === "blob" && item.path.startsWith(skillPath + "/")
     );
@@ -103,7 +200,7 @@ async function downloadSkillFromGitHub(skill) {
     const files = [];
     for (const item of skillFiles) {
       const rawUrl = `${GITHUB_RAW}/${owner}/${repo}/${branch}/${item.path}`;
-      const fileResponse = await fetch(rawUrl);
+      const fileResponse = await fetch(rawUrl, { headers: ghHeaders });
       if (!fileResponse.ok) {
         console.warn(`Failed to fetch ${item.path}: ${fileResponse.status}`);
         continue;
@@ -174,11 +271,19 @@ async function suggestSkills(dependencies, accessToken) {
 async function downloadSkill(project, skillName) {
   const skillData = await getSkill(project, skillName);
   if (skillData.error) {
-    return {
-      skill: { name: skillName, description: "", url: "", project },
-      files: [],
-      error: skillData.message || skillData.error
-    };
+    const ghResult = await getSkillFromGitHub(project, skillName);
+    if (ghResult.status !== "ok" || !ghResult.skill) {
+      return {
+        skill: { name: skillName, description: "", url: "", project },
+        files: [],
+        error: skillData.message || skillData.error
+      };
+    }
+    const { files: files2, error: error2 } = await downloadSkillFromGitHub(ghResult.skill);
+    if (error2) {
+      return { skill: ghResult.skill, files: [], error: error2 };
+    }
+    return { skill: ghResult.skill, files: files2 };
   }
   const skill = {
     name: skillData.name,
@@ -1833,23 +1938,45 @@ async function installCommand(input2, skillName, options) {
       if (skillData.error === "prompt_injection_detected") {
         spinner.fail(pc7.red(`Prompt injection detected in skill: ${skillName}`));
         log.warn("This skill contains potentially malicious content and cannot be installed.");
-      } else {
+        return;
+      }
+      spinner.text = `Fetching skill from GitHub: ${skillName}...`;
+      const ghResult = await getSkillFromGitHub(repo, skillName);
+      if (ghResult.status === "repo_not_found") {
+        spinner.fail(pc7.red(`Repository not found: ${repo}`));
+        return;
+      }
+      if (ghResult.status !== "ok" || !ghResult.skill) {
         spinner.fail(pc7.red(`Skill not found: ${skillName}`));
+        return;
       }
-      return;
+      spinner.succeed(`Found skill: ${skillName}`);
+      selectedSkills = [ghResult.skill];
+    } else {
+      spinner.succeed(`Found skill: ${skillName}`);
+      selectedSkills = [
+        {
+          name: skillData.name,
+          description: skillData.description,
+          url: skillData.url,
+          project: repo
+        }
+      ];
     }
-    spinner.succeed(`Found skill: ${skillName}`);
-    selectedSkills = [
-      {
-        name: skillData.name,
-        description: skillData.description,
-        url: skillData.url,
-        project: repo
-      }
-    ];
   } else {
-    const data = await listProjectSkills(repo);
-    if (data.error) {
+    let data = await listProjectSkills(repo);
+    if ((data.error || !data.skills || data.skills.length === 0) && !data.blockedSkillsCount) {
+      spinner.text = `Fetching skills from GitHub...`;
+      const ghResult = await listSkillsFromGitHub(repo);
+      if (ghResult.status === "repo_not_found") {
+        spinner.fail(pc7.red(`Repository not found: ${repo}`));
+        return;
+      }
+      if (ghResult.status === "ok" && ghResult.skills.length > 0) {
+        data = { project: repo, skills: ghResult.skills };
+      }
+    }
+    if (data.error && (!data.skills || data.skills.length === 0)) {
       spinner.fail(pc7.red(`Error: ${data.message || data.error}`));
       return;
     }
@@ -2433,8 +2560,8 @@ ${headerLine}`,
 import pc8 from "picocolors";
 import ora4 from "ora";
 import { select as select3 } from "@inquirer/prompts";
-import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
-import { dirname as dirname4, join as join9 } from "path";
+import { mkdir as mkdir4, readFile as readFile4, writeFile as writeFile4 } from "fs/promises";
+import { dirname as dirname5, join as join9 } from "path";
 import { randomBytes as randomBytes2 } from "crypto";
 
 // src/setup/agents.ts
@@ -2445,7 +2572,8 @@ var SETUP_AGENT_NAMES = {
   claude: "Claude Code",
   cursor: "Cursor",
   opencode: "OpenCode",
-  codex: "Codex"
+  codex: "Codex",
+  gemini: "Gemini CLI"
 };
 var AUTH_MODE_LABELS = {
   oauth: "OAuth",
@@ -2564,6 +2692,29 @@ var agents = {
       projectPaths: [".codex"],
       globalPaths: [join8(homedir5(), ".codex")]
     }
+  },
+  gemini: {
+    name: "gemini",
+    displayName: "Gemini CLI",
+    mcp: {
+      projectPaths: [join8(".gemini", "settings.json")],
+      globalPaths: [join8(homedir5(), ".gemini", "settings.json")],
+      configKey: "mcpServers",
+      buildEntry: (auth) => withHeaders({ httpUrl: mcpUrl(auth) }, auth)
+    },
+    rule: {
+      kind: "append",
+      file: (scope) => scope === "global" ? join8(homedir5(), ".gemini", "GEMINI.md") : "GEMINI.md",
+      sectionMarker: "<!-- context7 -->"
+    },
+    skill: {
+      name: "context7-mcp",
+      dir: (scope) => scope === "global" ? join8(homedir5(), ".gemini", "skills") : join8(".gemini", "skills")
+    },
+    detect: {
+      projectPaths: [".gemini"],
+      globalPaths: [join8(homedir5(), ".gemini")]
+    }
   }
 };
 function getAgent(name) {
@@ -2604,7 +2755,7 @@ Do not use for: refactoring, writing scripts from scratch, debugging business lo
 
 ## Steps
 
-1. \`resolve-library-id\` with the library name and the user's question
+1. \`resolve-library-id\` with the library name and the user's question. Use the official library name with proper punctuation (e.g., "Next.js" not "nextjs", "Customer.io" not "customerio", "Three.js" not "threejs")
 2. Pick the best match by: exact name match, description relevance, code snippet count, source reputation (High/Medium preferred), and benchmark score (higher is better). Use version-specific IDs when the user mentions a version
 3. \`query-docs\` with the selected library ID and the user's full question (not single words)
 4. Answer using the fetched docs
@@ -2648,6 +2799,127 @@ async function getRuleContent(mode, agent) {
   return agent === "cursor" ? `${CURSOR_FRONTMATTER}${body}` : body;
 }
 
+// src/setup/mcp-writer.ts
+import { access as access3, readFile as readFile3, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
+import { dirname as dirname4 } from "path";
+function stripJsonComments(text) {
+  let result = "";
+  let i = 0;
+  while (i < text.length) {
+    if (text[i] === '"') {
+      const start = i++;
+      while (i < text.length && text[i] !== '"') {
+        if (text[i] === "\\") i++;
+        i++;
+      }
+      result += text.slice(start, ++i);
+    } else if (text[i] === "/" && text[i + 1] === "/") {
+      i += 2;
+      while (i < text.length && text[i] !== "\n") i++;
+    } else if (text[i] === "/" && text[i + 1] === "*") {
+      i += 2;
+      while (i < text.length && !(text[i] === "*" && text[i + 1] === "/")) i++;
+      i += 2;
+    } else {
+      result += text[i++];
+    }
+  }
+  return result;
+}
+async function readJsonConfig(filePath) {
+  let raw;
+  try {
+    raw = await readFile3(filePath, "utf-8");
+  } catch {
+    return {};
+  }
+  raw = raw.trim();
+  if (!raw) return {};
+  return JSON.parse(stripJsonComments(raw));
+}
+function mergeServerEntry(existing, configKey, serverName, entry) {
+  const section = existing[configKey] ?? {};
+  const alreadyExists = serverName in section;
+  return {
+    config: {
+      ...existing,
+      [configKey]: {
+        ...section,
+        [serverName]: entry
+      }
+    },
+    alreadyExists
+  };
+}
+async function resolveMcpPath(candidates) {
+  for (const candidate of candidates) {
+    try {
+      await access3(candidate);
+      return candidate;
+    } catch {
+    }
+  }
+  return candidates[0];
+}
+async function writeJsonConfig(filePath, config) {
+  await mkdir3(dirname4(filePath), { recursive: true });
+  await writeFile3(filePath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+}
+function buildTomlServerBlock(serverName, entry) {
+  const lines = [`[mcp_servers.${serverName}]`];
+  const headers = entry.headers;
+  for (const [key, value] of Object.entries(entry)) {
+    if (key === "headers") continue;
+    lines.push(`${key} = ${JSON.stringify(value)}`);
+  }
+  if (headers && Object.keys(headers).length > 0) {
+    lines.push("");
+    lines.push(`[mcp_servers.${serverName}.http_headers]`);
+    for (const [key, value] of Object.entries(headers)) {
+      lines.push(`${key} = ${JSON.stringify(value)}`);
+    }
+  }
+  return lines.join("\n") + "\n";
+}
+async function appendTomlServer(filePath, serverName, entry) {
+  const block = buildTomlServerBlock(serverName, entry);
+  let existing = "";
+  try {
+    existing = await readFile3(filePath, "utf-8");
+  } catch {
+  }
+  const sectionHeader = `[mcp_servers.${serverName}]`;
+  const alreadyExists = existing.includes(sectionHeader);
+  if (alreadyExists) {
+    const subPrefix = `[mcp_servers.${serverName}.`;
+    const startIdx = existing.indexOf(sectionHeader);
+    const rest = existing.slice(startIdx + sectionHeader.length);
+    let endOffset = rest.length;
+    const re = /^\[/gm;
+    let m;
+    while ((m = re.exec(rest)) !== null) {
+      const lineEnd = rest.indexOf("\n", m.index);
+      const line = rest.slice(m.index, lineEnd === -1 ? void 0 : lineEnd);
+      if (!line.startsWith(subPrefix)) {
+        endOffset = m.index;
+        break;
+      }
+    }
+    const rawBefore = existing.slice(0, startIdx).replace(/\n+$/, "");
+    const rawAfter = existing.slice(startIdx + sectionHeader.length + endOffset).replace(/^\n+/, "");
+    const before = rawBefore.length > 0 ? rawBefore + "\n\n" : "";
+    const after = rawAfter.length > 0 ? "\n" + rawAfter : "";
+    const content = before + block + after;
+    await mkdir3(dirname4(filePath), { recursive: true });
+    await writeFile3(filePath, content, "utf-8");
+  } else {
+    const separator = existing.length > 0 && !existing.endsWith("\n") ? "\n\n" : existing.length > 0 ? "\n" : "";
+    await mkdir3(dirname4(filePath), { recursive: true });
+    await writeFile3(filePath, existing + separator + block, "utf-8");
+  }
+  return { alreadyExists };
+}
+
 // src/commands/setup.ts
 var CHECKBOX_THEME = {
   style: {
@@ -2661,10 +2933,11 @@ function getSelectedAgents(options) {
   if (options.cursor) agents2.push("cursor");
   if (options.opencode) agents2.push("opencode");
   if (options.codex) agents2.push("codex");
+  if (options.gemini) agents2.push("gemini");
   return agents2;
 }
 function registerSetupCommand(program2) {
-  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("--codex", "Set up for Codex").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) => {
+  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("--codex", "Set up for Codex").option("--gemini", "Set up for Gemini CLI").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);
   });
 }
@@ -2743,37 +3016,11 @@ async function resolveCliAuth(apiKey) {
   }
   await performLogin();
 }
-async function isAlreadyConfigured(agentName, scope) {
-  const agent = getAgent(agentName);
-  const mcpCandidates = scope === "global" ? agent.mcp.globalPaths : agent.mcp.projectPaths.map((p) => join9(process.cwd(), p));
-  const mcpPath = await resolveMcpPath(mcpCandidates);
-  try {
-    if (mcpPath.endsWith(".toml")) {
-      const { readTomlServerExists } = await import("./mcp-writer-IYBCUACD.js");
-      return readTomlServerExists(mcpPath, "context7");
-    }
-    const existing = await readJsonConfig(mcpPath);
-    const section = existing[agent.mcp.configKey] ?? {};
-    return "context7" in section;
-  } catch {
-    return false;
-  }
-}
-async function promptAgents(scope, mode) {
-  const choices = await Promise.all(
-    ALL_AGENT_NAMES.map(async (name) => {
-      const configured = mode === "mcp" ? await isAlreadyConfigured(name, scope) : false;
-      return {
-        name: SETUP_AGENT_NAMES[name],
-        value: name,
-        disabled: configured ? "(already configured)" : false
-      };
-    })
-  );
-  if (choices.every((c) => c.disabled)) {
-    log.info("Context7 is already configured for all detected agents.");
-    return null;
-  }
+async function promptAgents() {
+  const choices = ALL_AGENT_NAMES.map((name) => ({
+    name: SETUP_AGENT_NAMES[name],
+    value: name
+  }));
   const message = "Which agents do you want to set up?";
   try {
     return await checkboxWithHover(
@@ -2789,13 +3036,13 @@ async function promptAgents(scope, mode) {
     return null;
   }
 }
-async function resolveAgents(options, scope, mode = "mcp") {
+async function resolveAgents(options, scope) {
   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, mode);
+  const selected = await promptAgents();
   if (!selected) {
     log.warn("Setup cancelled");
     return [];
@@ -2809,8 +3056,8 @@ async function installRule(agentName, mode, scope) {
   if (rule.kind === "file") {
     const ruleDir = scope === "global" ? rule.dir("global") : join9(process.cwd(), rule.dir("project"));
     const rulePath = join9(ruleDir, rule.filename);
-    await mkdir3(dirname4(rulePath), { recursive: true });
-    await writeFile3(rulePath, content, "utf-8");
+    await mkdir4(dirname5(rulePath), { recursive: true });
+    await writeFile4(rulePath, content, "utf-8");
     return { status: "installed", path: rulePath };
   }
   const filePath = scope === "global" ? rule.file("global") : join9(process.cwd(), rule.file("project"));
@@ -2819,18 +3066,18 @@ async function installRule(agentName, mode, scope) {
 ${content}${rule.sectionMarker}`;
   let existing = "";
   try {
-    existing = await readFile3(filePath, "utf-8");
+    existing = await readFile4(filePath, "utf-8");
   } catch {
   }
   if (existing.includes(rule.sectionMarker)) {
     const regex = new RegExp(`${escapedMarker}\\n[\\s\\S]*?${escapedMarker}`);
     const updated = existing.replace(regex, section);
-    await writeFile3(filePath, updated, "utf-8");
+    await writeFile4(filePath, updated, "utf-8");
     return { status: "updated", path: filePath };
   }
   const separator = existing.length > 0 && !existing.endsWith("\n") ? "\n\n" : existing.length > 0 ? "\n" : "";
-  await mkdir3(dirname4(filePath), { recursive: true });
-  await writeFile3(filePath, existing + separator + section + "\n", "utf-8");
+  await mkdir4(dirname5(filePath), { recursive: true });
+  await writeFile4(filePath, existing + separator + section + "\n", "utf-8");
   return { status: "installed", path: filePath };
 }
 async function setupAgent(agentName, auth, scope) {
@@ -2845,7 +3092,7 @@ async function setupAgent(agentName, auth, scope) {
         "context7",
         agent.mcp.buildEntry(auth)
       );
-      mcpStatus = alreadyExists ? "already configured" : `configured with ${AUTH_MODE_LABELS[auth.mode]}`;
+      mcpStatus = alreadyExists ? `reconfigured with ${AUTH_MODE_LABELS[auth.mode]}` : `configured with ${AUTH_MODE_LABELS[auth.mode]}`;
     } else {
       const existing = await readJsonConfig(mcpPath);
       const { config, alreadyExists } = mergeServerEntry(
@@ -2854,14 +3101,8 @@ async function setupAgent(agentName, auth, scope) {
         "context7",
         agent.mcp.buildEntry(auth)
       );
-      if (alreadyExists) {
-        mcpStatus = "already configured";
-      } else {
-        mcpStatus = `configured with ${AUTH_MODE_LABELS[auth.mode]}`;
-      }
-      if (config !== existing) {
-        await writeJsonConfig(mcpPath, config);
-      }
+      mcpStatus = alreadyExists ? `reconfigured with ${AUTH_MODE_LABELS[auth.mode]}` : `configured with ${AUTH_MODE_LABELS[auth.mode]}`;
+      await writeJsonConfig(mcpPath, config);
     }
   } catch (err) {
     mcpStatus = `failed: ${err instanceof Error ? err.message : String(err)}`;
@@ -2916,7 +3157,7 @@ async function setupMcp(agents2, options, scope) {
   log.blank();
   for (const r of results) {
     log.plain(`  ${pc8.bold(r.agent)}`);
-    const mcpIcon = r.mcpStatus.startsWith("configured") ? pc8.green("+") : pc8.dim("~");
+    const mcpIcon = r.mcpStatus.startsWith("configured") || r.mcpStatus.startsWith("reconfigured") ? pc8.green("+") : pc8.dim("~");
     log.plain(`    ${mcpIcon} MCP server ${r.mcpStatus}`);
     log.plain(`      ${pc8.dim(r.mcpPath)}`);
     const ruleIcon = r.ruleStatus === "installed" ? pc8.green("+") : pc8.dim("~");
@@ -2925,6 +3166,11 @@ async function setupMcp(agents2, options, scope) {
     const skillIcon = r.skillStatus === "installed" ? pc8.green("+") : pc8.dim("~");
     log.plain(`    ${skillIcon} Skill ${r.skillStatus}`);
     log.plain(`      ${pc8.dim(r.skillPath)}`);
+    if (r.skillStatus.includes("EACCES")) {
+      log.plain(
+        `      ${pc8.yellow("tip:")} fix permissions with: ${pc8.cyan(`sudo chown -R $(whoami) ${dirname5(dirname5(r.skillPath))}`)}`
+      );
+    }
   }
   log.blank();
   trackEvent("setup", { agents: agents2, scope, authMode: auth.mode });
@@ -2956,7 +3202,7 @@ async function setupCliAgent(agentName, scope, downloadData) {
 async function setupCli(options) {
   await resolveCliAuth(options.apiKey);
   const scope = options.project ? "project" : "global";
-  const agents2 = await resolveAgents(options, scope, "cli");
+  const agents2 = await resolveAgents(options, scope);
   if (agents2.length === 0) return;
   log.blank();
   const spinner = ora4("Downloading find-docs skill...").start();
@@ -2980,6 +3226,11 @@ async function setupCli(options) {
     const skillIcon = r.skillStatus === "installed" ? pc8.green("+") : pc8.dim("~");
     log.plain(`    ${skillIcon} Skill ${r.skillStatus}`);
     log.plain(`      ${pc8.dim(r.skillPath)}`);
+    if (r.skillStatus.includes("EACCES")) {
+      log.plain(
+        `      ${pc8.yellow("tip:")} fix permissions with: ${pc8.cyan(`sudo chown -R $(whoami) ${dirname5(dirname5(r.skillPath))}`)}`
+      );
+    }
     const ruleIcon = r.ruleStatus === "installed" || r.ruleStatus === "updated" ? pc8.green("+") : pc8.dim("~");
     log.plain(`    ${ruleIcon} Rule ${r.ruleStatus}`);
     log.plain(`      ${pc8.dim(r.rulePath)}`);
@@ -2994,7 +3245,7 @@ async function setupCommand(options) {
     const mode = await resolveMode(options);
     if (mode === "mcp") {
       const scope = options.project ? "project" : "global";
-      const agents2 = await resolveAgents(options, scope, mode);
+      const agents2 = await resolveAgents(options, scope);
       if (agents2.length === 0) return;
       await setupMcp(agents2, options, scope);
     } else {