conare 0.5.5 → 0.5.7

package/dist/index.js

@@ -5,35 +5,53 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 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 { existsSync, 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";
+import { join } from "node:path";
+import { homedir } from "node:os";
 function fitContent(header, rounds) {
   const buildContent = (maxUser) => {
     const body = rounds.map((r) => {
@@ -57,6 +75,14 @@ ${body}`;
     return full;
   return buildContent(TRUNCATED_USER_MSG);
 }
+function parseTimestampMs(value) {
+  if (typeof value === "number" && Number.isFinite(value))
+    return value;
+  if (typeof value !== "string" || value.trim().length === 0)
+    return null;
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : null;
+}
 function isNarration(text) {
   const stripped = text.trim();
   if (stripped.length < MIN_SUBSTANTIVE)
@@ -86,8 +112,8 @@ function createContentHash(content) {
 }
 function getIngested() {
   try {
-    if (existsSync2(MANIFEST_PATH)) {
-      return JSON.parse(readFileSync2(MANIFEST_PATH, "utf-8"));
+    if (existsSync(MANIFEST_PATH)) {
+      return JSON.parse(readFileSync(MANIFEST_PATH, "utf-8"));
     }
   } catch {}
   return {};
@@ -98,8 +124,8 @@ function markIngested(source, sessionIds) {
   for (const id of sessionIds)
     existing.add(id);
   manifest[source] = [...existing];
-  const dir = join2(homedir2(), ".conare");
-  if (!existsSync2(dir))
+  const dir = join(homedir(), ".conare");
+  if (!existsSync(dir))
     mkdirSync(dir, { recursive: true });
   writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2));
 }
@@ -115,14 +141,14 @@ function clearIngested(source) {
     for (const key of Object.keys(manifest))
       delete manifest[key];
   }
-  const dir = join2(homedir2(), ".conare");
-  if (!existsSync2(dir))
+  const dir = join(homedir(), ".conare");
+  if (!existsSync(dir))
     mkdirSync(dir, { recursive: true });
   writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2));
 }
 var MANIFEST_PATH, MAX_MEMORY_CONTENT = 200000, TRUNCATED_USER_MSG = 3000, MIN_SUBSTANTIVE = 200, NARRATION_RE;
 var init_shared = __esm(() => {
-  MANIFEST_PATH = join2(homedir2(), ".conare", "ingested.json");
+  MANIFEST_PATH = join(homedir(), ".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))/;
 });
 
@@ -135,16 +161,16 @@ __export(exports_codebase, {
   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 { readdirSync as readdirSync4, 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 { execSync as execSync2 } from "node:child_process";
 function parseGitignore(rootPath) {
   const patterns = new Set;
   const gitignorePath = join6(rootPath, ".gitignore");
-  if (!existsSync5(gitignorePath))
+  if (!existsSync6(gitignorePath))
     return patterns;
   try {
-    const content = readFileSync6(gitignorePath, "utf-8");
+    const content = readFileSync5(gitignorePath, "utf-8");
     for (const line of content.split(`
 `)) {
       const trimmed = line.trim();
@@ -180,15 +206,15 @@ ${content}
 function detectProjectName(rootPath) {
   const readers = [
     () => {
-      const pkg = JSON.parse(readFileSync6(join6(rootPath, "package.json"), "utf-8"));
+      const pkg = JSON.parse(readFileSync5(join6(rootPath, "package.json"), "utf-8"));
       return typeof pkg.name === "string" ? pkg.name : null;
     },
     () => {
-      const content = readFileSync6(join6(rootPath, "Cargo.toml"), "utf-8");
+      const content = readFileSync5(join6(rootPath, "Cargo.toml"), "utf-8");
       return content.match(/^name\s*=\s*"([^"]+)"/m)?.[1] ?? null;
     },
     () => {
-      const content = readFileSync6(join6(rootPath, "pyproject.toml"), "utf-8");
+      const content = readFileSync5(join6(rootPath, "pyproject.toml"), "utf-8");
       return content.match(/^name\s*=\s*"([^"]+)"/m)?.[1] ?? null;
     }
   ];
@@ -285,7 +311,7 @@ function indexCodebase(rootPath, options = {}) {
       }
       let raw;
       try {
-        raw = readFileSync6(fullPath, "utf-8");
+        raw = readFileSync5(fullPath, "utf-8");
       } catch {
         skipped++;
         continue;
@@ -453,6 +479,7 @@ __export(exports_api, {
   uploadBulk: () => uploadBulk,
   listRemoteMemories: () => listRemoteMemories,
   getRemoteMemoryCount: () => getRemoteMemoryCount,
+  getRemoteChatMemoryCount: () => getRemoteChatMemoryCount,
   getBillingStatus: () => getBillingStatus,
   deleteMemory: () => deleteMemory,
   deleteMemories: () => deleteMemories,
@@ -549,6 +576,17 @@ async function getRemoteMemoryCount(apiKey) {
     return null;
   }
 }
+async function getRemoteChatMemoryCount(apiKey) {
+  try {
+    const data = await apiRequest("/api/containers", apiKey);
+    if (!Array.isArray(data.containers))
+      return 0;
+    const chatContainers = new Set(["claude-chats", "codex-chats", "cursor-chats"]);
+    return data.containers.filter((c) => c.tag && chatContainers.has(c.tag)).reduce((sum, c) => sum + (c.count || 0), 0);
+  } catch {
+    return null;
+  }
+}
 async function getBillingStatus(apiKey) {
   try {
     return await apiRequest("/api/billing/status", apiKey);
@@ -569,13 +607,14 @@ async function uploadItems(apiKey, items) {
       }
       return data.results;
     } catch (error) {
+      if (error instanceof ApiError && (error.statusCode === 402 || error.message.includes("quota_exceeded"))) {
+        const message = error.message || "Plan limit reached";
+        return items.map(() => ({
+          success: false,
+          error: message.includes("conare.ai") ? message : `${message}. Upgrade at https://conare.ai/pricing`
+        }));
+      }
       if (error instanceof ApiError && error.statusCode === 429) {
-        if (error.message.includes("quota_exceeded")) {
-          return items.map(() => ({
-            success: false,
-            error: "Memory limit reached. Upgrade at https://conare.ai/pricing"
-          }));
-        }
         retries--;
         await new Promise((r) => setTimeout(r, 5000));
         continue;
@@ -592,6 +631,9 @@ async function uploadItems(apiKey, items) {
   }
   return items.map(() => ({ success: false, error: "Upload failed" }));
 }
+function isPlanLimitError(error) {
+  return Boolean(error && /(quota|limit reached|upgrade your plan|pricing)/i.test(error));
+}
 async function uploadBulk(apiKey, memories, onProgress) {
   let success = 0;
   let failed = 0;
@@ -600,11 +642,11 @@ async function uploadBulk(apiKey, memories, onProgress) {
   const batches = createUploadBatches(memories);
   for (const batch of batches) {
     let batchResults = await uploadItems(apiKey, batch.items);
-    if (batch.items.length > 1 && batchResults.some((result) => !result.success)) {
+    if (batch.items.length > 1 && batchResults.some((result) => !result.success && !isPlanLimitError(result.error))) {
       const retriedResults = [];
       for (let i = 0;i < batch.items.length; i++) {
         const result = batchResults[i];
-        if (result.success) {
+        if (result.success || isPlanLimitError(result.error)) {
           retriedResults.push(result);
           continue;
         }
@@ -1748,10 +1790,10 @@ __export(exports_interactive, {
   finishSetup: () => finishSetup,
   confirmBackgroundSync: () => confirmBackgroundSync
 });
-function formatDetectedCount(count) {
+function formatDetectedCount(count, approximate = false) {
   if (count === undefined)
     return "available";
-  return `${count.toLocaleString()} chats`;
+  return `${approximate ? "~" : ""}${count.toLocaleString()} chats`;
 }
 function ensureValue(value) {
   if (pD(value)) {
@@ -1767,7 +1809,7 @@ function finishSetup() {
   Se("Starting setup...");
 }
 function showDetectedApps(targets) {
-  Me(targets.map((target) => `• ${target.label}: ${target.available === false ? "not detected" : formatDetectedCount(target.detectedCount)}`).join(`
+  Me(targets.map((target) => `• ${target.label}: ${target.available === false ? "not detected" : formatDetectedCount(target.detectedCount, target.detectedCountApproximate)}`).join(`
 `), "Detected apps");
 }
 async function promptApiKey(options) {
@@ -1832,7 +1874,7 @@ async function selectChatSources(targets) {
     options: targets.map((target) => ({
       value: target.id,
       label: target.label,
-      hint: target.available === false ? "not detected" : formatDetectedCount(target.detectedCount)
+      hint: target.available === false ? "not detected" : formatDetectedCount(target.detectedCount, target.detectedCountApproximate)
     }))
   }));
 }
@@ -1864,271 +1906,23 @@ var init_interactive = __esm(() => {
 });
 
 // src/index.ts
-import { existsSync as existsSync9 } from "node:fs";
+import { existsSync as existsSync10 } from "node:fs";
 import { join as join10 } from "node:path";
 
 // src/detect.ts
-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 {
-    for (const entry of readdirSync(dir, { withFileTypes: true })) {
-      if (entry.isDirectory()) {
-        count += countJsonlFiles(join(dir, entry.name));
-      } else if (entry.name.endsWith(".jsonl")) {
-        count++;
-      }
-    }
-  } catch {}
-  return count;
-}
-async function countCursorSessions(dbPath) {
-  try {
-    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;
-  }
-}
-async function detect() {
-  const home = homedir();
-  const os = platform();
-  const tools = [];
-  const claudeDir = join(home, ".claude", "projects");
-  if (existsSync(claudeDir)) {
-    const sessionCount = countJsonlFiles(claudeDir);
-    tools.push({ name: "Claude Code", id: "claude", available: sessionCount > 0, path: claudeDir, sessionCount });
-  } else {
-    tools.push({ name: "Claude Code", id: "claude", available: false, path: claudeDir, sessionCount: 0 });
-  }
-  const codexConfig = join(home, ".codex", "config.toml");
-  const codexHistory = join(home, ".codex", "history.jsonl");
-  const codexSessions = join(home, ".codex", "sessions");
-  if (existsSync(codexConfig) || existsSync(codexHistory) || existsSync(codexSessions)) {
-    let sessionCount = 0;
-    if (existsSync(codexHistory)) {
-      try {
-        const lines = readFileSync(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", id: "codex", available: true, path: codexConfig, sessionCount });
-  } else {
-    tools.push({ name: "Codex", id: "codex", available: false, path: codexConfig, sessionCount: 0 });
-  }
-  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",
-    id: "cursor",
-    available: existsSync(cursorDbPath),
-    path: cursorDbPath,
-    sessionCount: existsSync(cursorDbPath) ? await countCursorSessions(cursorDbPath) : 0
-  });
-  const windsurfDir = join(home, ".codeium", "windsurf");
-  tools.push({
-    name: "Windsurf",
-    id: "windsurf",
-    available: existsSync(windsurfDir),
-    path: join(windsurfDir, "mcp_config.json"),
-    sessionCount: 0
-  });
-  let vscodePath;
-  if (os === "darwin") {
-    vscodePath = join(home, "Library", "Application Support", "Code");
-  } else if (os === "win32") {
-    vscodePath = join(process.env.APPDATA || join(home, "AppData", "Roaming"), "Code");
-  } else {
-    vscodePath = join(home, ".config", "Code");
-  }
-  tools.push({
-    name: "VS Code Copilot",
-    id: "vscode",
-    available: existsSync(vscodePath),
-    path: join(vscodePath, "User", "mcp.json"),
-    sessionCount: 0
-  });
-  let clinePath;
-  if (os === "darwin") {
-    clinePath = join(home, "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
-  } else if (os === "win32") {
-    clinePath = join(process.env.APPDATA || join(home, "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
-  } else {
-    clinePath = join(home, ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev");
-  }
-  tools.push({
-    name: "Cline",
-    id: "cline",
-    available: existsSync(clinePath),
-    path: join(clinePath, "settings", "cline_mcp_settings.json"),
-    sessionCount: 0
-  });
-  const zedPath = os === "darwin" ? join(home, ".zed") : join(home, ".config", "zed");
-  tools.push({
-    name: "Zed",
-    id: "zed",
-    available: existsSync(zedPath),
-    path: join(zedPath, "settings.json"),
-    sessionCount: 0
-  });
-  const openclawDir = join(home, ".openclaw");
-  tools.push({
-    name: "OpenClaw",
-    id: "openclaw",
-    available: existsSync(openclawDir),
-    path: join(openclawDir, "openclaw.json"),
-    sessionCount: 0
-  });
-  const antigravityDir = join(home, ".gemini", "antigravity");
-  const antigravityConvDir = join(antigravityDir, "conversations");
-  let antigravityCount = 0;
-  if (existsSync(antigravityConvDir)) {
-    try {
-      antigravityCount = readdirSync(antigravityConvDir).filter((f) => f.endsWith(".pb")).length;
-    } catch {}
-  }
-  tools.push({
-    name: "Antigravity",
-    id: "antigravity",
-    available: existsSync(antigravityDir),
-    path: join(antigravityDir, "mcp_config.json"),
-    sessionCount: antigravityCount
-  });
-  return tools;
-}
-
-// src/auth.ts
-import { execSync } from "node:child_process";
-import { platform as platform2 } from "node:os";
-var API_URL = "https://conare.ai";
-async function browserAuth() {
-  const stateBytes = new Uint8Array(16);
-  crypto.getRandomValues(stateBytes);
-  const state = Array.from(stateBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
-  const sessionRes = await fetch(`${API_URL}/api/auth/cli-session`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ state })
-  });
-  if (!sessionRes.ok) {
-    throw new Error(`Failed to create auth session: HTTP ${sessionRes.status}`);
-  }
-  const { code, expiresAt } = await sessionRes.json();
-  const authUrl = `${API_URL}/cli-auth?code=${code}&state=${state}`;
-  const opened = openBrowser(authUrl);
-  if (!opened) {
-    console.log("");
-    console.log("  Open this URL in your browser to sign in:");
-    console.log("");
-    console.log(`  ${authUrl}`);
-    console.log("");
-  }
-  const timeout = Math.max(expiresAt - Date.now(), 0);
-  const deadline = Date.now() + timeout;
-  while (Date.now() < deadline) {
-    await sleep(2000);
-    const exchangeRes = await fetch(`${API_URL}/api/auth/cli-exchange`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ code, state })
-    });
-    if (exchangeRes.status === 202) {
-      continue;
-    }
-    if (exchangeRes.ok) {
-      const data = await exchangeRes.json();
-      return data.apiKey;
-    }
-    if (exchangeRes.status === 410) {
-      throw new Error("Authentication code was already used. Please try again.");
-    }
-    if (exchangeRes.status === 404) {
-      throw new Error("Authentication session expired. Please try again.");
-    }
-    throw new Error(`Authentication failed: HTTP ${exchangeRes.status}`);
-  }
-  throw new Error("Authentication timed out. Please try again.");
-}
-function openBrowser(url) {
-  try {
-    const os = platform2();
-    if (os === "darwin") {
-      execSync(`open "${url}"`, { stdio: "ignore" });
-    } else if (os === "win32") {
-      execSync(`start "" "${url}"`, { stdio: "ignore" });
-    } else {
-      try {
-        execSync(`xdg-open "${url}"`, { stdio: "ignore" });
-      } catch {
-        try {
-          execSync(`wslview "${url}"`, { stdio: "ignore" });
-        } catch {
-          return false;
-        }
-      }
-    }
-    return true;
-  } catch {
-    return false;
-  }
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
+import { existsSync as existsSync5, readdirSync as readdirSync3 } from "node:fs";
+import { join as join5 } from "node:path";
+import { homedir as homedir5, platform as platform3 } from "node:os";
 
 // 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 platform3 } from "node:os";
+import { readdirSync, readFileSync as readFileSync2, existsSync as existsSync2 } from "node:fs";
+import { join as join2, basename } from "node:path";
+import { homedir as homedir2, platform } from "node:os";
 var MIN_TURN_LEN = 50;
 function resolveProjectName(dirName) {
   const segments = dirName.replace(/^-/, "").split("-");
-  const isWindows = platform3() === "win32";
+  const isWindows = platform() === "win32";
   let resolved;
   let startIdx;
   if (isWindows && segments.length > 0 && /^[A-Za-z]$/.test(segments[0])) {
@@ -2143,8 +1937,8 @@ function resolveProjectName(dirName) {
     let found = false;
     for (let end = segments.length;end > i; end--) {
       const candidate = segments.slice(i, end).join("-");
-      const candidatePath = join3(resolved, candidate);
-      if (existsSync3(candidatePath)) {
+      const candidatePath = join2(resolved, candidate);
+      if (existsSync2(candidatePath)) {
         resolved = candidatePath;
         i = end;
         found = true;
@@ -2152,11 +1946,11 @@ function resolveProjectName(dirName) {
       }
     }
     if (!found) {
-      resolved = join3(resolved, segments[i]);
+      resolved = join2(resolved, segments[i]);
       i++;
     }
   }
-  const home = homedir3();
+  const home = homedir2();
   const sep = isWindows ? "\\" : "/";
   if (resolved.startsWith(home + sep)) {
     return resolved.slice(home.length + 1).replace(/\\/g, "/");
@@ -2174,6 +1968,9 @@ function extractText(content) {
 function parseSession(lines) {
   const rounds = [];
   let date = null;
+  let startedAt = null;
+  let updatedAt = null;
+  let sourceTimestamp = null;
   let currentUser = null;
   let currentAssistant = [];
   for (const line of lines) {
@@ -2185,8 +1982,15 @@ function parseSession(lines) {
     } catch {
       continue;
     }
-    if (!date && obj.timestamp)
+    if (obj.timestamp) {
+      if (!startedAt)
+        startedAt = obj.timestamp;
+      updatedAt = obj.timestamp;
+      const parsed = parseTimestampMs(obj.timestamp);
+      if (parsed !== null)
+        sourceTimestamp = parsed;
       date = obj.timestamp.slice(0, 10);
+    }
     if (obj.type === "user") {
       const text = cleanText(extractText(obj.message?.content));
       if (text.length >= MIN_TURN_LEN) {
@@ -2212,7 +2016,7 @@ function parseSession(lines) {
 
 `)
   })).filter((t) => t.assistant.length >= MIN_TURN_LEN);
-  return { turns, date };
+  return { turns, date, sourceTimestamp, startedAt, updatedAt };
 }
 function getParentUuid(lines) {
   for (const line of lines) {
@@ -2230,30 +2034,65 @@ function getParentUuid(lines) {
   }
   return;
 }
+function countImportableClaudeSessions() {
+  const projectsDir = join2(homedir2(), ".claude", "projects");
+  let count = 0;
+  let projectDirs;
+  try {
+    projectDirs = readdirSync(projectsDir);
+  } catch {
+    return 0;
+  }
+  for (const projDir of projectDirs) {
+    const projPath = join2(projectsDir, projDir);
+    let files;
+    try {
+      files = readdirSync(projPath).filter((f) => f.endsWith(".jsonl"));
+    } catch {
+      continue;
+    }
+    for (const file of files) {
+      try {
+        const raw = readFileSync2(join2(projPath, file), "utf-8");
+        const lines = raw.split(`
+`);
+        const parentUuid = getParentUuid(lines);
+        if (parentUuid != null)
+          continue;
+        const { turns } = parseSession(lines);
+        if (turns.length > 0)
+          count++;
+      } catch {
+        continue;
+      }
+    }
+  }
+  return count;
+}
 function ingestClaude() {
-  const projectsDir = join3(homedir3(), ".claude", "projects");
+  const projectsDir = join2(homedir2(), ".claude", "projects");
   const memories = [];
   const sessionIds = [];
   let filtered = 0;
   let deduped = 0;
   let projectDirs;
   try {
-    projectDirs = readdirSync2(projectsDir);
+    projectDirs = readdirSync(projectsDir);
   } catch {
     return { memories, sessionIds, skipped: 0, filtered, deduped };
   }
   for (const projDir of projectDirs) {
-    const projPath = join3(projectsDir, projDir);
+    const projPath = join2(projectsDir, projDir);
     const project = resolveProjectName(projDir);
     let files;
     try {
-      files = readdirSync2(projPath).filter((f) => f.endsWith(".jsonl"));
+      files = readdirSync(projPath).filter((f) => f.endsWith(".jsonl"));
     } catch {
       continue;
     }
     for (const file of files) {
       const sessionId = basename(file, ".jsonl");
-      const raw = readFileSync3(join3(projPath, file), "utf-8");
+      const raw = readFileSync2(join2(projPath, file), "utf-8");
       const lines = raw.split(`
 `);
       const parentUuid = getParentUuid(lines);
@@ -2261,7 +2100,7 @@ function ingestClaude() {
         filtered++;
         continue;
       }
-      const { turns, date } = parseSession(lines);
+      const { turns, date, sourceTimestamp, startedAt, updatedAt } = parseSession(lines);
       if (turns.length === 0) {
         filtered++;
         continue;
@@ -2284,8 +2123,12 @@ function ingestClaude() {
           source: "claude-code",
           sessionId,
           project,
-          date: date || "unknown"
-        }
+          date: date || "unknown",
+          ...sourceTimestamp ? { sourceTimestamp } : {},
+          ...startedAt ? { sessionStartedAt: startedAt } : {},
+          ...updatedAt ? { sessionUpdatedAt: updatedAt } : {}
+        },
+        ...sourceTimestamp ? { created_at: sourceTimestamp, updated_at: sourceTimestamp } : {}
       });
       sessionIds.push(sessionId);
     }
@@ -2295,9 +2138,9 @@ function ingestClaude() {
 
 // src/ingest/codex.ts
 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";
+import { existsSync as existsSync3, readFileSync as readFileSync3, readdirSync as readdirSync2 } from "node:fs";
+import { join as join3, basename as basename2 } from "node:path";
+import { homedir as homedir3 } from "node:os";
 function isCodexBoilerplate(text) {
   return text.startsWith("# AGENTS.md instructions for") || text.startsWith("<INSTRUCTIONS>") || text.startsWith("<user_instructions>") || text.startsWith("<user_action>");
 }
@@ -2306,7 +2149,7 @@ function extractCwd(text) {
   return match ? match[1] : null;
 }
 function projectFromCwd(cwd) {
-  const home = homedir4();
+  const home = homedir3();
   const normalized = cwd.replace(/\\/g, "/");
   const normalizedHome = home.replace(/\\/g, "/");
   if (normalized.startsWith(normalizedHome + "/")) {
@@ -2319,8 +2162,8 @@ function ingestCodex() {
   const sessionIds = [];
   let filtered = 0;
   let deduped = 0;
-  const sessionsDir = join4(homedir4(), ".codex", "sessions");
-  if (existsSync4(sessionsDir)) {
+  const sessionsDir = join3(homedir3(), ".codex", "sessions");
+  if (existsSync3(sessionsDir)) {
     try {
       const stats = { filtered: 0, deduped: 0 };
       walkCodexSessions(sessionsDir, memories, sessionIds, stats);
@@ -2330,77 +2173,119 @@ function ingestCodex() {
   }
   return { memories, sessionIds, skipped: filtered + deduped, filtered, deduped };
 }
+function parseCodexSession(lines) {
+  let date = null;
+  let startedAt = null;
+  let updatedAt = null;
+  let sourceTimestamp = null;
+  let project = null;
+  const rounds = [];
+  let currentUser = null;
+  let currentAssistant = [];
+  for (const line of lines) {
+    try {
+      const obj = JSON.parse(line);
+      if (typeof obj.timestamp === "string") {
+        if (!startedAt)
+          startedAt = obj.timestamp;
+        updatedAt = obj.timestamp;
+        const parsed = parseTimestampMs(obj.timestamp);
+        if (parsed !== null)
+          sourceTimestamp = parsed;
+        date = obj.timestamp.slice(0, 10);
+      }
+      if (obj.type === "session_meta" && obj.payload?.cwd) {
+        project = projectFromCwd(obj.payload.cwd);
+      }
+      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;
+            if (text.length >= 50) {
+              if (currentUser !== null && currentAssistant.length > 0) {
+                rounds.push({ user: currentUser, assistantParts: currentAssistant });
+              }
+              currentUser = text;
+              currentAssistant = [];
+            }
+          }
+        }
+      } else if (role === "assistant") {
+        for (const block of msgContent) {
+          if (block.type === "output_text" && block.text) {
+            const text = cleanText(block.text);
+            if (!isNarration(text)) {
+              currentAssistant.push(text);
+            }
+          }
+        }
+      }
+    } catch {
+      continue;
+    }
+  }
+  if (currentUser !== null && currentAssistant.length > 0) {
+    rounds.push({ user: currentUser, assistantParts: currentAssistant });
+  }
+  return { rounds, date, startedAt, updatedAt, sourceTimestamp, project };
+}
+function walkCodexSessionFiles(dir, visit) {
+  try {
+    for (const entry of readdirSync2(dir, { withFileTypes: true })) {
+      const fullPath = join3(dir, entry.name);
+      if (entry.isDirectory()) {
+        walkCodexSessionFiles(fullPath, visit);
+      } else if (entry.name.endsWith(".jsonl")) {
+        visit(fullPath);
+      }
+    }
+  } catch {}
+}
+function countImportableCodexSessions() {
+  const sessionsDir = join3(homedir3(), ".codex", "sessions");
+  if (!existsSync3(sessionsDir))
+    return 0;
+  let count = 0;
+  walkCodexSessionFiles(sessionsDir, (filePath) => {
+    try {
+      const lines = readFileSync3(filePath, "utf-8").split(`
+`).filter(Boolean);
+      const { rounds } = parseCodexSession(lines);
+      if (rounds.length > 0)
+        count++;
+    } catch {}
+  });
+  return count;
+}
 function walkCodexSessions(dir, memories, sessionIds, stats) {
   try {
-    for (const entry of readdirSync3(dir, { withFileTypes: true })) {
+    for (const entry of readdirSync2(dir, { withFileTypes: true })) {
       if (entry.isDirectory()) {
-        walkCodexSessions(join4(dir, entry.name), memories, sessionIds, stats);
+        walkCodexSessions(join3(dir, entry.name), memories, sessionIds, stats);
       } else if (entry.name.endsWith(".jsonl")) {
         const sessionId = basename2(entry.name, ".jsonl");
         try {
-          const lines = readFileSync4(join4(dir, entry.name), "utf-8").split(`
+          const lines = readFileSync3(join3(dir, entry.name), "utf-8").split(`
 `).filter(Boolean);
-          let date = null;
-          let project = null;
-          const rounds = [];
-          let currentUser = null;
-          let currentAssistant = [];
-          for (const line of lines) {
-            try {
-              const obj = JSON.parse(line);
-              if (!date && obj.timestamp)
-                date = typeof obj.timestamp === "string" ? obj.timestamp.slice(0, 10) : null;
-              if (obj.type === "session_meta" && obj.payload?.cwd) {
-                project = projectFromCwd(obj.payload.cwd);
-              }
-              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;
-                    if (text.length >= 50) {
-                      if (currentUser !== null && currentAssistant.length > 0) {
-                        rounds.push({ user: currentUser, assistantParts: currentAssistant });
-                      }
-                      currentUser = text;
-                      currentAssistant = [];
-                    }
-                  }
-                }
-              } else if (role === "assistant") {
-                for (const block of msgContent) {
-                  if (block.type === "output_text" && block.text) {
-                    const text = cleanText(block.text);
-                    if (!isNarration(text)) {
-                      currentAssistant.push(text);
-                    }
-                  }
-                }
-              }
-            } catch {
-              continue;
-            }
-          }
-          if (currentUser !== null && currentAssistant.length > 0) {
-            rounds.push({ user: currentUser, assistantParts: currentAssistant });
-          }
+          const { rounds, date, startedAt, updatedAt, sourceTimestamp, project } = parseCodexSession(lines);
           if (rounds.length === 0) {
             stats.filtered++;
             continue;
@@ -2429,8 +2314,12 @@ function walkCodexSessions(dir, memories, sessionIds, stats) {
               source: "codex-session",
               sessionId,
               date: date || "unknown",
+              ...sourceTimestamp ? { sourceTimestamp } : {},
+              ...startedAt ? { sessionStartedAt: startedAt } : {},
+              ...updatedAt ? { sessionUpdatedAt: updatedAt } : {},
               ...project ? { project } : {}
-            }
+            },
+            ...sourceTimestamp ? { created_at: sourceTimestamp, updated_at: sourceTimestamp } : {}
           });
           sessionIds.push(sessionId);
         } catch {}
@@ -2441,35 +2330,104 @@ function walkCodexSessions(dir, memories, sessionIds, stats) {
 
 // src/ingest/cursor.ts
 init_shared();
-import { readFileSync as readFileSync5, statSync } from "node:fs";
-import { join as join5 } from "node:path";
-import { createRequire as createRequire3 } from "node:module";
+import { existsSync as existsSync4, readFileSync as readFileSync4, statSync } from "node:fs";
+import { dirname, join as join4 } from "node:path";
+import { createRequire as createRequire2 } from "node:module";
+import { homedir as homedir4 } from "node:os";
 var MAX_DB_SIZE = 2 * 1024 * 1024 * 1024;
 var WARN_DB_SIZE = 500 * 1024 * 1024;
 var MIN_TURN_LEN2 = 50;
+function parseCursorTimestamp(value) {
+  const parsed = parseTimestampMs(value);
+  if (parsed === null)
+    return null;
+  return parsed < 10000000000 ? parsed * 1000 : parsed;
+}
 function loadSqlJs(wasmDir) {
   try {
     if (wasmDir) {
-      const require2 = createRequire3(join5(wasmDir, "sql.js", "package.json"));
+      const require2 = createRequire2(join4(wasmDir, "sql.js", "package.json"));
       return require2("sql.js");
     } else {
-      const require2 = createRequire3(import.meta.url);
+      const require2 = createRequire2(import.meta.url);
       return require2("sql.js");
     }
   } catch {
     return null;
   }
 }
+function resolveSqlJsWasmDir(wasmDir) {
+  if (wasmDir)
+    return wasmDir;
+  try {
+    const require2 = createRequire2(import.meta.url);
+    const packageJson = require2.resolve("sql.js/package.json");
+    return dirname(dirname(packageJson));
+  } catch {
+    const installedBundleDir = join4(homedir4(), ".conare", "bin", "node_modules");
+    return existsSync4(join4(installedBundleDir, "sql.js", "package.json")) ? installedBundleDir : undefined;
+  }
+}
 function openDb(initSqlJs, dbPath, wasmDir) {
   const locateOpts = {};
   if (wasmDir) {
-    locateOpts.locateFile = (file) => join5(wasmDir, "sql.js", "dist", file);
+    locateOpts.locateFile = (file) => join4(wasmDir, "sql.js", "dist", file);
   }
   return initSqlJs(locateOpts).then((SQL) => {
-    const buffer = readFileSync5(dbPath);
+    const buffer = readFileSync4(dbPath);
     return new SQL.Database(buffer);
   });
 }
+async function countImportableCursorSessions(dbPath, wasmDir) {
+  try {
+    const fileSize = statSync(dbPath).size;
+    if (fileSize > MAX_DB_SIZE)
+      return 0;
+  } catch {
+    return 0;
+  }
+  const effectiveWasmDir = resolveSqlJsWasmDir(wasmDir);
+  const initSqlJs = loadSqlJs(effectiveWasmDir);
+  if (!initSqlJs)
+    return 0;
+  let db;
+  try {
+    db = await openDb(initSqlJs, dbPath, effectiveWasmDir);
+  } catch {
+    return 0;
+  }
+  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 {
+      return 0;
+    }
+    let count = 0;
+    for (const [key, value] of rows) {
+      const composerId = key.replace("composerData:", "");
+      let parsed;
+      try {
+        parsed = JSON.parse(value);
+        if (!parsed || typeof parsed !== "object")
+          continue;
+      } catch {
+        continue;
+      }
+      const bubbleHeaders = parsed.fullConversationHeadersOnly;
+      if (!Array.isArray(bubbleHeaders) || bubbleHeaders.length === 0)
+        continue;
+      const turns = extractTurns(db, composerId, bubbleHeaders);
+      if (turns.length > 0)
+        count++;
+    }
+    return count;
+  } finally {
+    db.close();
+  }
+}
 function extractTurns(db, composerId, bubbleHeaders) {
   const turns = [];
   let pendingUser = null;
@@ -2514,14 +2472,15 @@ 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);
+  const effectiveWasmDir = resolveSqlJsWasmDir(wasmDir);
+  const initSqlJs = loadSqlJs(effectiveWasmDir);
   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);
+    db = await openDb(initSqlJs, dbPath, effectiveWasmDir);
   } catch (e) {
     console.log(`  Skipping Cursor: cannot open database (${e.message})`);
     return { memories, sessionIds, skipped: 0, filtered, deduped };
@@ -2557,7 +2516,9 @@ async function ingestCursor(dbPath, wasmDir) {
         continue;
       }
       const sessionName = parsed.name || "Cursor Chat";
-      const date = parsed.createdAt ? new Date(parsed.createdAt).toISOString().slice(0, 10) : "unknown";
+      const sourceTimestamp = parseCursorTimestamp(parsed.lastUpdatedAt) || parseCursorTimestamp(parsed.updatedAt) || parseCursorTimestamp(parsed.createdAt);
+      const startedTimestamp = parseCursorTimestamp(parsed.createdAt);
+      const date = sourceTimestamp ? new Date(sourceTimestamp).toISOString().slice(0, 10) : "unknown";
       const header = `# ${sessionName} | ${date}`;
       const content = fitContent(header, turns);
       const contentHash = createContentHash(content);
@@ -2576,8 +2537,12 @@ async function ingestCursor(dbPath, wasmDir) {
           source: "cursor",
           sessionId: composerId,
           name: sessionName,
-          date
-        }
+          date,
+          ...sourceTimestamp ? { sourceTimestamp } : {},
+          ...startedTimestamp ? { sessionStartedAt: new Date(startedTimestamp).toISOString() } : {},
+          ...sourceTimestamp ? { sessionUpdatedAt: new Date(sourceTimestamp).toISOString() } : {}
+        },
+        ...sourceTimestamp ? { created_at: sourceTimestamp, updated_at: sourceTimestamp } : {}
       });
       sessionIds.push(composerId);
     }
@@ -2589,15 +2554,202 @@ async function ingestCursor(dbPath, wasmDir) {
   return { memories, sessionIds, skipped: filtered + deduped, filtered, deduped };
 }
 
+// src/detect.ts
+async function detect() {
+  const home = homedir5();
+  const os = platform3();
+  const tools = [];
+  const claudeDir = join5(home, ".claude", "projects");
+  if (existsSync5(claudeDir)) {
+    const sessionCount = countImportableClaudeSessions();
+    tools.push({ name: "Claude Code", id: "claude", available: sessionCount > 0, path: claudeDir, sessionCount, sessionCountApproximate: true });
+  } else {
+    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 sessionCount = countImportableCodexSessions();
+    tools.push({ name: "Codex", id: "codex", available: true, path: codexConfig, sessionCount, sessionCountApproximate: true });
+  } else {
+    tools.push({ name: "Codex", id: "codex", available: false, path: codexConfig, sessionCount: 0 });
+  }
+  let cursorDbPath;
+  if (os === "darwin") {
+    cursorDbPath = join5(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");
+  } else {
+    cursorDbPath = join5(home, ".config", "Cursor", "User", "globalStorage", "state.vscdb");
+  }
+  tools.push({
+    name: "Cursor",
+    id: "cursor",
+    available: existsSync5(cursorDbPath),
+    path: cursorDbPath,
+    sessionCount: existsSync5(cursorDbPath) ? await countImportableCursorSessions(cursorDbPath) : 0,
+    sessionCountApproximate: true
+  });
+  const windsurfDir = join5(home, ".codeium", "windsurf");
+  tools.push({
+    name: "Windsurf",
+    id: "windsurf",
+    available: existsSync5(windsurfDir),
+    path: join5(windsurfDir, "mcp_config.json"),
+    sessionCount: 0
+  });
+  let vscodePath;
+  if (os === "darwin") {
+    vscodePath = join5(home, "Library", "Application Support", "Code");
+  } else if (os === "win32") {
+    vscodePath = join5(process.env.APPDATA || join5(home, "AppData", "Roaming"), "Code");
+  } else {
+    vscodePath = join5(home, ".config", "Code");
+  }
+  tools.push({
+    name: "VS Code Copilot",
+    id: "vscode",
+    available: existsSync5(vscodePath),
+    path: join5(vscodePath, "User", "mcp.json"),
+    sessionCount: 0
+  });
+  let clinePath;
+  if (os === "darwin") {
+    clinePath = join5(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");
+  } else {
+    clinePath = join5(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"),
+    sessionCount: 0
+  });
+  const zedPath = os === "darwin" ? join5(home, ".zed") : join5(home, ".config", "zed");
+  tools.push({
+    name: "Zed",
+    id: "zed",
+    available: existsSync5(zedPath),
+    path: join5(zedPath, "settings.json"),
+    sessionCount: 0
+  });
+  const openclawDir = join5(home, ".openclaw");
+  tools.push({
+    name: "OpenClaw",
+    id: "openclaw",
+    available: existsSync5(openclawDir),
+    path: join5(openclawDir, "openclaw.json"),
+    sessionCount: 0
+  });
+  const antigravityDir = join5(home, ".gemini", "antigravity");
+  const antigravityConvDir = join5(antigravityDir, "conversations");
+  let antigravityCount = 0;
+  if (existsSync5(antigravityConvDir)) {
+    try {
+      antigravityCount = readdirSync3(antigravityConvDir).filter((f) => f.endsWith(".pb")).length;
+    } catch {}
+  }
+  tools.push({
+    name: "Antigravity",
+    id: "antigravity",
+    available: existsSync5(antigravityDir),
+    path: join5(antigravityDir, "mcp_config.json"),
+    sessionCount: antigravityCount
+  });
+  return tools;
+}
+
+// src/auth.ts
+import { execSync } from "node:child_process";
+import { platform as platform4 } from "node:os";
+var API_URL = "https://conare.ai";
+async function browserAuth() {
+  const stateBytes = new Uint8Array(16);
+  crypto.getRandomValues(stateBytes);
+  const state = Array.from(stateBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
+  const sessionRes = await fetch(`${API_URL}/api/auth/cli-session`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ state })
+  });
+  if (!sessionRes.ok) {
+    throw new Error(`Failed to create auth session: HTTP ${sessionRes.status}`);
+  }
+  const { code, expiresAt } = await sessionRes.json();
+  const authUrl = `${API_URL}/cli-auth?code=${code}&state=${state}`;
+  const opened = openBrowser(authUrl);
+  if (!opened) {
+    console.log("");
+    console.log("  Open this URL in your browser to sign in:");
+    console.log("");
+    console.log(`  ${authUrl}`);
+    console.log("");
+  }
+  const timeout = Math.max(expiresAt - Date.now(), 0);
+  const deadline = Date.now() + timeout;
+  while (Date.now() < deadline) {
+    await sleep(2000);
+    const exchangeRes = await fetch(`${API_URL}/api/auth/cli-exchange`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ code, state })
+    });
+    if (exchangeRes.status === 202) {
+      continue;
+    }
+    if (exchangeRes.ok) {
+      const data = await exchangeRes.json();
+      return data.apiKey;
+    }
+    if (exchangeRes.status === 410) {
+      throw new Error("Authentication code was already used. Please try again.");
+    }
+    if (exchangeRes.status === 404) {
+      throw new Error("Authentication session expired. Please try again.");
+    }
+    throw new Error(`Authentication failed: HTTP ${exchangeRes.status}`);
+  }
+  throw new Error("Authentication timed out. Please try again.");
+}
+function openBrowser(url) {
+  try {
+    const os = platform4();
+    if (os === "darwin") {
+      execSync(`open "${url}"`, { stdio: "ignore" });
+    } else if (os === "win32") {
+      execSync(`start "" "${url}"`, { stdio: "ignore" });
+    } else {
+      try {
+        execSync(`xdg-open "${url}"`, { stdio: "ignore" });
+      } catch {
+        try {
+          execSync(`wslview "${url}"`, { stdio: "ignore" });
+        } catch {
+          return false;
+        }
+      }
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 // src/index.ts
 init_codebase();
 init_shared();
 init_api();
 
 // src/configure.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync7, writeFileSync as writeFileSync2, symlinkSync, readlinkSync, rmSync } from "node:fs";
-import { dirname, join as join7 } from "node:path";
-import { homedir as homedir5, platform as platform5 } from "node:os";
+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 { spawnSync } from "node:child_process";
 var CONARE_URL = "https://conare.ai";
 var SERVER_NAME = "conare";
@@ -2614,13 +2766,13 @@ var MCP_TARGETS = [
 ];
 function readJsonFile(path) {
   try {
-    return JSON.parse(readFileSync7(path, "utf-8"));
+    return JSON.parse(readFileSync6(path, "utf-8"));
   } catch {
     return {};
   }
 }
 function writeJsonFile(path, data) {
-  mkdirSync2(dirname(path), { recursive: true });
+  mkdirSync2(dirname2(path), { recursive: true });
   writeFileSync2(path, JSON.stringify(data, null, 2) + `
 `);
 }
@@ -2634,32 +2786,41 @@ function getServerConfig(apiKey) {
   };
 }
 function configureClaude(apiKey) {
-  const claudeConfigPath = join7(homedir5(), ".claude.json");
-  const claudeMcpPath = join7(homedir5(), ".claude", "mcp.json");
   if (spawnSync("claude", ["mcp", "add-json", SERVER_NAME, "--scope", "user", JSON.stringify(getServerConfig(apiKey))], {
     stdio: "ignore",
     shell: platform5() === "win32"
   }).status === 0) {
     return "\x1B[32m✓\x1B[0m Claude Code";
   }
+  if (spawnSync("claude", [
+    "mcp",
+    "add",
+    SERVER_NAME,
+    "--transport",
+    "http",
+    "--scope",
+    "user",
+    "--header",
+    `Authorization: Bearer ${apiKey}`,
+    "--",
+    `${CONARE_URL}/mcp`
+  ], {
+    stdio: "ignore",
+    shell: platform5() === "win32"
+  }).status === 0) {
+    return "\x1B[32m✓\x1B[0m Claude Code";
+  }
+  const claudeConfigPath = join7(homedir6(), ".claude.json");
   const config = readJsonFile(claudeConfigPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
   }
   config.mcpServers[SERVER_NAME] = getServerConfig(apiKey);
   writeJsonFile(claudeConfigPath, config);
-  if (existsSync6(join7(homedir5(), ".claude"))) {
-    const mcpConfig = readJsonFile(claudeMcpPath);
-    if (!mcpConfig.mcpServers || typeof mcpConfig.mcpServers !== "object") {
-      mcpConfig.mcpServers = {};
-    }
-    mcpConfig.mcpServers[SERVER_NAME] = getServerConfig(apiKey);
-    writeJsonFile(claudeMcpPath, mcpConfig);
-  }
-  return "\x1B[32m✓\x1B[0m Claude Code";
+  return "\x1B[32m✓\x1B[0m Claude Code (json fallback)";
 }
 function configureCodex(apiKey) {
-  const configPath = join7(homedir5(), ".codex", "config.toml");
+  const configPath = join7(homedir6(), ".codex", "config.toml");
   if (spawnSync("codex", ["mcp", "add", SERVER_NAME, "--url", `${CONARE_URL}/mcp`, "--header", `Authorization: Bearer ${apiKey}`], {
     stdio: "ignore",
     shell: platform5() === "win32"
@@ -2668,7 +2829,7 @@ function configureCodex(apiKey) {
   }
   let toml = "";
   try {
-    toml = readFileSync7(configPath, "utf-8");
+    toml = readFileSync6(configPath, "utf-8");
   } catch {}
   const sectionHeader = `[mcp_servers.${SERVER_NAME}]`;
   const newSection = [
@@ -2689,11 +2850,11 @@ function configureCodex(apiKey) {
 ${newSection}
 ` : `${newSection}
 `;
-  mkdirSync2(dirname(configPath), { recursive: true });
+  mkdirSync2(dirname2(configPath), { recursive: true });
   writeFileSync2(configPath, result);
-  const oldMcpJson = join7(homedir5(), ".codex", "mcp.json");
+  const oldMcpJson = join7(homedir6(), ".codex", "mcp.json");
   try {
-    if (existsSync6(oldMcpJson)) {
+    if (existsSync7(oldMcpJson)) {
       const old = readJsonFile(oldMcpJson);
       const servers = old.mcpServers;
       if (servers && (("conare" in servers) || ("conare-memory" in servers))) {
@@ -2710,7 +2871,7 @@ ${newSection}
   return "\x1B[32m✓\x1B[0m Codex";
 }
 function configureCursor(apiKey) {
-  const configPath = join7(homedir5(), ".cursor", "mcp.json");
+  const configPath = join7(homedir6(), ".cursor", "mcp.json");
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -2723,7 +2884,7 @@ function configureCursor(apiKey) {
   return "\x1B[32m✓\x1B[0m Cursor";
 }
 function configureWindsurf(apiKey) {
-  const configPath = join7(homedir5(), ".codeium", "windsurf", "mcp_config.json");
+  const configPath = join7(homedir6(), ".codeium", "windsurf", "mcp_config.json");
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -2739,11 +2900,11 @@ function configureVscode(apiKey) {
   const os = platform5();
   let configPath;
   if (os === "darwin") {
-    configPath = join7(homedir5(), "Library", "Application Support", "Code", "User", "mcp.json");
+    configPath = join7(homedir6(), "Library", "Application Support", "Code", "User", "mcp.json");
   } else if (os === "win32") {
-    configPath = join7(process.env.APPDATA || join7(homedir5(), "AppData", "Roaming"), "Code", "User", "mcp.json");
+    configPath = join7(process.env.APPDATA || join7(homedir6(), "AppData", "Roaming"), "Code", "User", "mcp.json");
   } else {
-    configPath = join7(homedir5(), ".config", "Code", "User", "mcp.json");
+    configPath = join7(homedir6(), ".config", "Code", "User", "mcp.json");
   }
   const config = readJsonFile(configPath);
   if (!config.servers || typeof config.servers !== "object") {
@@ -2761,11 +2922,11 @@ function configureCline(apiKey) {
   const os = platform5();
   let configPath;
   if (os === "darwin") {
-    configPath = join7(homedir5(), "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+    configPath = join7(homedir6(), "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
   } else if (os === "win32") {
-    configPath = join7(process.env.APPDATA || join7(homedir5(), "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+    configPath = join7(process.env.APPDATA || join7(homedir6(), "AppData", "Roaming"), "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
   } else {
-    configPath = join7(homedir5(), ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
+    configPath = join7(homedir6(), ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json");
   }
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
@@ -2783,9 +2944,9 @@ function configureZed(apiKey) {
   const os = platform5();
   let configPath;
   if (os === "darwin") {
-    configPath = join7(homedir5(), ".zed", "settings.json");
+    configPath = join7(homedir6(), ".zed", "settings.json");
   } else {
-    configPath = join7(homedir5(), ".config", "zed", "settings.json");
+    configPath = join7(homedir6(), ".config", "zed", "settings.json");
   }
   const config = readJsonFile(configPath);
   if (!config.context_servers || typeof config.context_servers !== "object") {
@@ -2806,7 +2967,7 @@ function configureZed(apiKey) {
   return "\x1B[32m✓\x1B[0m Zed";
 }
 function configureOpenclaw(apiKey) {
-  const configPath = join7(homedir5(), ".openclaw", "openclaw.json");
+  const configPath = join7(homedir6(), ".openclaw", "openclaw.json");
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -2820,7 +2981,7 @@ function configureOpenclaw(apiKey) {
   return "\x1B[32m✓\x1B[0m OpenClaw";
 }
 function configureAntigravity(apiKey) {
-  const configPath = join7(homedir5(), ".gemini", "antigravity", "mcp_config.json");
+  const configPath = join7(homedir6(), ".gemini", "antigravity", "mcp_config.json");
   const config = readJsonFile(configPath);
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
@@ -2849,7 +3010,7 @@ description: Load prior project context, search past sessions, save durable pref
 compatibility: Requires the Conare MCP server tools (\`recall\`, \`search\`, \`save\`, \`list\`, \`forget\`) to be installed and connected.
 metadata:
   author: Conare
-  version: 1.2.0
+  version: 1.3.0
   mcp-server: conare
 homepage: https://conare.ai
 ---
@@ -2868,22 +3029,33 @@ This skill teaches the agent the default workflow, tool-selection rules, and que
 
 | Situation | Tool | Example |
 |-----------|------|---------|
-| Start of conversation | \`recall\` | Always call first with conversation context |
-| User asks about past work | \`search\` | "What did we do last week?" |
+| Start of conversation | \`recall\` | Always call first with conversation context + \`prompt\` |
+| User asks about past work | \`search\` | query + \`prompt\` steering the angle |
 | User says "remember this" | \`save\` | Save preferences, rules, decisions |
 | User says "forget this" | \`forget\` | Remove a specific memory |
 | Browse what's stored | \`list\` | "Show me recent memories" |
-| Narrative/summary question | \`search\` with \`deep: true\` | "What happened with the auth rewrite?" |
-| Deep + specific format | \`search\` with \`deep\` + \`prompt\` | query="auth rewrite bug", prompt="timeline with dates" |
+| Exact-string raw lookup | \`search\` with \`deep: false\` | Verbatim memory text (rare) |
+
+## How recall & search Work
+
+Both return an LLM-synthesized answer by default — a noise-removed, detail-preserving brief distilled from the matched memories. The synthesizer is **not a summarizer**: it strips redundancy and superseded claims while preserving every specific number, file path, CLI command, code block, and the WHY behind each decision.
 
-## Deep Mode
+**Two axes, always pair them:**
 
-\`deep: true\` on \`search\` or \`recall\` returns an LLM-synthesized answer instead of raw memories.
+- \`query\` / \`context\` → keyword-dense retrieval phrase (finds the right memories)
+- \`prompt\` → synthesis instruction (what to emphasize / how to structure it)
 
-- **Use for**: narratives, summaries, "what happened with X", comparing approaches
-- **Don't use for**: exact values, config lookups, file paths — raw preserves full detail
+Example:
+\`\`\`
+search({
+  query: "auth rewrite middleware compliance",
+  prompt: "focus on the final decision and why; preserve all file paths and config values"
+})
+\`\`\`
 
-\`prompt\` (deep only) separates retrieval from synthesis. Keep \`query\` keyword-dense to find the right memories. Use \`prompt\` to instruct the LLM on format: "chronological timeline with dates", "only shipped changes, not proposals", "compare X vs Y". Omit \`prompt\` to let the LLM infer format from the query.
+Pass \`prompt\` on almost every call. Without it the synthesizer picks a sensible default, but with it you get exactly the angle the user cares about.
+
+**Opt out of synthesis** with \`deep: false\` only when you need raw memory text for an exact-string lookup. Prefer leaving it unset.
 
 ## Critical Rules
 
@@ -2940,14 +3112,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(homedir5(), ".agents", "skills", "conare");
+  const skillDir = join7(homedir6(), ".agents", "skills", "conare");
   mkdirSync2(skillDir, { recursive: true });
   writeFileSync2(join7(skillDir, "SKILL.md"), SKILL_MD);
-  const claudeSkillsDir = join7(homedir5(), ".claude", "skills");
+  const claudeSkillsDir = join7(homedir6(), ".claude", "skills");
   const claudeSkillDir = join7(claudeSkillsDir, "conare");
   try {
-    if (existsSync6(claudeSkillsDir)) {
-      if (existsSync6(claudeSkillDir)) {
+    if (existsSync7(claudeSkillsDir)) {
+      if (existsSync7(claudeSkillDir)) {
         try {
           if (readlinkSync(claudeSkillDir) === skillDir)
             return "\x1B[32m✓\x1B[0m Agent Skill";
@@ -2978,16 +3150,16 @@ function configureMcp(apiKey, targets = ["claude", "codex"]) {
 }
 
 // src/config.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync8, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync7, 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");
+import { homedir as homedir7 } from "node:os";
+var CONFIG_DIR = join8(homedir7(), ".conare");
 var CONFIG_PATH = join8(CONFIG_DIR, "config.json");
 function readConfig() {
   try {
-    if (!existsSync7(CONFIG_PATH))
+    if (!existsSync8(CONFIG_PATH))
       return {};
-    return JSON.parse(readFileSync8(CONFIG_PATH, "utf-8"));
+    return JSON.parse(readFileSync7(CONFIG_PATH, "utf-8"));
   } catch {
     return {};
   }
@@ -3007,16 +3179,16 @@ function getSavedApiKey() {
 }
 
 // src/sync.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync, readFileSync as readFileSync9, chmodSync, cpSync, rmSync as rmSync2, symlinkSync as symlinkSync2, readlinkSync as readlinkSync2, appendFileSync } from "node:fs";
-import { join as join9, dirname as dirname2 } from "node:path";
-import { homedir as homedir7, platform as platform6 } from "node:os";
+import { existsSync as existsSync9, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync, 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 { execSync as execSync3 } from "node:child_process";
-var CONARE_DIR = join9(homedir7(), ".conare");
+var CONARE_DIR = join9(homedir8(), ".conare");
 var BIN_DIR = join9(CONARE_DIR, "bin");
 var CONFIG_PATH2 = join9(CONARE_DIR, "config.json");
 var PLIST_LABEL = "ai.conare.ingest";
-var PLIST_PATH = join9(homedir7(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
-var SYSTEMD_DIR = join9(homedir7(), ".config", "systemd", "user");
+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 TASK_NAME = "ConareMemorySync";
@@ -3161,7 +3333,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 = readFileSync9(cliEntry, "utf-8");
+  const content = readFileSync8(cliEntry, "utf-8");
   writeFileSync4(dest, content);
   const sqlJsDir = findSqlJs();
   if (sqlJsDir) {
@@ -3184,17 +3356,17 @@ function persistBinary(apiKey) {
 `, { mode: 384 });
 }
 function isValidJsBundle(path) {
-  if (!existsSync8(path))
+  if (!existsSync9(path))
     return false;
   if (path.endsWith(".ts") || path.endsWith(".tsx"))
     return false;
-  const head = readFileSync9(path, "utf-8").slice(0, 2000);
+  const head = readFileSync8(path, "utf-8").slice(0, 2000);
   if (/\btype\s+\{/.test(head) || /,\s*type\s+\w+/.test(head))
     return false;
   return true;
 }
 function findCliBundle() {
-  const dir = dirname2(new URL(import.meta.url).pathname);
+  const dir = dirname3(new URL(import.meta.url).pathname);
   const distCandidates = [
     join9(dir, "index.js"),
     join9(dir, "..", "dist", "index.js")
@@ -3211,11 +3383,11 @@ function findCliBundle() {
 function findSqlJs() {
   const candidates = [
     join9(process.cwd(), "node_modules", "sql.js"),
-    join9(dirname2(new URL(import.meta.url).pathname), "..", "node_modules", "sql.js"),
-    join9(dirname2(new URL(import.meta.url).pathname), "..", "..", "node_modules", "sql.js")
+    join9(dirname3(new URL(import.meta.url).pathname), "..", "node_modules", "sql.js"),
+    join9(dirname3(new URL(import.meta.url).pathname), "..", "..", "node_modules", "sql.js")
   ];
   for (const c of candidates) {
-    if (existsSync8(c))
+    if (existsSync9(c))
       return c;
   }
   return null;
@@ -3224,7 +3396,7 @@ function cleanupOldLaunchAgent() {
   try {
     execSync3(`launchctl bootout gui/${uid()} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
   } catch {}
-  if (existsSync8(PLIST_PATH)) {
+  if (existsSync9(PLIST_PATH)) {
     unlinkSync(PLIST_PATH);
   }
 }
@@ -3253,7 +3425,7 @@ function clampCronInterval(intervalMinutes) {
 }
 function setupCron(intervalMinutes) {
   const clamped = clampCronInterval(intervalMinutes);
-  const cronCmd = `"${homedir7()}/.conare/bin/run.sh"`;
+  const cronCmd = `"${homedir8()}/.conare/bin/run.sh"`;
   const cronLine = `*/${clamped} * * * * ${cronCmd}  # conare-sync`;
   try {
     const existing = execSync3("crontab -l 2>/dev/null", { encoding: "utf-8" });
@@ -3296,13 +3468,13 @@ function runSyncNow() {
   try {
     if (os === "win32") {
       const runCmd = join9(BIN_DIR, "run.cmd");
-      if (existsSync8(runCmd)) {
+      if (existsSync9(runCmd)) {
         execSync3(`"${runCmd}"`, { stdio: "ignore", timeout: 60000 });
         return true;
       }
     } else {
       const runSh = join9(BIN_DIR, "run.sh");
-      if (existsSync8(runSh)) {
+      if (existsSync9(runSh)) {
         execSync3(`/bin/bash "${runSh}"`, { stdio: "ignore", timeout: 60000 });
         return true;
       }
@@ -3356,7 +3528,7 @@ exec "$NODE" "$CONARE_DIR/bin/conare-ingest.mjs" "$@"
   chmodSync(wrapper, 493);
   const symlinkTarget = "/usr/local/bin/conare";
   try {
-    if (existsSync8(symlinkTarget)) {
+    if (existsSync9(symlinkTarget)) {
       try {
         const existing = readlinkSync2(symlinkTarget);
         if (existing === wrapper)
@@ -3374,7 +3546,7 @@ exec "$NODE" "$CONARE_DIR/bin/conare-ingest.mjs" "$@"
     const shellProfile = getShellProfile();
     if (shellProfile) {
       try {
-        const profileContent = existsSync8(shellProfile) ? readFileSync9(shellProfile, "utf-8") : "";
+        const profileContent = existsSync9(shellProfile) ? readFileSync8(shellProfile, "utf-8") : "";
         const exportLine = `export PATH="$HOME/.conare/bin:$PATH"`;
         if (!profileContent.includes(".conare/bin")) {
           appendFileSync(shellProfile, `
@@ -3392,19 +3564,19 @@ ${exportLine}
   }
 }
 function getShellProfile() {
-  const home = homedir7();
+  const home = homedir8();
   const shell = process.env.SHELL || "";
   if (shell.includes("zsh"))
     return join9(home, ".zshrc");
   if (shell.includes("bash")) {
     const profile = join9(home, ".bash_profile");
-    if (platform6() === "darwin" && existsSync8(profile))
+    if (platform6() === "darwin" && existsSync9(profile))
       return profile;
     return join9(home, ".bashrc");
   }
-  if (existsSync8(join9(home, ".zshrc")))
+  if (existsSync9(join9(home, ".zshrc")))
     return join9(home, ".zshrc");
-  if (existsSync8(join9(home, ".bashrc")))
+  if (existsSync9(join9(home, ".bashrc")))
     return join9(home, ".bashrc");
   return null;
 }
@@ -3474,9 +3646,9 @@ function uninstallSync() {
       try {
         execSync3("systemctl --user disable --now conare-sync.timer 2>/dev/null", { stdio: "ignore" });
       } catch {}
-      if (existsSync8(SYSTEMD_SERVICE))
+      if (existsSync9(SYSTEMD_SERVICE))
         unlinkSync(SYSTEMD_SERVICE);
-      if (existsSync8(SYSTEMD_TIMER))
+      if (existsSync9(SYSTEMD_TIMER))
         unlinkSync(SYSTEMD_TIMER);
       try {
         execSync3("systemctl --user daemon-reload", { stdio: "ignore" });
@@ -3487,15 +3659,15 @@ function uninstallSync() {
     }
   }
   const configPath = join9(CONARE_DIR, "config.json");
-  if (existsSync8(configPath))
+  if (existsSync9(configPath))
     unlinkSync(configPath);
   const lockDir = join9(CONARE_DIR, "sync.lock.d");
-  if (existsSync8(lockDir))
+  if (existsSync9(lockDir))
     rmSync2(lockDir, { recursive: true, force: true });
   const lockFile = join9(CONARE_DIR, "sync.lock");
-  if (existsSync8(lockFile))
+  if (existsSync9(lockFile))
     unlinkSync(lockFile);
-  if (existsSync8(BIN_DIR)) {
+  if (existsSync9(BIN_DIR)) {
     rmSync2(BIN_DIR, { recursive: true, force: true });
     messages.push("Removed ~/.conare/bin/");
   }
@@ -3508,6 +3680,11 @@ function uninstallSync() {
 // src/index.ts
 init_interactive();
 var CONARE_URL2 = "https://conare.ai";
+var CHAT_CONTAINER_LABELS = {
+  "claude-chats": "Claude Code",
+  "codex-chats": "Codex",
+  "cursor-chats": "Cursor"
+};
 function getManifestFingerprint(memory) {
   const metadata = memory.metadata;
   if (metadata?.dedupKey && metadata?.contentHash) {
@@ -3563,6 +3740,16 @@ function renderDiscoverySummary(discovered, _filtered, deduped) {
     parts.push(`${deduped} already imported`);
   return parts.join(", ");
 }
+function renderSourceBreakdown(memories) {
+  const counts = new Map;
+  for (const memory of memories) {
+    counts.set(memory.containerTag, (counts.get(memory.containerTag) || 0) + 1);
+  }
+  return [...counts.entries()].map(([tag, count]) => `${CHAT_CONTAINER_LABELS[tag] || tag}: ${count}`).join(", ");
+}
+function formatSessionCount(count, approximate) {
+  return `${approximate ? "~" : ""}${count} sessions`;
+}
 function parseArgs() {
   const args = process.argv.slice(2);
   let key = "";
@@ -3621,6 +3808,7 @@ conare — AI memory for your coding tools
 Usage:
   conare                                    Interactive setup with browser auth
   conare install                            Just install the MCP (all detected clients)
+  conare logout                             Clear saved API key, sync timer, and local index history
   conare --key <api_key>                    Index chat history (key optional with browser auth)
   conare --key <api_key> --index [path]     Index codebase
 
@@ -3713,16 +3901,36 @@ async function runInstall() {
   console.log("  \x1B[32m✓\x1B[0m MCP installed. Restart your AI tool to connect.");
   console.log("");
 }
+async function runLogout() {
+  const { unlinkSync: unlinkSync2, existsSync: existsSync11 } = await import("node:fs");
+  const { join: join11 } = await import("node:path");
+  const { homedir: homedir9 } = await import("node:os");
+  const messages = uninstallSync();
+  const manifestPath = join11(homedir9(), ".conare", "ingested.json");
+  if (existsSync11(manifestPath)) {
+    unlinkSync2(manifestPath);
+    messages.push("Removed local index history");
+  }
+  console.log("");
+  for (const msg of messages)
+    console.log(`  ${msg}`);
+  console.log("");
+  console.log("  \x1B[32m✓\x1B[0m Logged out. API key cleared from ~/.conare/.");
+  console.log("");
+}
 async function main() {
   if (process.argv[2] === "install") {
     return runInstall();
   }
+  if (process.argv[2] === "logout") {
+    return runLogout();
+  }
   const opts = parseArgs();
   let configFileKey;
   if (opts.configFile) {
     try {
-      const { readFileSync: readFileSync10 } = await import("node:fs");
-      const raw = JSON.parse(readFileSync10(opts.configFile, "utf-8"));
+      const { readFileSync: readFileSync9 } = await import("node:fs");
+      const raw = JSON.parse(readFileSync9(opts.configFile, "utf-8"));
       configFileKey = raw.apiKey || raw.key;
       if (!configFileKey) {
         console.error(`Error: no apiKey/key found in ${opts.configFile}`);
@@ -3749,7 +3957,8 @@ async function main() {
     label: target.label,
     available: true,
     recommended: target.defaultSelected,
-    detectedCount: undefined
+    detectedCount: undefined,
+    detectedCountApproximate: undefined
   }));
   let interactiveMode = false;
   if (shouldRunInteractive) {
@@ -3761,7 +3970,8 @@ async function main() {
         label: target.label,
         available: detected?.available,
         recommended: target.defaultSelected && detected?.available !== false,
-        detectedCount: detected?.sessionCount
+        detectedCount: detected?.sessionCount,
+        detectedCountApproximate: detected?.sessionCountApproximate
       };
     });
     startSetup();
@@ -3841,7 +4051,7 @@ async function main() {
       log("");
     }
   }
-  if (!opts.wasmDir && existsSync9(join10(process.cwd(), "node_modules", "sql.js"))) {
+  if (!opts.wasmDir && existsSync10(join10(process.cwd(), "node_modules", "sql.js"))) {
     opts.wasmDir = join10(process.cwd(), "node_modules");
   }
   if (effectiveConfigOnly) {
@@ -3964,7 +4174,7 @@ Nothing new to index.`);
     log("Detected AI tools:");
     for (const t of tools) {
       if (t.available) {
-        log(`  + ${t.name}${t.sessionCount || t.sessionCount === 0 ? ` — ${t.sessionCount} sessions` : ""}`);
+        log(`  + ${t.name}${t.sessionCount || t.sessionCount === 0 ? ` — ${formatSessionCount(t.sessionCount, t.sessionCountApproximate)}` : ""}`);
       } else {
         log(`  - ${t.name} (not found)`);
       }
@@ -4009,6 +4219,10 @@ Nothing new to index.`);
     }
   }
   allMemories.sort((a, b3) => {
+    const ta = a.metadata?.sourceTimestamp || a.updated_at || 0;
+    const tb = b3.metadata?.sourceTimestamp || b3.updated_at || 0;
+    if (ta !== tb)
+      return tb - ta;
     const da = a.metadata?.date || "0000";
     const db = b3.metadata?.date || "0000";
     return db.localeCompare(da);
@@ -4016,10 +4230,20 @@ Nothing new to index.`);
   const billing = await getBillingStatus(apiKey);
   if (billing && billing.plan === "free" && billing.limits.uploadedChats > 0) {
     const chatLimit = billing.limits.uploadedChats;
-    if (allMemories.length > chatLimit) {
-      const skipped = allMemories.length - chatLimit;
-      allMemories.splice(chatLimit);
-      log(`\x1B[33m⚠\x1B[0m  Free plan: uploading ${chatLimit} most recent sessions (${skipped} older sessions skipped)`);
+    const remoteChatCount = opts.dryRun ? 0 : await getRemoteChatMemoryCount(apiKey);
+    const knownRemoteChatCount = remoteChatCount ?? billing.usage?.memories ?? 0;
+    const remaining = Math.max(0, chatLimit - knownRemoteChatCount);
+    if (allMemories.length > remaining) {
+      const skipped = allMemories.length - remaining;
+      allMemories.splice(remaining);
+      if (remaining > 0) {
+        const breakdown = renderSourceBreakdown(allMemories);
+        log(`\x1B[33m⚠\x1B[0m  Free plan: uploading ${remaining} newest remaining sessions (${knownRemoteChatCount}/${chatLimit} already imported; ${skipped} older sessions skipped)`);
+        if (breakdown)
+          log(`   Selected now: ${breakdown}`);
+      } else {
+        log(`\x1B[33m⚠\x1B[0m  Free plan: chat upload limit already reached (${knownRemoteChatCount}/${chatLimit}); ${skipped} new local sessions skipped`);
+      }
       log(`   Upgrade to Pro for unlimited uploads → \x1B[4mhttps://conare.ai/pricing\x1B[0m`);
       log();
     }