conare 0.5.14 → 0.5.16

package/dist/index.js

@@ -1836,15 +1836,10 @@ function showCountingToolProgress(tool, checked, found, total) {
   countingSpinner?.message(`Scanning ${tool}: ${checkedText} files, ${found.toLocaleString()} importable`);
 }
 function showCountingToolDone(tool, count) {
-  toolTotals[tool] = count;
   countingSpinner?.message(`${tool}: ${count.toLocaleString()} chats`);
 }
 function showLocalChatsCounted() {
-  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?.stop("Scan complete");
   countingSpinner = null;
 }
 async function promptApiKey(options) {
@@ -1936,10 +1931,9 @@ async function confirmBackgroundSync() {
   }));
   return value === "yes";
 }
-var countingSpinner = null, toolTotals;
+var countingSpinner = null;
 var init_interactive = __esm(() => {
   init_dist2();
-  toolTotals = {};
 });
 
 // src/index.ts
@@ -2055,6 +2049,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())
@@ -2072,56 +2102,48 @@ function getParentUuid(lines) {
   return;
 }
 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 yieldToEventLoop = () => new Promise((resolve) => setImmediate(resolve));
-  const checkpoint = async () => {
-    onProgress?.({ checked, found: count, total });
-    await yieldToEventLoop();
-  };
-  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)
-            await checkpoint();
-          continue;
-        }
-        const { turns } = parseSession(lines);
-        if (turns.length > 0)
+        if (parentUuid == null && hasAnyImportableTurn(lines))
           count++;
-      } catch {
-        if (checked % 100 === 0)
-          await checkpoint();
-        continue;
-      }
+      } catch {}
+      checked++;
       if (checked % 100 === 0)
-        await checkpoint();
+        onProgress?.({ checked, found: count, total });
     }
-  }
+  };
+  await Promise.all(Array.from({ length: CONCURRENCY }, () => worker()));
   onProgress?.({ checked, found: count, total });
   return count;
 }
@@ -2319,6 +2341,7 @@ 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);
@@ -2326,21 +2349,26 @@ async function countImportableCodexSessions(onProgress) {
   const total = files.length;
   let count = 0;
   let checked = 0;
-  const yieldToEventLoop = () => new Promise((resolve) => setImmediate(resolve));
-  for (const filePath of files) {
-    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, total });
-      await yieldToEventLoop();
+        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;
 }

package/package.json

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