conare 0.3.9 → 0.4.0

package/dist/index.js

@@ -1575,27 +1575,23 @@ async function countCursorSessions(dbPath) {
 }
 async function detect() {
   const home = homedir();
+  const os = platform();
   const tools = [];
   const claudeDir = join(home, ".claude", "projects");
   if (existsSync(claudeDir)) {
     const sessionCount = countJsonlFiles(claudeDir);
-    tools.push({
-      name: "Claude Code",
-      available: sessionCount > 0,
-      path: claudeDir,
-      sessionCount
-    });
+    tools.push({ name: "Claude Code", id: "claude", available: sessionCount > 0, path: claudeDir, sessionCount });
   } else {
-    tools.push({ name: "Claude Code", available: false, path: claudeDir, sessionCount: 0 });
+    tools.push({ name: "Claude Code", id: "claude", available: false, path: claudeDir, sessionCount: 0 });
   }
+  const codexConfig = join(home, ".codex", "config.toml");
   const codexHistory = join(home, ".codex", "history.jsonl");
   const codexSessions = join(home, ".codex", "sessions");
-  if (existsSync(codexHistory) || existsSync(codexSessions)) {
+  if (existsSync(codexConfig) || existsSync(codexHistory) || existsSync(codexSessions)) {
     let sessionCount = 0;
     if (existsSync(codexHistory)) {
       try {
-        const { readFileSync: readFileSync2 } = __require("node:fs");
-        const lines = readFileSync2(codexHistory, "utf-8").split(`
+        const lines = readFileSync(codexHistory, "utf-8").split(`
 `).filter(Boolean);
         const sessions = new Set(lines.map((l) => {
           try {
@@ -1608,16 +1604,10 @@ async function detect() {
         sessionCount = sessions.size;
       } catch {}
     }
-    tools.push({
-      name: "Codex",
-      available: true,
-      path: existsSync(codexHistory) ? codexHistory : codexSessions,
-      sessionCount
-    });
+    tools.push({ name: "Codex", id: "codex", available: true, path: codexConfig, sessionCount });
   } else {
-    tools.push({ name: "Codex", available: false, path: codexHistory, sessionCount: 0 });
+    tools.push({ name: "Codex", id: "codex", available: false, path: codexConfig, sessionCount: 0 });
   }
-  const os = platform();
   let cursorDbPath;
   if (os === "darwin") {
     cursorDbPath = join(home, "Library", "Application Support", "Cursor", "User", "globalStorage", "state.vscdb");
@@ -1628,10 +1618,65 @@ async function detect() {
   }
   tools.push({
     name: "Cursor",
+    id: "cursor",
     available: existsSync(cursorDbPath),
     path: cursorDbPath,
     sessionCount: existsSync(cursorDbPath) ? await countCursorSessions(cursorDbPath) : 0
   });
+  const windsurfDir = join(home, ".codeium", "windsurf");
+  tools.push({
+    name: "Windsurf",
+    id: "windsurf",
+    available: existsSync(windsurfDir),
+    path: join(windsurfDir, "mcp_config.json"),
+    sessionCount: 0
+  });
+  let vscodePath;
+  if (os === "darwin") {
+    vscodePath = join(home, "Library", "Application Support", "Code");
+  } else if (os === "win32") {
+    vscodePath = join(process.env.APPDATA || join(home, "AppData", "Roaming"), "Code");
+  } else {
+    vscodePath = join(home, ".config", "Code");
+  }
+  tools.push({
+    name: "VS Code Copilot",
+    id: "vscode",
+    available: existsSync(vscodePath),
+    path: join(vscodePath, "User", "mcp.json"),
+    sessionCount: 0
+  });
+  let clinePath;
+  if (os === "darwin") {
+    clinePath = join(home, "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
+  } else if (os === "win32") {
+    clinePath = join(process.env.APPDATA || join(home, "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
+  } else {
+    clinePath = join(home, ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
+  }
+  tools.push({
+    name: "Cline",
+    id: "cline",
+    available: existsSync(clinePath),
+    path: join(clinePath, "settings", "cline_mcp_settings.json"),
+    sessionCount: 0
+  });
+  const zedPath = os === "darwin" ? join(home, ".zed") : join(home, ".config", "zed");
+  tools.push({
+    name: "Zed",
+    id: "zed",
+    available: existsSync(zedPath),
+    path: join(zedPath, "settings.json"),
+    sessionCount: 0
+  });
+  const openclawDir = join(home, ".openclaw");
+  tools.push({
+    name: "OpenClaw",
+    id: "openclaw",
+    available: existsSync(openclawDir),
+    path: join(openclawDir, "openclaw.json"),
+    sessionCount: 0
+  });
   return tools;
 }
 
@@ -2240,9 +2285,14 @@ import { spawnSync } from "node:child_process";
 var CONARE_URL = "https://mcp.conare.ai";
 var SERVER_NAME = "conare";
 var MCP_TARGETS = [
-  { id: "claude", label: "Claude Code" },
-  { id: "cursor", label: "Cursor" },
-  { id: "codex", label: "Codex" }
+  { id: "claude", label: "Claude Code", defaultSelected: true },
+  { id: "codex", label: "Codex", defaultSelected: true },
+  { id: "cursor", label: "Cursor", defaultSelected: false },
+  { id: "windsurf", label: "Windsurf", defaultSelected: false },
+  { id: "vscode", label: "VS Code Copilot", defaultSelected: false },
+  { id: "cline", label: "Cline", defaultSelected: false },
+  { id: "zed", label: "Zed", defaultSelected: false },
+  { id: "openclaw", label: "OpenClaw", defaultSelected: false }
 ];
 function readJsonFile(path) {
   try {
@@ -2265,14 +2315,6 @@ function getServerConfig(apiKey) {
     }
   };
 }
-function upsertMcpServer(path, apiKey) {
-  const config = readJsonFile(path);
-  if (!config.mcpServers || typeof config.mcpServers !== "object") {
-    config.mcpServers = {};
-  }
-  config.mcpServers[SERVER_NAME] = getServerConfig(apiKey);
-  writeJsonFile(path, config);
-}
 function configureClaude(apiKey) {
   const claudeConfigPath = join7(homedir5(), ".claude.json");
   const claudeMcpPath = join7(homedir5(), ".claude", "mcp.json");
@@ -2282,16 +2324,193 @@ function configureClaude(apiKey) {
   }).status === 0) {
     return "Claude Code configured via `claude mcp add-json`";
   }
-  upsertMcpServer(claudeConfigPath, apiKey);
+  const config = readJsonFile(claudeConfigPath);
+  if (!config.mcpServers || typeof config.mcpServers !== "object") {
+    config.mcpServers = {};
+  }
+  config.mcpServers[SERVER_NAME] = getServerConfig(apiKey);
+  writeJsonFile(claudeConfigPath, config);
   if (existsSync6(join7(homedir5(), ".claude"))) {
-    upsertMcpServer(claudeMcpPath, apiKey);
+    const mcpConfig = readJsonFile(claudeMcpPath);
+    if (!mcpConfig.mcpServers || typeof mcpConfig.mcpServers !== "object") {
+      mcpConfig.mcpServers = {};
+    }
+    mcpConfig.mcpServers[SERVER_NAME] = getServerConfig(apiKey);
+    writeJsonFile(claudeMcpPath, mcpConfig);
   }
   return `Claude Code configured at ${claudeConfigPath}`;
 }
-function configureJsonClient(path, apiKey, label) {
-  upsertMcpServer(path, apiKey);
-  return `${label} configured at ${path}`;
+function configureCodex(apiKey) {
+  const configPath = join7(homedir5(), ".codex", "config.toml");
+  if (spawnSync("codex", ["mcp", "add", SERVER_NAME, "--url", `${CONARE_URL}/mcp`, "--header", `Authorization: Bearer ${apiKey}`], {
+    stdio: "ignore",
+    shell: platform5() === "win32"
+  }).status === 0) {
+    return "Codex configured via `codex mcp add`";
+  }
+  let toml = "";
+  try {
+    toml = readFileSync7(configPath, "utf-8");
+  } catch {}
+  const sectionHeader = `[mcp_servers.${SERVER_NAME}]`;
+  const newSection = [
+    sectionHeader,
+    `url = "${CONARE_URL}/mcp"`,
+    `enabled = true`,
+    "",
+    `[mcp_servers.${SERVER_NAME}.http_headers]`,
+    `"Authorization" = "Bearer ${apiKey}"`
+  ].join(`
+`);
+  const sectionRegex = new RegExp(`\\[mcp_servers\\.${SERVER_NAME}(?:\\.[^\\]]*)?\\][^\\[]*`, "g");
+  const cleaned = toml.replace(sectionRegex, "").replace(/\n{3,}/g, `
+
+`).trim();
+  const result = cleaned ? `${cleaned}
+
+${newSection}
+` : `${newSection}
+`;
+  mkdirSync2(dirname(configPath), { recursive: true });
+  writeFileSync2(configPath, result);
+  const oldMcpJson = join7(homedir5(), ".codex", "mcp.json");
+  try {
+    if (existsSync6(oldMcpJson)) {
+      const old = readJsonFile(oldMcpJson);
+      const servers = old.mcpServers;
+      if (servers && (("conare" in servers) || ("conare-memory" in servers))) {
+        delete servers["conare"];
+        delete servers["conare-memory"];
+        if (Object.keys(servers).length === 0) {
+          rmSync(oldMcpJson);
+        } else {
+          writeJsonFile(oldMcpJson, old);
+        }
+      }
+    }
+  } catch {}
+  return `Codex configured at ${configPath}`;
+}
+function configureCursor(apiKey) {
+  const configPath = join7(homedir5(), ".cursor", "mcp.json");
+  const config = readJsonFile(configPath);
+  if (!config.mcpServers || typeof config.mcpServers !== "object") {
+    config.mcpServers = {};
+  }
+  config.mcpServers[SERVER_NAME] = {
+    url: `${CONARE_URL}/mcp`,
+    headers: { Authorization: `Bearer ${apiKey}` }
+  };
+  writeJsonFile(configPath, config);
+  return `Cursor configured at ${configPath}`;
+}
+function configureWindsurf(apiKey) {
+  const configPath = join7(homedir5(), ".codeium", "windsurf", "mcp_config.json");
+  const config = readJsonFile(configPath);
+  if (!config.mcpServers || typeof config.mcpServers !== "object") {
+    config.mcpServers = {};
+  }
+  config.mcpServers[SERVER_NAME] = {
+    serverUrl: `${CONARE_URL}/mcp`,
+    headers: { Authorization: `Bearer ${apiKey}` }
+  };
+  writeJsonFile(configPath, config);
+  return `Windsurf configured at ${configPath}`;
+}
+function configureVscode(apiKey) {
+  const os = platform5();
+  let configPath;
+  if (os === "darwin") {
+    configPath = join7(homedir5(), "Library", "Application Support", "Code", "User", "mcp.json");
+  } else if (os === "win32") {
+    configPath = join7(process.env.APPDATA || join7(homedir5(), "AppData", "Roaming"), "Code", "User", "mcp.json");
+  } else {
+    configPath = join7(homedir5(), ".config", "Code", "User", "mcp.json");
+  }
+  const config = readJsonFile(configPath);
+  if (!config.servers || typeof config.servers !== "object") {
+    config.servers = {};
+  }
+  config.servers[SERVER_NAME] = {
+    type: "http",
+    url: `${CONARE_URL}/mcp`,
+    headers: { Authorization: `Bearer ${apiKey}` }
+  };
+  writeJsonFile(configPath, config);
+  return `VS Code Copilot configured at ${configPath}`;
+}
+function configureCline(apiKey) {
+  const os = platform5();
+  let configPath;
+  if (os === "darwin") {
+    configPath = join7(homedir5(), "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+  } else if (os === "win32") {
+    configPath = join7(process.env.APPDATA || join7(homedir5(), "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+  } else {
+    configPath = join7(homedir5(), ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+  }
+  const config = readJsonFile(configPath);
+  if (!config.mcpServers || typeof config.mcpServers !== "object") {
+    config.mcpServers = {};
+  }
+  config.mcpServers[SERVER_NAME] = {
+    url: `${CONARE_URL}/mcp`,
+    headers: { Authorization: `Bearer ${apiKey}` },
+    disabled: false
+  };
+  writeJsonFile(configPath, config);
+  return `Cline configured at ${configPath}`;
+}
+function configureZed(apiKey) {
+  const os = platform5();
+  let configPath;
+  if (os === "darwin") {
+    configPath = join7(homedir5(), ".zed", "settings.json");
+  } else {
+    configPath = join7(homedir5(), ".config", "zed", "settings.json");
+  }
+  const config = readJsonFile(configPath);
+  if (!config.context_servers || typeof config.context_servers !== "object") {
+    config.context_servers = {};
+  }
+  config.context_servers[SERVER_NAME] = {
+    command: "npx",
+    args: [
+      "-y",
+      "mcp-remote",
+      `${CONARE_URL}/mcp`,
+      "--header",
+      `Authorization:Bearer ${apiKey}`
+    ],
+    env: {}
+  };
+  writeJsonFile(configPath, config);
+  return `Zed configured at ${configPath}`;
 }
+function configureOpenclaw(apiKey) {
+  const configPath = join7(homedir5(), ".openclaw", "openclaw.json");
+  const config = readJsonFile(configPath);
+  if (!config.mcpServers || typeof config.mcpServers !== "object") {
+    config.mcpServers = {};
+  }
+  config.mcpServers[SERVER_NAME] = {
+    type: "streamable-http",
+    url: `${CONARE_URL}/mcp`,
+    headers: { Authorization: `Bearer ${apiKey}` }
+  };
+  writeJsonFile(configPath, config);
+  return `OpenClaw configured at ${configPath}`;
+}
+var CLIENT_CONFIGURATORS = {
+  claude: configureClaude,
+  codex: configureCodex,
+  cursor: configureCursor,
+  windsurf: configureWindsurf,
+  vscode: configureVscode,
+  cline: configureCline,
+  zed: configureZed,
+  openclaw: configureOpenclaw
+};
 var SKILL_MD = `---
 name: conare
 description: Complements the Conare MCP server by teaching the agent when and how to load prior project context, search past sessions, save durable preferences, list stored memories, and forget saved items. Use when the user asks what they worked on before, wants prior context loaded at the start of a task, asks to remember or forget something, or needs past conversations, decisions, or code recalled from memory.
@@ -2365,95 +2584,6 @@ Expected outcome: future \`recall\` calls surface the information automatically
 - Keep \`limit\` low (3-5) for focused results, higher (10-15) for broad exploration
 - When user asks to "remember" something, save it with \`save\` — it goes to the \`preferences\` container and gets surfaced by \`recall\` in future sessions
 
-## Examples
-
-### Example 1: Start with context
-
-User says: "Help me continue the OAuth migration in this repo."
-
-Actions:
-1. Call \`recall\` with context like "continue OAuth migration in the current repository".
-2. Review returned memories for prior migration decisions, unresolved blockers, and saved preferences.
-3. Proceed with implementation using that context.
-
-Result: the agent starts with the relevant project history instead of asking the user to restate it.
-
-### Example 2: Find prior work
-
-User says: "What did we decide last week about billing webhooks?"
-
-Actions:
-1. Call \`search\` with a descriptive query such as "billing webhook decision refunds retries last week".
-2. If results are weak, retry with alternatives like "refund webhook handling" or "billing retry policy".
-3. Summarize the decision and note uncertainty if memories conflict.
-
-Result: the agent retrieves prior decisions from memory rather than guessing.
-
-### Example 3: Save a durable preference
-
-User says: "Remember that I prefer ripgrep over grep."
-
-Actions:
-1. Call \`save\` with the preference in durable wording.
-2. Confirm the preference was saved.
-
-Result: future \`recall\` results can surface that preference automatically.
-
-## Troubleshooting
-
-### Weak or irrelevant search results
-
-Cause:
-- Query is too short or too generic.
-- Search needs a different phrasing or time scope.
-
-Response:
-1. Rewrite the query with concrete nouns, entities, and actions.
-2. Add \`after\`/\`before\` when the user implies a time window.
-3. Add \`project\` or \`containerTag\` when the scope is known.
-
-### \`recall\` returns little useful context
-
-Cause:
-- Conversation context passed to \`recall\` was too vague.
-- The project parameter was omitted when it should have been included.
-
-Response:
-1. Retry \`recall\` with a more specific task description.
-2. Include \`project\` if the workspace or repository is known.
-3. Fall back to \`search\` for the exact topic the user cares about.
-
-### Unsure whether to save something
-
-Cause:
-- The information may be temporary rather than durable.
-
-Response:
-1. Save it when it is likely to help in future sessions, especially if it reflects a preference, rule, decision, or durable project fact.
-2. Skip only clearly transient implementation notes unless the user explicitly asks to retain them.
-
-## Triggering Tests
-
-Use these tests to validate whether the skill description is tuned correctly.
-
-Should trigger:
-- "What did we work on in this repo last week?"
-- "Load context for the auth refactor before we continue."
-- "Remember that I prefer pnpm in JavaScript projects."
-- "Forget the note about using staging Stripe keys."
-- "Search my past sessions for the DO migration fix."
-
-Should not trigger:
-- "Write a sorting function in TypeScript."
-- "What is the weather in San Francisco?"
-- "Explain how PostgreSQL indexes work."
-- "Create a landing page from this mockup."
-
-Success criteria:
-- Triggers on memory-oriented requests and start-of-task context loading.
-- Does not trigger on generic coding or research tasks with no memory component.
-- Uses \`recall\` first for new task continuation, and uses \`search\` only when the user asks about specific past work.
-
 ## Setup
 
 Install with a single command:
@@ -2486,16 +2616,17 @@ function installSkill() {
   } catch {}
   return "Agent Skill installed";
 }
-function configureMcp(apiKey, targets = ["claude", "cursor", "codex"]) {
+function configureMcp(apiKey, targets = ["claude", "codex"]) {
   const results = [];
-  if (targets.includes("claude")) {
-    results.push(configureClaude(apiKey));
-  }
-  if (targets.includes("cursor")) {
-    results.push(configureJsonClient(join7(homedir5(), ".cursor", "mcp.json"), apiKey, "Cursor"));
-  }
-  if (targets.includes("codex")) {
-    results.push(configureJsonClient(join7(homedir5(), ".codex", "mcp.json"), apiKey, "Codex"));
+  for (const target of targets) {
+    const configurator = CLIENT_CONFIGURATORS[target];
+    if (configurator) {
+      try {
+        results.push(configurator(apiKey));
+      } catch (e) {
+        results.push(`${target}: failed — ${e.message}`);
+      }
+    }
   }
   try {
     results.push(installSkill());
@@ -3132,10 +3263,13 @@ conare — AI memory for your coding tools
 
 Usage:
   conare                                    Interactive setup with browser auth
-  conare install                            Just install the MCP
+  conare install                            Just install the MCP (all detected clients)
   conare --key <api_key>                    Ingest chat history (key optional with browser auth)
   conare --key <api_key> --index [path]     Index codebase
 
+Supported clients:
+  Claude Code, Codex, Cursor, Windsurf, VS Code Copilot, Cline, Zed, OpenClaw
+
 Options:
   --key <key>         Your Conare API key (optional if using browser auth, starts with cmem_)
   --config-file <path> Read API key from JSON config file (e.g. ~/.conare/config.json)
@@ -3210,8 +3344,12 @@ async function runInstall() {
     process.exit(1);
   }
   saveApiKey(apiKey);
-  const allTargets = MCP_TARGETS.map((t) => t.id);
-  const lines = configureMcp(apiKey, allTargets);
+  const detectedTools = await detect();
+  const targets = MCP_TARGETS.filter((t) => {
+    const detected = detectedTools.find((d3) => d3.id === t.id);
+    return detected?.available || t.defaultSelected;
+  }).map((t) => t.id);
+  const lines = configureMcp(apiKey, targets);
   for (const line of lines)
     console.log(`  ${line}`);
   console.log("");
@@ -3243,7 +3381,7 @@ async function main() {
   const savedApiKey = getSavedApiKey();
   const hasTty = !!process.stdin.isTTY && !!process.stdout.isTTY;
   const shouldRunInteractive = hasTty && !opts.dryRun && !opts.quiet && (opts.interactive || !opts.force && !opts.source && !opts.indexPath && !opts.configOnly && !opts.ingestOnly && !opts.wasmDir);
-  let selectedTargets = MCP_TARGETS.map((target) => target.id);
+  let selectedTargets = MCP_TARGETS.filter((t) => t.defaultSelected).map((t) => t.id);
   let effectiveConfigOnly = opts.configOnly;
   let effectiveIngestOnly = opts.ingestOnly;
   let effectiveIndexPath = opts.indexPath;
@@ -3254,19 +3392,19 @@ async function main() {
     id: target.id,
     label: target.label,
     available: true,
-    recommended: true,
+    recommended: target.defaultSelected,
     detectedCount: undefined
   }));
   let interactiveMode = false;
   if (shouldRunInteractive) {
     const detectedTools = await detect();
     interactiveTargets = MCP_TARGETS.map((target) => {
-      const detected = detectedTools.find((tool) => target.id === "claude" && tool.name === "Claude Code" || target.id === "cursor" && tool.name === "Cursor" || target.id === "codex" && tool.name === "Codex");
+      const detected = detectedTools.find((tool) => tool.id === target.id);
       return {
         id: target.id,
         label: target.label,
         available: detected?.available,
-        recommended: detected?.available !== false,
+        recommended: target.defaultSelected && detected?.available !== false,
         detectedCount: detected?.sessionCount
       };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "conare",
-  "version": "0.3.9",
+  "version": "0.4.0",
   "description": "Conare CLI for ingesting AI chat history and configuring memory at conare.ai",
   "type": "module",
   "bin": {