@neat.is/core 0.7.5 → 0.7.6

package/dist/cli.js

@@ -6,7 +6,7 @@ import {
   resolveHost,
   resolveNeatVersion,
   writeDaemonRecord
-} from "./chunk-MYLUXVXE.js";
+} from "./chunk-XHSK4BGL.js";
 import {
   buildSearchIndex
 } from "./chunk-BIY46Q6U.js";
@@ -74,7 +74,7 @@ import {
   startStalenessLoop,
   upsertConnectorEntry,
   validateConnectorEntry
-} from "./chunk-KB4HRB6N.js";
+} from "./chunk-XT4NNFH6.js";
 import {
   startOtelGrpcReceiver
 } from "./chunk-6H757ZNM.js";
@@ -4749,24 +4749,42 @@ async function runCodexCommand(args) {
 import path11 from "path";
 import os3 from "os";
 import { promises as fs10 } from "fs";
+import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
+import * as jsonc from "jsonc-parser";
 var NEAT_MCP_SERVER = {
   command: "npx",
   args: ["-y", "@neat.is/mcp"]
 };
+var NEAT_OPENCODE_SERVER = {
+  type: "local",
+  command: ["npx", "-y", "@neat.is/mcp"],
+  enabled: true
+};
+var NEAT_CRUSH_SERVER = {
+  type: "stdio",
+  command: "npx",
+  args: ["-y", "@neat.is/mcp"]
+};
 var GRAPH_FIRST_MARKER_OPEN = "<!-- neat:graph-first -->";
 var GRAPH_FIRST_MARKER_CLOSE = "<!-- /neat:graph-first -->";
 function homeDir() {
   return process.env.HOME ?? process.env.USERPROFILE ?? os3.homedir();
 }
+function xdgConfigDir() {
+  const xdg = process.env.XDG_CONFIG_HOME;
+  return xdg && xdg.length > 0 ? path11.resolve(xdg) : path11.join(homeDir(), ".config");
+}
+function envOverride(name) {
+  const v = process.env[name];
+  return v && v.length > 0 ? path11.resolve(v) : void 0;
+}
 var CURSOR_CLIENT = {
   id: "cursor",
   label: "Cursor",
   docsUrl: "https://docs.cursor.com/context/mcp",
-  mcpConfigPath: () => {
-    const override = process.env.NEAT_CURSOR_CONFIG;
-    if (override && override.length > 0) return path11.resolve(override);
-    return path11.join(homeDir(), ".cursor", "mcp.json");
-  },
+  mcpConfigPath: () => envOverride("NEAT_CURSOR_CONFIG") ?? path11.join(homeDir(), ".cursor", "mcp.json"),
+  mcpContainerKey: "mcpServers",
+  format: "json",
   // Cursor still reads a single `.cursorrules` at the project root (the modern
   // `.cursor/rules/*.mdc` split is one-rule-per-file with frontmatter — a worse
   // fit for a marker-fenced block). GRAPH_FIRST.md names this file directly.
@@ -4776,22 +4794,116 @@ var DEVIN_CLIENT = {
   id: "devin",
   label: "Devin Desktop (Cascade)",
   docsUrl: "https://docs.devin.ai/desktop/cascade/mcp",
+  mcpConfigPath: () => envOverride("NEAT_DEVIN_CONFIG") ?? path11.join(homeDir(), ".codeium", "windsurf", "mcp_config.json"),
+  mcpContainerKey: "mcpServers",
+  format: "json",
+  rulesFileName: ".windsurfrules"
+};
+var GEMINI_CLIENT = {
+  id: "gemini",
+  label: "Gemini CLI",
+  docsUrl: "https://github.com/google-gemini/gemini-cli/blob/main/docs/tools/mcp-server.md",
+  mcpConfigPath: () => envOverride("NEAT_GEMINI_CONFIG") ?? path11.join(homeDir(), ".gemini", "settings.json"),
+  mcpContainerKey: "mcpServers",
+  format: "json",
+  rulesFileName: "GEMINI.md"
+};
+var QWEN_CLIENT = {
+  id: "qwen",
+  label: "Qwen Code",
+  docsUrl: "https://qwenlm.github.io/qwen-code-docs/en/users/features/mcp/",
+  mcpConfigPath: () => envOverride("NEAT_QWEN_CONFIG") ?? path11.join(homeDir(), ".qwen", "settings.json"),
+  mcpContainerKey: "mcpServers",
+  format: "json",
+  rulesFileName: "QWEN.md"
+};
+var AMAZONQ_CLIENT = {
+  id: "amazonq",
+  label: "Amazon Q Developer CLI",
+  docsUrl: "https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-mcp-configuration.html",
+  mcpConfigPath: () => envOverride("NEAT_AMAZONQ_CONFIG") ?? path11.join(homeDir(), ".aws", "amazonq", "mcp.json"),
+  mcpContainerKey: "mcpServers",
+  format: "json"
+};
+var ROOCODE_CLIENT = {
+  id: "roocode",
+  label: "Roo Code",
+  docsUrl: "https://roocodeinc.github.io/Roo-Code/features/mcp/using-mcp-in-roo",
+  mcpConfigPath: () => envOverride("NEAT_ROOCODE_CONFIG") ?? path11.join(process.cwd(), ".roo", "mcp.json"),
+  mcpContainerKey: "mcpServers",
+  format: "json"
+};
+var ZED_CLIENT = {
+  id: "zed",
+  label: "Zed",
+  docsUrl: "https://zed.dev/docs/ai/mcp",
   mcpConfigPath: () => {
-    const override = process.env.NEAT_DEVIN_CONFIG;
-    if (override && override.length > 0) return path11.resolve(override);
-    return path11.join(homeDir(), ".codeium", "windsurf", "mcp_config.json");
+    const override = envOverride("NEAT_ZED_CONFIG");
+    if (override) return override;
+    if (process.platform === "win32") {
+      const appData = process.env.APPDATA;
+      if (appData && appData.length > 0) return path11.join(appData, "Zed", "settings.json");
+    }
+    return path11.join(homeDir(), ".config", "zed", "settings.json");
   },
-  rulesFileName: ".windsurfrules"
+  mcpContainerKey: "context_servers",
+  format: "jsonc",
+  rulesFileName: ".rules"
+};
+var OPENCODE_CLIENT = {
+  id: "opencode",
+  label: "OpenCode",
+  docsUrl: "https://opencode.ai/docs/mcp-servers/",
+  mcpConfigPath: () => envOverride("NEAT_OPENCODE_CONFIG") ?? path11.join(xdgConfigDir(), "opencode", "opencode.json"),
+  mcpContainerKey: "mcp",
+  format: "json",
+  serverEntry: NEAT_OPENCODE_SERVER,
+  rulesFileName: "AGENTS.md"
+};
+var CRUSH_CLIENT = {
+  id: "crush",
+  label: "Crush",
+  docsUrl: "https://charmbracelet-crush.mintlify.app/configuration/mcp",
+  mcpConfigPath: () => envOverride("NEAT_CRUSH_CONFIG") ?? path11.join(xdgConfigDir(), "crush", "crush.json"),
+  mcpContainerKey: "mcp",
+  format: "json",
+  serverEntry: NEAT_CRUSH_SERVER,
+  rulesFileName: "AGENTS.md"
 };
-function mergeMcpConfig(existing) {
-  const servers = existing.mcpServers ?? {};
-  const already = JSON.stringify(servers.neat) === JSON.stringify(NEAT_MCP_SERVER);
+var CLIENTS = {
+  cursor: CURSOR_CLIENT,
+  devin: DEVIN_CLIENT,
+  gemini: GEMINI_CLIENT,
+  qwen: QWEN_CLIENT,
+  amazonq: AMAZONQ_CLIENT,
+  roocode: ROOCODE_CLIENT,
+  zed: ZED_CLIENT,
+  opencode: OPENCODE_CLIENT,
+  crush: CRUSH_CLIENT
+};
+function mergeJsonMcp(existing, containerKey, serverEntry) {
+  const servers = existing[containerKey] ?? {};
+  const already = isDeepStrictEqual2(servers.neat, serverEntry);
   const merged = {
     ...existing,
-    mcpServers: { ...servers, neat: NEAT_MCP_SERVER }
+    [containerKey]: { ...servers, neat: serverEntry }
   };
   return { merged, changed: !already };
 }
+function mergeJsoncMcp(raw, containerKey, serverEntry) {
+  const base = raw.trim().length > 0 ? raw : "{}";
+  const parsed = jsonc.parse(base) ?? {};
+  const servers = parsed[containerKey] ?? {};
+  if (isDeepStrictEqual2(servers.neat, serverEntry)) {
+    return { text: raw, changed: false };
+  }
+  const edits = jsonc.modify(base, [containerKey, "neat"], serverEntry, {
+    formattingOptions: { tabSize: 2, insertSpaces: true }
+  });
+  let text = jsonc.applyEdits(base, edits);
+  if (!text.endsWith("\n")) text += "\n";
+  return { text, changed: text !== raw };
+}
 function escapeRegExp(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -4811,66 +4923,104 @@ function mergeRulesFile(existing, block) {
 
 ${block}`;
 }
-async function runEditorInstall(client, opts) {
-  const mcpPath = client.mcpConfigPath();
-  const rulesPath = path11.join(opts.projectDir, client.rulesFileName);
-  let existingMcp = {};
+async function planMcp(client, mcpPath) {
+  const serverEntry = client.serverEntry ?? NEAT_MCP_SERVER;
+  let raw = "";
   try {
-    existingMcp = JSON.parse(await fs10.readFile(mcpPath, "utf8"));
+    raw = await fs10.readFile(mcpPath, "utf8");
   } catch (err) {
     const e = err;
     if (e.code === "ENOENT") {
-      existingMcp = {};
-    } else if (err instanceof SyntaxError) {
-      console.error(
-        `neat ${client.id}: ${mcpPath} is not valid JSON \u2014 ${e.message}. Fix it (or move it aside) and re-run; nothing was written.`
-      );
-      return { exitCode: 1 };
+      raw = "";
     } else {
       console.error(`neat ${client.id}: failed to read ${mcpPath} \u2014 ${e.message}`);
-      return { exitCode: 1 };
+      return null;
     }
   }
+  if (client.format === "jsonc") {
+    if (raw.trim().length > 0) {
+      const errors = [];
+      jsonc.parse(raw, errors, { allowTrailingComma: true });
+      if (errors.length > 0) {
+        const first = errors[0];
+        console.error(
+          `neat ${client.id}: ${mcpPath} is not valid JSONC \u2014 ${jsonc.printParseErrorCode(first.error)} at offset ${first.offset}. Fix it (or move it aside) and re-run; nothing was written.`
+        );
+        return null;
+      }
+    }
+    return mergeJsoncMcp(raw, client.mcpContainerKey, serverEntry);
+  }
+  let existing = {};
+  if (raw.trim().length > 0) {
+    try {
+      existing = JSON.parse(raw);
+    } catch (err) {
+      console.error(
+        `neat ${client.id}: ${mcpPath} is not valid JSON \u2014 ${err.message}. Fix it (or move it aside) and re-run; nothing was written.`
+      );
+      return null;
+    }
+  }
+  const { merged, changed } = mergeJsonMcp(existing, client.mcpContainerKey, serverEntry);
+  return { text: JSON.stringify(merged, null, 2) + "\n", changed };
+}
+async function runEditorInstall(client, opts) {
+  const mcpPath = client.mcpConfigPath();
+  const serverEntry = client.serverEntry ?? NEAT_MCP_SERVER;
+  const hasRules = typeof client.rulesFileName === "string";
+  const rulesPath = hasRules ? path11.join(opts.projectDir, client.rulesFileName) : "";
+  const mcp = await planMcp(client, mcpPath);
+  if (mcp === null) return { exitCode: 1 };
   let existingRules = "";
-  try {
-    existingRules = await fs10.readFile(rulesPath, "utf8");
-  } catch (err) {
-    if (err.code !== "ENOENT") {
-      console.error(`neat ${client.id}: failed to read ${rulesPath} \u2014 ${err.message}`);
-      return { exitCode: 1 };
+  let newRules = "";
+  let rulesChanged = false;
+  let block = "";
+  if (hasRules) {
+    try {
+      existingRules = await fs10.readFile(rulesPath, "utf8");
+    } catch (err) {
+      if (err.code !== "ENOENT") {
+        console.error(`neat ${client.id}: failed to read ${rulesPath} \u2014 ${err.message}`);
+        return { exitCode: 1 };
+      }
     }
+    const guide = await readSkillAsset(GUIDE_FILENAME);
+    block = buildGuidanceBlock(guide);
+    newRules = mergeRulesFile(existingRules, block);
+    rulesChanged = newRules !== existingRules;
   }
-  const guide = await readSkillAsset(GUIDE_FILENAME);
-  const block = buildGuidanceBlock(guide);
-  const { merged, changed: mcpChanged } = mergeMcpConfig(existingMcp);
-  const mcpJson = JSON.stringify(merged, null, 2) + "\n";
-  const newRules = mergeRulesFile(existingRules, block);
-  const rulesChanged = newRules !== existingRules;
   if (!opts.apply) {
     console.log(`neat ${client.id} \u2014 wire NEAT into ${client.label} (plan; nothing written)`);
     console.log("");
     console.log(`MCP server \u2192 ${mcpPath}`);
     console.log(
-      mcpChanged ? "  would add mcpServers.neat:" : "  mcpServers.neat already present and current \u2014 no change:"
+      mcp.changed ? `  would add ${client.mcpContainerKey}.neat:` : `  ${client.mcpContainerKey}.neat already present and current \u2014 no change:`
     );
-    console.log(indent(JSON.stringify({ neat: NEAT_MCP_SERVER }, null, 2)));
+    console.log(indent(JSON.stringify({ neat: serverEntry }, null, 2)));
+    if (hasRules) {
+      console.log("");
+      console.log(`Graph-first guidance \u2192 ${rulesPath}`);
+      console.log(
+        rulesChanged ? existingRules.includes(GRAPH_FIRST_MARKER_OPEN) ? "  would refresh the neat:graph-first block:" : "  would add the neat:graph-first block:" : "  neat:graph-first block already present and current \u2014 no change."
+      );
+      if (rulesChanged) console.log(indent(block.trimEnd()));
+    }
     console.log("");
-    console.log(`Graph-first guidance \u2192 ${rulesPath}`);
     console.log(
-      rulesChanged ? existingRules.includes(GRAPH_FIRST_MARKER_OPEN) ? "  would refresh the neat:graph-first block:" : "  would add the neat:graph-first block:" : "  neat:graph-first block already present and current \u2014 no change."
+      hasRules ? `Re-run with --apply to write both files. Existing servers and rules are kept.` : `Re-run with --apply to write the config. Existing servers are kept.`
     );
-    if (rulesChanged) console.log(indent(block.trimEnd()));
-    console.log("");
-    console.log(`Re-run with --apply to write both files. Existing servers and rules are kept.`);
     return { exitCode: 0 };
   }
   await fs10.mkdir(path11.dirname(mcpPath), { recursive: true });
-  await fs10.writeFile(mcpPath, mcpJson, "utf8");
-  await fs10.mkdir(path11.dirname(rulesPath), { recursive: true });
-  await fs10.writeFile(rulesPath, newRules, "utf8");
+  await fs10.writeFile(mcpPath, mcp.text, "utf8");
+  if (hasRules) {
+    await fs10.mkdir(path11.dirname(rulesPath), { recursive: true });
+    await fs10.writeFile(rulesPath, newRules, "utf8");
+  }
   console.log(`neat ${client.id}: wired NEAT into ${client.label}`);
-  console.log(`  MCP server: ${mcpPath} (mcpServers.neat \u2192 npx -y @neat.is/mcp)`);
-  console.log(`  guidance:   ${rulesPath} (neat:graph-first block)`);
+  console.log(`  MCP server: ${mcpPath} (${client.mcpContainerKey}.neat \u2192 npx -y @neat.is/mcp)`);
+  if (hasRules) console.log(`  guidance:   ${rulesPath} (neat:graph-first block)`);
   console.log("");
   console.log(`restart ${client.label} to pick up the MCP server. Point it at a non-default`);
   console.log(`daemon by setting NEAT_CORE_URL in the neat server's env in that config.`);
@@ -4880,19 +5030,28 @@ function indent(text) {
   return text.split("\n").map((line) => line.length > 0 ? `    ${line}` : line).join("\n");
 }
 function usage3(client) {
-  console.log(`neat ${client.id} \u2014 install NEAT's MCP server + graph-first guidance into ${client.label}`);
+  const hasRules = typeof client.rulesFileName === "string";
+  console.log(
+    hasRules ? `neat ${client.id} \u2014 install NEAT's MCP server + graph-first guidance into ${client.label}` : `neat ${client.id} \u2014 install NEAT's MCP server into ${client.label}`
+  );
   console.log("");
-  console.log("  --apply   write the MCP config and the rules file (default: plan only)");
+  console.log(
+    hasRules ? "  --apply   write the MCP config and the rules file (default: plan only)" : "  --apply   write the MCP config (default: plan only)"
+  );
   console.log("");
   console.log("Writes NEAT's stdio MCP server (npx -y @neat.is/mcp) into");
   console.log(`  ${client.mcpConfigPath()}`);
-  console.log(`and the graph-first guidance block into ./${client.rulesFileName}, both`);
-  console.log("additively \u2014 existing servers and rules are preserved, a re-run is a no-op.");
+  if (hasRules) {
+    console.log(`and the graph-first guidance block into ./${client.rulesFileName}, both`);
+    console.log("additively \u2014 existing servers and rules are preserved, a re-run is a no-op.");
+  } else {
+    console.log("additively \u2014 existing servers are preserved, a re-run is a no-op.");
+  }
   console.log("");
   console.log(`See ${client.docsUrl} for ${client.label}'s MCP config format.`);
 }
 async function runEditorCommand(clientId, args, projectDir = process.cwd()) {
-  const client = clientId === "cursor" ? CURSOR_CLIENT : DEVIN_CLIENT;
+  const client = CLIENTS[clientId];
   let apply4 = false;
   for (const arg of args) {
     switch (arg) {
@@ -6067,6 +6226,39 @@ function usage4() {
   console.log("                 to ./.windsurfrules. Plan by default.");
   console.log("                 Flags:");
   console.log("                   --apply   write the MCP config + rules file (default: plan)");
+  console.log("  gemini         Wire NEAT into the Gemini CLI: add the MCP server to");
+  console.log("                 ~/.gemini/settings.json and the graph-first guidance to");
+  console.log("                 ./GEMINI.md. Plan by default.");
+  console.log("                 Flags:");
+  console.log("                   --apply   write the MCP config + rules file (default: plan)");
+  console.log("  qwen           Wire NEAT into Qwen Code: add the MCP server to");
+  console.log("                 ~/.qwen/settings.json and the graph-first guidance to");
+  console.log("                 ./QWEN.md. Plan by default.");
+  console.log("                 Flags:");
+  console.log("                   --apply   write the MCP config + rules file (default: plan)");
+  console.log("  amazonq        Wire NEAT into the Amazon Q Developer CLI: add the MCP server to");
+  console.log("                 ~/.aws/amazonq/mcp.json. Plan by default.");
+  console.log("                 Flags:");
+  console.log("                   --apply   write the MCP config (default: plan)");
+  console.log("  roocode        Wire NEAT into Roo Code: add the MCP server to the project's");
+  console.log("                 ./.roo/mcp.json. Plan by default.");
+  console.log("                 Flags:");
+  console.log("                   --apply   write the MCP config (default: plan)");
+  console.log("  zed            Wire NEAT into Zed: add the MCP server under context_servers in");
+  console.log("                 ~/.config/zed/settings.json (comments preserved) and the");
+  console.log("                 graph-first guidance to ./.rules. Plan by default.");
+  console.log("                 Flags:");
+  console.log("                   --apply   write the MCP config + rules file (default: plan)");
+  console.log("  opencode       Wire NEAT into OpenCode: add the MCP server under mcp in");
+  console.log("                 ~/.config/opencode/opencode.json and the graph-first guidance");
+  console.log("                 to ./AGENTS.md. Plan by default.");
+  console.log("                 Flags:");
+  console.log("                   --apply   write the MCP config + rules file (default: plan)");
+  console.log("  crush          Wire NEAT into Crush: add the MCP server under mcp in");
+  console.log("                 ~/.config/crush/crush.json and the graph-first guidance");
+  console.log("                 to ./AGENTS.md. Plan by default.");
+  console.log("                 Flags:");
+  console.log("                   --apply   write the MCP config + rules file (default: plan)");
   console.log("  deploy         Detect the deploy substrate, generate NEAT_AUTH_TOKEN,");
   console.log("                 emit a docker-compose / systemd / docker run artifact, and");
   console.log("                 print the OTel env-vars block to paste into your platform.");
@@ -6536,7 +6728,18 @@ async function main() {
     if (code !== 0) process.exit(code);
     return;
   }
-  if (cmd0 === "cursor" || cmd0 === "devin") {
+  const EDITOR_VERBS = [
+    "cursor",
+    "devin",
+    "gemini",
+    "qwen",
+    "amazonq",
+    "roocode",
+    "zed",
+    "opencode",
+    "crush"
+  ];
+  if (typeof cmd0 === "string" && EDITOR_VERBS.includes(cmd0)) {
     const code = await runEditorCommand(cmd0, argv.slice(1));
     if (code !== 0) process.exit(code);
     return;