conare 0.3.1 → 0.3.3

package/dist/index.js

@@ -29,6 +29,584 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
+// src/ingest/shared.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync, mkdirSync } from "node:fs";
+import { createHash } from "node:crypto";
+import { join as join2 } from "node:path";
+import { homedir as homedir2 } from "node:os";
+function isNarration(text) {
+  const stripped = text.trim();
+  if (stripped.length < MIN_SUBSTANTIVE)
+    return true;
+  if (stripped.length <= 300 && NARRATION_RE.test(stripped))
+    return true;
+  return false;
+}
+function cleanText(raw) {
+  let text = raw;
+  text = text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "");
+  text = text.replace(/<attached-context[\s\S]*?<\/attached-context>/g, "");
+  text = text.replace(/<environment_context>[\s\S]*?<\/environment_context>/g, "");
+  text = text.replace(/^\s*Base directory for this skill:[\s\S]*/g, "");
+  text = text.replace(/\nBase directory for this skill:[\s\S]*/g, "");
+  text = text.replace(/<!-- vibe-rules Integration -->[\s\S]*?<!-- \/vibe-rules Integration -->/g, "");
+  text = text.replace(/<good-behaviour>[\s\S]*?<\/good-behaviour>/g, "");
+  text = text.replace(/<frontend-design>[\s\S]*?<\/frontend-design>/g, "");
+  text = text.replace(/<architecture>[\s\S]*?<\/architecture>/g, "");
+  text = text.replace(/<task-notification>[\s\S]*?<\/task-notification>/g, "");
+  text = text.replace(/<local-command-stdout>[\s\S]*?<\/local-command-stdout>/g, "");
+  text = text.replace(/<system_instruction>[\s\S]*?<\/system_instruction>/g, "");
+  return text.trim();
+}
+function createContentHash(content) {
+  return createHash("sha256").update(content).digest("hex").slice(0, 16);
+}
+function getIngested() {
+  try {
+    if (existsSync2(MANIFEST_PATH)) {
+      return JSON.parse(readFileSync2(MANIFEST_PATH, "utf-8"));
+    }
+  } catch {}
+  return {};
+}
+function markIngested(source, sessionIds) {
+  const manifest = getIngested();
+  const existing = new Set(manifest[source] || []);
+  for (const id of sessionIds)
+    existing.add(id);
+  manifest[source] = [...existing];
+  const dir = join2(homedir2(), ".conare");
+  if (!existsSync2(dir))
+    mkdirSync(dir, { recursive: true });
+  writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2));
+}
+function isIngested(source, sessionId) {
+  const manifest = getIngested();
+  return (manifest[source] || []).includes(sessionId);
+}
+function clearIngested(source) {
+  const manifest = getIngested();
+  if (source) {
+    delete manifest[source];
+  } else {
+    for (const key of Object.keys(manifest))
+      delete manifest[key];
+  }
+  const dir = join2(homedir2(), ".conare");
+  if (!existsSync2(dir))
+    mkdirSync(dir, { recursive: true });
+  writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2));
+}
+var MANIFEST_PATH, MIN_SUBSTANTIVE = 200, NARRATION_RE;
+var init_shared = __esm(() => {
+  MANIFEST_PATH = join2(homedir2(), ".conare", "ingested.json");
+  NARRATION_RE = /^[\s\n]*(Let me |Now let me |Now I['\u2019]|Now add |Now fix |Now replace |Now integrate |Now update |Now pass |Now clean |Now build|Update the |Builds clean|Deployed\.|Wait, I |Let['\u2019]s test |Good —|Great\.|Perfect\.|Alright|OK,? let me|I[''\u2019]ll |Starting |I need to |Need |I found |I read |I[''\u2019]ve (loaded|confirmed|verified)|Context loaded|Next (I[''\u2019]|step)|Deps confirm|Diff check|Still missing|I[''\u2019]ll (do|check|inspect|trace|run|grab|pull|read|verify))/;
+});
+
+// src/ingest/codebase.ts
+var exports_codebase = {};
+__export(exports_codebase, {
+  indexCodebase: () => indexCodebase,
+  getRemoteFilePath: () => getRemoteFilePath,
+  getChangedFiles: () => getChangedFiles,
+  detectProjectName: () => detectProjectName
+});
+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";
+function parseGitignore(rootPath) {
+  const patterns = new Set;
+  const gitignorePath = join6(rootPath, ".gitignore");
+  if (!existsSync5(gitignorePath))
+    return patterns;
+  try {
+    const content = readFileSync6(gitignorePath, "utf-8");
+    for (const line of content.split(`
+`)) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("#"))
+        continue;
+      patterns.add(trimmed.replace(/\/$/, ""));
+    }
+  } catch {}
+  return patterns;
+}
+function shouldIgnore(name, ignorePatterns) {
+  if (DEFAULT_IGNORE.has(name))
+    return true;
+  if (IGNORE_FILES.has(name))
+    return true;
+  if (name.startsWith(".env"))
+    return true;
+  if (ignorePatterns.has(name))
+    return true;
+  return false;
+}
+function langFromExt(ext) {
+  return EXT_TO_LANG[ext] || ext.slice(1);
+}
+function formatFile(relPath, content, ext) {
+  const lang = langFromExt(ext);
+  return `# File: ${relPath}
+
+\`\`\`${lang}
+${content}
+\`\`\``;
+}
+function detectProjectName(rootPath) {
+  const readers = [
+    () => {
+      const pkg = JSON.parse(readFileSync6(join6(rootPath, "package.json"), "utf-8"));
+      return typeof pkg.name === "string" ? pkg.name : null;
+    },
+    () => {
+      const content = readFileSync6(join6(rootPath, "Cargo.toml"), "utf-8");
+      return content.match(/^name\s*=\s*"([^"]+)"/m)?.[1] ?? null;
+    },
+    () => {
+      const content = readFileSync6(join6(rootPath, "pyproject.toml"), "utf-8");
+      return content.match(/^name\s*=\s*"([^"]+)"/m)?.[1] ?? null;
+    }
+  ];
+  for (const reader of readers) {
+    try {
+      const name = reader();
+      if (name)
+        return name;
+    } catch {}
+  }
+  return basename3(resolve(rootPath));
+}
+function getChangedFiles(rootPath) {
+  try {
+    const committed = execSync("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", {
+      cwd: rootPath,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    const all = new Set;
+    for (const line of [...committed.split(`
+`), ...staged.split(`
+`)]) {
+      const f = line.trim();
+      if (f.length > 0)
+        all.add(f);
+    }
+    return [...all];
+  } catch {
+    return null;
+  }
+}
+function getRemoteFilePath(memory) {
+  const meta = memory.metadata;
+  if (!meta || typeof meta !== "object")
+    return null;
+  const fp = meta.filePath;
+  return typeof fp === "string" ? fp : null;
+}
+function indexCodebase(rootPath, options = {}) {
+  const absRoot = resolve(rootPath);
+  const repoHash = createHash2("sha256").update(absRoot).digest("hex").slice(0, 12);
+  const gitignorePatterns = parseGitignore(absRoot);
+  const memories = [];
+  const localFilePaths = [];
+  let fileCount = 0;
+  let skipped = 0;
+  const project = options.project || detectProjectName(absRoot);
+  const changedFiles = options.changedOnly ? getChangedFiles(absRoot) : null;
+  const changedSet = changedFiles ? new Set(changedFiles) : null;
+  if (options.changedOnly && changedSet !== null && changedSet.size === 0) {
+    return { memories, fileCount: 0, skipped: 0, localFilePaths: [], project };
+  }
+  function walk(dir) {
+    let entries;
+    try {
+      entries = readdirSync4(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (shouldIgnore(entry.name, gitignorePatterns))
+        continue;
+      const fullPath = join6(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(fullPath);
+        continue;
+      }
+      if (!entry.isFile())
+        continue;
+      const ext = extname(entry.name).toLowerCase();
+      if (!CODE_EXTENSIONS.has(ext) && !SPECIAL_FILES.has(entry.name))
+        continue;
+      const relPath = relative(absRoot, fullPath);
+      localFilePaths.push(relPath);
+      if (changedSet && !changedSet.has(relPath)) {
+        skipped++;
+        continue;
+      }
+      let stat;
+      try {
+        stat = statSync2(fullPath);
+      } catch {
+        continue;
+      }
+      if (stat.size > MAX_FILE_SIZE || stat.size === 0) {
+        skipped++;
+        continue;
+      }
+      let raw;
+      try {
+        raw = readFileSync6(fullPath, "utf-8");
+      } catch {
+        skipped++;
+        continue;
+      }
+      if (raw.includes("\x00")) {
+        skipped++;
+        continue;
+      }
+      const contentHash = createContentHash(raw);
+      const dedupKey = `codebase:${repoHash}:${relPath}`;
+      const fingerprint = `${dedupKey}:${contentHash}`;
+      if (isIngested("codebase", fingerprint)) {
+        skipped++;
+        continue;
+      }
+      const content = formatFile(relPath, raw, ext);
+      const metadata = {
+        dedupKey,
+        contentHash,
+        source: "codebase-index",
+        repoHash,
+        filePath: relPath,
+        fileHash: `${relPath}:${contentHash}`,
+        language: langFromExt(ext),
+        project
+      };
+      memories.push({ content, containerTag: "codebase", metadata });
+      fileCount++;
+    }
+  }
+  walk(absRoot);
+  return { memories, fileCount, skipped, localFilePaths, project };
+}
+var DEFAULT_IGNORE, IGNORE_FILES, CODE_EXTENSIONS, SPECIAL_FILES, MAX_FILE_SIZE = 1e5, EXT_TO_LANG;
+var init_codebase = __esm(() => {
+  init_shared();
+  DEFAULT_IGNORE = new Set([
+    "node_modules",
+    ".git",
+    ".next",
+    ".nuxt",
+    ".output",
+    "dist",
+    "build",
+    ".cache",
+    "__pycache__",
+    ".venv",
+    "venv",
+    "vendor",
+    "target",
+    ".turbo",
+    ".DS_Store",
+    ".claude",
+    ".conare"
+  ]);
+  IGNORE_FILES = new Set([
+    "package-lock.json",
+    "bun.lockb",
+    "yarn.lock",
+    "pnpm-lock.yaml"
+  ]);
+  CODE_EXTENSIONS = new Set([
+    ".ts",
+    ".tsx",
+    ".js",
+    ".jsx",
+    ".mjs",
+    ".cjs",
+    ".vue",
+    ".svelte",
+    ".astro",
+    ".py",
+    ".rb",
+    ".go",
+    ".rs",
+    ".java",
+    ".kt",
+    ".swift",
+    ".c",
+    ".cpp",
+    ".h",
+    ".css",
+    ".scss",
+    ".less",
+    ".html",
+    ".json",
+    ".yaml",
+    ".yml",
+    ".toml",
+    ".md",
+    ".mdx",
+    ".txt",
+    ".sql",
+    ".graphql",
+    ".prisma",
+    ".sh",
+    ".bash",
+    ".zsh",
+    ".lua",
+    ".zig",
+    ".ex",
+    ".exs"
+  ]);
+  SPECIAL_FILES = new Set([
+    "Dockerfile",
+    "Makefile",
+    "Procfile",
+    "Justfile",
+    ".gitignore",
+    ".dockerignore",
+    "CLAUDE.md",
+    "AGENTS.md",
+    "README.md",
+    "ARCHITECTURE.md",
+    "wrangler.toml",
+    "wrangler.json"
+  ]);
+  EXT_TO_LANG = {
+    ".ts": "typescript",
+    ".tsx": "tsx",
+    ".js": "javascript",
+    ".jsx": "jsx",
+    ".mjs": "javascript",
+    ".cjs": "javascript",
+    ".vue": "vue",
+    ".svelte": "svelte",
+    ".astro": "astro",
+    ".py": "python",
+    ".rb": "ruby",
+    ".go": "go",
+    ".rs": "rust",
+    ".java": "java",
+    ".kt": "kotlin",
+    ".swift": "swift",
+    ".c": "c",
+    ".cpp": "cpp",
+    ".h": "c",
+    ".css": "css",
+    ".scss": "scss",
+    ".less": "less",
+    ".html": "html",
+    ".json": "json",
+    ".yaml": "yaml",
+    ".yml": "yaml",
+    ".toml": "toml",
+    ".md": "markdown",
+    ".mdx": "mdx",
+    ".sql": "sql",
+    ".graphql": "graphql",
+    ".prisma": "prisma",
+    ".sh": "bash",
+    ".bash": "bash",
+    ".zsh": "zsh",
+    ".lua": "lua",
+    ".zig": "zig",
+    ".ex": "elixir",
+    ".exs": "elixir"
+  };
+});
+
+// src/api.ts
+var exports_api = {};
+__export(exports_api, {
+  validateKey: () => validateKey,
+  uploadBulk: () => uploadBulk,
+  listRemoteMemories: () => listRemoteMemories,
+  getRemoteMemoryCount: () => getRemoteMemoryCount,
+  deleteMemory: () => deleteMemory,
+  deleteMemories: () => deleteMemories,
+  createUploadBatches: () => createUploadBatches,
+  ApiError: () => ApiError
+});
+async function apiRequest(path, apiKey, init) {
+  const res = await fetch(`${API_URL}${path}`, {
+    ...init,
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json",
+      ...init?.headers || {}
+    }
+  });
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    throw new ApiError(`${path} failed: HTTP ${res.status}${body ? ` — ${body.slice(0, 200)}` : ""}`, res.status, path);
+  }
+  return res.json();
+}
+async function listRemoteMemories(apiKey, containerTag) {
+  const all = [];
+  let offset = 0;
+  while (true) {
+    const data = await apiRequest(`/api/memories?containerTag=${encodeURIComponent(containerTag)}&limit=${PAGE_SIZE}&offset=${offset}`, apiKey);
+    const page = data.memories || [];
+    all.push(...page);
+    if (page.length < PAGE_SIZE)
+      break;
+    offset += PAGE_SIZE;
+  }
+  return all;
+}
+async function deleteMemory(apiKey, memoryId) {
+  try {
+    await apiRequest(`/api/memories/${memoryId}`, apiKey, { method: "DELETE" });
+    return true;
+  } catch (err) {
+    if (err instanceof ApiError && err.statusCode === 404)
+      return false;
+    throw err;
+  }
+}
+async function deleteMemories(apiKey, memoryIds, onProgress) {
+  let deleted = 0;
+  const total = memoryIds.length;
+  for (let i = 0;i < total; i += DELETE_CONCURRENCY) {
+    const batch = memoryIds.slice(i, i + DELETE_CONCURRENCY);
+    const results = await Promise.all(batch.map((id) => deleteMemory(apiKey, id)));
+    deleted += results.filter(Boolean).length;
+    onProgress?.(deleted, total);
+  }
+  return deleted;
+}
+function createUploadBatches(memories, maxItems = 10, maxChars = 500000) {
+  const batches = [];
+  let current = [];
+  let currentChars = 0;
+  let startIndex = 0;
+  for (let i = 0;i < memories.length; i++) {
+    const item = memories[i];
+    const itemChars = item.content.length;
+    const exceedsBatch = current.length > 0 && (current.length >= maxItems || currentChars + itemChars > maxChars);
+    if (exceedsBatch) {
+      batches.push({ startIndex, items: current });
+      current = [];
+      currentChars = 0;
+      startIndex = i;
+    }
+    current.push(item);
+    currentChars += itemChars;
+  }
+  if (current.length > 0) {
+    batches.push({ startIndex, items: current });
+  }
+  return batches;
+}
+async function validateKey(apiKey) {
+  try {
+    const data = await apiRequest("/api/auth/me", apiKey);
+    return { valid: true, email: data.user.email, name: data.user.name };
+  } catch {
+    return { valid: false };
+  }
+}
+async function getRemoteMemoryCount(apiKey) {
+  try {
+    const data = await apiRequest("/api/containers", apiKey);
+    if (!Array.isArray(data.containers))
+      return 0;
+    return data.containers.reduce((sum, c) => sum + (c.count || 0), 0);
+  } catch {
+    return null;
+  }
+}
+async function uploadItems(apiKey, items, asyncEmbed = false) {
+  let retries = 4;
+  while (retries > 0) {
+    try {
+      const data = await apiRequest("/api/memories/bulk", apiKey, {
+        method: "POST",
+        body: JSON.stringify(asyncEmbed ? { items, async: true } : items)
+      });
+      if (!Array.isArray(data.results) || data.results.length !== items.length) {
+        throw new Error("Unexpected bulk upload response");
+      }
+      return data.results;
+    } catch (error) {
+      if (error instanceof ApiError && error.statusCode === 429) {
+        retries--;
+        await new Promise((r) => setTimeout(r, 5000));
+        continue;
+      }
+      retries--;
+      if (retries === 0) {
+        return items.map(() => ({
+          success: false,
+          error: error instanceof Error ? error.message : String(error)
+        }));
+      }
+      await new Promise((r) => setTimeout(r, 2000));
+    }
+  }
+  return items.map(() => ({ success: false, error: "Upload failed" }));
+}
+async function uploadBulk(apiKey, memories, onProgress) {
+  let success = 0;
+  let failed = 0;
+  const total = memories.length;
+  const results = [];
+  const batches = createUploadBatches(memories);
+  for (const batch of batches) {
+    let batchResults = await uploadItems(apiKey, batch.items, true);
+    if (batch.items.length > 1 && batchResults.some((result) => !result.success)) {
+      const retriedResults = [];
+      for (let i = 0;i < batch.items.length; i++) {
+        const result = batchResults[i];
+        if (result.success) {
+          retriedResults.push(result);
+          continue;
+        }
+        const [singleResult] = await uploadItems(apiKey, [batch.items[i]], true);
+        retriedResults.push(singleResult);
+      }
+      batchResults = retriedResults;
+    }
+    for (let i = 0;i < batchResults.length; i++) {
+      const result = batchResults[i];
+      results.push({
+        index: batch.startIndex + i,
+        success: result.success,
+        deduped: result.deduped,
+        error: result.error
+      });
+      if (result.success)
+        success++;
+      else
+        failed++;
+    }
+    onProgress?.(success + failed, total, failed);
+  }
+  return { success, failed, results };
+}
+var API_URL = "https://mcp.conare.ai", ApiError, PAGE_SIZE = 200, DELETE_CONCURRENCY = 5;
+var init_api = __esm(() => {
+  ApiError = class ApiError extends Error {
+    statusCode;
+    endpoint;
+    constructor(message, statusCode, endpoint) {
+      super(message);
+      this.statusCode = statusCode;
+      this.endpoint = endpoint;
+      this.name = "ApiError";
+    }
+  };
+});
+
 // node_modules/sisteransi/src/index.js
 var require_src = __commonJS((exports, module) => {
   var ESC = "\x1B";
@@ -794,7 +1372,8 @@ __export(exports_interactive, {
   selectChatSources: () => selectChatSources,
   promptApiKey: () => promptApiKey,
   finishSetup: () => finishSetup,
-  confirmIndexCodebase: () => confirmIndexCodebase
+  confirmIndexCodebase: () => confirmIndexCodebase,
+  confirmBackgroundSync: () => confirmBackgroundSync
 });
 function formatDetectedCount(count) {
   if (count === undefined)
@@ -866,6 +1445,12 @@ async function confirmIndexCodebase() {
     initialValue: false
   }));
 }
+async function confirmBackgroundSync() {
+  return ensureValue(await ye({
+    message: "Auto-ingest new chats every 10 minutes?",
+    initialValue: true
+  }));
+}
 var init_interactive = __esm(() => {
   init_dist2();
 });
@@ -875,10 +1460,10 @@ import { existsSync as existsSync9 } from "node:fs";
 import { join as join10 } from "node:path";
 
 // src/detect.ts
-import { existsSync, readdirSync } from "node:fs";
-import { spawnSync } from "node:child_process";
+import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { homedir, platform } from "node:os";
+import { createRequire as createRequire2 } from "node:module";
 function countJsonlFiles(dir) {
   let count = 0;
   try {
@@ -892,50 +1477,41 @@ function countJsonlFiles(dir) {
   } catch {}
   return count;
 }
-function countCursorSessions(dbPath) {
+async function countCursorSessions(dbPath) {
   try {
-    const result = spawnSync("sqlite3", [
-      dbPath,
-      `
-WITH composer_rows AS (
-  SELECT substr(key, 14) AS composer_id, value AS composer_json
-  FROM cursorDiskKV
-  WHERE key LIKE 'composerData:%'
-),
-headers AS (
-  SELECT
-    composer_id,
-    json_extract(j.value, '$.bubbleId') AS bubble_id,
-    json_extract(j.value, '$.type') AS type
-  FROM composer_rows, json_each(json_extract(composer_json, '$.fullConversationHeadersOnly')) AS j
-),
-messages AS (
-  SELECT h.composer_id, h.type
-  FROM headers h
-  JOIN cursorDiskKV kv
-    ON kv.key = 'bubbleId:' || h.composer_id || ':' || h.bubble_id
-  WHERE h.type IN (1, 2)
-    AND length(COALESCE(json_extract(kv.value, '$.text'), '')) >= 50
-)
-SELECT count(*)
-FROM (
-  SELECT composer_id
-  FROM messages
-  GROUP BY composer_id
-  HAVING SUM(CASE WHEN type = 1 THEN 1 ELSE 0 END) > 0
-     AND SUM(CASE WHEN type = 2 THEN 1 ELSE 0 END) > 0
-);
-        `.trim()
-    ], { encoding: "utf-8" });
-    if (result.status !== 0)
-      return 0;
-    const count = Number.parseInt(result.stdout.trim(), 10);
-    return Number.isFinite(count) ? count : 0;
+    const require2 = createRequire2(import.meta.url);
+    const initSqlJs = require2("sql.js");
+    const SQL = await initSqlJs();
+    const buffer = readFileSync(dbPath);
+    const db = new SQL.Database(buffer);
+    try {
+      const results = db.exec("SELECT key, value FROM cursorDiskKV WHERE key LIKE 'composerData:%'");
+      if (results.length === 0)
+        return 0;
+      let count = 0;
+      for (const [, value] of results[0].values) {
+        try {
+          const parsed = JSON.parse(value);
+          const headers = parsed.fullConversationHeadersOnly;
+          if (!Array.isArray(headers) || headers.length < 2)
+            continue;
+          const hasUser = headers.some((h) => h.type === 1);
+          const hasAssistant = headers.some((h) => h.type === 2);
+          if (hasUser && hasAssistant)
+            count++;
+        } catch {
+          continue;
+        }
+      }
+      return count;
+    } finally {
+      db.close();
+    }
   } catch {
     return 0;
   }
 }
-function detect() {
+async function detect() {
   const home = homedir();
   const tools = [];
   const claudeDir = join(home, ".claude", "projects");
@@ -956,135 +1532,74 @@ function detect() {
     let sessionCount = 0;
     if (existsSync(codexHistory)) {
       try {
-        const { readFileSync } = __require("node:fs");
-        const lines = readFileSync(codexHistory, "utf-8").split(`
+        const { readFileSync: readFileSync2 } = __require("node:fs");
+        const lines = readFileSync2(codexHistory, "utf-8").split(`
 `).filter(Boolean);
         const sessions = new Set(lines.map((l) => {
           try {
             return JSON.parse(l).session_id;
           } catch {
             return null;
-          }
-        }));
-        sessions.delete(null);
-        sessionCount = sessions.size;
-      } catch {}
-    }
-    tools.push({
-      name: "Codex",
-      available: true,
-      path: existsSync(codexHistory) ? codexHistory : codexSessions,
-      sessionCount
-    });
-  } else {
-    tools.push({ name: "Codex", available: false, path: codexHistory, sessionCount: 0 });
-  }
-  const os = platform();
-  let cursorDbPath;
-  if (os === "darwin") {
-    cursorDbPath = join(home, "Library", "Application Support", "Cursor", "User", "globalStorage", "state.vscdb");
-  } else if (os === "win32") {
-    cursorDbPath = join(process.env.APPDATA || join(home, "AppData", "Roaming"), "Cursor", "User", "globalStorage", "state.vscdb");
-  } else {
-    cursorDbPath = join(home, ".config", "Cursor", "User", "globalStorage", "state.vscdb");
-  }
-  tools.push({
-    name: "Cursor",
-    available: existsSync(cursorDbPath),
-    path: cursorDbPath,
-    sessionCount: existsSync(cursorDbPath) ? countCursorSessions(cursorDbPath) : 0
-  });
-  const openclawDir = join(home, ".openclaw");
-  tools.push({
-    name: "OpenClaw",
-    available: existsSync(openclawDir),
-    path: openclawDir,
-    sessionCount: 0
-  });
-  return tools;
-}
-
-// src/ingest/claude.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync2, existsSync as existsSync3 } from "node:fs";
-import { join as join3, basename } from "node:path";
-import { homedir as homedir3 } from "node:os";
-
-// src/ingest/shared.ts
-import { existsSync as existsSync2, readFileSync, writeFileSync, mkdirSync } from "node:fs";
-import { createHash } from "node:crypto";
-import { join as join2 } from "node:path";
-import { homedir as homedir2 } from "node:os";
-var MANIFEST_PATH = join2(homedir2(), ".conare", "ingested.json");
-var MIN_SUBSTANTIVE = 200;
-var NARRATION_RE = /^[\s\n]*(Let me |Now let me |Now I['\u2019]|Now add |Now fix |Now replace |Now integrate |Now update |Now pass |Now clean |Now build|Update the |Builds clean|Deployed\.|Wait, I |Let['\u2019]s test |Good —|Great\.|Perfect\.|Alright|OK,? let me|I[''\u2019]ll |Starting |I need to |Need |I found |I read |I[''\u2019]ve (loaded|confirmed|verified)|Context loaded|Next (I[''\u2019]|step)|Deps confirm|Diff check|Still missing|I[''\u2019]ll (do|check|inspect|trace|run|grab|pull|read|verify))/;
-function isNarration(text) {
-  const stripped = text.trim();
-  if (stripped.length < MIN_SUBSTANTIVE)
-    return true;
-  if (stripped.length <= 300 && NARRATION_RE.test(stripped))
-    return true;
-  return false;
-}
-function cleanText(raw) {
-  let text = raw;
-  text = text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "");
-  text = text.replace(/<attached-context[\s\S]*?<\/attached-context>/g, "");
-  text = text.replace(/<environment_context>[\s\S]*?<\/environment_context>/g, "");
-  text = text.replace(/^\s*Base directory for this skill:[\s\S]*/g, "");
-  text = text.replace(/\nBase directory for this skill:[\s\S]*/g, "");
-  text = text.replace(/<!-- vibe-rules Integration -->[\s\S]*?<!-- \/vibe-rules Integration -->/g, "");
-  text = text.replace(/<good-behaviour>[\s\S]*?<\/good-behaviour>/g, "");
-  text = text.replace(/<frontend-design>[\s\S]*?<\/frontend-design>/g, "");
-  text = text.replace(/<architecture>[\s\S]*?<\/architecture>/g, "");
-  return text.trim();
-}
-function createContentHash(content) {
-  return createHash("sha256").update(content).digest("hex").slice(0, 16);
-}
-function getIngested() {
-  try {
-    if (existsSync2(MANIFEST_PATH)) {
-      return JSON.parse(readFileSync(MANIFEST_PATH, "utf-8"));
-    }
-  } catch {}
-  return {};
-}
-function markIngested(source, sessionIds) {
-  const manifest = getIngested();
-  const existing = new Set(manifest[source] || []);
-  for (const id of sessionIds)
-    existing.add(id);
-  manifest[source] = [...existing];
-  const dir = join2(homedir2(), ".conare");
-  if (!existsSync2(dir))
-    mkdirSync(dir, { recursive: true });
-  writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2));
-}
-function isIngested(source, sessionId) {
-  const manifest = getIngested();
-  return (manifest[source] || []).includes(sessionId);
-}
-function clearIngested(source) {
-  const manifest = getIngested();
-  if (source) {
-    delete manifest[source];
+          }
+        }));
+        sessions.delete(null);
+        sessionCount = sessions.size;
+      } catch {}
+    }
+    tools.push({
+      name: "Codex",
+      available: true,
+      path: existsSync(codexHistory) ? codexHistory : codexSessions,
+      sessionCount
+    });
   } else {
-    for (const key of Object.keys(manifest))
-      delete manifest[key];
+    tools.push({ name: "Codex", available: false, path: codexHistory, sessionCount: 0 });
   }
-  const dir = join2(homedir2(), ".conare");
-  if (!existsSync2(dir))
-    mkdirSync(dir, { recursive: true });
-  writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2));
+  const os = platform();
+  let cursorDbPath;
+  if (os === "darwin") {
+    cursorDbPath = join(home, "Library", "Application Support", "Cursor", "User", "globalStorage", "state.vscdb");
+  } else if (os === "win32") {
+    cursorDbPath = join(process.env.APPDATA || join(home, "AppData", "Roaming"), "Cursor", "User", "globalStorage", "state.vscdb");
+  } else {
+    cursorDbPath = join(home, ".config", "Cursor", "User", "globalStorage", "state.vscdb");
+  }
+  tools.push({
+    name: "Cursor",
+    available: existsSync(cursorDbPath),
+    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/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";
 var MAX_CONTENT = 48000;
 var MIN_TURN_LEN = 50;
 function resolveProjectName(dirName) {
   const segments = dirName.replace(/^-/, "").split("-");
-  let resolved = "/";
-  let i = 0;
+  const isWindows = platform2() === "win32";
+  let resolved;
+  let startIdx;
+  if (isWindows && segments.length > 0 && /^[A-Za-z]$/.test(segments[0])) {
+    resolved = segments[0].toUpperCase() + ":\\";
+    startIdx = 1;
+  } else {
+    resolved = "/";
+    startIdx = 0;
+  }
+  let i = startIdx;
   while (i < segments.length) {
     let found = false;
     for (let end = segments.length;end > i; end--) {
@@ -1103,10 +1618,11 @@ function resolveProjectName(dirName) {
     }
   }
   const home = homedir3();
-  if (resolved.startsWith(home + "/")) {
-    return resolved.slice(home.length + 1);
+  const sep = isWindows ? "\\" : "/";
+  if (resolved.startsWith(home + sep)) {
+    return resolved.slice(home.length + 1).replace(/\\/g, "/");
   }
-  return resolved;
+  return resolved.replace(/\\/g, "/");
 }
 function extractText(content) {
   if (typeof content === "string")
@@ -1182,7 +1698,7 @@ function ingestClaude() {
     }
     for (const file of files) {
       const sessionId = basename(file, ".jsonl");
-      const raw = readFileSync2(join3(projPath, file), "utf-8");
+      const raw = readFileSync3(join3(projPath, file), "utf-8");
       const { turns, date } = parseSession(raw.split(`
 `));
       if (turns.length === 0) {
@@ -1191,8 +1707,7 @@ function ingestClaude() {
       }
       const header = `# Chat: ${project}${date ? ` | ${date}` : ""}`;
       const body = turns.map((t) => {
-        const q = t.user.length > 300 ? t.user.slice(0, 300) + "..." : t.user;
-        return `## Q: ${q}
+        return `## Q: ${t.user}
 
 ${t.assistant}`;
       }).join(`
@@ -1233,103 +1748,32 @@ ${body}`;
 }
 
 // src/ingest/codex.ts
-import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync3 } from "node:fs";
+init_shared();
+import { existsSync as existsSync4, readFileSync as readFileSync4, readdirSync as readdirSync3 } from "node:fs";
 import { join as join4, basename as basename2 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 var MAX_CONTENT2 = 48000;
 function isCodexBoilerplate(text) {
   return text.startsWith("# AGENTS.md instructions for") || text.startsWith("<INSTRUCTIONS>") || text.startsWith("<user_instructions>") || text.startsWith("<user_action>");
 }
-function stripEnvironmentContext(text) {
-  let cwd = null;
-  const cwdMatch = text.match(/<cwd>([^<]+)<\/cwd>/);
-  if (cwdMatch)
-    cwd = cwdMatch[1];
-  const cleaned = text.replace(/<environment_context>[\s\S]*?<\/environment_context>/g, "").trim();
-  return { text: cleaned, cwd };
+function extractCwd(text) {
+  const match = text.match(/<cwd>([^<]+)<\/cwd>/);
+  return match ? match[1] : null;
 }
 function projectFromCwd(cwd) {
-  return cwd.replace(/^\/Users\/[^/]+\//, "");
+  const home = homedir4();
+  const normalized = cwd.replace(/\\/g, "/");
+  const normalizedHome = home.replace(/\\/g, "/");
+  if (normalized.startsWith(normalizedHome + "/")) {
+    return normalized.slice(normalizedHome.length + 1);
+  }
+  return normalized.replace(/^\/Users\/[^/]+\//, "").replace(/^\/home\/[^/]+\//, "").replace(/^[A-Za-z]:\/Users\/[^/]+\//, "");
 }
 function ingestCodex() {
   const memories = [];
   const sessionIds = [];
   let filtered = 0;
   let deduped = 0;
-  const historyPath = join4(homedir4(), ".codex", "history.jsonl");
-  if (existsSync4(historyPath)) {
-    try {
-      const lines = readFileSync3(historyPath, "utf-8").split(`
-`).filter(Boolean);
-      const sessions = new Map;
-      for (const line of lines) {
-        try {
-          const obj = JSON.parse(line);
-          if (!obj.session_id || !obj.text)
-            continue;
-          if (!sessions.has(obj.session_id))
-            sessions.set(obj.session_id, []);
-          sessions.get(obj.session_id).push({ ts: obj.ts, text: obj.text });
-        } catch {
-          continue;
-        }
-      }
-      for (const [sessionId, entries] of sessions) {
-        entries.sort((a, b) => a.ts - b.ts);
-        const date = new Date(entries[0].ts * 1000).toISOString().slice(0, 10);
-        let project = null;
-        const cleanEntries = [];
-        for (const e of entries) {
-          let text = cleanText(e.text);
-          if (isCodexBoilerplate(text))
-            continue;
-          const env = stripEnvironmentContext(text);
-          text = env.text;
-          if (!project && env.cwd)
-            project = projectFromCwd(env.cwd);
-          if (text.length === 0)
-            continue;
-          cleanEntries.push(text.length > 300 ? text.slice(0, 300) + "..." : text);
-        }
-        const body = cleanEntries.filter(Boolean).join(`
-
----
-
-`);
-        let content = `# Codex Chat | ${date}
-
-${body}`;
-        if (content.length > MAX_CONTENT2)
-          content = content.slice(0, MAX_CONTENT2) + `
-
-[truncated]`;
-        if (content.length < 100) {
-          filtered++;
-          continue;
-        }
-        const contentHash = createContentHash(content);
-        const dedupKey = `codex:${sessionId}`;
-        const fingerprint = `${dedupKey}:${contentHash}`;
-        if (isIngested("codex", fingerprint)) {
-          deduped++;
-          continue;
-        }
-        memories.push({
-          content,
-          containerTag: "codex-chats",
-          metadata: {
-            dedupKey,
-            contentHash,
-            source: "codex",
-            sessionId,
-            date,
-            ...project ? { project } : {}
-          }
-        });
-        sessionIds.push(sessionId);
-      }
-    } catch {}
-  }
   const sessionsDir = join4(homedir4(), ".codex", "sessions");
   if (existsSync4(sessionsDir)) {
     try {
@@ -1348,10 +1792,8 @@ function walkCodexSessions(dir, memories, sessionIds, stats) {
         walkCodexSessions(join4(dir, entry.name), memories, sessionIds, stats);
       } else if (entry.name.endsWith(".jsonl")) {
         const sessionId = basename2(entry.name, ".jsonl");
-        if (sessionIds.includes(sessionId))
-          continue;
         try {
-          const lines = readFileSync3(join4(dir, entry.name), "utf-8").split(`
+          const lines = readFileSync4(join4(dir, entry.name), "utf-8").split(`
 `).filter(Boolean);
           let date = null;
           let project = null;
@@ -1362,19 +1804,29 @@ function walkCodexSessions(dir, memories, sessionIds, stats) {
             try {
               const obj = JSON.parse(line);
               if (!date && obj.timestamp)
-                date = obj.timestamp.slice(0, 10);
+                date = typeof obj.timestamp === "string" ? obj.timestamp.slice(0, 10) : null;
               if (obj.type === "session_meta" && obj.payload?.cwd) {
                 project = projectFromCwd(obj.payload.cwd);
               }
-              if (obj.type !== "response_item" || obj.payload?.type !== "message")
-                continue;
-              const role = obj.payload.role;
-              const msgContent = obj.payload.content;
-              if (!Array.isArray(msgContent))
+              let role;
+              let msgContent;
+              if (obj.type === "response_item" && obj.payload?.type === "message") {
+                role = obj.payload.role;
+                msgContent = Array.isArray(obj.payload.content) ? obj.payload.content : undefined;
+              } else if (obj.type === "message" && obj.role) {
+                role = obj.role;
+                msgContent = Array.isArray(obj.content) ? obj.content : undefined;
+              }
+              if (!role || !msgContent)
                 continue;
               if (role === "user") {
                 for (const block of msgContent) {
                   if (block.type === "input_text" && block.text) {
+                    if (!project) {
+                      const cwd = extractCwd(block.text);
+                      if (cwd)
+                        project = projectFromCwd(cwd);
+                    }
                     const text = cleanText(block.text);
                     if (isCodexBoilerplate(text))
                       continue;
@@ -1409,11 +1861,10 @@ function walkCodexSessions(dir, memories, sessionIds, stats) {
             continue;
           }
           const body = rounds.map((r) => {
-            const q = r.user.length > 300 ? r.user.slice(0, 300) + "..." : r.user;
             const assistant = r.assistantParts.join(`
 
 `);
-            return `## Q: ${q}
+            return `## Q: ${r.user}
 
 ${assistant}`;
           }).join(`
@@ -1455,9 +1906,10 @@ ${body}`;
 }
 
 // src/ingest/cursor.ts
-import { readFileSync as readFileSync4, statSync } from "node:fs";
+init_shared();
+import { readFileSync as readFileSync5, statSync } from "node:fs";
 import { join as join5 } from "node:path";
-import { createRequire as createRequire2 } from "node:module";
+import { createRequire as createRequire3 } from "node:module";
 var MAX_CONTENT3 = 48000;
 var MAX_DB_SIZE = 2 * 1024 * 1024 * 1024;
 var WARN_DB_SIZE = 500 * 1024 * 1024;
@@ -1465,10 +1917,10 @@ var MIN_TURN_LEN2 = 50;
 function loadSqlJs(wasmDir) {
   try {
     if (wasmDir) {
-      const require2 = createRequire2(join5(wasmDir, "sql.js", "package.json"));
+      const require2 = createRequire3(join5(wasmDir, "sql.js", "package.json"));
       return require2("sql.js");
     } else {
-      const require2 = createRequire2(import.meta.url);
+      const require2 = createRequire3(import.meta.url);
       return require2("sql.js");
     }
   } catch {
@@ -1481,7 +1933,7 @@ function openDb(initSqlJs, dbPath, wasmDir) {
     locateOpts.locateFile = (file) => join5(wasmDir, "sql.js", "dist", file);
   }
   return initSqlJs(locateOpts).then((SQL) => {
-    const buffer = readFileSync4(dbPath);
+    const buffer = readFileSync5(dbPath);
     return new SQL.Database(buffer);
   });
 }
@@ -1528,477 +1980,107 @@ async function ingestCursor(dbPath, wasmDir) {
   }
   if (fileSize > WARN_DB_SIZE) {
     console.log(`  Warning: large database (${(fileSize / 1024 / 1024).toFixed(0)}MB), loading into memory...`);
-  }
-  const initSqlJs = loadSqlJs(wasmDir);
-  if (!initSqlJs) {
-    console.log("  Skipping Cursor: sql.js not available");
-    return { memories, sessionIds, skipped: 0, filtered, deduped };
-  }
-  let db;
-  try {
-    db = await openDb(initSqlJs, dbPath, wasmDir);
-  } catch (e) {
-    console.log(`  Skipping Cursor: cannot open database (${e.message})`);
-    return { memories, sessionIds, skipped: 0, filtered, deduped };
-  }
-  try {
-    let rows = [];
-    try {
-      const results = db.exec("SELECT key, value FROM cursorDiskKV WHERE key LIKE 'composerData:%'");
-      if (results.length > 0)
-        rows = results[0].values;
-    } catch {}
-    for (const [key, value] of rows) {
-      const composerId = key.replace("composerData:", "");
-      let parsed;
-      try {
-        parsed = JSON.parse(value);
-        if (!parsed || typeof parsed !== "object") {
-          filtered++;
-          continue;
-        }
-      } catch {
-        filtered++;
-        continue;
-      }
-      const bubbleHeaders = parsed.fullConversationHeadersOnly;
-      if (!Array.isArray(bubbleHeaders) || bubbleHeaders.length === 0) {
-        filtered++;
-        continue;
-      }
-      const turns = extractTurns(db, composerId, bubbleHeaders);
-      if (turns.length === 0) {
-        filtered++;
-        continue;
-      }
-      const sessionName = parsed.name || "Cursor Chat";
-      const date = parsed.createdAt ? new Date(parsed.createdAt).toISOString().slice(0, 10) : "unknown";
-      const header = `# ${sessionName} | ${date}`;
-      const body = turns.map((t) => {
-        const q = t.user.length > 300 ? t.user.slice(0, 300) + "..." : t.user;
-        return `## Q: ${q}
-
-${t.assistant}`;
-      }).join(`
-
----
-
-`);
-      let content = `${header}
-
-${body}`;
-      if (content.length > MAX_CONTENT3)
-        content = content.slice(0, MAX_CONTENT3) + `
-
-[truncated]`;
-      const contentHash = createContentHash(content);
-      const dedupKey = `cursor:${composerId}`;
-      const fingerprint = `${dedupKey}:${contentHash}`;
-      if (isIngested("cursor", fingerprint)) {
-        deduped++;
-        continue;
-      }
-      memories.push({
-        content,
-        containerTag: "cursor-chats",
-        metadata: {
-          dedupKey,
-          contentHash,
-          source: "cursor",
-          sessionId: composerId,
-          name: sessionName,
-          date
-        }
-      });
-      sessionIds.push(composerId);
-    }
-  } catch (e) {
-    console.log(`  Cursor ingestion error: ${e.message}`);
-  } finally {
-    db.close();
-  }
-  return { memories, sessionIds, skipped: filtered + deduped, filtered, deduped };
-}
-
-// src/ingest/codebase.ts
-import { createHash as createHash2 } from "node:crypto";
-import { readdirSync as readdirSync4, readFileSync as readFileSync5, statSync as statSync2, existsSync as existsSync5 } from "node:fs";
-import { join as join6, relative, extname, resolve } from "node:path";
-var DEFAULT_IGNORE = new Set([
-  "node_modules",
-  ".git",
-  ".next",
-  ".nuxt",
-  ".output",
-  "dist",
-  "build",
-  ".cache",
-  "__pycache__",
-  ".venv",
-  "venv",
-  "vendor",
-  "target",
-  ".turbo",
-  ".DS_Store",
-  ".claude",
-  ".conare"
-]);
-var IGNORE_FILES = new Set([
-  "package-lock.json",
-  "bun.lockb",
-  "yarn.lock",
-  "pnpm-lock.yaml"
-]);
-var CODE_EXTENSIONS = new Set([
-  ".ts",
-  ".tsx",
-  ".js",
-  ".jsx",
-  ".mjs",
-  ".cjs",
-  ".vue",
-  ".svelte",
-  ".astro",
-  ".py",
-  ".rb",
-  ".go",
-  ".rs",
-  ".java",
-  ".kt",
-  ".swift",
-  ".c",
-  ".cpp",
-  ".h",
-  ".css",
-  ".scss",
-  ".less",
-  ".html",
-  ".json",
-  ".yaml",
-  ".yml",
-  ".toml",
-  ".md",
-  ".mdx",
-  ".txt",
-  ".sql",
-  ".graphql",
-  ".prisma",
-  ".sh",
-  ".bash",
-  ".zsh",
-  ".lua",
-  ".zig",
-  ".ex",
-  ".exs"
-]);
-var SPECIAL_FILES = new Set([
-  "Dockerfile",
-  "Makefile",
-  "Procfile",
-  "Justfile",
-  ".gitignore",
-  ".dockerignore",
-  "CLAUDE.md",
-  "AGENTS.md",
-  "README.md",
-  "ARCHITECTURE.md",
-  "wrangler.toml",
-  "wrangler.json"
-]);
-var MAX_FILE_SIZE = 1e5;
-function parseGitignore(rootPath) {
-  const patterns = new Set;
-  const gitignorePath = join6(rootPath, ".gitignore");
-  if (!existsSync5(gitignorePath))
-    return patterns;
-  try {
-    const content = readFileSync5(gitignorePath, "utf-8");
-    for (const line of content.split(`
-`)) {
-      const trimmed = line.trim();
-      if (!trimmed || trimmed.startsWith("#"))
-        continue;
-      patterns.add(trimmed.replace(/\/$/, ""));
-    }
-  } catch {}
-  return patterns;
-}
-function shouldIgnore(name, ignorePatterns) {
-  if (DEFAULT_IGNORE.has(name))
-    return true;
-  if (IGNORE_FILES.has(name))
-    return true;
-  if (name.startsWith(".env"))
-    return true;
-  if (ignorePatterns.has(name))
-    return true;
-  return false;
-}
-function langFromExt(ext) {
-  const map = {
-    ".ts": "typescript",
-    ".tsx": "tsx",
-    ".js": "javascript",
-    ".jsx": "jsx",
-    ".mjs": "javascript",
-    ".cjs": "javascript",
-    ".vue": "vue",
-    ".svelte": "svelte",
-    ".astro": "astro",
-    ".py": "python",
-    ".rb": "ruby",
-    ".go": "go",
-    ".rs": "rust",
-    ".java": "java",
-    ".kt": "kotlin",
-    ".swift": "swift",
-    ".c": "c",
-    ".cpp": "cpp",
-    ".h": "c",
-    ".css": "css",
-    ".scss": "scss",
-    ".less": "less",
-    ".html": "html",
-    ".json": "json",
-    ".yaml": "yaml",
-    ".yml": "yaml",
-    ".toml": "toml",
-    ".md": "markdown",
-    ".mdx": "mdx",
-    ".sql": "sql",
-    ".graphql": "graphql",
-    ".prisma": "prisma",
-    ".sh": "bash",
-    ".bash": "bash",
-    ".zsh": "zsh",
-    ".lua": "lua",
-    ".zig": "zig",
-    ".ex": "elixir",
-    ".exs": "elixir"
-  };
-  return map[ext] || ext.slice(1);
-}
-function formatFile(relPath, content, ext) {
-  const lang = langFromExt(ext);
-  return `# File: ${relPath}
-
-\`\`\`${lang}
-${content}
-\`\`\``;
-}
-function indexCodebase(rootPath) {
-  const absRoot = resolve(rootPath);
-  const repoHash = createHash2("sha256").update(absRoot).digest("hex").slice(0, 12);
-  const gitignorePatterns = parseGitignore(absRoot);
-  const memories = [];
-  let fileCount = 0;
-  let skipped = 0;
-  function walk(dir) {
-    let entries;
+  }
+  const initSqlJs = loadSqlJs(wasmDir);
+  if (!initSqlJs) {
+    console.log("  Skipping Cursor: sql.js not available");
+    return { memories, sessionIds, skipped: 0, filtered, deduped };
+  }
+  let db;
+  try {
+    db = await openDb(initSqlJs, dbPath, wasmDir);
+  } catch (e) {
+    console.log(`  Skipping Cursor: cannot open database (${e.message})`);
+    return { memories, sessionIds, skipped: 0, filtered, deduped };
+  }
+  try {
+    let rows = [];
     try {
-      entries = readdirSync4(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const entry of entries) {
-      if (shouldIgnore(entry.name, gitignorePatterns))
-        continue;
-      const fullPath = join6(dir, entry.name);
-      if (entry.isDirectory()) {
-        walk(fullPath);
-        continue;
-      }
-      if (!entry.isFile())
-        continue;
-      const ext = extname(entry.name).toLowerCase();
-      if (!CODE_EXTENSIONS.has(ext) && !SPECIAL_FILES.has(entry.name))
-        continue;
-      let stat;
+      const results = db.exec("SELECT key, value FROM cursorDiskKV WHERE key LIKE 'composerData:%'");
+      if (results.length > 0)
+        rows = results[0].values;
+    } catch {}
+    for (const [key, value] of rows) {
+      const composerId = key.replace("composerData:", "");
+      let parsed;
       try {
-        stat = statSync2(fullPath);
+        parsed = JSON.parse(value);
+        if (!parsed || typeof parsed !== "object") {
+          filtered++;
+          continue;
+        }
       } catch {
+        filtered++;
         continue;
       }
-      if (stat.size > MAX_FILE_SIZE || stat.size === 0) {
-        skipped++;
-        continue;
-      }
-      let raw;
-      try {
-        raw = readFileSync5(fullPath, "utf-8");
-      } catch {
-        skipped++;
+      const bubbleHeaders = parsed.fullConversationHeadersOnly;
+      if (!Array.isArray(bubbleHeaders) || bubbleHeaders.length === 0) {
+        filtered++;
         continue;
       }
-      if (raw.includes("\x00")) {
-        skipped++;
+      const turns = extractTurns(db, composerId, bubbleHeaders);
+      if (turns.length === 0) {
+        filtered++;
         continue;
       }
-      const relPath = relative(absRoot, fullPath);
-      const contentHash = createContentHash(raw);
-      const dedupKey = `codebase:${repoHash}:${relPath}`;
+      const sessionName = parsed.name || "Cursor Chat";
+      const date = parsed.createdAt ? new Date(parsed.createdAt).toISOString().slice(0, 10) : "unknown";
+      const header = `# ${sessionName} | ${date}`;
+      const body = turns.map((t) => {
+        return `## Q: ${t.user}
+
+${t.assistant}`;
+      }).join(`
+
+---
+
+`);
+      let content = `${header}
+
+${body}`;
+      if (content.length > MAX_CONTENT3)
+        content = content.slice(0, MAX_CONTENT3) + `
+
+[truncated]`;
+      const contentHash = createContentHash(content);
+      const dedupKey = `cursor:${composerId}`;
       const fingerprint = `${dedupKey}:${contentHash}`;
-      if (isIngested("codebase", fingerprint)) {
-        skipped++;
+      if (isIngested("cursor", fingerprint)) {
+        deduped++;
         continue;
       }
-      const content = formatFile(relPath, raw, ext);
       memories.push({
         content,
-        containerTag: "codebase",
+        containerTag: "cursor-chats",
         metadata: {
           dedupKey,
           contentHash,
-          source: "codebase-index",
-          repoHash,
-          filePath: relPath,
-          fileHash: `${relPath}:${contentHash}`,
-          language: langFromExt(ext)
+          source: "cursor",
+          sessionId: composerId,
+          name: sessionName,
+          date
         }
       });
-      fileCount++;
+      sessionIds.push(composerId);
     }
+  } catch (e) {
+    console.log(`  Cursor ingestion error: ${e.message}`);
+  } finally {
+    db.close();
   }
-  walk(absRoot);
-  return { memories, fileCount, skipped };
+  return { memories, sessionIds, skipped: filtered + deduped, filtered, deduped };
 }
 
-// src/api.ts
-var API_URL = "https://mcp.conare.ai";
-function createUploadBatches(memories, maxItems = 50, maxChars = 1500000) {
-  const batches = [];
-  let current = [];
-  let currentChars = 0;
-  let startIndex = 0;
-  for (let i = 0;i < memories.length; i++) {
-    const item = memories[i];
-    const itemChars = item.content.length;
-    const exceedsBatch = current.length > 0 && (current.length >= maxItems || currentChars + itemChars > maxChars);
-    if (exceedsBatch) {
-      batches.push({ startIndex, items: current });
-      current = [];
-      currentChars = 0;
-      startIndex = i;
-    }
-    current.push(item);
-    currentChars += itemChars;
-  }
-  if (current.length > 0) {
-    batches.push({ startIndex, items: current });
-  }
-  return batches;
-}
-async function validateKey(apiKey) {
-  try {
-    const res = await fetch(`${API_URL}/api/auth/me`, {
-      headers: { Authorization: `Bearer ${apiKey}` }
-    });
-    if (!res.ok)
-      return { valid: false };
-    const data = await res.json();
-    return { valid: true, email: data.user.email, name: data.user.name };
-  } catch {
-    return { valid: false };
-  }
-}
-async function getRemoteMemoryCount(apiKey) {
-  try {
-    const res = await fetch(`${API_URL}/api/containers`, {
-      headers: { Authorization: `Bearer ${apiKey}` }
-    });
-    if (!res.ok)
-      return null;
-    const data = await res.json();
-    if (!Array.isArray(data.containers))
-      return 0;
-    return data.containers.reduce((sum, container) => sum + (container.count || 0), 0);
-  } catch {
-    return null;
-  }
-}
-async function uploadItems(apiKey, items, asyncEmbed = false) {
-  let retries = 4;
-  while (retries > 0) {
-    try {
-      const res = await fetch(`${API_URL}/api/memories/bulk`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${apiKey}`
-        },
-        body: JSON.stringify(asyncEmbed ? { items, async: true } : items)
-      });
-      if (res.status === 429) {
-        retries--;
-        await new Promise((r) => setTimeout(r, 5000));
-        continue;
-      }
-      if (!res.ok) {
-        const body = await res.text().catch(() => "");
-        throw new Error(`HTTP ${res.status}: ${body.slice(0, 120)}`);
-      }
-      const data = await res.json();
-      if (!Array.isArray(data.results) || data.results.length !== items.length) {
-        throw new Error("Unexpected bulk upload response");
-      }
-      return data.results;
-    } catch (error) {
-      retries--;
-      if (retries === 0) {
-        return items.map(() => ({
-          success: false,
-          error: error instanceof Error ? error.message : String(error)
-        }));
-      }
-      await new Promise((r) => setTimeout(r, 2000));
-    }
-  }
-  return items.map(() => ({ success: false, error: "Upload failed" }));
-}
-async function uploadBulk(apiKey, memories, onProgress) {
-  let success = 0;
-  let failed = 0;
-  const total = memories.length;
-  const results = [];
-  const batches = createUploadBatches(memories);
-  for (const batch of batches) {
-    let batchResults = await uploadItems(apiKey, batch.items, true);
-    if (batch.items.length > 1 && batchResults.some((result) => !result.success)) {
-      const retriedResults = [];
-      for (let i = 0;i < batch.items.length; i++) {
-        const result = batchResults[i];
-        if (result.success) {
-          retriedResults.push(result);
-          continue;
-        }
-        const [singleResult] = await uploadItems(apiKey, [batch.items[i]], true);
-        retriedResults.push(singleResult);
-      }
-      batchResults = retriedResults;
-    }
-    for (let i = 0;i < batchResults.length; i++) {
-      const result = batchResults[i];
-      results.push({
-        index: batch.startIndex + i,
-        success: result.success,
-        deduped: result.deduped,
-        error: result.error
-      });
-      if (result.success)
-        success++;
-      else
-        failed++;
-    }
-    onProgress?.(success + failed, total, failed);
-  }
-  return { success, failed, results };
-}
+// src/index.ts
+init_codebase();
+init_shared();
+init_api();
 
 // src/configure.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync7, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname, join as join7 } from "node:path";
-import { homedir as homedir5 } from "node:os";
-import { spawnSync as spawnSync2 } from "node:child_process";
+import { homedir as homedir5, platform as platform4 } from "node:os";
+import { spawnSync } from "node:child_process";
 var CONARE_URL = "https://mcp.conare.ai";
 var SERVER_NAME = "conare-memory";
 var MCP_TARGETS = [
@@ -2009,7 +2091,7 @@ var MCP_TARGETS = [
 ];
 function readJsonFile(path) {
   try {
-    return JSON.parse(readFileSync6(path, "utf-8"));
+    return JSON.parse(readFileSync7(path, "utf-8"));
   } catch {
     return {};
   }
@@ -2039,8 +2121,9 @@ function upsertMcpServer(path, apiKey) {
 function configureClaude(apiKey) {
   const claudeConfigPath = join7(homedir5(), ".claude.json");
   const claudeMcpPath = join7(homedir5(), ".claude", "mcp.json");
-  if (spawnSync2("claude", ["mcp", "add-json", SERVER_NAME, "--scope", "user", JSON.stringify(getServerConfig(apiKey))], {
-    stdio: "ignore"
+  if (spawnSync("claude", ["mcp", "add-json", SERVER_NAME, "--scope", "user", JSON.stringify(getServerConfig(apiKey))], {
+    stdio: "ignore",
+    shell: platform4() === "win32"
   }).status === 0) {
     return "Claude Code configured via `claude mcp add-json`";
   }
@@ -2072,7 +2155,7 @@ function configureMcp(apiKey, targets = ["claude", "cursor", "codex"]) {
 }
 
 // src/config.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync7, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync8, writeFileSync as writeFileSync3 } from "node:fs";
 import { join as join8 } from "node:path";
 import { homedir as homedir6 } from "node:os";
 var CONFIG_DIR = join8(homedir6(), ".conare");
@@ -2081,7 +2164,7 @@ function readConfig() {
   try {
     if (!existsSync7(CONFIG_PATH))
       return {};
-    return JSON.parse(readFileSync7(CONFIG_PATH, "utf-8"));
+    return JSON.parse(readFileSync8(CONFIG_PATH, "utf-8"));
   } catch {
     return {};
   }
@@ -2096,10 +2179,10 @@ function getSavedApiKey() {
 }
 
 // src/sync.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync, readFileSync as readFileSync8, chmodSync, cpSync, rmSync, symlinkSync, readlinkSync, appendFileSync } from "node:fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync, readFileSync as readFileSync9, chmodSync, cpSync, rmSync, symlinkSync, readlinkSync, appendFileSync } from "node:fs";
 import { join as join9, dirname as dirname2 } from "node:path";
-import { homedir as homedir7, platform as platform2 } from "node:os";
-import { execSync } from "node:child_process";
+import { homedir as homedir7, platform as platform5 } from "node:os";
+import { execSync as execSync2 } 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");
@@ -2108,6 +2191,43 @@ var PLIST_PATH = join9(homedir7(), "Library", "LaunchAgents", `${PLIST_LABEL}.pl
 var SYSTEMD_DIR = join9(homedir7(), ".config", "systemd", "user");
 var SYSTEMD_SERVICE = join9(SYSTEMD_DIR, "conare-sync.service");
 var SYSTEMD_TIMER = join9(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
+`;
+var RUN_CMD = `@echo off
+REM Conare Memory — background sync wrapper (Windows)
+setlocal
+
+set "CONARE_DIR=%USERPROFILE%\\.conare"
+set "LOG=%CONARE_DIR%\\ingest.log"
+set "LOCKFILE=%CONARE_DIR%\\sync.lock.d"
+
+REM File lock: prevent concurrent runs
+if exist "%LOCKFILE%" (
+  echo %DATE% %TIME% SKIP: another instance running >> "%LOG%"
+  exit /b 0
+)
+mkdir "%LOCKFILE%" 2>nul
+if errorlevel 1 (
+  echo %DATE% %TIME% SKIP: lock failed >> "%LOG%"
+  exit /b 0
+)
+
+REM Resolve node
+where node >nul 2>nul
+if errorlevel 1 (
+  echo %DATE% %TIME% ERROR: node not found >> "%LOG%"
+  rmdir "%LOCKFILE%" 2>nul
+  exit /b 1
+)
+
+echo %DATE% %TIME% START sync >> "%LOG%"
+node "%CONARE_DIR%\\bin\\conare-ingest.mjs" --config-file "%CONARE_DIR%\\config.json" --ingest-only --quiet 2>> "%LOG%"
+echo %DATE% %TIME% DONE sync (exit %ERRORLEVEL%) >> "%LOG%"
+
+rmdir "%LOCKFILE%" 2>nul
+`;
 var RUN_SH = `#!/bin/bash
 # Conare Memory — background sync wrapper
 # Resolves node at runtime to survive nvm/fnm upgrades
@@ -2218,7 +2338,7 @@ WantedBy=timers.target
 }
 function hasSystemd() {
   try {
-    execSync("systemctl --user status 2>/dev/null", { stdio: "ignore" });
+    execSync2("systemctl --user status 2>/dev/null", { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -2226,7 +2346,7 @@ function hasSystemd() {
 }
 function uid() {
   try {
-    return execSync("id -u", { encoding: "utf-8" }).trim();
+    return execSync2("id -u", { encoding: "utf-8" }).trim();
   } catch {
     return "501";
   }
@@ -2238,7 +2358,7 @@ function persistBinary(apiKey) {
     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 content = readFileSync9(cliEntry, "utf-8");
   writeFileSync4(dest, content);
   const sqlJsDir = findSqlJs();
   if (sqlJsDir) {
@@ -2250,7 +2370,13 @@ function persistBinary(apiKey) {
   }
   const runShPath = join9(BIN_DIR, "run.sh");
   writeFileSync4(runShPath, RUN_SH);
-  chmodSync(runShPath, 493);
+  try {
+    chmodSync(runShPath, 493);
+  } catch {}
+  const runCmdPath = join9(BIN_DIR, "run.cmd");
+  writeFileSync4(runCmdPath, RUN_CMD);
+  const runVbsPath = join9(BIN_DIR, "run.vbs");
+  writeFileSync4(runVbsPath, RUN_VBS);
   writeFileSync4(CONFIG_PATH2, JSON.stringify({ apiKey }, null, 2) + `
 `);
 }
@@ -2286,13 +2412,13 @@ function setupMacOS(intervalMinutes) {
   writeFileSync4(PLIST_PATH, makePlist(intervalMinutes));
   const id = uid();
   try {
-    execSync(`launchctl bootout gui/${id} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
+    execSync2(`launchctl bootout gui/${id} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
   } catch {}
   try {
-    execSync(`launchctl bootstrap gui/${id} "${PLIST_PATH}"`, { stdio: "ignore" });
+    execSync2(`launchctl bootstrap gui/${id} "${PLIST_PATH}"`, { stdio: "ignore" });
   } catch {
     try {
-      execSync(`launchctl load "${PLIST_PATH}"`, { stdio: "ignore" });
+      execSync2(`launchctl load "${PLIST_PATH}"`, { stdio: "ignore" });
     } catch {
       throw new Error("Failed to load launchd agent. Try manually: launchctl load " + PLIST_PATH);
     }
@@ -2302,27 +2428,51 @@ function setupLinuxSystemd(intervalMinutes) {
   mkdirSync4(SYSTEMD_DIR, { recursive: true });
   writeFileSync4(SYSTEMD_SERVICE, SYSTEMD_SERVICE_CONTENT);
   writeFileSync4(SYSTEMD_TIMER, makeSystemdTimer(intervalMinutes));
-  execSync("systemctl --user daemon-reload", { stdio: "ignore" });
-  execSync("systemctl --user enable --now conare-sync.timer", { stdio: "ignore" });
+  execSync2("systemctl --user daemon-reload", { stdio: "ignore" });
+  execSync2("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 = execSync("crontab -l 2>/dev/null", { encoding: "utf-8" });
+    const existing = execSync2("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 + `
 `;
-    execSync("crontab -", { input: newCrontab, stdio: ["pipe", "ignore", "ignore"] });
+    execSync2("crontab -", { input: newCrontab, stdio: ["pipe", "ignore", "ignore"] });
   } catch {
-    execSync("crontab -", { input: cronLine + `
+    execSync2("crontab -", { input: cronLine + `
 `, stdio: ["pipe", "ignore", "ignore"] });
   }
 }
 function installGlobalCommand() {
+  const isWindows = platform5() === "win32";
+  if (isWindows) {
+    const wrapper2 = join9(BIN_DIR, "conare.cmd");
+    const content2 = `@echo off\r
+where node >nul 2>nul\r
+if errorlevel 1 (\r
+  echo Error: node not found. Install Node.js first. >&2\r
+  exit /b 1\r
+)\r
+node "%USERPROFILE%\\.conare\\bin\\conare-ingest.mjs" %*\r
+`;
+    writeFileSync4(wrapper2, content2);
+    const pathDirs = (process.env.PATH || "").split(";");
+    if (pathDirs.some((d) => d.toLowerCase() === BIN_DIR.toLowerCase())) {
+      return "Global command: conare (via .conare\\bin in PATH)";
+    }
+    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" });
+      return `Global command: conare (added .conare\\bin to user PATH — restart terminal)`;
+    } catch {
+      return `Global command: add ${binDirWin} to your PATH manually`;
+    }
+  }
   const wrapper = join9(BIN_DIR, "conare");
   const content = `#!/bin/bash
 # Conare global command — runs the persisted CLI bundle
@@ -2362,7 +2512,7 @@ exec "$NODE" "$CONARE_DIR/bin/conare-ingest.mjs" "$@"
     const shellProfile = getShellProfile();
     if (shellProfile) {
       try {
-        const profileContent = existsSync8(shellProfile) ? readFileSync8(shellProfile, "utf-8") : "";
+        const profileContent = existsSync8(shellProfile) ? readFileSync9(shellProfile, "utf-8") : "";
         const exportLine = `export PATH="$HOME/.conare/bin:$PATH"`;
         if (!profileContent.includes(".conare/bin")) {
           appendFileSync(shellProfile, `
@@ -2386,7 +2536,7 @@ function getShellProfile() {
     return join9(home, ".zshrc");
   if (shell.includes("bash")) {
     const profile = join9(home, ".bash_profile");
-    if (platform2() === "darwin" && existsSync8(profile))
+    if (platform5() === "darwin" && existsSync8(profile))
       return profile;
     return join9(home, ".bashrc");
   }
@@ -2396,9 +2546,16 @@ function getShellProfile() {
     return join9(home, ".bashrc");
   return null;
 }
+function setupWindows(intervalMinutes) {
+  const runVbs = join9(BIN_DIR, "run.vbs").replace(/\//g, "\\");
+  try {
+    execSync2(`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" });
+}
 function installSync(apiKey, intervalMinutes = 10) {
   const messages = [];
-  const os = platform2();
+  const os = platform5();
   persistBinary(apiKey);
   messages.push("Persisted CLI to ~/.conare/bin/");
   messages.push("Saved config to ~/.conare/config.json");
@@ -2409,6 +2566,9 @@ function installSync(apiKey, intervalMinutes = 10) {
     setupMacOS(intervalMinutes);
     messages.push(`Installed launchd agent (every ${intervalMinutes} min)`);
     messages.push(`Plist: ${PLIST_PATH}`);
+  } else if (os === "win32") {
+    setupWindows(intervalMinutes);
+    messages.push(`Installed Windows Task Scheduler (every ${intervalMinutes} min)`);
   } else if (os === "linux") {
     if (hasSystemd()) {
       setupLinuxSystemd(intervalMinutes);
@@ -2424,35 +2584,40 @@ function installSync(apiKey, intervalMinutes = 10) {
 }
 function uninstallSync() {
   const messages = [];
-  const os = platform2();
+  const os = platform5();
   if (os === "darwin") {
     try {
-      execSync(`launchctl bootout gui/${uid()} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
+      execSync2(`launchctl bootout gui/${uid()} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
     } catch {}
     if (existsSync8(PLIST_PATH)) {
       unlinkSync(PLIST_PATH);
       messages.push("Removed launchd agent");
     }
+  } else if (os === "win32") {
+    try {
+      execSync2(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: "ignore" });
+      messages.push("Removed Windows scheduled task");
+    } catch {}
   } else if (os === "linux") {
     if (hasSystemd()) {
       try {
-        execSync("systemctl --user disable --now conare-sync.timer 2>/dev/null", { stdio: "ignore" });
+        execSync2("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 {
-        execSync("systemctl --user daemon-reload", { stdio: "ignore" });
+        execSync2("systemctl --user daemon-reload", { stdio: "ignore" });
       } catch {}
       messages.push("Removed systemd timer");
     } else {
       try {
-        const existing = execSync("crontab -l 2>/dev/null", { encoding: "utf-8" });
+        const existing = execSync2("crontab -l 2>/dev/null", { encoding: "utf-8" });
         const filtered = existing.split(`
 `).filter((l) => !l.includes("conare")).join(`
 `);
-        execSync("crontab -", { input: filtered.trim() + `
+        execSync2("crontab -", { input: filtered.trim() + `
 `, stdio: ["pipe", "ignore", "ignore"] });
         messages.push("Removed cron job");
       } catch {}
@@ -2547,6 +2712,8 @@ function parseArgs() {
   let source;
   let wasmDir;
   let indexPath;
+  let indexProject;
+  let indexChanged = false;
   for (let i = 0;i < args.length; i++) {
     if (args[i] === "--key" && args[i + 1]) {
       key = args[++i];
@@ -2570,6 +2737,10 @@ function parseArgs() {
       wasmDir = args[++i];
     } else if (args[i] === "--index") {
       indexPath = args[i + 1] && !args[i + 1].startsWith("--") ? args[++i] : ".";
+    } else if (args[i] === "--project" && args[i + 1]) {
+      indexProject = args[++i];
+    } else if (args[i] === "--changed") {
+      indexChanged = true;
     } else if (args[i] === "--ingest-only") {
       ingestOnly = true;
     } else if (args[i] === "--config-only") {
@@ -2590,6 +2761,8 @@ Options:
   --key <key>         Your Conare API key (required, 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)
+  --changed           Only index files changed in the last git commit
   --dry-run           Preview what would be uploaded
   --force             Re-ingest all / re-index all (bypass dedup)
   --quiet             Suppress all stdout output (for background timer runs)
@@ -2615,7 +2788,7 @@ Get your API key at https://mcp.conare.ai
     console.error("Error: --ingest-only and --config-only cannot be used together");
     process.exit(1);
   }
-  return { key, configFile, dryRun, force, ingestOnly, configOnly, interactive, quiet, installSync: installSyncFlag, uninstallSync: uninstallSyncFlag, syncInterval, source, wasmDir, indexPath };
+  return { key, configFile, dryRun, force, ingestOnly, configOnly, interactive, quiet, installSync: installSyncFlag, uninstallSync: uninstallSyncFlag, syncInterval, source, wasmDir, indexPath, indexProject, indexChanged };
 }
 async function runInstall() {
   const args = process.argv.slice(3);
@@ -2658,8 +2831,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: readFileSync10 } = await import("node:fs");
+      const raw = JSON.parse(readFileSync10(opts.configFile, "utf-8"));
       configFileKey = raw.apiKey || raw.key;
       if (!configFileKey) {
         console.error(`Error: no apiKey/key found in ${opts.configFile}`);
@@ -2691,7 +2864,7 @@ async function main() {
   }));
   let interactiveMode = false;
   if (shouldRunInteractive) {
-    const detectedTools = detect();
+    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");
       return {
@@ -2779,15 +2952,52 @@ async function main() {
       } catch {}
     }
     const idxSpinner = Y2();
-    idxSpinner.start("Scanning codebase...");
-    const { memories, fileCount, skipped } = indexCodebase(absPath);
-    idxSpinner.stop(`Codebase: ${fileCount} files found, ${skipped} skipped`);
+    const scanLabel = opts.indexChanged ? "Scanning changed files..." : "Scanning codebase...";
+    idxSpinner.start(scanLabel);
+    const { memories, fileCount, skipped, localFilePaths, project } = indexCodebase(absPath, {
+      changedOnly: opts.indexChanged,
+      project: opts.indexProject
+    });
+    idxSpinner.stop(`Codebase: ${fileCount} files found, ${skipped} skipped (project: ${project})`);
+    if (!opts.dryRun && !opts.indexChanged) {
+      const cleanupSpinner = Y2();
+      cleanupSpinner.start("Checking for stale/deleted files...");
+      try {
+        const { listRemoteMemories: listRemoteMemories2, deleteMemories: deleteMemories2 } = await Promise.resolve().then(() => (init_api(), exports_api));
+        const { getRemoteFilePath: getRemoteFilePath2 } = await Promise.resolve().then(() => (init_codebase(), exports_codebase));
+        const remoteMemories = await listRemoteMemories2(apiKey, "codebase");
+        const localPathSet = new Set(localFilePaths);
+        const uploadingPaths = new Set(memories.map((m2) => getRemoteFilePath2(m2)).filter(Boolean));
+        const toDelete = [];
+        for (const remote of remoteMemories) {
+          const remotePath = getRemoteFilePath2(remote);
+          if (!remotePath)
+            continue;
+          if (!localPathSet.has(remotePath) || uploadingPaths.has(remotePath)) {
+            toDelete.push(remote.id);
+          }
+        }
+        if (toDelete.length > 0) {
+          cleanupSpinner.stop(`Found ${toDelete.length} stale/orphaned files`);
+          const deleted = await deleteMemories2(apiKey, toDelete, (done, total) => {
+            write(`\r  Cleaning up ${done}/${total}...`);
+          });
+          write(`\r  Cleaned up ${deleted}/${toDelete.length} old memories
+`);
+        } else {
+          cleanupSpinner.stop("No stale files found");
+        }
+      } catch (err) {
+        cleanupSpinner.stop(`Cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
+        log("  Continuing with upload (stale files may remain)...");
+      }
+    }
     if (memories.length === 0) {
       log(`
 Nothing new to index.`);
     } else if (opts.dryRun) {
       log(`
-[DRY RUN] Would upload ${memories.length} files`);
+[DRY RUN] Would upload ${memories.length} files (project: ${project})`);
       for (const m2 of memories.slice(0, 10)) {
         const meta = m2.metadata;
         log(`  ${meta.language.padEnd(12)} ${meta.filePath}`);
@@ -2828,7 +3038,7 @@ Nothing new to index.`);
     }
     log();
   }
-  const tools = detect();
+  const tools = await detect();
   if (!interactiveMode) {
     log("Detected AI tools:");
     for (const t of tools) {
@@ -2961,8 +3171,10 @@ Nothing new to index.`);
     const absPath = resolve2(postIngestIndexPath);
     const idxSpinner = Y2();
     idxSpinner.start("Indexing codebase...");
-    const { memories, fileCount, skipped } = indexCodebase(absPath);
-    idxSpinner.stop(`Codebase: ${fileCount} files found, ${skipped} skipped`);
+    const { memories, fileCount, skipped, project } = indexCodebase(absPath, {
+      project: opts.indexProject
+    });
+    idxSpinner.stop(`Codebase: ${fileCount} files found, ${skipped} skipped (project: ${project})`);
     if (memories.length === 0) {
       log(`
 Nothing new to index.`);
@@ -2983,13 +3195,16 @@ Nothing new to index.`);
     log("");
   }
   if (!opts.dryRun && !opts.quiet) {
-    const syncSpinner = Y2();
-    syncSpinner.start("Setting up background sync...");
-    try {
-      installSync(apiKey, opts.syncInterval);
-      syncSpinner.stop(`Background sync active (every ${opts.syncInterval}min)`);
-    } catch (e2) {
-      syncSpinner.stop(`Could not set up background sync: ${e2.message}`);
+    const shouldSync = interactiveMode ? await confirmBackgroundSync() : true;
+    if (shouldSync) {
+      const syncSpinner = Y2();
+      syncSpinner.start("Setting up background sync...");
+      try {
+        installSync(apiKey, opts.syncInterval);
+        syncSpinner.stop(`Background sync active (every ${opts.syncInterval}min)`);
+      } catch (e2) {
+        syncSpinner.stop(`Could not set up background sync: ${e2.message}`);
+      }
     }
   }
   log("");