conare 0.3.5 → 0.3.6

package/dist/index.js

@@ -114,7 +114,7 @@ __export(exports_codebase, {
 import { createHash as createHash2 } from "node:crypto";
 import { readdirSync as readdirSync4, readFileSync as readFileSync6, statSync as statSync2, existsSync as existsSync5 } from "node:fs";
 import { join as join6, relative, extname, resolve, basename as basename3 } from "node:path";
-import { execSync } from "node:child_process";
+import { execSync as execSync2 } from "node:child_process";
 function parseGitignore(rootPath) {
   const patterns = new Set;
   const gitignorePath = join6(rootPath, ".gitignore");
@@ -180,12 +180,12 @@ function detectProjectName(rootPath) {
 }
 function getChangedFiles(rootPath) {
   try {
-    const committed = execSync("git diff --name-only HEAD 2>/dev/null || true", {
+    const committed = execSync2("git diff --name-only HEAD 2>/dev/null || true", {
       cwd: rootPath,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     }).trim();
-    const staged = execSync("git diff --name-only --cached 2>/dev/null || true", {
+    const staged = execSync2("git diff --name-only --cached 2>/dev/null || true", {
       cwd: rootPath,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -436,7 +436,7 @@ __export(exports_api, {
   ApiError: () => ApiError
 });
 async function apiRequest(path, apiKey, init) {
-  const res = await fetch(`${API_URL}${path}`, {
+  const res = await fetch(`${API_URL2}${path}`, {
     ...init,
     headers: {
       Authorization: `Bearer ${apiKey}`,
@@ -593,7 +593,7 @@ async function uploadBulk(apiKey, memories, onProgress) {
   }
   return { success, failed, results };
 }
-var API_URL = "https://mcp.conare.ai", ApiError, PAGE_SIZE = 200, DELETE_CONCURRENCY = 5;
+var API_URL2 = "https://mcp.conare.ai", ApiError, PAGE_SIZE = 200, DELETE_CONCURRENCY = 5;
 var init_api = __esm(() => {
   ApiError = class ApiError extends Error {
     statusCode;
@@ -1425,6 +1425,7 @@ __export(exports_interactive, {
   showDetectedApps: () => showDetectedApps,
   selectMcpTargets: () => selectMcpTargets,
   selectChatSources: () => selectChatSources,
+  promptAuth: () => promptAuth,
   promptApiKey: () => promptApiKey,
   finishSetup: () => finishSetup,
   confirmIndexCodebase: () => confirmIndexCodebase,
@@ -1470,6 +1471,54 @@ async function promptApiKey(options) {
   });
   return ensureValue(keyPrompt).trim() || options.savedApiKey;
 }
+async function promptAuth(options) {
+  if (options.providedApiKey) {
+    return options.providedApiKey;
+  }
+  if (options.savedApiKey) {
+    const useSaved = await ye({
+      message: `Use saved API key ending in ${options.savedApiKey.slice(-6)}?`,
+      initialValue: true
+    });
+    if (pD(useSaved)) {
+      xe("Setup cancelled.");
+      process.exit(0);
+    }
+    if (useSaved)
+      return options.savedApiKey;
+  }
+  const method = await ve({
+    message: "How would you like to authenticate?",
+    options: [
+      { value: "browser", label: "Sign in with browser", hint: "recommended" },
+      { value: "manual", label: "Enter API key manually" }
+    ]
+  });
+  if (pD(method)) {
+    xe("Setup cancelled.");
+    process.exit(0);
+  }
+  if (method === "browser") {
+    return "__BROWSER_AUTH__";
+  }
+  const keyPrompt = await ge({
+    message: "API key",
+    mask: "*",
+    validate(value) {
+      const resolved = value.trim();
+      if (!resolved)
+        return "Enter an API key from https://mcp.conare.ai";
+      if (!resolved.startsWith("cmem_"))
+        return "API keys start with cmem_";
+      return;
+    }
+  });
+  if (pD(keyPrompt)) {
+    xe("Setup cancelled.");
+    process.exit(0);
+  }
+  return keyPrompt.trim();
+}
 async function selectChatSources(targets) {
   return ensureValue(await fe({
     message: "Select chat sources",
@@ -1630,26 +1679,98 @@ async function detect() {
     path: cursorDbPath,
     sessionCount: existsSync(cursorDbPath) ? await countCursorSessions(cursorDbPath) : 0
   });
-  const openclawDir = join(home, ".openclaw");
-  tools.push({
-    name: "OpenClaw",
-    available: existsSync(openclawDir),
-    path: openclawDir,
-    sessionCount: 0
-  });
   return tools;
 }
 
+// src/auth.ts
+import { execSync } from "node:child_process";
+import { platform as platform2 } from "node:os";
+var API_URL = "https://mcp.conare.ai";
+async function browserAuth() {
+  const stateBytes = new Uint8Array(16);
+  crypto.getRandomValues(stateBytes);
+  const state = Array.from(stateBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
+  const sessionRes = await fetch(`${API_URL}/api/auth/cli-session`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ state })
+  });
+  if (!sessionRes.ok) {
+    throw new Error(`Failed to create auth session: HTTP ${sessionRes.status}`);
+  }
+  const { code, expiresAt } = await sessionRes.json();
+  const authUrl = `${API_URL}/cli-auth?code=${code}&state=${state}`;
+  const opened = openBrowser(authUrl);
+  if (!opened) {
+    console.log("");
+    console.log("  Open this URL in your browser to sign in:");
+    console.log("");
+    console.log(`  ${authUrl}`);
+    console.log("");
+  }
+  const timeout = Math.max(expiresAt - Date.now(), 0);
+  const deadline = Date.now() + timeout;
+  while (Date.now() < deadline) {
+    await sleep(2000);
+    const exchangeRes = await fetch(`${API_URL}/api/auth/cli-exchange`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ code, state })
+    });
+    if (exchangeRes.status === 202) {
+      continue;
+    }
+    if (exchangeRes.ok) {
+      const data = await exchangeRes.json();
+      return data.apiKey;
+    }
+    if (exchangeRes.status === 410) {
+      throw new Error("Authentication code was already used. Please try again.");
+    }
+    if (exchangeRes.status === 404) {
+      throw new Error("Authentication session expired. Please try again.");
+    }
+    throw new Error(`Authentication failed: HTTP ${exchangeRes.status}`);
+  }
+  throw new Error("Authentication timed out. Please try again.");
+}
+function openBrowser(url) {
+  try {
+    const os = platform2();
+    if (os === "darwin") {
+      execSync(`open "${url}"`, { stdio: "ignore" });
+    } else if (os === "win32") {
+      execSync(`start "" "${url}"`, { stdio: "ignore" });
+    } else {
+      try {
+        execSync(`xdg-open "${url}"`, { stdio: "ignore" });
+      } catch {
+        try {
+          execSync(`wslview "${url}"`, { stdio: "ignore" });
+        } catch {
+          return false;
+        }
+      }
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 // src/ingest/claude.ts
 init_shared();
 import { readdirSync as readdirSync2, readFileSync as readFileSync3, existsSync as existsSync3 } from "node:fs";
 import { join as join3, basename } from "node:path";
-import { homedir as homedir3, platform as platform2 } from "node:os";
+import { homedir as homedir3, platform as platform3 } from "node:os";
 var MAX_CONTENT = 48000;
 var MIN_TURN_LEN = 50;
 function resolveProjectName(dirName) {
   const segments = dirName.replace(/^-/, "").split("-");
-  const isWindows = platform2() === "win32";
+  const isWindows = platform3() === "win32";
   let resolved;
   let startIdx;
   if (isWindows && segments.length > 0 && /^[A-Za-z]$/.test(segments[0])) {
@@ -1735,6 +1856,22 @@ function parseSession(lines) {
   })).filter((t) => t.assistant.length >= MIN_TURN_LEN);
   return { turns, date };
 }
+function getParentUuid(lines) {
+  for (const line of lines) {
+    if (!line.trim())
+      continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (obj && typeof obj === "object" && "parentUuid" in obj) {
+      return obj.parentUuid;
+    }
+  }
+  return;
+}
 function ingestClaude() {
   const projectsDir = join3(homedir3(), ".claude", "projects");
   const memories = [];
@@ -1759,8 +1896,14 @@ function ingestClaude() {
     for (const file of files) {
       const sessionId = basename(file, ".jsonl");
       const raw = readFileSync3(join3(projPath, file), "utf-8");
-      const { turns, date } = parseSession(raw.split(`
-`));
+      const lines = raw.split(`
+`);
+      const parentUuid = getParentUuid(lines);
+      if (parentUuid != null) {
+        filtered++;
+        continue;
+      }
+      const { turns, date } = parseSession(lines);
       if (turns.length === 0) {
         filtered++;
         continue;
@@ -2139,15 +2282,14 @@ init_api();
 // src/configure.ts
 import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync7, writeFileSync as writeFileSync2, symlinkSync, readlinkSync, rmSync } from "node:fs";
 import { dirname, join as join7 } from "node:path";
-import { homedir as homedir5, platform as platform4 } from "node:os";
+import { homedir as homedir5, platform as platform5 } from "node:os";
 import { spawnSync } from "node:child_process";
 var CONARE_URL = "https://mcp.conare.ai";
-var SERVER_NAME = "conare-memory";
+var SERVER_NAME = "conare";
 var MCP_TARGETS = [
   { id: "claude", label: "Claude Code" },
   { id: "cursor", label: "Cursor" },
-  { id: "codex", label: "Codex" },
-  { id: "openclaw", label: "OpenClaw" }
+  { id: "codex", label: "Codex" }
 ];
 function readJsonFile(path) {
   try {
@@ -2183,7 +2325,7 @@ function configureClaude(apiKey) {
   const claudeMcpPath = join7(homedir5(), ".claude", "mcp.json");
   if (spawnSync("claude", ["mcp", "add-json", SERVER_NAME, "--scope", "user", JSON.stringify(getServerConfig(apiKey))], {
     stdio: "ignore",
-    shell: platform4() === "win32"
+    shell: platform5() === "win32"
   }).status === 0) {
     return "Claude Code configured via `claude mcp add-json`";
   }
@@ -2198,41 +2340,166 @@ function configureJsonClient(path, apiKey, label) {
   return `${label} configured at ${path}`;
 }
 var SKILL_MD = `---
-slug: conare-memory
-name: Conare Memory
-description: Long-term memory for AI agents — automatically recalls past conversations, saves preferences, and searches across all your coding sessions. Works with Claude Code, Cursor, Codex, and more.
+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.
+compatibility: Requires the Conare MCP server tools (\`recall\`, \`search\`, \`save\`, \`list\`, \`forget\`) to be installed and connected.
+metadata:
+  author: Conare
+  version: 1.1.0
+  mcp-server: conare
 homepage: https://conare.ai
 ---
 
-# Conare Memory
+# Conare
+
+This skill complements the Conare MCP server. The MCP provides memory tools and live access to stored memories; this skill teaches the agent the default workflow, tool-selection rules, and query patterns that make those tools reliable.
 
-Persistent memory across coding sessions. Your conversations, decisions, and preferences are automatically indexed and recalled in future sessions.
+## Primary Use Cases
+
+1. Start a new coding task with relevant history already loaded through \`recall\`.
+2. Answer questions about prior work, decisions, bugs, architecture, or preferences through \`search\`.
+3. Persist durable information the user wants carried into future sessions through \`save\`.
 
 ## When To Use Each Tool
 
 | Situation | Tool | Example |
 |-----------|------|---------|
 | Start of conversation | \`recall\` | Always call first with conversation context |
-| User asks about past work | \`memory_search\` | "What did we do last week?" |
-| User says "remember this" | \`memory_save\` | Save preferences, rules, decisions |
-| User says "forget this" | \`memory_forget\` | Remove a specific memory |
-| Browse what's stored | \`memory_list\` | "Show me recent memories" |
+| User asks about past work | \`search\` | "What did we do last week?" |
+| User says "remember this" | \`save\` | Save preferences, rules, decisions |
+| User says "forget this" | \`forget\` | Remove a specific memory |
+| Browse what's stored | \`list\` | "Show me recent memories" |
 
 ## Critical Rules
 
 1. **Always call \`recall\` at conversation start** — pass a specific description of the conversation topic, not generic text
-2. **\`memory_search\` is global** — it searches ALL memories across all projects. Use it when the user asks about specific topics or past conversations
+2. **\`search\` is global** — it searches ALL memories across all projects. Use it when the user asks about specific topics or past conversations
 3. **\`recall\` is scoped** — it returns project-relevant context + recent sessions + preferences. Use the \`project\` param when available
 4. **Write descriptive queries** — "how does the billing webhook handle refunds" beats "billing"
 5. **Rephrase and retry** — if first search misses, try different phrasing. Semantic search responds to synonyms and related concepts
 
+## Workflow
+
+### Step 1: Load context at the start
+
+- Call \`recall\` at conversation start with a specific description of the current task.
+- Include the \`project\` parameter when the project is known or inferable from the workspace.
+- Use the returned context to avoid re-asking for things the user already told the agent in earlier sessions.
+
+Expected outcome: the agent begins with recent sessions, saved preferences, and project-relevant memory already in context.
+
+### Step 2: Search when the user asks about prior work
+
+- Use \`search\` for questions about past conversations, earlier implementations, prior bugs, design decisions, or work done in a time range.
+- Start with a descriptive natural-language query.
+- If results are weak, retry with 2-3 rephrasings from different angles.
+
+Expected outcome: the agent can cite or summarize the most relevant prior work without broad manual browsing.
+
+### Step 3: Save durable facts intentionally
+
+- Use \`save\` proactively for information that should persist across sessions: preferences, standing rules, important decisions, long-lived project facts, and user-specific context that will help in future work.
+- When the user shares durable context or says to remember something, prefer capturing it with \`save\` so future \`recall\` calls can surface it automatically.
+- Avoid cluttering memory with purely transient scratch notes unless the user explicitly wants them remembered.
+
+Expected outcome: future \`recall\` calls surface the information automatically when relevant.
+
 ## Search Tips
 
 - Use \`after\`/\`before\` (Unix ms) for time-scoped searches: "what did we work on this week?"
 - Use \`containerTag\` to filter by source: \`claude-chats\`, \`codex-chats\`, \`cursor-chats\`, \`codebase\`, \`preferences\`
 - Use \`project\` for cross-project filtering (partial names work: "conare" matches "fun/conare-memory-engine")
 - Keep \`limit\` low (3-5) for focused results, higher (10-15) for broad exploration
-- When user asks to "remember" something, save it with \`memory_save\` — it goes to the \`preferences\` container and gets surfaced by \`recall\` in future sessions
+- 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
 
@@ -2247,11 +2514,11 @@ The wizard handles everything: account creation, API key, MCP configuration, bac
 For manual setup, visit [conare.ai](https://conare.ai).
 `;
 function installSkill() {
-  const skillDir = join7(homedir5(), ".agents", "skills", "conare-memory");
+  const skillDir = join7(homedir5(), ".agents", "skills", "conare");
   mkdirSync2(skillDir, { recursive: true });
   writeFileSync2(join7(skillDir, "SKILL.md"), SKILL_MD);
   const claudeSkillsDir = join7(homedir5(), ".claude", "skills");
-  const claudeSkillDir = join7(claudeSkillsDir, "conare-memory");
+  const claudeSkillDir = join7(claudeSkillsDir, "conare");
   try {
     if (existsSync6(claudeSkillsDir)) {
       if (existsSync6(claudeSkillDir)) {
@@ -2277,9 +2544,6 @@ function configureMcp(apiKey, targets = ["claude", "cursor", "codex"]) {
   if (targets.includes("codex")) {
     results.push(configureJsonClient(join7(homedir5(), ".codex", "mcp.json"), apiKey, "Codex"));
   }
-  if (targets.includes("openclaw")) {
-    results.push(configureJsonClient(join7(homedir5(), ".openclaw", "mcp.json"), apiKey, "OpenClaw"));
-  }
   try {
     results.push(installSkill());
   } catch {}
@@ -2301,20 +2565,35 @@ function readConfig() {
     return {};
   }
 }
+function writeConfig(config) {
+  mkdirSync3(CONFIG_DIR, { recursive: true, mode: 448 });
+  writeFileSync3(CONFIG_PATH, JSON.stringify(config, null, 2) + `
+`, { mode: 384 });
+}
 function saveApiKey(apiKey) {
-  mkdirSync3(CONFIG_DIR, { recursive: true });
-  writeFileSync3(CONFIG_PATH, JSON.stringify({ apiKey }, null, 2) + `
-`);
+  const config = readConfig();
+  config.apiKey = apiKey;
+  writeConfig(config);
 }
 function getSavedApiKey() {
   return readConfig().apiKey;
 }
+function addIndexedPath(absPath) {
+  const config = readConfig();
+  const paths = new Set(config.indexedPaths || []);
+  paths.add(absPath);
+  config.indexedPaths = [...paths];
+  writeConfig(config);
+}
+function getIndexedPaths() {
+  return readConfig().indexedPaths || [];
+}
 
 // src/sync.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync, readFileSync as readFileSync9, chmodSync, cpSync, rmSync as rmSync2, symlinkSync as symlinkSync2, readlinkSync as readlinkSync2, appendFileSync } from "node:fs";
 import { join as join9, dirname as dirname2 } from "node:path";
-import { homedir as homedir7, platform as platform5 } from "node:os";
-import { execSync as execSync2 } from "node:child_process";
+import { homedir as homedir7, platform as platform6 } from "node:os";
+import { execSync as execSync3 } from "node:child_process";
 var CONARE_DIR = join9(homedir7(), ".conare");
 var BIN_DIR = join9(CONARE_DIR, "bin");
 var CONFIG_PATH2 = join9(CONARE_DIR, "config.json");
@@ -2470,7 +2749,7 @@ WantedBy=timers.target
 }
 function hasSystemd() {
   try {
-    execSync2("systemctl --user status 2>/dev/null", { stdio: "ignore" });
+    execSync3("systemctl --user status 2>/dev/null", { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -2478,7 +2757,7 @@ function hasSystemd() {
 }
 function uid() {
   try {
-    return execSync2("id -u", { encoding: "utf-8" }).trim();
+    return execSync3("id -u", { encoding: "utf-8" }).trim();
   } catch {
     return "501";
   }
@@ -2510,7 +2789,7 @@ function persistBinary(apiKey) {
   const runVbsPath = join9(BIN_DIR, "run.vbs");
   writeFileSync4(runVbsPath, RUN_VBS);
   writeFileSync4(CONFIG_PATH2, JSON.stringify({ apiKey }, null, 2) + `
-`);
+`, { mode: 384 });
 }
 function isValidJsBundle(path) {
   if (!existsSync8(path))
@@ -2555,13 +2834,13 @@ function setupMacOS(intervalMinutes) {
   writeFileSync4(PLIST_PATH, makePlist(intervalMinutes));
   const id = uid();
   try {
-    execSync2(`launchctl bootout gui/${id} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
+    execSync3(`launchctl bootout gui/${id} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
   } catch {}
   try {
-    execSync2(`launchctl bootstrap gui/${id} "${PLIST_PATH}"`, { stdio: "ignore" });
+    execSync3(`launchctl bootstrap gui/${id} "${PLIST_PATH}"`, { stdio: "ignore" });
   } catch {
     try {
-      execSync2(`launchctl load "${PLIST_PATH}"`, { stdio: "ignore" });
+      execSync3(`launchctl load "${PLIST_PATH}"`, { stdio: "ignore" });
     } catch {
       throw new Error("Failed to load launchd agent. Try manually: launchctl load " + PLIST_PATH);
     }
@@ -2571,28 +2850,28 @@ function setupLinuxSystemd(intervalMinutes) {
   mkdirSync4(SYSTEMD_DIR, { recursive: true });
   writeFileSync4(SYSTEMD_SERVICE, SYSTEMD_SERVICE_CONTENT);
   writeFileSync4(SYSTEMD_TIMER, makeSystemdTimer(intervalMinutes));
-  execSync2("systemctl --user daemon-reload", { stdio: "ignore" });
-  execSync2("systemctl --user enable --now conare-sync.timer", { stdio: "ignore" });
+  execSync3("systemctl --user daemon-reload", { stdio: "ignore" });
+  execSync3("systemctl --user enable --now conare-sync.timer", { stdio: "ignore" });
 }
 function setupLinuxCron(intervalMinutes) {
   const cronCmd = `${homedir7()}/.conare/bin/run.sh`;
   const cronLine = `*/${intervalMinutes} * * * * ${cronCmd}`;
   try {
-    const existing = execSync2("crontab -l 2>/dev/null", { encoding: "utf-8" });
+    const existing = execSync3("crontab -l 2>/dev/null", { encoding: "utf-8" });
     const filtered = existing.split(`
 `).filter((l) => !l.includes("conare")).join(`
 `);
     const newCrontab = (filtered.trim() ? filtered.trim() + `
 ` : "") + cronLine + `
 `;
-    execSync2("crontab -", { input: newCrontab, stdio: ["pipe", "ignore", "ignore"] });
+    execSync3("crontab -", { input: newCrontab, stdio: ["pipe", "ignore", "ignore"] });
   } catch {
-    execSync2("crontab -", { input: cronLine + `
+    execSync3("crontab -", { input: cronLine + `
 `, stdio: ["pipe", "ignore", "ignore"] });
   }
 }
 function installGlobalCommand() {
-  const isWindows = platform5() === "win32";
+  const isWindows = platform6() === "win32";
   if (isWindows) {
     const wrapper2 = join9(BIN_DIR, "conare.cmd");
     const content2 = `@echo off\r
@@ -2610,7 +2889,7 @@ node "%USERPROFILE%\\.conare\\bin\\conare-ingest.mjs" %*\r
     }
     const binDirWin = BIN_DIR.replace(/\//g, "\\");
     try {
-      execSync2(`powershell -NoProfile -Command "$p = [Environment]::GetEnvironmentVariable('PATH','User'); if ($p -and $p.ToLower().Contains('${binDirWin.toLowerCase().replace(/\\/g, "\\\\")}')) { exit 0 }; [Environment]::SetEnvironmentVariable('PATH', $(if($p){$p + ';'} else {''}) + '${binDirWin.replace(/\\/g, "\\\\")}', 'User')"`, { stdio: "ignore" });
+      execSync3(`powershell -NoProfile -Command "$p = [Environment]::GetEnvironmentVariable('PATH','User'); if ($p -and $p.ToLower().Contains('${binDirWin.toLowerCase().replace(/\\/g, "\\\\")}')) { exit 0 }; [Environment]::SetEnvironmentVariable('PATH', $(if($p){$p + ';'} else {''}) + '${binDirWin.replace(/\\/g, "\\\\")}', 'User')"`, { stdio: "ignore" });
       return `Global command: conare (added .conare\\bin to user PATH — restart terminal)`;
     } catch {
       return `Global command: add ${binDirWin} to your PATH manually`;
@@ -2679,7 +2958,7 @@ function getShellProfile() {
     return join9(home, ".zshrc");
   if (shell.includes("bash")) {
     const profile = join9(home, ".bash_profile");
-    if (platform5() === "darwin" && existsSync8(profile))
+    if (platform6() === "darwin" && existsSync8(profile))
       return profile;
     return join9(home, ".bashrc");
   }
@@ -2692,9 +2971,9 @@ function getShellProfile() {
 function setupWindows(intervalMinutes) {
   const runVbs = join9(BIN_DIR, "run.vbs").replace(/\//g, "\\");
   try {
-    execSync2(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: "ignore" });
+    execSync3(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: "ignore" });
   } catch {}
-  execSync2(`schtasks /Create /TN "${TASK_NAME}" /TR "wscript.exe \\"${runVbs}\\"" /SC MINUTE /MO ${intervalMinutes} /F`, { stdio: "ignore" });
+  execSync3(`schtasks /Create /TN "${TASK_NAME}" /TR "wscript.exe \\"${runVbs}\\"" /SC MINUTE /MO ${intervalMinutes} /F`, { stdio: "ignore" });
 }
 function persistAndInstallGlobal(apiKey) {
   const messages = [];
@@ -2708,7 +2987,7 @@ function persistAndInstallGlobal(apiKey) {
 }
 function installSync(apiKey, intervalMinutes = 10) {
   const messages = persistAndInstallGlobal(apiKey);
-  const os = platform5();
+  const os = platform6();
   if (os === "darwin") {
     setupMacOS(intervalMinutes);
     messages.push(`Installed launchd agent (every ${intervalMinutes} min)`);
@@ -2731,10 +3010,10 @@ function installSync(apiKey, intervalMinutes = 10) {
 }
 function uninstallSync() {
   const messages = [];
-  const os = platform5();
+  const os = platform6();
   if (os === "darwin") {
     try {
-      execSync2(`launchctl bootout gui/${uid()} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
+      execSync3(`launchctl bootout gui/${uid()} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
     } catch {}
     if (existsSync8(PLIST_PATH)) {
       unlinkSync(PLIST_PATH);
@@ -2742,29 +3021,29 @@ function uninstallSync() {
     }
   } else if (os === "win32") {
     try {
-      execSync2(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: "ignore" });
+      execSync3(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: "ignore" });
       messages.push("Removed Windows scheduled task");
     } catch {}
   } else if (os === "linux") {
     if (hasSystemd()) {
       try {
-        execSync2("systemctl --user disable --now conare-sync.timer 2>/dev/null", { stdio: "ignore" });
+        execSync3("systemctl --user disable --now conare-sync.timer 2>/dev/null", { stdio: "ignore" });
       } catch {}
       if (existsSync8(SYSTEMD_SERVICE))
         unlinkSync(SYSTEMD_SERVICE);
       if (existsSync8(SYSTEMD_TIMER))
         unlinkSync(SYSTEMD_TIMER);
       try {
-        execSync2("systemctl --user daemon-reload", { stdio: "ignore" });
+        execSync3("systemctl --user daemon-reload", { stdio: "ignore" });
       } catch {}
       messages.push("Removed systemd timer");
     } else {
       try {
-        const existing = execSync2("crontab -l 2>/dev/null", { encoding: "utf-8" });
+        const existing = execSync3("crontab -l 2>/dev/null", { encoding: "utf-8" });
         const filtered = existing.split(`
 `).filter((l) => !l.includes("conare")).join(`
 `);
-        execSync2("crontab -", { input: filtered.trim() + `
+        execSync3("crontab -", { input: filtered.trim() + `
 `, stdio: ["pipe", "ignore", "ignore"] });
         messages.push("Removed cron job");
       } catch {}
@@ -2899,13 +3178,13 @@ function parseArgs() {
 conare — AI memory for your coding tools
 
 Usage:
-  conare install                            Just install the MCP (simplest)
-  conare install --key <api_key>            Install MCP with key
-  conare --key <api_key>                    Ingest chat history
+  conare                                    Interactive setup with browser auth
+  conare install                            Just install the MCP
+  conare --key <api_key>                    Ingest chat history (key optional with browser auth)
   conare --key <api_key> --index [path]     Index codebase
 
 Options:
-  --key <key>         Your Conare API key (required, starts with cmem_)
+  --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)
   --index [path]      Index codebase at path (default: current directory)
   --project <name>    Project name for codebase indexing (auto-detected if omitted)
@@ -2949,8 +3228,22 @@ async function runInstall() {
   let apiKey = key || process.env.CONARE_API_KEY || savedApiKey;
   const hasTty = !!process.stdin.isTTY && !!process.stdout.isTTY;
   if (!apiKey && hasTty) {
-    const { promptApiKey: promptKey } = await Promise.resolve().then(() => (init_interactive(), exports_interactive));
-    apiKey = await promptKey({ savedApiKey }) || "";
+    const { promptAuth: promptAuthFn } = await Promise.resolve().then(() => (init_interactive(), exports_interactive));
+    const { spinner: clackSpinner } = await Promise.resolve().then(() => (init_interactive(), exports_interactive));
+    const authResult = await promptAuthFn({ savedApiKey });
+    if (authResult === "__BROWSER_AUTH__") {
+      const authSpinner = clackSpinner();
+      authSpinner.start("Waiting for browser sign-in...");
+      try {
+        apiKey = await browserAuth();
+        authSpinner.stop("Signed in successfully.");
+      } catch (e2) {
+        authSpinner.stop(`Authentication failed: ${e2.message}`);
+        process.exit(1);
+      }
+    } else {
+      apiKey = authResult || "";
+    }
   }
   if (!apiKey) {
     printMissingKeyError();
@@ -3013,7 +3306,7 @@ async function main() {
   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" || target.id === "openclaw" && tool.name === "OpenClaw");
+      const detected = detectedTools.find((tool) => target.id === "claude" && tool.name === "Claude Code" || target.id === "cursor" && tool.name === "Cursor" || target.id === "codex" && tool.name === "Codex");
       return {
         id: target.id,
         label: target.label,
@@ -3023,10 +3316,23 @@ async function main() {
       };
     });
     startSetup();
-    apiKey = await promptApiKey({
+    const authResult = await promptAuth({
       savedApiKey,
       providedApiKey: opts.key
-    }) || apiKey;
+    });
+    if (authResult === "__BROWSER_AUTH__") {
+      const authSpinner = Y2();
+      authSpinner.start("Waiting for browser sign-in...");
+      try {
+        apiKey = await browserAuth();
+        authSpinner.stop("Signed in successfully.");
+      } catch (e2) {
+        authSpinner.stop(`Authentication failed: ${e2.message}`);
+        process.exit(1);
+      }
+    } else {
+      apiKey = authResult || apiKey;
+    }
     showDetectedApps(interactiveTargets);
     selectedSources = await selectChatSources(interactiveTargets);
     interactiveMode = true;
@@ -3038,8 +3344,20 @@ async function main() {
     return;
   }
   if (!apiKey) {
-    printMissingKeyError();
-    process.exit(1);
+    if (hasTty) {
+      const authSpinner = Y2();
+      authSpinner.start("Waiting for browser sign-in...");
+      try {
+        apiKey = await browserAuth();
+        authSpinner.stop("Signed in successfully.");
+      } catch (e2) {
+        authSpinner.stop(`Authentication failed: ${e2.message}`);
+        process.exit(1);
+      }
+    } else {
+      printMissingKeyError();
+      process.exit(1);
+    }
   }
   if (opts.installSync) {
     const auth2 = await validateKey(apiKey);
@@ -3162,6 +3480,7 @@ Nothing new to index.`);
       write(renderProgressSummary(success, failed, "indexed"));
       const fileHashes = results.filter((result) => result.success).map((result) => getManifestFingerprint(memories[result.index])).filter((key) => !!key);
       markIngested("codebase", fileHashes);
+      addIndexedPath(absPath);
       if (!opts.quiet)
         printFailureSummary(results, memories);
     }
@@ -3293,6 +3612,24 @@ Nothing new to index.`);
     }
   }
   log();
+  if (effectiveIngestOnly && !opts.dryRun) {
+    const savedPaths = getIndexedPaths();
+    for (const savedPath of savedPaths) {
+      if (!existsSync9(savedPath))
+        continue;
+      try {
+        const { memories: codeMemories, project } = indexCodebase(savedPath, { changedOnly: true });
+        if (codeMemories.length === 0)
+          continue;
+        log(`  Re-indexing ${project}: ${codeMemories.length} changed files`);
+        const { success, failed, results } = await uploadBulk(apiKey, codeMemories, () => {});
+        if (!opts.quiet)
+          log(`  ${project}: ${success} indexed, ${failed} failed`);
+        const fileHashes = results.filter((r2) => r2.success).map((r2) => getManifestFingerprint(codeMemories[r2.index])).filter((k3) => !!k3);
+        markIngested("codebase", fileHashes);
+      } catch {}
+    }
+  }
   if (interactiveMode) {
     selectedTargets = await selectMcpTargets(interactiveTargets);
     const shouldIndexCurrentCodebase = await confirmIndexCodebase();
@@ -3336,6 +3673,7 @@ Nothing new to index.`);
       write(renderProgressSummary(success, failed, "indexed"));
       const fileHashes = results.filter((result) => result.success).map((result) => getManifestFingerprint(memories[result.index])).filter((key) => !!key);
       markIngested("codebase", fileHashes);
+      addIndexedPath(absPath);
       if (!opts.quiet)
         printFailureSummary(results, memories);
     }

package/package.json

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