ctx7 0.3.8 → 0.3.9

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";
@@ -2433,8 +2426,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
@@ -2648,6 +2641,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: {
@@ -2743,37 +2857,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 +2877,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 +2897,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 +2907,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 +2933,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 +2942,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 +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("~");
@@ -2956,7 +3038,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();
@@ -2994,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 {