conare 0.6.1 → 0.6.2

package/dist/index.js

@@ -60,18 +60,18 @@ function conareDir() {
 function globalManifestPath() {
   return join(conareDir(), "ingested.json");
 }
-function scopedManifestPath(userId) {
-  const slug = createHash("sha256").update(userId).digest("hex").slice(0, 16);
+function scopedManifestPath(scope) {
+  const slug = createHash("sha256").update(scope).digest("hex").slice(0, 16);
   return join(conareDir(), `ingested.${slug}.json`);
 }
 function manifestPath() {
-  return activeUserId ? scopedManifestPath(activeUserId) : globalManifestPath();
+  return activeScope ? scopedManifestPath(activeScope) : globalManifestPath();
 }
-function setManifestAccount(userId) {
-  activeUserId = userId || null;
-  if (!userId)
+function setManifestScope(userId, apiKey) {
+  activeScope = userId ? `${userId}:${apiKey}` : null;
+  if (!activeScope)
     return;
-  const scoped = scopedManifestPath(userId);
+  const scoped = scopedManifestPath(activeScope);
   if (!existsSync(scoped) && existsSync(globalManifestPath())) {
     try {
       if (!existsSync(conareDir()))
@@ -240,7 +240,7 @@ function clearIngested(source) {
   }
   writeManifest(manifest);
 }
-var activeUserId = null, MAX_MEMORY_CONTENT = 200000, TRUNCATED_USER_MSG = 3000, TRUNCATED_MARKER = `
+var activeScope = null, MAX_MEMORY_CONTENT = 200000, TRUNCATED_USER_MSG = 3000, TRUNCATED_MARKER = `
 
 ...[truncated to fit Conare upload limit]`, MIN_SUBSTANTIVE = 200, NARRATION_RE, remoteCache, CASE_INSENSITIVE_FS;
 var init_shared = __esm(() => {
@@ -258,16 +258,16 @@ __export(exports_codebase, {
   detectProjectName: () => detectProjectName
 });
 import { createHash as createHash2 } from "node:crypto";
-import { readdirSync as readdirSync5, readFileSync as readFileSync5, statSync as statSync2, existsSync as existsSync6 } from "node:fs";
-import { join as join6, relative, extname, resolve, basename as basename3 } from "node:path";
+import { readdirSync as readdirSync7, readFileSync as readFileSync7, statSync as statSync2, existsSync as existsSync8 } from "node:fs";
+import { join as join8, relative, extname, resolve, basename as basename3 } from "node:path";
 import { execSync as execSync2 } from "node:child_process";
 function parseGitignore(rootPath) {
   const patterns = new Set;
-  const gitignorePath = join6(rootPath, ".gitignore");
-  if (!existsSync6(gitignorePath))
+  const gitignorePath = join8(rootPath, ".gitignore");
+  if (!existsSync8(gitignorePath))
     return patterns;
   try {
-    const content = readFileSync5(gitignorePath, "utf-8");
+    const content = readFileSync7(gitignorePath, "utf-8");
     for (const line of content.split(`
 `)) {
       const trimmed = line.trim();
@@ -303,15 +303,15 @@ ${content}
 function detectProjectName(rootPath) {
   const readers = [
     () => {
-      const pkg = JSON.parse(readFileSync5(join6(rootPath, "package.json"), "utf-8"));
+      const pkg = JSON.parse(readFileSync7(join8(rootPath, "package.json"), "utf-8"));
       return typeof pkg.name === "string" ? pkg.name : null;
     },
     () => {
-      const content = readFileSync5(join6(rootPath, "Cargo.toml"), "utf-8");
+      const content = readFileSync7(join8(rootPath, "Cargo.toml"), "utf-8");
       return content.match(/^name\s*=\s*"([^"]+)"/m)?.[1] ?? null;
     },
     () => {
-      const content = readFileSync5(join6(rootPath, "pyproject.toml"), "utf-8");
+      const content = readFileSync7(join8(rootPath, "pyproject.toml"), "utf-8");
       return content.match(/^name\s*=\s*"([^"]+)"/m)?.[1] ?? null;
     }
   ];
@@ -373,14 +373,14 @@ function indexCodebase(rootPath, options = {}) {
   function walk(dir) {
     let entries;
     try {
-      entries = readdirSync5(dir, { withFileTypes: true });
+      entries = readdirSync7(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const entry of entries) {
       if (shouldIgnore(entry.name, gitignorePatterns))
         continue;
-      const fullPath = join6(dir, entry.name);
+      const fullPath = join8(dir, entry.name);
       if (entry.isDirectory()) {
         walk(fullPath);
         continue;
@@ -408,7 +408,7 @@ function indexCodebase(rootPath, options = {}) {
       }
       let raw;
       try {
-        raw = readFileSync5(fullPath, "utf-8");
+        raw = readFileSync7(fullPath, "utf-8");
       } catch {
         skipped++;
         continue;
@@ -2057,13 +2057,13 @@ var init_interactive = __esm(() => {
 });
 
 // src/index.ts
-import { existsSync as existsSync10 } from "node:fs";
-import { join as join10 } from "node:path";
+import { existsSync as existsSync12 } from "node:fs";
+import { join as join12 } from "node:path";
 
 // src/detect.ts
-import { existsSync as existsSync5, readdirSync as readdirSync4 } from "node:fs";
-import { join as join5 } from "node:path";
-import { homedir as homedir5, platform as platform3 } from "node:os";
+import { existsSync as existsSync7, readdirSync as readdirSync6 } from "node:fs";
+import { join as join7 } from "node:path";
+import { homedir as homedir7, platform as platform3 } from "node:os";
 
 // src/ingest/claude.ts
 init_shared();
@@ -2271,7 +2271,6 @@ async function countImportableClaudeSessions(onProgress) {
   return count;
 }
 function ingestClaude(projectRoots, opts) {
-  const dedupKeySource = opts?.dedupSource ?? "claude";
   const projectsDir = join2(homedir2(), ".claude", "projects");
   const memories = [];
   const sessionIds = [];
@@ -2316,7 +2315,7 @@ function ingestClaude(projectRoots, opts) {
       const contentHash = createContentHash(content);
       const dedupKey = `claude:${sessionId}`;
       const fingerprint = `${dedupKey}:${contentHash}`;
-      if (!opts?.includeIngested && isIngested(dedupKeySource, fingerprint)) {
+      if (!opts?.includeIngested && isIngested("claude", fingerprint)) {
         deduped++;
         continue;
       }
@@ -2365,7 +2364,7 @@ function projectFromCwd(cwd) {
   }
   return normalized.replace(/^\/Users\/[^/]+\//, "").replace(/^\/home\/[^/]+\//, "").replace(/^[A-Za-z]:\/Users\/[^/]+\//, "");
 }
-function ingestCodex(projectRoots) {
+function ingestCodex(projectRoots, opts) {
   const memories = [];
   const sessionIds = [];
   let filtered = 0;
@@ -2374,7 +2373,7 @@ function ingestCodex(projectRoots) {
   if (existsSync3(sessionsDir)) {
     try {
       const stats = { filtered: 0, deduped: 0 };
-      walkCodexSessions(sessionsDir, memories, sessionIds, stats, projectRoots);
+      walkCodexSessions(sessionsDir, memories, sessionIds, stats, projectRoots, opts?.includeIngested);
       filtered += stats.filtered;
       deduped += stats.deduped;
     } catch {}
@@ -2540,6 +2539,7 @@ function walkCodexSessions(dir, memories, sessionIds, stats, projectRoots, inclu
             stats.deduped++;
             continue;
           }
+          const sourceRemote = cwd ? repoRemote(cwd) : undefined;
           memories.push({
             content,
             containerTag: "codex-chats",
@@ -2549,6 +2549,7 @@ function walkCodexSessions(dir, memories, sessionIds, stats, projectRoots, inclu
               source: "codex-session",
               sessionId,
               ...cwd ? { sourceRoot: cwd } : {},
+              ...sourceRemote ? { sourceRemote } : {},
               date: date || "unknown",
               ...sourceTimestamp ? { sourceTimestamp } : {},
               ...startedAt ? { sessionStartedAt: startedAt } : {},
@@ -3032,7 +3033,7 @@ async function ingestCursor(dbPath, wasmDir, projectRoots, opts) {
       const contentHash = createContentHash(content);
       const dedupKey = `cursor:${composerId}`;
       const fingerprint = `${dedupKey}:${contentHash}`;
-      if (!opts?.includeIngested && isIngested(opts?.dedupSource ?? "cursor", fingerprint)) {
+      if (!opts?.includeIngested && isIngested("cursor", fingerprint)) {
         deduped++;
         continue;
       }
@@ -3066,14 +3067,410 @@ async function ingestCursor(dbPath, wasmDir, projectRoots, opts) {
   return { memories, sessionIds, skipped: filtered + deduped, filtered, deduped };
 }
 
+// src/ingest/opencode.ts
+init_shared();
+import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync4 } from "node:fs";
+import { join as join5 } from "node:path";
+import { homedir as homedir5 } from "node:os";
+function dataDirs() {
+  const override = process.env.OPENCODE_DATA_DIR;
+  if (override)
+    return override.split(",").map((d) => d.trim()).filter(Boolean);
+  return [join5(homedir5(), ".local", "share", "opencode")];
+}
+function storageDirs() {
+  return dataDirs().map((d) => join5(d, "storage")).filter(existsSync5);
+}
+function readSessions(storage) {
+  const out = [];
+  const sessionRoot = join5(storage, "session");
+  if (!existsSync5(sessionRoot))
+    return out;
+  const walk = (dir) => {
+    for (const entry of readdirSync4(dir, { withFileTypes: true })) {
+      const full = join5(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(full);
+        continue;
+      }
+      if (!entry.name.endsWith(".json"))
+        continue;
+      try {
+        const s = JSON.parse(readFileSync5(full, "utf-8"));
+        if (typeof s.id !== "string")
+          continue;
+        out.push({
+          id: s.id,
+          directory: typeof s.directory === "string" ? s.directory : null,
+          createdMs: typeof s.time?.created === "number" ? s.time.created : null,
+          updatedMs: typeof s.time?.updated === "number" ? s.time.updated : null
+        });
+      } catch {}
+    }
+  };
+  try {
+    walk(sessionRoot);
+  } catch {}
+  return out;
+}
+function messageText(storage, messageId) {
+  const partDir = join5(storage, "part", messageId);
+  if (!existsSync5(partDir))
+    return "";
+  const texts = [];
+  let files;
+  try {
+    files = readdirSync4(partDir).filter((f) => f.endsWith(".json")).sort();
+  } catch {
+    return "";
+  }
+  for (const f of files) {
+    try {
+      const p = JSON.parse(readFileSync5(join5(partDir, f), "utf-8"));
+      if (p.type === "text" && typeof p.text === "string")
+        texts.push(p.text);
+    } catch {}
+  }
+  return texts.join(`
+
+`);
+}
+function buildRounds(storage, sessionId) {
+  const msgDir = join5(storage, "message", sessionId);
+  if (!existsSync5(msgDir))
+    return [];
+  let entries = [];
+  try {
+    for (const f of readdirSync4(msgDir)) {
+      if (!f.endsWith(".json"))
+        continue;
+      const m = JSON.parse(readFileSync5(join5(msgDir, f), "utf-8"));
+      if (typeof m.id !== "string" || typeof m.role !== "string")
+        continue;
+      entries.push({ id: m.id, role: m.role, createdMs: typeof m.time?.created === "number" ? m.time.created : 0 });
+    }
+  } catch {
+    return [];
+  }
+  entries.sort((a, b) => a.createdMs - b.createdMs);
+  const rounds = [];
+  let currentUser = null;
+  let currentAssistant = [];
+  for (const e of entries) {
+    const text = cleanText(messageText(storage, e.id));
+    if (!text)
+      continue;
+    if (e.role === "user") {
+      if (currentUser !== null && currentAssistant.length > 0) {
+        rounds.push({ user: currentUser, assistantParts: currentAssistant });
+      }
+      currentUser = text;
+      currentAssistant = [];
+    } else if (e.role === "assistant") {
+      if (!isNarration(text))
+        currentAssistant.push(text);
+    }
+  }
+  if (currentUser !== null && currentAssistant.length > 0) {
+    rounds.push({ user: currentUser, assistantParts: currentAssistant });
+  }
+  return rounds;
+}
+function ingestOpenCode(projectRoots, opts) {
+  const memories = [];
+  const sessionIds = [];
+  let filtered = 0;
+  let deduped = 0;
+  for (const storage of storageDirs()) {
+    for (const session of readSessions(storage)) {
+      const cwd = session.directory;
+      if (!matchesProjectFilter(cwd, projectRoots)) {
+        filtered++;
+        continue;
+      }
+      const rounds = buildRounds(storage, session.id);
+      if (rounds.length === 0) {
+        filtered++;
+        continue;
+      }
+      const date = session.createdMs ? new Date(session.createdMs).toISOString().slice(0, 10) : null;
+      const project = cwd ? projectFromCwd2(cwd) : null;
+      const header = `# OpenCode Session${project ? `: ${project}` : ""} | ${date || "unknown"}`;
+      const turns = rounds.map((r) => ({ user: r.user, assistant: r.assistantParts.join(`
+
+`) }));
+      const content = fitContent(header, turns);
+      const contentHash = createContentHash(content);
+      const dedupKey = `opencode:${session.id}`;
+      const fingerprint = `${dedupKey}:${contentHash}`;
+      if (!opts?.includeIngested && isIngested("opencode", fingerprint)) {
+        deduped++;
+        continue;
+      }
+      const sourceRemote = cwd ? repoRemote(cwd) : undefined;
+      const sourceTimestamp = session.updatedMs ?? session.createdMs ?? null;
+      memories.push({
+        content,
+        containerTag: "opencode-chats",
+        metadata: {
+          dedupKey,
+          contentHash,
+          source: "opencode-session",
+          sessionId: session.id,
+          ...cwd ? { sourceRoot: cwd } : {},
+          ...sourceRemote ? { sourceRemote } : {},
+          date: date || "unknown",
+          ...sourceTimestamp ? { sourceTimestamp } : {},
+          ...session.createdMs ? { sessionStartedAt: new Date(session.createdMs).toISOString() } : {},
+          ...session.updatedMs ? { sessionUpdatedAt: new Date(session.updatedMs).toISOString() } : {},
+          ...project ? { project } : {}
+        },
+        ...sourceTimestamp ? { created_at: sourceTimestamp, updated_at: sourceTimestamp } : {}
+      });
+      sessionIds.push(session.id);
+    }
+  }
+  return { memories, sessionIds, skipped: filtered + deduped, filtered, deduped };
+}
+function projectFromCwd2(cwd) {
+  const home = homedir5().replace(/\\/g, "/");
+  const normalized = cwd.replace(/\\/g, "/");
+  if (normalized.startsWith(home + "/"))
+    return normalized.slice(home.length + 1);
+  return normalized.replace(/^\/Users\/[^/]+\//, "").replace(/^\/home\/[^/]+\//, "").replace(/^[A-Za-z]:\/Users\/[^/]+\//, "");
+}
+async function countImportableOpenCodeSessions(onProgress) {
+  const storages = storageDirs();
+  if (storages.length === 0)
+    return 0;
+  let found = 0;
+  let checked = 0;
+  let total = 0;
+  const work = [];
+  for (const storage of storages) {
+    for (const s of readSessions(storage))
+      work.push({ storage, sessionId: s.id });
+  }
+  total = work.length;
+  for (const { storage, sessionId } of work) {
+    if (buildRounds(storage, sessionId).length > 0)
+      found++;
+    checked++;
+    if (checked % 50 === 0)
+      onProgress?.({ checked, found, total });
+  }
+  onProgress?.({ checked, found, total });
+  return found;
+}
+
+// src/ingest/grok.ts
+init_shared();
+import { existsSync as existsSync6, readFileSync as readFileSync6, readdirSync as readdirSync5 } from "node:fs";
+import { join as join6 } from "node:path";
+import { homedir as homedir6 } from "node:os";
+var MIN_TURN_LEN3 = 50;
+function dataDirs2() {
+  const override = process.env.GROK_DATA_DIR;
+  if (override)
+    return override.split(",").map((d) => d.trim()).filter(Boolean);
+  return [join6(homedir6(), ".grok")];
+}
+function sessionRoots() {
+  return dataDirs2().map((d) => join6(d, "sessions")).filter(existsSync6);
+}
+function readSessions2(sessionsRoot) {
+  const out = [];
+  let cwdDirs;
+  try {
+    cwdDirs = readdirSync5(sessionsRoot, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return out;
+  }
+  for (const cwdDir of cwdDirs) {
+    const cwdPath = join6(sessionsRoot, cwdDir);
+    let sessionDirs;
+    try {
+      sessionDirs = readdirSync5(cwdPath, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+    } catch {
+      continue;
+    }
+    for (const sid of sessionDirs) {
+      const dir = join6(cwdPath, sid);
+      if (!existsSync6(join6(dir, "chat_history.jsonl")))
+        continue;
+      let summary = {};
+      try {
+        summary = JSON.parse(readFileSync6(join6(dir, "summary.json"), "utf-8"));
+      } catch {}
+      const cwd = typeof summary.info?.cwd === "string" ? summary.info.cwd : safeDecode(cwdDir);
+      const remotes = Array.isArray(summary.git_remotes) ? summary.git_remotes.filter((r) => typeof r === "string") : [];
+      out.push({
+        id: sid,
+        dir,
+        cwd,
+        gitRoot: typeof summary.git_root_dir === "string" ? summary.git_root_dir : null,
+        gitRemote: remotes[0] ?? null,
+        title: typeof summary.generated_title === "string" ? summary.generated_title : typeof summary.session_summary === "string" ? summary.session_summary : null,
+        createdAt: typeof summary.created_at === "string" ? summary.created_at : null,
+        updatedAt: typeof summary.updated_at === "string" ? summary.updated_at : null
+      });
+    }
+  }
+  return out;
+}
+function safeDecode(name) {
+  try {
+    return decodeURIComponent(name);
+  } catch {
+    return name || null;
+  }
+}
+function extractText2(content) {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return "";
+  return content.filter((b) => b && b.type === "text" && typeof b.text === "string").map((b) => b.text).join(`
+`);
+}
+function userQuery(text) {
+  const m = text.match(/<user_query>([\s\S]*?)<\/user_query>/);
+  return m ? cleanText(m[1]) : "";
+}
+function parseRounds(lines) {
+  const rounds = [];
+  let currentUser = null;
+  let currentAssistant = [];
+  for (const line of lines) {
+    if (!line.trim())
+      continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (obj.type === "user") {
+      const query = userQuery(extractText2(obj.content));
+      if (query.length >= MIN_TURN_LEN3) {
+        if (currentUser !== null && currentAssistant.length > 0) {
+          rounds.push({ user: currentUser, assistantParts: currentAssistant });
+        }
+        currentUser = query;
+        currentAssistant = [];
+      }
+    } else if (obj.type === "assistant") {
+      const text = cleanText(extractText2(obj.content));
+      if (text.length >= MIN_TURN_LEN3 && !isNarration(text))
+        currentAssistant.push(text);
+    }
+  }
+  if (currentUser !== null && currentAssistant.length > 0) {
+    rounds.push({ user: currentUser, assistantParts: currentAssistant });
+  }
+  return rounds.map((r) => ({ user: r.user, assistant: r.assistantParts.join(`
+
+`) })).filter((t) => t.assistant.length >= MIN_TURN_LEN3);
+}
+function readRounds(sessionDir) {
+  let raw;
+  try {
+    raw = readFileSync6(join6(sessionDir, "chat_history.jsonl"), "utf-8");
+  } catch {
+    return [];
+  }
+  return parseRounds(raw.split(`
+`));
+}
+function ingestGrok(projectRoots, opts) {
+  const memories = [];
+  const sessionIds = [];
+  let filtered = 0;
+  let deduped = 0;
+  for (const root of sessionRoots()) {
+    for (const session of readSessions2(root)) {
+      const cwd = session.gitRoot ?? session.cwd;
+      if (!matchesProjectFilter(cwd, projectRoots)) {
+        filtered++;
+        continue;
+      }
+      const turns = readRounds(session.dir);
+      if (turns.length === 0) {
+        filtered++;
+        continue;
+      }
+      const project = cwd ? projectFromCwd3(cwd) : null;
+      const date = session.createdAt ? session.createdAt.slice(0, 10) : null;
+      const header = `# Grok Session${project ? `: ${project}` : ""}${session.title ? ` — ${session.title}` : ""} | ${date || "unknown"}`;
+      const content = fitContent(header, turns);
+      const contentHash = createContentHash(content);
+      const dedupKey = `grok:${session.id}`;
+      const fingerprint = `${dedupKey}:${contentHash}`;
+      if (!opts?.includeIngested && isIngested("grok", fingerprint)) {
+        deduped++;
+        continue;
+      }
+      const sourceRemote = session.gitRemote ?? (cwd ? repoRemote(cwd) : undefined);
+      const sourceTimestamp = parseTimestampMs(session.updatedAt ?? session.createdAt ?? "");
+      memories.push({
+        content,
+        containerTag: "grok-chats",
+        metadata: {
+          dedupKey,
+          contentHash,
+          source: "grok-session",
+          sessionId: session.id,
+          ...cwd ? { sourceRoot: cwd } : {},
+          ...sourceRemote ? { sourceRemote } : {},
+          date: date || "unknown",
+          ...sourceTimestamp ? { sourceTimestamp } : {},
+          ...session.createdAt ? { sessionStartedAt: session.createdAt } : {},
+          ...session.updatedAt ? { sessionUpdatedAt: session.updatedAt } : {},
+          ...project ? { project } : {}
+        },
+        ...sourceTimestamp ? { created_at: sourceTimestamp, updated_at: sourceTimestamp } : {}
+      });
+      sessionIds.push(session.id);
+    }
+  }
+  return { memories, sessionIds, skipped: filtered + deduped, filtered, deduped };
+}
+function projectFromCwd3(cwd) {
+  const home = homedir6().replace(/\\/g, "/");
+  const normalized = cwd.replace(/\\/g, "/").replace(/\/$/, "");
+  if (normalized.startsWith(home + "/"))
+    return normalized.slice(home.length + 1);
+  return normalized.replace(/^\/Users\/[^/]+\//, "").replace(/^\/home\/[^/]+\//, "").replace(/^[A-Za-z]:\/Users\/[^/]+\//, "");
+}
+async function countImportableGrokSessions(onProgress) {
+  const roots = sessionRoots();
+  if (roots.length === 0)
+    return 0;
+  const sessions = [];
+  for (const root of roots)
+    sessions.push(...readSessions2(root));
+  let found = 0;
+  let checked = 0;
+  const total = sessions.length;
+  for (const session of sessions) {
+    if (readRounds(session.dir).length > 0)
+      found++;
+    checked++;
+    if (checked % 25 === 0)
+      onProgress?.({ checked, found, total });
+  }
+  onProgress?.({ checked, found, total });
+  return found;
+}
+
 // src/detect.ts
 async function detect(options = {}) {
-  const home = homedir5();
+  const home = homedir7();
   const os = platform3();
   const tools = [];
   const onProgress = options.onProgress;
-  const claudeDir = join5(home, ".claude", "projects");
-  if (existsSync5(claudeDir)) {
+  const claudeDir = join7(home, ".claude", "projects");
+  if (existsSync7(claudeDir)) {
     onProgress?.({ tool: "Claude Code", status: "start" });
     const sessionCount = await countImportableClaudeSessions((progress) => {
       onProgress?.({ tool: "Claude Code", status: "progress", ...progress });
@@ -3084,9 +3481,9 @@ async function detect(options = {}) {
     onProgress?.({ tool: "Claude Code", status: "skip", reason: "not found" });
     tools.push({ name: "Claude Code", id: "claude", available: false, path: claudeDir, sessionCount: 0 });
   }
-  const codexConfig = join5(home, ".codex", "config.toml");
-  const codexSessions = join5(home, ".codex", "sessions");
-  if (existsSync5(codexConfig) || existsSync5(codexSessions)) {
+  const codexConfig = join7(home, ".codex", "config.toml");
+  const codexSessions = join7(home, ".codex", "sessions");
+  if (existsSync7(codexConfig) || existsSync7(codexSessions)) {
     onProgress?.({ tool: "Codex", status: "start" });
     const sessionCount = await countImportableCodexSessions((progress) => {
       onProgress?.({ tool: "Codex", status: "progress", ...progress });
@@ -3099,13 +3496,13 @@ async function detect(options = {}) {
   }
   let cursorDbPath;
   if (os === "darwin") {
-    cursorDbPath = join5(home, "Library", "Application Support", "Cursor", "User", "globalStorage", "state.vscdb");
+    cursorDbPath = join7(home, "Library", "Application Support", "Cursor", "User", "globalStorage", "state.vscdb");
   } else if (os === "win32") {
-    cursorDbPath = join5(process.env.APPDATA || join5(home, "AppData", "Roaming"), "Cursor", "User", "globalStorage", "state.vscdb");
+    cursorDbPath = join7(process.env.APPDATA || join7(home, "AppData", "Roaming"), "Cursor", "User", "globalStorage", "state.vscdb");
   } else {
-    cursorDbPath = join5(home, ".config", "Cursor", "User", "globalStorage", "state.vscdb");
+    cursorDbPath = join7(home, ".config", "Cursor", "User", "globalStorage", "state.vscdb");
   }
-  const cursorExists = existsSync5(cursorDbPath);
+  const cursorExists = existsSync7(cursorDbPath);
   if (cursorExists)
     onProgress?.({ tool: "Cursor", status: "start" });
   else
@@ -3123,73 +3520,111 @@ async function detect(options = {}) {
     sessionCount: cursorCount,
     sessionCountApproximate: true
   });
-  const windsurfDir = join5(home, ".codeium", "windsurf");
+  const opencodeStorage = join7(process.env.OPENCODE_DATA_DIR?.split(",")[0]?.trim() || join7(home, ".local", "share", "opencode"), "storage");
+  const opencodeExists = existsSync7(opencodeStorage);
+  if (opencodeExists)
+    onProgress?.({ tool: "OpenCode", status: "start" });
+  else
+    onProgress?.({ tool: "OpenCode", status: "skip", reason: "not found" });
+  const opencodeCount = opencodeExists ? await countImportableOpenCodeSessions((progress) => {
+    onProgress?.({ tool: "OpenCode", status: "progress", ...progress });
+  }) : 0;
+  if (opencodeExists)
+    onProgress?.({ tool: "OpenCode", status: "done", count: opencodeCount });
+  tools.push({
+    name: "OpenCode",
+    id: "opencode",
+    available: opencodeExists,
+    path: join7(home, ".config", "opencode", "opencode.json"),
+    sessionCount: opencodeCount,
+    sessionCountApproximate: true
+  });
+  const grokSessions = join7(process.env.GROK_DATA_DIR?.split(",")[0]?.trim() || join7(home, ".grok"), "sessions");
+  const grokExists = existsSync7(grokSessions);
+  if (grokExists)
+    onProgress?.({ tool: "Grok", status: "start" });
+  else
+    onProgress?.({ tool: "Grok", status: "skip", reason: "not found" });
+  const grokCount = grokExists ? await countImportableGrokSessions((progress) => {
+    onProgress?.({ tool: "Grok", status: "progress", ...progress });
+  }) : 0;
+  if (grokExists)
+    onProgress?.({ tool: "Grok", status: "done", count: grokCount });
+  tools.push({
+    name: "Grok",
+    id: "grok",
+    available: grokExists,
+    path: join7(home, ".grok", "config.toml"),
+    sessionCount: grokCount,
+    sessionCountApproximate: true
+  });
+  const windsurfDir = join7(home, ".codeium", "windsurf");
   tools.push({
     name: "Windsurf",
     id: "windsurf",
-    available: existsSync5(windsurfDir),
-    path: join5(windsurfDir, "mcp_config.json"),
+    available: existsSync7(windsurfDir),
+    path: join7(windsurfDir, "mcp_config.json"),
     sessionCount: 0
   });
   let vscodePath;
   if (os === "darwin") {
-    vscodePath = join5(home, "Library", "Application Support", "Code");
+    vscodePath = join7(home, "Library", "Application Support", "Code");
   } else if (os === "win32") {
-    vscodePath = join5(process.env.APPDATA || join5(home, "AppData", "Roaming"), "Code");
+    vscodePath = join7(process.env.APPDATA || join7(home, "AppData", "Roaming"), "Code");
   } else {
-    vscodePath = join5(home, ".config", "Code");
+    vscodePath = join7(home, ".config", "Code");
   }
   tools.push({
     name: "VS Code Copilot",
     id: "vscode",
-    available: existsSync5(vscodePath),
-    path: join5(vscodePath, "User", "mcp.json"),
+    available: existsSync7(vscodePath),
+    path: join7(vscodePath, "User", "mcp.json"),
     sessionCount: 0
   });
   let clinePath;
   if (os === "darwin") {
-    clinePath = join5(home, "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
+    clinePath = join7(home, "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
   } else if (os === "win32") {
-    clinePath = join5(process.env.APPDATA || join5(home, "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
+    clinePath = join7(process.env.APPDATA || join7(home, "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
   } else {
-    clinePath = join5(home, ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
+    clinePath = join7(home, ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
   }
   tools.push({
     name: "Cline",
     id: "cline",
-    available: existsSync5(clinePath),
-    path: join5(clinePath, "settings", "cline_mcp_settings.json"),
+    available: existsSync7(clinePath),
+    path: join7(clinePath, "settings", "cline_mcp_settings.json"),
     sessionCount: 0
   });
-  const zedPath = os === "darwin" ? join5(home, ".zed") : join5(home, ".config", "zed");
+  const zedPath = os === "darwin" ? join7(home, ".zed") : join7(home, ".config", "zed");
   tools.push({
     name: "Zed",
     id: "zed",
-    available: existsSync5(zedPath),
-    path: join5(zedPath, "settings.json"),
+    available: existsSync7(zedPath),
+    path: join7(zedPath, "settings.json"),
     sessionCount: 0
   });
-  const openclawDir = join5(home, ".openclaw");
+  const openclawDir = join7(home, ".openclaw");
   tools.push({
     name: "OpenClaw",
     id: "openclaw",
-    available: existsSync5(openclawDir),
-    path: join5(openclawDir, "openclaw.json"),
+    available: existsSync7(openclawDir),
+    path: join7(openclawDir, "openclaw.json"),
     sessionCount: 0
   });
-  const antigravityDir = join5(home, ".gemini", "antigravity");
-  const antigravityConvDir = join5(antigravityDir, "conversations");
+  const antigravityDir = join7(home, ".gemini", "antigravity");
+  const antigravityConvDir = join7(antigravityDir, "conversations");
   let antigravityCount = 0;
-  if (existsSync5(antigravityConvDir)) {
+  if (existsSync7(antigravityConvDir)) {
     try {
-      antigravityCount = readdirSync4(antigravityConvDir).filter((f) => f.endsWith(".pb")).length;
+      antigravityCount = readdirSync6(antigravityConvDir).filter((f) => f.endsWith(".pb")).length;
     } catch {}
   }
   tools.push({
     name: "Antigravity",
     id: "antigravity",
-    available: existsSync5(antigravityDir),
-    path: join5(antigravityDir, "mcp_config.json"),
+    available: existsSync7(antigravityDir),
+    path: join7(antigravityDir, "mcp_config.json"),
     sessionCount: antigravityCount
   });
   return tools;
@@ -3283,9 +3718,9 @@ init_shared();
 init_api();
 
 // src/configure.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync2, symlinkSync, readlinkSync, rmSync } from "node:fs";
-import { dirname as dirname2, join as join7 } from "node:path";
-import { homedir as homedir6, platform as platform5 } from "node:os";
+import { existsSync as existsSync9, mkdirSync as mkdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync2, symlinkSync, readlinkSync, rmSync } from "node:fs";
+import { dirname as dirname2, join as join9 } from "node:path";
+import { homedir as homedir8, platform as platform5 } from "node:os";
 import { spawnSync } from "node:child_process";
 var CONARE_URL = "https://conare.ai";
 var SERVER_NAME = "conare";
@@ -3298,11 +3733,13 @@ var MCP_TARGETS = [
   { id: "cline", label: "Cline", defaultSelected: false },
   { id: "zed", label: "Zed", defaultSelected: false },
   { id: "openclaw", label: "OpenClaw", defaultSelected: false },
-  { id: "antigravity", label: "Antigravity", defaultSelected: false }
+  { id: "antigravity", label: "Antigravity", defaultSelected: false },
+  { id: "opencode", label: "OpenCode", defaultSelected: false },
+  { id: "grok", label: "Grok", defaultSelected: false }
 ];
 function readJsonFile(path) {
   try {
-    return JSON.parse(readFileSync6(path, "utf-8"));
+    return JSON.parse(readFileSync8(path, "utf-8"));
   } catch {
     return {};
   }
@@ -3346,7 +3783,7 @@ function configureClaude(apiKey) {
   }).status === 0) {
     return "\x1B[32m✓\x1B[0m Claude Code";
   }
-  const claudeConfigPath = join7(homedir6(), ".claude.json");
+  const claudeConfigPath = join9(homedir8(), ".claude.json");
   const config = readJsonFile(claudeConfigPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -3356,7 +3793,7 @@ function configureClaude(apiKey) {
   return "\x1B[32m✓\x1B[0m Claude Code (json fallback)";
 }
 function configureCodex(apiKey) {
-  const configPath = join7(homedir6(), ".codex", "config.toml");
+  const configPath = join9(homedir8(), ".codex", "config.toml");
   if (spawnSync("codex", ["mcp", "add", SERVER_NAME, "--url", `${CONARE_URL}/mcp`, "--header", `Authorization: Bearer ${apiKey}`], {
     stdio: "ignore",
     shell: platform5() === "win32"
@@ -3365,7 +3802,7 @@ function configureCodex(apiKey) {
   }
   let toml = "";
   try {
-    toml = readFileSync6(configPath, "utf-8");
+    toml = readFileSync8(configPath, "utf-8");
   } catch {}
   const sectionHeader = `[mcp_servers.${SERVER_NAME}]`;
   const newSection = [
@@ -3388,9 +3825,9 @@ ${newSection}
 `;
   mkdirSync2(dirname2(configPath), { recursive: true });
   writeFileSync2(configPath, result);
-  const oldMcpJson = join7(homedir6(), ".codex", "mcp.json");
+  const oldMcpJson = join9(homedir8(), ".codex", "mcp.json");
   try {
-    if (existsSync7(oldMcpJson)) {
+    if (existsSync9(oldMcpJson)) {
       const old = readJsonFile(oldMcpJson);
       const servers = old.mcpServers;
       if (servers && (("conare" in servers) || ("conare-memory" in servers))) {
@@ -3407,7 +3844,7 @@ ${newSection}
   return "\x1B[32m✓\x1B[0m Codex";
 }
 function configureCursor(apiKey) {
-  const configPath = join7(homedir6(), ".cursor", "mcp.json");
+  const configPath = join9(homedir8(), ".cursor", "mcp.json");
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -3420,7 +3857,7 @@ function configureCursor(apiKey) {
   return "\x1B[32m✓\x1B[0m Cursor";
 }
 function configureWindsurf(apiKey) {
-  const configPath = join7(homedir6(), ".codeium", "windsurf", "mcp_config.json");
+  const configPath = join9(homedir8(), ".codeium", "windsurf", "mcp_config.json");
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -3436,11 +3873,11 @@ function configureVscode(apiKey) {
   const os = platform5();
   let configPath;
   if (os === "darwin") {
-    configPath = join7(homedir6(), "Library", "Application Support", "Code", "User", "mcp.json");
+    configPath = join9(homedir8(), "Library", "Application Support", "Code", "User", "mcp.json");
   } else if (os === "win32") {
-    configPath = join7(process.env.APPDATA || join7(homedir6(), "AppData", "Roaming"), "Code", "User", "mcp.json");
+    configPath = join9(process.env.APPDATA || join9(homedir8(), "AppData", "Roaming"), "Code", "User", "mcp.json");
   } else {
-    configPath = join7(homedir6(), ".config", "Code", "User", "mcp.json");
+    configPath = join9(homedir8(), ".config", "Code", "User", "mcp.json");
   }
   const config = readJsonFile(configPath);
   if (!config.servers || typeof config.servers !== "object") {
@@ -3458,11 +3895,11 @@ function configureCline(apiKey) {
   const os = platform5();
   let configPath;
   if (os === "darwin") {
-    configPath = join7(homedir6(), "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+    configPath = join9(homedir8(), "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
   } else if (os === "win32") {
-    configPath = join7(process.env.APPDATA || join7(homedir6(), "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+    configPath = join9(process.env.APPDATA || join9(homedir8(), "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
   } else {
-    configPath = join7(homedir6(), ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+    configPath = join9(homedir8(), ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
   }
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
@@ -3480,9 +3917,9 @@ function configureZed(apiKey) {
   const os = platform5();
   let configPath;
   if (os === "darwin") {
-    configPath = join7(homedir6(), ".zed", "settings.json");
+    configPath = join9(homedir8(), ".zed", "settings.json");
   } else {
-    configPath = join7(homedir6(), ".config", "zed", "settings.json");
+    configPath = join9(homedir8(), ".config", "zed", "settings.json");
   }
   const config = readJsonFile(configPath);
   if (!config.context_servers || typeof config.context_servers !== "object") {
@@ -3503,7 +3940,7 @@ function configureZed(apiKey) {
   return "\x1B[32m✓\x1B[0m Zed";
 }
 function configureOpenclaw(apiKey) {
-  const configPath = join7(homedir6(), ".openclaw", "openclaw.json");
+  const configPath = join9(homedir8(), ".openclaw", "openclaw.json");
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -3517,7 +3954,7 @@ function configureOpenclaw(apiKey) {
   return "\x1B[32m✓\x1B[0m OpenClaw";
 }
 function configureAntigravity(apiKey) {
-  const configPath = join7(homedir6(), ".gemini", "antigravity", "mcp_config.json");
+  const configPath = join9(homedir8(), ".gemini", "antigravity", "mcp_config.json");
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -3529,6 +3966,49 @@ function configureAntigravity(apiKey) {
   writeJsonFile(configPath, config);
   return "\x1B[32m✓\x1B[0m Antigravity";
 }
+function configureOpencode(apiKey) {
+  const configPath = join9(homedir8(), ".config", "opencode", "opencode.json");
+  const config = readJsonFile(configPath);
+  if (!config.mcp || typeof config.mcp !== "object") {
+    config.mcp = {};
+  }
+  config.mcp[SERVER_NAME] = {
+    type: "remote",
+    url: `${CONARE_URL}/mcp`,
+    enabled: true,
+    headers: { Authorization: `Bearer ${apiKey}` }
+  };
+  if (!config["$schema"])
+    config["$schema"] = "https://opencode.ai/config.json";
+  writeJsonFile(configPath, config);
+  return "\x1B[32m✓\x1B[0m OpenCode";
+}
+function configureGrok(apiKey) {
+  const configPath = join9(homedir8(), ".grok", "config.toml");
+  let toml = "";
+  try {
+    toml = readFileSync8(configPath, "utf-8");
+  } catch {}
+  const newSection = [
+    `[mcp_servers.${SERVER_NAME}]`,
+    `url = "${CONARE_URL}/mcp"`,
+    `enabled = true`,
+    `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(dirname2(configPath), { recursive: true });
+  writeFileSync2(configPath, result);
+  return "\x1B[32m✓\x1B[0m Grok";
+}
 var CLIENT_CONFIGURATORS = {
   claude: configureClaude,
   codex: configureCodex,
@@ -3538,7 +4018,9 @@ var CLIENT_CONFIGURATORS = {
   cline: configureCline,
   zed: configureZed,
   openclaw: configureOpenclaw,
-  antigravity: configureAntigravity
+  antigravity: configureAntigravity,
+  opencode: configureOpencode,
+  grok: configureGrok
 };
 var SKILL_MD = `---
 name: conare
@@ -3648,14 +4130,14 @@ 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(homedir6(), ".agents", "skills", "conare");
+  const skillDir = join9(homedir8(), ".agents", "skills", "conare");
   mkdirSync2(skillDir, { recursive: true });
-  writeFileSync2(join7(skillDir, "SKILL.md"), SKILL_MD);
-  const claudeSkillsDir = join7(homedir6(), ".claude", "skills");
-  const claudeSkillDir = join7(claudeSkillsDir, "conare");
+  writeFileSync2(join9(skillDir, "SKILL.md"), SKILL_MD);
+  const claudeSkillsDir = join9(homedir8(), ".claude", "skills");
+  const claudeSkillDir = join9(claudeSkillsDir, "conare");
   try {
-    if (existsSync7(claudeSkillsDir)) {
-      if (existsSync7(claudeSkillDir)) {
+    if (existsSync9(claudeSkillsDir)) {
+      if (existsSync9(claudeSkillDir)) {
         try {
           if (readlinkSync(claudeSkillDir) === skillDir)
             return "\x1B[32m✓\x1B[0m Agent Skill";
@@ -3686,15 +4168,15 @@ function configureMcp(apiKey, targets = ["claude", "codex"]) {
 }
 
 // src/config.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync7, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
-import { join as join8 } from "node:path";
-import { homedir as homedir7 } from "node:os";
+import { existsSync as existsSync10, mkdirSync as mkdirSync3, readFileSync as readFileSync9, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
+import { join as join10 } from "node:path";
+import { homedir as homedir9 } from "node:os";
 function readConfig() {
   const configPath = getConfigPath();
   try {
-    if (!existsSync8(configPath))
+    if (!existsSync10(configPath))
       return {};
-    return JSON.parse(readFileSync7(configPath, "utf-8"));
+    return JSON.parse(readFileSync9(configPath, "utf-8"));
   } catch {
     return {};
   }
@@ -3705,10 +4187,10 @@ function writeConfig(config) {
 `, { mode: 384 });
 }
 function getConfigDir() {
-  return join8(homedir7(), ".conare");
+  return join10(homedir9(), ".conare");
 }
 function getConfigPath() {
-  return join8(getConfigDir(), "config.json");
+  return join10(getConfigDir(), "config.json");
 }
 function saveApiKey(apiKey) {
   const config = readConfig();
@@ -3728,7 +4210,7 @@ function clearSavedApiKey() {
   delete config.key;
   if (Object.keys(config).length === 0) {
     const configPath = getConfigPath();
-    if (existsSync8(configPath))
+    if (existsSync10(configPath))
       unlinkSync(configPath);
   } else {
     writeConfig(config);
@@ -3747,19 +4229,19 @@ function stripLegacyTeamConfig(config) {
 }
 
 // src/sync.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2, readFileSync as readFileSync8, chmodSync, cpSync, rmSync as rmSync2, symlinkSync as symlinkSync2, readlinkSync as readlinkSync2, appendFileSync } from "node:fs";
-import { join as join9, dirname as dirname3 } from "node:path";
-import { homedir as homedir8, platform as platform6 } from "node:os";
+import { existsSync as existsSync11, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2, readFileSync as readFileSync10, chmodSync, cpSync, rmSync as rmSync2, symlinkSync as symlinkSync2, readlinkSync as readlinkSync2, appendFileSync } from "node:fs";
+import { join as join11, dirname as dirname3 } from "node:path";
+import { homedir as homedir10, platform as platform6 } from "node:os";
 import { execSync as execSync3 } from "node:child_process";
 import { createRequire as createRequire3 } from "node:module";
-var CONARE_DIR = join9(homedir8(), ".conare");
-var BIN_DIR = join9(CONARE_DIR, "bin");
-var CONFIG_PATH = join9(CONARE_DIR, "config.json");
+var CONARE_DIR = join11(homedir10(), ".conare");
+var BIN_DIR = join11(CONARE_DIR, "bin");
+var CONFIG_PATH = join11(CONARE_DIR, "config.json");
 var PLIST_LABEL = "ai.conare.ingest";
-var PLIST_PATH = join9(homedir8(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
-var SYSTEMD_DIR = join9(homedir8(), ".config", "systemd", "user");
-var SYSTEMD_SERVICE = join9(SYSTEMD_DIR, "conare-sync.service");
-var SYSTEMD_TIMER = join9(SYSTEMD_DIR, "conare-sync.timer");
+var PLIST_PATH = join11(homedir10(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
+var SYSTEMD_DIR = join11(homedir10(), ".config", "systemd", "user");
+var SYSTEMD_SERVICE = join11(SYSTEMD_DIR, "conare-sync.service");
+var SYSTEMD_TIMER = join11(SYSTEMD_DIR, "conare-sync.timer");
 var TASK_NAME = "ConareMemorySync";
 var RUN_VBS = `Set WshShell = CreateObject("WScript.Shell")
 WshShell.Run """" & CreateObject("WScript.Shell").ExpandEnvironmentStrings("%USERPROFILE%") & "\\.conare\\bin\\run.cmd" & """", 0, True
@@ -3904,38 +4386,38 @@ function persistBinary(apiKey) {
   if (!cliEntry) {
     throw new Error("Could not locate CLI bundle. Run from an installed conare package.");
   }
-  const dest = join9(BIN_DIR, "conare-ingest.mjs");
-  const content = readFileSync8(cliEntry, "utf-8");
+  const dest = join11(BIN_DIR, "conare-ingest.mjs");
+  const content = readFileSync10(cliEntry, "utf-8");
   writeFileSync4(dest, content);
   for (const moduleName of ["sql.js", "better-sqlite3", "bindings", "file-uri-to-path"]) {
     try {
       copyNodeModule(moduleName);
     } catch {}
   }
-  const runShPath = join9(BIN_DIR, "run.sh");
+  const runShPath = join11(BIN_DIR, "run.sh");
   writeFileSync4(runShPath, RUN_SH);
   try {
     chmodSync(runShPath, 493);
   } catch {}
-  const runCmdPath = join9(BIN_DIR, "run.cmd");
+  const runCmdPath = join11(BIN_DIR, "run.cmd");
   writeFileSync4(runCmdPath, RUN_CMD);
-  const runVbsPath = join9(BIN_DIR, "run.vbs");
+  const runVbsPath = join11(BIN_DIR, "run.vbs");
   writeFileSync4(runVbsPath, RUN_VBS);
   let existing = {};
-  if (existsSync9(CONFIG_PATH)) {
+  if (existsSync11(CONFIG_PATH)) {
     try {
-      existing = JSON.parse(readFileSync8(CONFIG_PATH, "utf-8"));
+      existing = JSON.parse(readFileSync10(CONFIG_PATH, "utf-8"));
     } catch {}
   }
   writeFileSync4(CONFIG_PATH, JSON.stringify(mergeApiKeyIntoConfig(existing, apiKey), null, 2) + `
 `, { mode: 384 });
 }
 function isValidJsBundle(path) {
-  if (!existsSync9(path))
+  if (!existsSync11(path))
     return false;
   if (path.endsWith(".ts") || path.endsWith(".tsx"))
     return false;
-  const head = readFileSync8(path, "utf-8").slice(0, 2000);
+  const head = readFileSync10(path, "utf-8").slice(0, 2000);
   if (/\btype\s+\{/.test(head) || /,\s*type\s+\w+/.test(head))
     return false;
   return true;
@@ -3943,8 +4425,8 @@ function isValidJsBundle(path) {
 function findCliBundle() {
   const dir = dirname3(new URL(import.meta.url).pathname);
   const distCandidates = [
-    join9(dir, "index.js"),
-    join9(dir, "..", "dist", "index.js")
+    join11(dir, "index.js"),
+    join11(dir, "..", "dist", "index.js")
   ];
   for (const c of distCandidates) {
     if (isValidJsBundle(c))
@@ -3961,12 +4443,12 @@ function findNodeModule(name) {
     return dirname3(require2.resolve(`${name}/package.json`));
   } catch {}
   const candidates = [
-    join9(process.cwd(), "node_modules", name),
-    join9(dirname3(new URL(import.meta.url).pathname), "..", "node_modules", name),
-    join9(dirname3(new URL(import.meta.url).pathname), "..", "..", "node_modules", name)
+    join11(process.cwd(), "node_modules", name),
+    join11(dirname3(new URL(import.meta.url).pathname), "..", "node_modules", name),
+    join11(dirname3(new URL(import.meta.url).pathname), "..", "..", "node_modules", name)
   ];
   for (const c of candidates) {
-    if (existsSync9(c))
+    if (existsSync11(c))
       return c;
   }
   return null;
@@ -3975,7 +4457,7 @@ function copyNodeModule(name) {
   const sourceDir = findNodeModule(name);
   if (!sourceDir)
     return;
-  const targetDir = join9(BIN_DIR, "node_modules", name);
+  const targetDir = join11(BIN_DIR, "node_modules", name);
   rmSync2(targetDir, { recursive: true, force: true });
   mkdirSync4(dirname3(targetDir), { recursive: true });
   cpSync(sourceDir, targetDir, { recursive: true });
@@ -4010,7 +4492,7 @@ function makeLaunchdPlist(intervalSeconds) {
   <key>ProgramArguments</key>
   <array>
     <string>/bin/bash</string>
-    <string>${join9(BIN_DIR, "run.sh")}</string>
+    <string>${join11(BIN_DIR, "run.sh")}</string>
   </array>
   <key>StartInterval</key>
   <integer>${intervalSeconds}</integer>
@@ -4019,7 +4501,7 @@ function makeLaunchdPlist(intervalSeconds) {
   <key>ProcessType</key>
   <string>Background</string>
   <key>StandardErrorPath</key>
-  <string>${join9(CONARE_DIR, "ingest.log")}</string>
+  <string>${join11(CONARE_DIR, "ingest.log")}</string>
 </dict>
 </plist>
 `;
@@ -4072,7 +4554,7 @@ function clampCronInterval(intervalMinutes) {
 }
 function setupCron(intervalMinutes) {
   const clamped = clampCronInterval(intervalMinutes);
-  const cronCmd = `"${homedir8()}/.conare/bin/run.sh"`;
+  const cronCmd = `"${homedir10()}/.conare/bin/run.sh"`;
   const cronLine = `*/${clamped} * * * * ${cronCmd}  # conare-sync`;
   try {
     const existing = execSync3("crontab -l 2>/dev/null", { encoding: "utf-8" });
@@ -4113,7 +4595,7 @@ function removeCronEntry() {
 function installGlobalCommand() {
   const isWindows = platform6() === "win32";
   if (isWindows) {
-    const wrapper2 = join9(BIN_DIR, "conare.cmd");
+    const wrapper2 = join11(BIN_DIR, "conare.cmd");
     const content2 = `@echo off\r
 where node >nul 2>nul\r
 if errorlevel 1 (\r
@@ -4135,7 +4617,7 @@ node "%USERPROFILE%\\.conare\\bin\\conare-ingest.mjs" %*\r
       return `Global command: add ${binDirWin} to your PATH manually`;
     }
   }
-  const wrapper = join9(BIN_DIR, "conare");
+  const wrapper = join11(BIN_DIR, "conare");
   const content = `#!/bin/bash
 # Conare global command — runs the persisted CLI bundle
 CONARE_DIR="$HOME/.conare"
@@ -4156,7 +4638,7 @@ exec "$NODE" "$CONARE_DIR/bin/conare-ingest.mjs" "$@"
   chmodSync(wrapper, 493);
   const symlinkTarget = "/usr/local/bin/conare";
   try {
-    if (existsSync9(symlinkTarget)) {
+    if (existsSync11(symlinkTarget)) {
       try {
         const existing = readlinkSync2(symlinkTarget);
         if (existing === wrapper)
@@ -4174,7 +4656,7 @@ exec "$NODE" "$CONARE_DIR/bin/conare-ingest.mjs" "$@"
     const shellProfile = getShellProfile();
     if (shellProfile) {
       try {
-        const profileContent = existsSync9(shellProfile) ? readFileSync8(shellProfile, "utf-8") : "";
+        const profileContent = existsSync11(shellProfile) ? readFileSync10(shellProfile, "utf-8") : "";
         const exportLine = `export PATH="$HOME/.conare/bin:$PATH"`;
         if (!profileContent.includes(".conare/bin")) {
           appendFileSync(shellProfile, `
@@ -4192,24 +4674,24 @@ ${exportLine}
   }
 }
 function getShellProfile() {
-  const home = homedir8();
+  const home = homedir10();
   const shell = process.env.SHELL || "";
   if (shell.includes("zsh"))
-    return join9(home, ".zshrc");
+    return join11(home, ".zshrc");
   if (shell.includes("bash")) {
-    const profile = join9(home, ".bash_profile");
-    if (platform6() === "darwin" && existsSync9(profile))
+    const profile = join11(home, ".bash_profile");
+    if (platform6() === "darwin" && existsSync11(profile))
       return profile;
-    return join9(home, ".bashrc");
+    return join11(home, ".bashrc");
   }
-  if (existsSync9(join9(home, ".zshrc")))
-    return join9(home, ".zshrc");
-  if (existsSync9(join9(home, ".bashrc")))
-    return join9(home, ".bashrc");
+  if (existsSync11(join11(home, ".zshrc")))
+    return join11(home, ".zshrc");
+  if (existsSync11(join11(home, ".bashrc")))
+    return join11(home, ".bashrc");
   return null;
 }
 function setupWindows(intervalMinutes) {
-  const runVbs = join9(BIN_DIR, "run.vbs").replace(/\//g, "\\");
+  const runVbs = join11(BIN_DIR, "run.vbs").replace(/\//g, "\\");
   try {
     execSync3(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: "ignore" });
   } catch {}
@@ -4349,18 +4831,18 @@ function detectMechanism() {
 }
 function syncStatus() {
   const mechanism = detectMechanism();
-  const logPath = join9(CONARE_DIR, "ingest.log");
+  const logPath = join11(CONARE_DIR, "ingest.log");
   let parsed = { lastSyncIso: null, lastSyncError: null };
-  if (existsSync9(logPath)) {
+  if (existsSync11(logPath)) {
     try {
-      parsed = parseLastSync(readFileSync8(logPath, "utf-8"));
+      parsed = parseLastSync(readFileSync10(logPath, "utf-8"));
     } catch {}
   }
   return {
     timerInstalled: syncTimerInstalled(),
     mechanism,
-    binaryPersisted: existsSync9(join9(BIN_DIR, "conare-ingest.mjs")),
-    configPresent: existsSync9(CONFIG_PATH),
+    binaryPersisted: existsSync11(join11(BIN_DIR, "conare-ingest.mjs")),
+    configPresent: existsSync11(CONFIG_PATH),
     lastSyncIso: parsed.lastSyncIso,
     lastSyncError: parsed.lastSyncError
   };
@@ -4370,7 +4852,7 @@ function removeSyncTimer() {
   const os = platform6();
   if (os === "darwin") {
     bootoutLaunchAgent();
-    if (existsSync9(PLIST_PATH)) {
+    if (existsSync11(PLIST_PATH)) {
       unlinkSync2(PLIST_PATH);
       messages.push("Removed launchd agent");
     }
@@ -4385,9 +4867,9 @@ function removeSyncTimer() {
       try {
         execSync3("systemctl --user disable --now conare-sync.timer 2>/dev/null", { stdio: "ignore" });
       } catch {}
-      if (existsSync9(SYSTEMD_SERVICE))
+      if (existsSync11(SYSTEMD_SERVICE))
         unlinkSync2(SYSTEMD_SERVICE);
-      if (existsSync9(SYSTEMD_TIMER))
+      if (existsSync11(SYSTEMD_TIMER))
         unlinkSync2(SYSTEMD_TIMER);
       try {
         execSync3("systemctl --user daemon-reload", { stdio: "ignore" });
@@ -4400,19 +4882,19 @@ function removeSyncTimer() {
   return messages;
 }
 function clearSyncLocks() {
-  const lockDir = join9(CONARE_DIR, "sync.lock.d");
-  if (existsSync9(lockDir))
+  const lockDir = join11(CONARE_DIR, "sync.lock.d");
+  if (existsSync11(lockDir))
     rmSync2(lockDir, { recursive: true, force: true });
-  const lockFile = join9(CONARE_DIR, "sync.lock");
-  if (existsSync9(lockFile))
+  const lockFile = join11(CONARE_DIR, "sync.lock");
+  if (existsSync11(lockFile))
     unlinkSync2(lockFile);
 }
 function uninstallSync() {
   const messages = removeSyncTimer();
-  if (existsSync9(CONFIG_PATH))
+  if (existsSync11(CONFIG_PATH))
     unlinkSync2(CONFIG_PATH);
   clearSyncLocks();
-  if (existsSync9(BIN_DIR)) {
+  if (existsSync11(BIN_DIR)) {
     rmSync2(BIN_DIR, { recursive: true, force: true });
     messages.push("Removed ~/.conare/bin/");
   }
@@ -4438,7 +4920,9 @@ var CONARE_URL2 = "https://conare.ai";
 var CHAT_CONTAINER_LABELS = {
   "claude-chats": "Claude Code",
   "codex-chats": "Codex",
-  "cursor-chats": "Cursor"
+  "cursor-chats": "Cursor",
+  "opencode-chats": "OpenCode",
+  "grok-chats": "Grok"
 };
 function getManifestFingerprint(memory) {
   const metadata = memory.metadata;
@@ -4595,7 +5079,7 @@ Options:
   --ingest-only       Index memories without MCP configuration
   --config-only       Configure MCP only, skip indexing
   --interactive       Run guided setup prompts
-  --source <name>     Only index from: claude, codex, cursor
+  --source <name>     Only index from: claude, codex, cursor, opencode, grok
   --wasm-dir <path>   Path to sql.js module (for Cursor indexing)
 
 Get your API key at https://conare.ai
@@ -4733,8 +5217,8 @@ async function main() {
   let configFileKey;
   if (opts.configFile) {
     try {
-      const { readFileSync: readFileSync9 } = await import("node:fs");
-      const raw = JSON.parse(readFileSync9(opts.configFile, "utf-8"));
+      const { readFileSync: readFileSync11 } = await import("node:fs");
+      const raw = JSON.parse(readFileSync11(opts.configFile, "utf-8"));
       configFileKey = raw.apiKey || raw.key;
       if (!configFileKey) {
         console.error(`Error: no apiKey/key found in ${opts.configFile}`);
@@ -4754,7 +5238,7 @@ async function main() {
   let effectiveConfigOnly = opts.configOnly;
   let effectiveIngestOnly = opts.ingestOnly;
   let effectiveIndexPath = opts.indexPath;
-  let selectedSources = opts.source ? [opts.source] : ["claude", "cursor", "codex"];
+  let selectedSources = opts.source ? [opts.source] : ["claude", "cursor", "codex", "opencode", "grok"];
   let apiKey = opts.key || configFileKey || process.env.CONARE_API_KEY || savedApiKey;
   let interactiveTargets = MCP_TARGETS.map((target) => ({
     id: target.id,
@@ -4801,7 +5285,7 @@ async function main() {
         detectedCountApproximate: detected?.sessionCountApproximate
       };
     });
-    const INGESTIBLE_SOURCES = new Set(["claude", "codex", "cursor"]);
+    const INGESTIBLE_SOURCES = new Set(["claude", "codex", "cursor", "opencode", "grok"]);
     const ingestibleTargets = interactiveTargets.filter((t) => INGESTIBLE_SOURCES.has(t.id));
     showDetectedApps(ingestibleTargets);
     selectedSources = await selectChatSources(ingestibleTargets);
@@ -4849,7 +5333,7 @@ async function main() {
   }
   saveApiKey(apiKey);
   if (auth.id)
-    setManifestAccount(auth.id);
+    setManifestScope(auth.id, apiKey);
   if (!opts.force && !opts.dryRun) {
     const remoteMemoryCount = await getRemoteMemoryCount(apiKey);
     const localManifest = getIngested();
@@ -4871,8 +5355,8 @@ async function main() {
       }
     }
   }
-  if (!opts.wasmDir && existsSync10(join10(process.cwd(), "node_modules", "sql.js"))) {
-    opts.wasmDir = join10(process.cwd(), "node_modules");
+  if (!opts.wasmDir && existsSync12(join12(process.cwd(), "node_modules", "sql.js"))) {
+    opts.wasmDir = join12(process.cwd(), "node_modules");
   }
   if (effectiveConfigOnly) {
     if (!opts.dryRun) {
@@ -5019,11 +5503,11 @@ Nothing new to index.`);
     if (!opts.quiet) {
       const s = Y2();
       s.start("Scanning Claude Code chats...");
-      const { memories, filtered, deduped } = ingestClaude(undefined, { dedupSource: "claude" });
+      const { memories, filtered, deduped } = ingestClaude();
       allMemories.push(...memories);
       s.stop(`Claude Code: ${renderDiscoverySummary(memories.length, filtered, deduped)}`);
     } else {
-      allMemories.push(...ingestClaude(undefined, { dedupSource: "claude" }).memories);
+      allMemories.push(...ingestClaude().memories);
     }
   }
   if (shouldIngest("codex") && tools.find((t) => t.name === "Codex")?.available) {
@@ -5042,12 +5526,34 @@ Nothing new to index.`);
       const s = Y2();
       s.start("Scanning Cursor chats...");
       const cursorTool = tools.find((t) => t.name === "Cursor");
-      const { memories, filtered, deduped } = await ingestCursor(cursorTool.path, opts.wasmDir, undefined, { dedupSource: "cursor" });
+      const { memories, filtered, deduped } = await ingestCursor(cursorTool.path, opts.wasmDir);
       allMemories.push(...memories);
       s.stop(`Cursor: ${renderDiscoverySummary(memories.length, filtered, deduped)}`);
     } else {
       const cursorTool = tools.find((t) => t.name === "Cursor");
-      allMemories.push(...(await ingestCursor(cursorTool.path, opts.wasmDir, undefined, { dedupSource: "cursor" })).memories);
+      allMemories.push(...(await ingestCursor(cursorTool.path, opts.wasmDir)).memories);
+    }
+  }
+  if (shouldIngest("opencode") && tools.find((t) => t.name === "OpenCode")?.available) {
+    if (!opts.quiet) {
+      const s = Y2();
+      s.start("Scanning OpenCode chats...");
+      const { memories, filtered, deduped } = ingestOpenCode();
+      allMemories.push(...memories);
+      s.stop(`OpenCode: ${renderDiscoverySummary(memories.length, filtered, deduped)}`);
+    } else {
+      allMemories.push(...ingestOpenCode().memories);
+    }
+  }
+  if (shouldIngest("grok") && tools.find((t) => t.name === "Grok")?.available) {
+    if (!opts.quiet) {
+      const s = Y2();
+      s.start("Scanning Grok chats...");
+      const { memories, filtered, deduped } = ingestGrok();
+      allMemories.push(...memories);
+      s.stop(`Grok: ${renderDiscoverySummary(memories.length, filtered, deduped)}`);
+    } else {
+      allMemories.push(...ingestGrok().memories);
     }
   }
   allMemories.sort((a, b3) => {
@@ -5133,7 +5639,9 @@ Nothing new to index.`);
     const successfulKeysBySource = {
       claude: [],
       codex: [],
-      cursor: []
+      cursor: [],
+      opencode: [],
+      grok: []
     };
     for (const result of results) {
       if (!result.success)
@@ -5152,6 +5660,12 @@ Nothing new to index.`);
         case "cursor-chats":
           successfulKeysBySource.cursor.push(key);
           break;
+        case "opencode-chats":
+          successfulKeysBySource.opencode.push(key);
+          break;
+        case "grok-chats":
+          successfulKeysBySource.grok.push(key);
+          break;
       }
     }
     for (const [source, ids] of Object.entries(successfulKeysBySource)) {
@@ -5207,6 +5721,10 @@ Nothing new to index.`);
       return "Codex";
     if (t === "cursor")
       return "Cursor";
+    if (t === "opencode")
+      return "OpenCode";
+    if (t === "grok")
+      return "Grok";
     return t;
   });
   const toolList = configuredTools.length > 0 ? configuredTools.join(", ") : "your AI tools";