conare 0.5.5 → 0.5.6

package/dist/index.js

@@ -5,25 +5,43 @@ 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);
@@ -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)
@@ -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;
         }
@@ -2174,6 +2216,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 +2230,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 +2264,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) {
@@ -2261,7 +2313,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 +2336,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);
     }
@@ -2341,6 +2397,9 @@ function walkCodexSessions(dir, memories, sessionIds, stats) {
           const lines = readFileSync4(join4(dir, entry.name), "utf-8").split(`
 `).filter(Boolean);
           let date = null;
+          let startedAt = null;
+          let updatedAt = null;
+          let sourceTimestamp = null;
           let project = null;
           const rounds = [];
           let currentUser = null;
@@ -2348,8 +2407,15 @@ function walkCodexSessions(dir, memories, sessionIds, stats) {
           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 (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);
               }
@@ -2429,8 +2495,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 {}
@@ -2447,6 +2517,12 @@ import { createRequire as createRequire3 } from "node:module";
 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) {
@@ -2557,7 +2633,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 +2654,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);
     }
@@ -2634,29 +2716,38 @@ 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(homedir5(), ".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");
@@ -2849,7 +2940,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 +2959,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.
+
+**Two axes, always pair them:**
 
-## Deep Mode
+- \`query\` / \`context\` → keyword-dense retrieval phrase (finds the right memories)
+- \`prompt\` → synthesis instruction (what to emphasize / how to structure it)
 
-\`deep: true\` on \`search\` or \`recall\` returns an LLM-synthesized answer instead of raw memories.
+Example:
+\`\`\`
+search({
+  query: "auth rewrite middleware compliance",
+  prompt: "focus on the final decision and why; preserve all file paths and config values"
+})
+\`\`\`
 
-- **Use for**: narratives, summaries, "what happened with X", comparing approaches
-- **Don't use for**: exact values, config lookups, file paths — raw preserves full detail
+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.
 
-\`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.
+**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
 
@@ -3508,6 +3610,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 +3670,13 @@ 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 parseArgs() {
   const args = process.argv.slice(2);
   let key = "";
@@ -3621,6 +3735,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,10 +3828,30 @@ 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: existsSync10 } = await import("node:fs");
+  const { join: join11 } = await import("node:path");
+  const { homedir: homedir8 } = await import("node:os");
+  const messages = uninstallSync();
+  const manifestPath = join11(homedir8(), ".conare", "ingested.json");
+  if (existsSync10(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) {
@@ -4009,6 +4144,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 +4155,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();
     }

package/package.json

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