conare 0.5.13 → 0.5.15

package/dist/index.js

@@ -1825,20 +1825,27 @@ function showDetectedApps(targets) {
 `), "Detected apps");
 }
 function showCountingLocalChats() {
-  M2.step("Counting local chats...");
+  countingSpinner = Y2();
+  countingSpinner.start("Scanning local chats");
 }
 function showCountingToolChats(tool) {
-  M2.step(`Counting ${tool} chats...`);
+  countingSpinner?.message(`Scanning ${tool} chats`);
 }
 function showCountingToolProgress(tool, checked, found, total) {
-  const checkedText = total ? `${checked.toLocaleString()}/${total.toLocaleString()} checked` : `${checked.toLocaleString()} checked`;
-  M2.message(`${tool}: ${checkedText}, ${found.toLocaleString()} importable`);
+  const checkedText = total ? `${checked.toLocaleString()}/${total.toLocaleString()}` : checked.toLocaleString();
+  countingSpinner?.message(`Scanning ${tool}: ${checkedText} files, ${found.toLocaleString()} importable`);
 }
 function showCountingToolDone(tool, count) {
-  M2.success(`${tool}: ~${count.toLocaleString()} chats`);
+  toolTotals[tool] = count;
+  countingSpinner?.message(`${tool}: ${count.toLocaleString()} chats`);
 }
 function showLocalChatsCounted() {
-  M2.success("Local chats counted");
+  if (!countingSpinner)
+    return;
+  const entries = Object.entries(toolTotals).filter(([, n]) => n > 0);
+  const summary = entries.length ? entries.map(([tool, n]) => `${tool} ${n.toLocaleString()}`).join(", ") : "no chats found";
+  countingSpinner.stop(`Found ${summary}`);
+  countingSpinner = null;
 }
 async function promptApiKey(options) {
   if (options.providedApiKey) {
@@ -1929,8 +1936,10 @@ async function confirmBackgroundSync() {
   }));
   return value === "yes";
 }
+var countingSpinner = null, toolTotals;
 var init_interactive = __esm(() => {
   init_dist2();
+  toolTotals = {};
 });
 
 // src/index.ts
@@ -2046,6 +2055,42 @@ function parseSession(lines) {
   })).filter((t) => t.assistant.length >= MIN_TURN_LEN);
   return { turns, date, sourceTimestamp, startedAt, updatedAt };
 }
+function hasAnyImportableTurn(lines) {
+  let currentUser = null;
+  let currentAssistant = [];
+  const closeRound = () => {
+    if (currentUser === null || currentAssistant.length === 0)
+      return false;
+    const assistant = currentAssistant.filter((p) => !isNarration(p)).join(`
+
+`);
+    return assistant.length >= MIN_TURN_LEN;
+  };
+  for (const line of lines) {
+    if (!line.trim())
+      continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (obj.type === "user") {
+      const text = cleanText(extractText(obj.message?.content));
+      if (text.length >= MIN_TURN_LEN) {
+        if (closeRound())
+          return true;
+        currentUser = text;
+        currentAssistant = [];
+      }
+    } else if (obj.type === "assistant") {
+      const text = cleanText(extractText(obj.message?.content));
+      if (text.length >= MIN_TURN_LEN)
+        currentAssistant.push(text);
+    }
+  }
+  return closeRound();
+}
 function getParentUuid(lines) {
   for (const line of lines) {
     if (!line.trim())
@@ -2062,54 +2107,50 @@ function getParentUuid(lines) {
   }
   return;
 }
-function countImportableClaudeSessions(onProgress) {
+async function countImportableClaudeSessions(onProgress) {
+  const { readFile } = await import("node:fs/promises");
   const projectsDir = join2(homedir2(), ".claude", "projects");
-  let count = 0;
-  let checked = 0;
-  let total = 0;
   let projectDirs;
   try {
     projectDirs = readdirSync(projectsDir);
   } catch {
     return 0;
   }
-  const projectFiles = projectDirs.map((projDir) => {
+  const allFiles = [];
+  for (const projDir of projectDirs) {
     const projPath = join2(projectsDir, projDir);
     try {
-      const files = readdirSync(projPath).filter((f) => f.endsWith(".jsonl"));
-      total += files.length;
-      return { projPath, files };
-    } catch {
-      return { projPath, files: [] };
-    }
-  });
-  const report = () => onProgress?.({ checked, found: count, total });
-  for (const { projPath, files } of projectFiles) {
-    for (const file of files) {
-      checked++;
+      for (const f of readdirSync(projPath)) {
+        if (f.endsWith(".jsonl"))
+          allFiles.push(join2(projPath, f));
+      }
+    } catch {}
+  }
+  const total = allFiles.length;
+  let count = 0;
+  let checked = 0;
+  const CONCURRENCY = 16;
+  let nextIdx = 0;
+  const worker = async () => {
+    while (true) {
+      const i = nextIdx++;
+      if (i >= allFiles.length)
+        return;
       try {
-        const raw = readFileSync2(join2(projPath, file), "utf-8");
+        const raw = await readFile(allFiles[i], "utf-8");
         const lines = raw.split(`
 `);
         const parentUuid = getParentUuid(lines);
-        if (parentUuid != null) {
-          if (checked % 100 === 0)
-            report();
-          continue;
-        }
-        const { turns } = parseSession(lines);
-        if (turns.length > 0)
+        if (parentUuid == null && hasAnyImportableTurn(lines))
           count++;
-      } catch {
-        if (checked % 100 === 0)
-          report();
-        continue;
-      }
+      } catch {}
+      checked++;
       if (checked % 100 === 0)
-        report();
+        onProgress?.({ checked, found: count, total });
     }
-  }
-  report();
+  };
+  await Promise.all(Array.from({ length: CONCURRENCY }, () => worker()));
+  onProgress?.({ checked, found: count, total });
   return count;
 }
 function ingestClaude() {
@@ -2302,25 +2343,39 @@ function walkCodexSessionFiles(dir, visit) {
     }
   } catch {}
 }
-function countImportableCodexSessions(onProgress) {
+async function countImportableCodexSessions(onProgress) {
   const sessionsDir = join3(homedir3(), ".codex", "sessions");
   if (!existsSync3(sessionsDir))
     return 0;
+  const { readFile } = await import("node:fs/promises");
+  const files = [];
+  walkCodexSessionFiles(sessionsDir, (filePath) => {
+    files.push(filePath);
+  });
+  const total = files.length;
   let count = 0;
   let checked = 0;
-  walkCodexSessionFiles(sessionsDir, (filePath) => {
-    checked++;
-    try {
-      const lines = readFileSync3(filePath, "utf-8").split(`
+  const CONCURRENCY = 16;
+  let nextIdx = 0;
+  const worker = async () => {
+    while (true) {
+      const i = nextIdx++;
+      if (i >= files.length)
+        return;
+      try {
+        const lines = (await readFile(files[i], "utf-8")).split(`
 `).filter(Boolean);
-      const { rounds } = parseCodexSession(lines);
-      if (rounds.length > 0)
-        count++;
-    } catch {}
-    if (checked % 100 === 0)
-      onProgress?.({ checked, found: count });
-  });
-  onProgress?.({ checked, found: count });
+        const { rounds } = parseCodexSession(lines);
+        if (rounds.length > 0)
+          count++;
+      } catch {}
+      checked++;
+      if (checked % 100 === 0)
+        onProgress?.({ checked, found: count, total });
+    }
+  };
+  await Promise.all(Array.from({ length: CONCURRENCY }, () => worker()));
+  onProgress?.({ checked, found: count, total });
   return count;
 }
 function walkCodexSessions(dir, memories, sessionIds, stats) {
@@ -2797,7 +2852,7 @@ async function detect(options = {}) {
   const claudeDir = join5(home, ".claude", "projects");
   if (existsSync5(claudeDir)) {
     onProgress?.({ tool: "Claude Code", status: "start" });
-    const sessionCount = countImportableClaudeSessions((progress) => {
+    const sessionCount = await countImportableClaudeSessions((progress) => {
       onProgress?.({ tool: "Claude Code", status: "progress", ...progress });
     });
     onProgress?.({ tool: "Claude Code", status: "done", count: sessionCount });
@@ -2810,7 +2865,7 @@ async function detect(options = {}) {
   const codexSessions = join5(home, ".codex", "sessions");
   if (existsSync5(codexConfig) || existsSync5(codexSessions)) {
     onProgress?.({ tool: "Codex", status: "start" });
-    const sessionCount = countImportableCodexSessions((progress) => {
+    const sessionCount = await countImportableCodexSessions((progress) => {
       onProgress?.({ tool: "Codex", status: "progress", ...progress });
     });
     onProgress?.({ tool: "Codex", status: "done", count: sessionCount });

package/package.json

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