ctx7 0.3.6 → 0.3.9

package/dist/index.js

@@ -103,6 +103,10 @@ async function downloadSkillFromGitHub(skill) {
       }
       const content = await fileResponse.text();
       const relativePath = item.path.slice(skillPath.length + 1);
+      if (relativePath.includes("..")) {
+        console.warn(`Skipping file with unsafe path: ${item.path}`);
+        continue;
+      }
       files.push({
         path: relativePath,
         content
@@ -433,13 +437,18 @@ async function checkboxWithHover(config, options) {
   );
   const values = choices.map((c) => c.value);
   const totalItems = values.length;
-  let cursorPosition = 0;
+  let cursorPosition = choices.findIndex((c) => !c.disabled);
+  if (cursorPosition < 0) 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++;
+    if (key.name === "up") {
+      let next = cursorPosition - 1;
+      while (next >= 0 && choices[next].disabled) next--;
+      if (next >= 0) cursorPosition = next;
+    } else if (key.name === "down") {
+      let next = cursorPosition + 1;
+      while (next < totalItems && choices[next].disabled) next++;
+      if (next < totalItems) cursorPosition = next;
     }
   };
   readline.emitKeypressEvents(process.stdin);
@@ -483,7 +492,7 @@ var IDE_GLOBAL_PATHS = {
   claude: ".claude/skills",
   cursor: ".cursor/skills",
   antigravity: ".agent/skills",
-  universal: ".config/agents/skills"
+  universal: ".agents/skills"
 };
 var IDE_NAMES = {
   claude: "Claude Code",
@@ -492,7 +501,7 @@ var IDE_NAMES = {
   universal: "Universal"
 };
 var UNIVERSAL_SKILLS_PATH = ".agents/skills";
-var UNIVERSAL_SKILLS_GLOBAL_PATH = ".config/agents/skills";
+var UNIVERSAL_SKILLS_GLOBAL_PATH = ".agents/skills";
 var UNIVERSAL_AGENTS_LABEL = "Amp, Codex, Gemini CLI, GitHub Copilot, OpenCode + more";
 var VENDOR_SPECIFIC_AGENTS = ["claude", "cursor", "antigravity"];
 var DEFAULT_CONFIG = {
@@ -715,12 +724,15 @@ function getTargetDirFromSelection(ide, scope) {
 
 // src/utils/installer.ts
 import { mkdir, writeFile, rm, symlink, lstat } from "fs/promises";
-import { join as join3 } from "path";
+import { join as join3, resolve, dirname as dirname3 } from "path";
 async function installSkillFiles(skillName, files, targetDir) {
-  const skillDir = join3(targetDir, skillName);
+  const skillDir = resolve(targetDir, skillName);
   for (const file of files) {
-    const filePath = join3(skillDir, file.path);
-    const fileDir = join3(filePath, "..");
+    const filePath = resolve(skillDir, file.path);
+    if (!filePath.startsWith(skillDir + "/") && filePath !== skillDir) {
+      throw new Error(`Skill file path "${file.path}" resolves outside the target directory`);
+    }
+    const fileDir = dirname3(filePath);
     await mkdir(fileDir, { recursive: true });
     await writeFile(filePath, file.content);
   }
@@ -850,11 +862,11 @@ function createCallbackServer(expectedState) {
   let resolveResult;
   let rejectResult;
   let serverInstance = null;
-  const portPromise = new Promise((resolve) => {
-    resolvePort = resolve;
+  const portPromise = new Promise((resolve2) => {
+    resolvePort = resolve2;
   });
-  const resultPromise = new Promise((resolve, reject) => {
-    resolveResult = resolve;
+  const resultPromise = new Promise((resolve2, reject) => {
+    resolveResult = resolve2;
     rejectResult = reject;
   });
   const server = http.createServer((req, res) => {
@@ -1317,7 +1329,7 @@ async function generateCommand(options) {
   log.blank();
   if (searchResult.searchFilterApplied) {
     log.warn(
-      "Your results only include libraries matching your access settings. To search across all public libraries, update your settings at https://context7.com/dashboard?tab=libraries"
+      "Your results only include libraries matching your teamspace's library filters. To adjust quality thresholds or blocked libraries, update your filters at https://context7.com/dashboard?tab=policies"
     );
     log.blank();
   }
@@ -1542,12 +1554,11 @@ async function generateCommand(options) {
         previewFileWritten = true;
       }
       const editor = process.env.EDITOR || "open";
-      await new Promise((resolve) => {
+      await new Promise((resolve2) => {
         const child = spawn(editor, [previewFile], {
-          stdio: "inherit",
-          shell: true
+          stdio: "inherit"
         });
-        child.on("close", () => resolve());
+        child.on("close", () => resolve2());
       });
     };
     const syncFromPreviewFile = async () => {
@@ -1556,7 +1567,7 @@ async function generateCommand(options) {
       }
     };
     showPreview();
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve2) => setTimeout(resolve2, 100));
     try {
       let action;
       while (true) {
@@ -2415,8 +2426,8 @@ ${headerLine}`,
 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 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
@@ -2426,7 +2437,8 @@ import { homedir as homedir5 } from "os";
 var SETUP_AGENT_NAMES = {
   claude: "Claude Code",
   cursor: "Cursor",
-  opencode: "OpenCode"
+  opencode: "OpenCode",
+  codex: "Codex"
 };
 var AUTH_MODE_LABELS = {
   oauth: "OAuth",
@@ -2447,12 +2459,13 @@ var agents = {
     name: "claude",
     displayName: "Claude Code",
     mcp: {
-      projectPath: ".mcp.json",
-      globalPath: join8(homedir5(), ".claude.json"),
+      projectPaths: [".mcp.json"],
+      globalPaths: [join8(homedir5(), ".claude.json")],
       configKey: "mcpServers",
       buildEntry: (auth) => withHeaders({ type: "http", url: mcpUrl(auth) }, auth)
     },
     rule: {
+      kind: "file",
       dir: (scope) => scope === "global" ? join8(homedir5(), ".claude", "rules") : join8(".claude", "rules"),
       filename: "context7.md"
     },
@@ -2469,12 +2482,13 @@ var agents = {
     name: "cursor",
     displayName: "Cursor",
     mcp: {
-      projectPath: join8(".cursor", "mcp.json"),
-      globalPath: join8(homedir5(), ".cursor", "mcp.json"),
+      projectPaths: [join8(".cursor", "mcp.json")],
+      globalPaths: [join8(homedir5(), ".cursor", "mcp.json")],
       configKey: "mcpServers",
       buildEntry: (auth) => withHeaders({ url: mcpUrl(auth) }, auth)
     },
     rule: {
+      kind: "file",
       dir: (scope) => scope === "global" ? join8(homedir5(), ".cursor", "rules") : join8(".cursor", "rules"),
       filename: "context7.mdc"
     },
@@ -2491,24 +2505,58 @@ var agents = {
     name: "opencode",
     displayName: "OpenCode",
     mcp: {
-      projectPath: ".opencode.json",
-      globalPath: join8(homedir5(), ".config", "opencode", "opencode.json"),
+      projectPaths: ["opencode.json", "opencode.jsonc", ".opencode.json", ".opencode.jsonc"],
+      globalPaths: [
+        join8(homedir5(), ".config", "opencode", "opencode.json"),
+        join8(homedir5(), ".config", "opencode", "opencode.jsonc"),
+        join8(homedir5(), ".config", "opencode", ".opencode.json"),
+        join8(homedir5(), ".config", "opencode", ".opencode.jsonc")
+      ],
       configKey: "mcp",
       buildEntry: (auth) => withHeaders({ type: "remote", url: mcpUrl(auth), enabled: true }, auth)
     },
     rule: {
-      dir: (scope) => scope === "global" ? join8(homedir5(), ".config", "opencode", "rules") : join8(".opencode", "rules"),
-      filename: "context7.md",
-      instructionsGlob: (scope) => scope === "global" ? join8(homedir5(), ".config", "opencode", "rules", "*.md") : ".opencode/rules/*.md"
+      kind: "append",
+      file: (scope) => scope === "global" ? join8(homedir5(), ".config", "opencode", "AGENTS.md") : "AGENTS.md",
+      sectionMarker: "<!-- context7 -->"
     },
     skill: {
       name: "context7-mcp",
       dir: (scope) => scope === "global" ? join8(homedir5(), ".agents", "skills") : join8(".agents", "skills")
     },
     detect: {
-      projectPaths: [".opencode.json"],
+      projectPaths: ["opencode.json", "opencode.jsonc", ".opencode.json", ".opencode.jsonc"],
       globalPaths: [join8(homedir5(), ".config", "opencode")]
     }
+  },
+  codex: {
+    name: "codex",
+    displayName: "Codex",
+    mcp: {
+      projectPaths: [join8(".codex", "config.toml")],
+      globalPaths: [join8(homedir5(), ".codex", "config.toml")],
+      configKey: "mcp_servers",
+      buildEntry: (auth) => {
+        const entry = { type: "http", url: mcpUrl(auth) };
+        if (auth.mode === "api-key" && auth.apiKey) {
+          entry.headers = { CONTEXT7_API_KEY: auth.apiKey };
+        }
+        return entry;
+      }
+    },
+    rule: {
+      kind: "append",
+      file: (scope) => scope === "global" ? join8(homedir5(), ".codex", "AGENTS.md") : "AGENTS.md",
+      sectionMarker: "<!-- context7 -->"
+    },
+    skill: {
+      name: "context7-mcp",
+      dir: (scope) => scope === "global" ? join8(homedir5(), ".agents", "skills") : join8(".agents", "skills")
+    },
+    detect: {
+      projectPaths: [".codex"],
+      globalPaths: [join8(homedir5(), ".codex")]
+    }
   }
 };
 function getAgent(name) {
@@ -2539,23 +2587,87 @@ async function detectAgents(scope) {
 }
 
 // src/setup/templates.ts
-var RULE_CONTENT = `---
-alwaysApply: true
----
+var GITHUB_RAW_URLS = [
+  "https://raw.githubusercontent.com/upstash/context7/master/rules",
+  "https://raw.githubusercontent.com/upstash/context7/main/rules"
+];
+var FALLBACK_MCP = `Use Context7 MCP to fetch current documentation whenever the user asks about a library, framework, SDK, API, CLI tool, or cloud service -- even well-known ones like React, Next.js, Prisma, Express, Tailwind, Django, or Spring Boot. This includes API syntax, configuration, version migration, library-specific debugging, setup instructions, and CLI tool usage. Use even when you think you know the answer -- your training data may not reflect recent changes. Prefer this over web search for library docs.
+
+Do not use for: refactoring, writing scripts from scratch, debugging business logic, code review, or general programming concepts.
+
+## Steps
 
-When working with libraries, frameworks, or APIs \u2014 use Context7 MCP to fetch current documentation instead of relying on training data. This includes setup questions, code generation, API references, and anything involving specific packages.
+1. \`resolve-library-id\` with the library name and the user's question
+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
+`;
+var FALLBACK_CLI = `Use the \`ctx7\` CLI to fetch current documentation whenever the user asks about a library, framework, SDK, API, CLI tool, or cloud service -- even well-known ones like React, Next.js, Prisma, Express, Tailwind, Django, or Spring Boot. This includes API syntax, configuration, version migration, library-specific debugging, setup instructions, and CLI tool usage. Use even when you think you know the answer -- your training data may not reflect recent changes. Prefer this over web search for library docs.
+
+Do not use for: refactoring, writing scripts from scratch, debugging business logic, code review, or general programming concepts.
 
 ## Steps
 
-1. Call \`resolve-library-id\` with the library name and the user's question
-2. Pick the best match \u2014 prefer exact names and version-specific IDs when a version is mentioned
-3. Call \`query-docs\` with the selected library ID and the user's question
-4. Answer using the fetched docs \u2014 include code examples and cite the version
+1. Resolve library: \`npx ctx7@latest library <name> "<user's question>"\`
+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). If results don't look right, try the full name with punctuation (e.g., "next.js" not "nextjs")
+3. Fetch docs: \`npx ctx7@latest docs <libraryId> "<user's question>"\`
+4. Answer using the fetched documentation
+
+You MUST call \`library\` first to get a valid ID (format: \`/org/project\`) unless the user provides one directly. Use the user's full question as the query -- specific and detailed queries return better results than vague single words. Do not run more than 3 commands per question. Do not include sensitive information (API keys, passwords, credentials) in queries.
+
+For version-specific docs, use \`/org/project/version\` from the \`library\` output (e.g., \`/vercel/next.js/v14.3.0\`).
+
+If a command fails with a quota error, inform the user and suggest \`npx ctx7@latest login\` or setting \`CONTEXT7_API_KEY\` env var for higher limits. Do not silently fall back to training data.
 `;
+var CURSOR_FRONTMATTER = `---
+alwaysApply: true
+---
+
+`;
+async function fetchRule(filename, fallback) {
+  for (const base of GITHUB_RAW_URLS) {
+    try {
+      const res = await fetch(`${base}/${filename}`);
+      if (res.ok) return await res.text();
+    } catch {
+      continue;
+    }
+  }
+  return fallback;
+}
+async function getRuleContent(mode, agent) {
+  const [filename, fallback] = mode === "mcp" ? ["context7-mcp.md", FALLBACK_MCP] : ["context7-cli.md", FALLBACK_CLI];
+  const body = await fetchRule(filename, fallback);
+  return agent === "cursor" ? `${CURSOR_FRONTMATTER}${body}` : body;
+}
 
 // src/setup/mcp-writer.ts
-import { readFile as readFile3, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
-import { dirname as dirname3 } from "path";
+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 {
@@ -2565,13 +2677,11 @@ async function readJsonConfig(filePath) {
   }
   raw = raw.trim();
   if (!raw) return {};
-  return JSON.parse(raw);
+  return JSON.parse(stripJsonComments(raw));
 }
 function mergeServerEntry(existing, configKey, serverName, entry) {
   const section = existing[configKey] ?? {};
-  if (serverName in section) {
-    return { config: existing, alreadyExists: true };
-  }
+  const alreadyExists = serverName in section;
   return {
     config: {
       ...existing,
@@ -2580,18 +2690,77 @@ function mergeServerEntry(existing, configKey, serverName, entry) {
         [serverName]: entry
       }
     },
-    alreadyExists: false
+    alreadyExists
   };
 }
-function mergeInstructions(config, glob) {
-  const instructions = config.instructions ?? [];
-  if (instructions.includes(glob)) return config;
-  return { ...config, instructions: [...instructions, glob] };
+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(dirname3(filePath), { recursive: true });
+  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 = {
@@ -2605,10 +2774,11 @@ function getSelectedAgents(options) {
   if (options.claude) agents2.push("claude");
   if (options.cursor) agents2.push("cursor");
   if (options.opencode) agents2.push("opencode");
+  if (options.codex) agents2.push("codex");
   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("--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("--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);
   });
 }
@@ -2687,33 +2857,12 @@ async function resolveCliAuth(apiKey) {
   }
   await performLogin();
 }
-async function isAlreadyConfigured(agentName, scope) {
-  const agent = getAgent(agentName);
-  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] ?? {};
-    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;
-  }
-  const message = mode === "cli" ? "Install find-docs skill for which agents?" : "Which agents do you want to set up?";
+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(
       {
@@ -2728,51 +2877,86 @@ 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 [];
   }
   return selected;
 }
+async function installRule(agentName, mode, scope) {
+  const agent = getAgent(agentName);
+  const rule = agent.rule;
+  const content = await getRuleContent(mode, agentName);
+  if (rule.kind === "file") {
+    const ruleDir = scope === "global" ? rule.dir("global") : join9(process.cwd(), rule.dir("project"));
+    const rulePath = join9(ruleDir, rule.filename);
+    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"));
+  const escapedMarker = rule.sectionMarker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const section = `${rule.sectionMarker}
+${content}${rule.sectionMarker}`;
+  let existing = "";
+  try {
+    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 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 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) {
   const agent = getAgent(agentName);
-  const mcpPath = scope === "global" ? agent.mcp.globalPath : join9(process.cwd(), agent.mcp.projectPath);
+  const mcpCandidates = scope === "global" ? agent.mcp.globalPaths : agent.mcp.projectPaths.map((p) => join9(process.cwd(), p));
+  const mcpPath = await resolveMcpPath(mcpCandidates);
   let mcpStatus;
   try {
-    const existing = await readJsonConfig(mcpPath);
-    const { config, alreadyExists } = mergeServerEntry(
-      existing,
-      agent.mcp.configKey,
-      "context7",
-      agent.mcp.buildEntry(auth)
-    );
-    if (alreadyExists) {
-      mcpStatus = "already configured";
+    if (mcpPath.endsWith(".toml")) {
+      const { alreadyExists } = await appendTomlServer(
+        mcpPath,
+        "context7",
+        agent.mcp.buildEntry(auth)
+      );
+      mcpStatus = alreadyExists ? `reconfigured with ${AUTH_MODE_LABELS[auth.mode]}` : `configured with ${AUTH_MODE_LABELS[auth.mode]}`;
     } else {
-      mcpStatus = `configured with ${AUTH_MODE_LABELS[auth.mode]}`;
-    }
-    const finalConfig = agent.rule.instructionsGlob ? mergeInstructions(config, agent.rule.instructionsGlob(scope)) : config;
-    if (finalConfig !== existing) {
-      await writeJsonConfig(mcpPath, finalConfig);
+      const existing = await readJsonConfig(mcpPath);
+      const { config, alreadyExists } = mergeServerEntry(
+        existing,
+        agent.mcp.configKey,
+        "context7",
+        agent.mcp.buildEntry(auth)
+      );
+      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)}`;
   }
-  const rulePath = scope === "global" ? join9(agent.rule.dir("global"), agent.rule.filename) : join9(process.cwd(), agent.rule.dir("project"), agent.rule.filename);
   let ruleStatus;
+  let rulePath;
   try {
-    await mkdir4(dirname4(rulePath), { recursive: true });
-    await writeFile4(rulePath, RULE_CONTENT, "utf-8");
-    ruleStatus = "installed";
+    const result = await installRule(agentName, "mcp", scope);
+    ruleStatus = result.status;
+    rulePath = result.path;
   } catch (err) {
     ruleStatus = `failed: ${err instanceof Error ? err.message : String(err)}`;
+    rulePath = "";
   }
   const skillDir = scope === "global" ? agent.skill.dir("global") : join9(process.cwd(), agent.skill.dir("project"));
   const skillPath = join9(skillDir, agent.skill.name, "SKILL.md");
@@ -2814,7 +2998,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("~");
@@ -2828,13 +3012,34 @@ async function setupMcp(agents2, options, scope) {
   trackEvent("setup", { agents: agents2, scope, authMode: auth.mode });
   trackEvent("install", { skills: ["/upstash/context7/context7-mcp"], ides: agents2 });
 }
+async function setupCliAgent(agentName, scope, downloadData) {
+  const agent = getAgent(agentName);
+  const skillDir = scope === "global" ? agent.skill.dir("global") : join9(process.cwd(), agent.skill.dir("project"));
+  let skillStatus;
+  try {
+    await installSkillFiles("find-docs", downloadData.files, skillDir);
+    skillStatus = "installed";
+  } catch (err) {
+    skillStatus = `failed: ${err instanceof Error ? err.message : String(err)}`;
+  }
+  const skillPath = join9(skillDir, "find-docs");
+  let ruleStatus;
+  let rulePath;
+  try {
+    const result = await installRule(agentName, "cli", scope);
+    ruleStatus = result.status;
+    rulePath = result.path;
+  } catch (err) {
+    ruleStatus = `failed: ${err instanceof Error ? err.message : String(err)}`;
+    rulePath = "";
+  }
+  return { skillPath, skillStatus, rulePath, ruleStatus };
+}
 async function setupCli(options) {
   await resolveCliAuth(options.apiKey);
-  const targets = await promptForInstallTargets({ ...options, global: !options.project }, false);
-  if (!targets) {
-    log.warn("Setup cancelled");
-    return;
-  }
+  const scope = options.project ? "project" : "global";
+  const agents2 = await resolveAgents(options, scope);
+  if (agents2.length === 0) return;
   log.blank();
   const spinner = ora4("Downloading find-docs skill...").start();
   const downloadData = await downloadSkill("/upstash/context7", "find-docs");
@@ -2843,28 +3048,27 @@ async function setupCli(options) {
     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);
+  const installSpinner = ora4("Installing...").start();
+  const results = [];
+  for (const agentName of agents2) {
+    installSpinner.text = `Setting up ${getAgent(agentName).displayName}...`;
+    const r = await setupCliAgent(agentName, scope, downloadData);
+    results.push({ agent: getAgent(agentName).displayName, ...r });
   }
-  installSpinner.stop();
+  installSpinner.succeed("Context7 CLI setup complete");
   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)}`);
+  for (const r of results) {
+    log.plain(`  ${pc8.bold(r.agent)}`);
+    const skillIcon = r.skillStatus === "installed" ? pc8.green("+") : pc8.dim("~");
+    log.plain(`    ${skillIcon} Skill ${r.skillStatus}`);
+    log.plain(`      ${pc8.dim(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)}`);
   }
   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 });
+  trackEvent("install", { skills: ["/upstash/context7/find-docs"], ides: agents2 });
 }
 async function setupCommand(options) {
   trackEvent("command", { name: "setup" });
@@ -2872,7 +3076,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 {
@@ -2953,7 +3157,7 @@ async function resolveCommand(library, query, options) {
   log.blank();
   if (data.searchFilterApplied) {
     log.warn(
-      "Your results only include libraries matching your access settings. To search across all public libraries, update your settings at https://context7.com/dashboard?tab=libraries"
+      "Your results only include libraries matching your teamspace's library filters. To adjust quality thresholds or blocked libraries, update your filters at https://context7.com/dashboard?tab=policies"
     );
     log.blank();
   }