conare 0.0.6 → 0.0.8

package/dist/index.js

@@ -153,6 +153,7 @@ import { join as join9 } from "node:path";
 
 // src/detect.ts
 import { existsSync, readdirSync } from "node:fs";
+import { spawnSync } from "node:child_process";
 import { join } from "node:path";
 import { homedir, platform } from "node:os";
 function countJsonlFiles(dir) {
@@ -168,6 +169,49 @@ function countJsonlFiles(dir) {
   } catch {}
   return count;
 }
+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;
+  } catch {
+    return 0;
+  }
+}
 function detect() {
   const home = homedir();
   const tools = [];
@@ -225,7 +269,7 @@ function detect() {
     name: "Cursor",
     available: existsSync(cursorDbPath),
     path: cursorDbPath,
-    sessionCount: 0
+    sessionCount: existsSync(cursorDbPath) ? countCursorSessions(cursorDbPath) : 0
   });
   return tools;
 }
@@ -1029,7 +1073,7 @@ async function uploadBulk(apiKey, memories, onProgress) {
 import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname, join as join7 } from "node:path";
 import { homedir as homedir5 } from "node:os";
-import { spawnSync } from "node:child_process";
+import { spawnSync as spawnSync2 } from "node:child_process";
 var CONARE_URL = "https://mcp.conare.ai";
 var SERVER_NAME = "conare-memory";
 var MCP_TARGETS = [
@@ -1069,7 +1113,7 @@ function upsertMcpServer(path, 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))], {
+  if (spawnSync2("claude", ["mcp", "add-json", SERVER_NAME, "--scope", "user", JSON.stringify(getServerConfig(apiKey))], {
     stdio: "ignore"
   }).status === 0) {
     return "Claude Code configured via `claude mcp add-json`";
@@ -1538,24 +1582,6 @@ class MD extends x {
     return this.value.replaceAll(/./g, this._mask);
   }
 }
-class RD extends x {
-  get valueWithCursor() {
-    if (this.state === "submit")
-      return this.value;
-    if (this.cursor >= this.value.length)
-      return `${this.value}█`;
-    const u = this.value.slice(0, this.cursor), [t, ...F] = this.value.slice(this.cursor);
-    return `${u}${import_picocolors.default.inverse(t)}${F.join("")}`;
-  }
-  get cursor() {
-    return this._cursor;
-  }
-  constructor(u) {
-    super(u), this.on("finalize", () => {
-      this.value || (this.value = u.defaultValue);
-    });
-  }
-}
 
 // node_modules/@clack/prompts/dist/index.mjs
 var import_picocolors2 = __toESM(require_picocolors(), 1);
@@ -1610,27 +1636,6 @@ var G2 = (t) => {
     return j2 || E ? import_picocolors2.default.dim("...") : i(p2, v2 + l2 === n);
   });
 };
-var he = (t) => new RD({ validate: t.validate, placeholder: t.placeholder, defaultValue: t.defaultValue, initialValue: t.initialValue, render() {
-  const n = `${import_picocolors2.default.gray(o)}
-${b2(this.state)}  ${t.message}
-`, r2 = t.placeholder ? import_picocolors2.default.inverse(t.placeholder[0]) + import_picocolors2.default.dim(t.placeholder.slice(1)) : import_picocolors2.default.inverse(import_picocolors2.default.hidden("_")), i = this.value ? this.valueWithCursor : r2;
-  switch (this.state) {
-    case "error":
-      return `${n.trim()}
-${import_picocolors2.default.yellow(o)}  ${i}
-${import_picocolors2.default.yellow(d2)}  ${import_picocolors2.default.yellow(this.error)}
-`;
-    case "submit":
-      return `${n}${import_picocolors2.default.gray(o)}  ${import_picocolors2.default.dim(this.value || t.placeholder)}`;
-    case "cancel":
-      return `${n}${import_picocolors2.default.gray(o)}  ${import_picocolors2.default.strikethrough(import_picocolors2.default.dim(this.value ?? ""))}${this.value?.trim() ? `
-${import_picocolors2.default.gray(o)}` : ""}`;
-    default:
-      return `${n}${import_picocolors2.default.cyan(o)}  ${i}
-${import_picocolors2.default.cyan(d2)}
-`;
-  }
-} }).prompt();
 var ge = (t) => new MD({ validate: t.validate, mask: t.mask ?? $e, render() {
   const n = `${import_picocolors2.default.gray(o)}
 ${b2(this.state)}  ${t.message}
@@ -1746,9 +1751,9 @@ var J = `${import_picocolors2.default.gray(o)}  `;
 
 // src/interactive.ts
 function formatDetectedCount(count) {
-  if (!count || count <= 0)
+  if (count === undefined)
     return "available";
-  return `${count.toLocaleString()} found`;
+  return `${count.toLocaleString()} chats`;
 }
 function ensureValue(value) {
   if (pD(value)) {
@@ -1757,74 +1762,63 @@ function ensureValue(value) {
   }
   return value;
 }
-async function runInteractiveSetup(options) {
+function startSetup() {
   Ie("Conare setup");
-  let apiKey = options.providedApiKey;
-  if (!apiKey) {
-    const keyPrompt = await ge({
-      message: options.savedApiKey ? `API key (press Enter to use saved key ending in ${options.savedApiKey.slice(-6)})` : "API key",
-      mask: "*",
-      validate(value) {
-        const resolved = value.trim() || options.savedApiKey || "";
-        if (!resolved)
-          return "Enter an API key from https://mcp.conare.ai";
-        if (!resolved.startsWith("cmem_"))
-          return "API keys start with cmem_";
-        return;
-      }
-    });
-    apiKey = ensureValue(keyPrompt).trim() || options.savedApiKey;
-  }
-  Me(options.detectedTargets.map((target) => `• ${target.label}: ${target.available === false ? "not detected" : formatDetectedCount(target.detectedCount)}`).join(`
+}
+function finishSetup() {
+  Se("Starting setup...");
+}
+function showDetectedApps(targets) {
+  Me(targets.map((target) => `• ${target.label}: ${target.available === false ? "not detected" : formatDetectedCount(target.detectedCount)}`).join(`
 `), "Detected apps");
-  const ingestChats = ensureValue(await ye({
-    message: "Import past chats?",
-    initialValue: true
-  }));
-  let ingestTargets = [];
-  if (ingestChats) {
-    ingestTargets = ensureValue(await fe({
-      message: "Select chat sources",
-      required: false,
-      initialValues: options.detectedTargets.filter((target) => target.recommended).map((target) => target.id),
-      options: options.detectedTargets.map((target) => ({
-        value: target.id,
-        label: target.label,
-        hint: target.available === false ? "not detected" : formatDetectedCount(target.detectedCount)
-      }))
-    }));
-  }
-  const indexCodebase2 = ensureValue(await ye({
-    message: "Index this codebase too?",
-    initialValue: false
+}
+async function promptApiKey(options) {
+  if (options.providedApiKey) {
+    return options.providedApiKey;
+  }
+  const keyPrompt = await ge({
+    message: options.savedApiKey ? `API key (press Enter to use saved key ending in ${options.savedApiKey.slice(-6)})` : "API key",
+    mask: "*",
+    validate(value) {
+      const resolved = value.trim() || options.savedApiKey || "";
+      if (!resolved)
+        return "Enter an API key from https://mcp.conare.ai";
+      if (!resolved.startsWith("cmem_"))
+        return "API keys start with cmem_";
+      return;
+    }
+  });
+  return ensureValue(keyPrompt).trim() || options.savedApiKey;
+}
+async function selectChatSources(targets) {
+  return ensureValue(await fe({
+    message: "Select chat sources",
+    required: false,
+    initialValues: targets.filter((target) => target.recommended).map((target) => target.id),
+    options: targets.map((target) => ({
+      value: target.id,
+      label: target.label,
+      hint: target.available === false ? "not detected" : formatDetectedCount(target.detectedCount)
+    }))
   }));
-  let indexPath;
-  if (indexCodebase2) {
-    const pathPrompt = await he({
-      message: "Project path",
-      placeholder: "."
-    });
-    indexPath = ensureValue(pathPrompt).trim() || ".";
-  }
-  const configureTargets = ensureValue(await fe({
+}
+async function selectMcpTargets(targets) {
+  return ensureValue(await fe({
     message: "Select where to install the MCP",
     required: false,
-    initialValues: options.detectedTargets.filter((target) => target.recommended).map((target) => target.id),
-    options: options.detectedTargets.map((target) => ({
+    initialValues: targets.filter((target) => target.recommended).map((target) => target.id),
+    options: targets.map((target) => ({
       value: target.id,
       label: target.label,
       hint: target.available === false ? "not detected" : "recommended"
     }))
   }));
-  Se("Starting setup...");
-  return {
-    apiKey,
-    configureTargets,
-    ingestTargets,
-    ingestChats: ingestChats && ingestTargets.length > 0,
-    indexCodebase: indexCodebase2,
-    indexPath
-  };
+}
+async function confirmIndexCodebase() {
+  return ensureValue(await ye({
+    message: "Index this codebase too?",
+    initialValue: false
+  }));
 }
 
 // src/index.ts
@@ -1936,29 +1930,34 @@ async function main() {
   let postIngestIndexPath;
   let selectedSources = opts.source ? [opts.source] : ["claude", "cursor", "codex"];
   let apiKey = opts.key || process.env.CONARE_API_KEY || savedApiKey;
+  let interactiveTargets = MCP_TARGETS.map((target) => ({
+    id: target.id,
+    label: target.label,
+    available: true,
+    recommended: true,
+    detectedCount: undefined
+  }));
+  let interactiveMode = false;
   if (shouldRunInteractive) {
     const detectedTools = detect();
-    const answers = await runInteractiveSetup({
-      savedApiKey,
-      providedApiKey: opts.key,
-      detectedTargets: 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");
-        return {
-          id: target.id,
-          label: target.label,
-          available: detected?.available,
-          recommended: detected?.available !== false,
-          detectedCount: detected?.sessionCount
-        };
-      })
+    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");
+      return {
+        id: target.id,
+        label: target.label,
+        available: detected?.available,
+        recommended: detected?.available !== false,
+        detectedCount: detected?.sessionCount
+      };
     });
-    apiKey = answers.apiKey || apiKey;
-    selectedTargets = answers.configureTargets.length > 0 ? answers.configureTargets : [];
-    selectedSources = answers.ingestTargets;
-    effectiveConfigOnly = !answers.ingestChats && !answers.indexCodebase;
-    effectiveIngestOnly = answers.ingestChats && answers.configureTargets.length === 0;
-    effectiveIndexPath = !answers.ingestChats && answers.indexCodebase ? answers.indexPath || "." : undefined;
-    postIngestIndexPath = answers.ingestChats && answers.indexCodebase ? answers.indexPath || "." : undefined;
+    startSetup();
+    apiKey = await promptApiKey({
+      savedApiKey,
+      providedApiKey: opts.key
+    }) || apiKey;
+    showDetectedApps(interactiveTargets);
+    selectedSources = await selectChatSources(interactiveTargets);
+    interactiveMode = true;
   }
   if (!apiKey) {
     printMissingKeyError();
@@ -2065,15 +2064,17 @@ Nothing new to index.`);
     console.log();
   }
   const tools = detect();
-  console.log("Detected AI tools:");
-  for (const t of tools) {
-    if (t.available) {
-      console.log(`  + ${t.name}${t.sessionCount ? ` — ${t.sessionCount} sessions` : ""}`);
-    } else {
-      console.log(`  - ${t.name} (not found)`);
+  if (!interactiveMode) {
+    console.log("Detected AI tools:");
+    for (const t of tools) {
+      if (t.available) {
+        console.log(`  + ${t.name}${t.sessionCount || t.sessionCount === 0 ? ` — ${t.sessionCount} sessions` : ""}`);
+      } else {
+        console.log(`  - ${t.name} (not found)`);
+      }
     }
+    console.log();
   }
-  console.log();
   const allMemories = [];
   const shouldIngest = (name) => selectedSources.includes(name);
   if (shouldIngest("claude") && tools.find((t) => t.name === "Claude Code")?.available) {
@@ -2149,6 +2150,20 @@ Nothing new to index.`);
     }
   }
   console.log();
+  if (interactiveMode) {
+    selectedTargets = await selectMcpTargets(interactiveTargets);
+    const shouldIndexCurrentCodebase = await confirmIndexCodebase();
+    if (selectedTargets.length === 0 && selectedSources.length === 0 && !shouldIndexCurrentCodebase) {
+      effectiveConfigOnly = false;
+      effectiveIngestOnly = false;
+    } else {
+      effectiveIngestOnly = selectedTargets.length === 0;
+    }
+    if (shouldIndexCurrentCodebase) {
+      postIngestIndexPath = ".";
+    }
+    finishSetup();
+  }
   if (!opts.dryRun && !effectiveIngestOnly) {
     console.log("─── Configuring MCP ───");
     console.log("");

package/package.json

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