conare 0.4.4 → 0.4.5

package/dist/index.js

@@ -34,6 +34,27 @@ import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync
 import { createHash } from "node:crypto";
 import { join as join2 } from "node:path";
 import { homedir as homedir2 } from "node:os";
+function fitContent(header, rounds) {
+  const buildContent = (maxUser) => {
+    const body = rounds.map((r) => {
+      const user = maxUser > 0 && r.user.length > maxUser ? r.user.slice(0, maxUser) + "..." : r.user;
+      return `## Q: ${user}
+
+${r.assistant}`;
+    }).join(`
+
+---
+
+`);
+    return `${header}
+
+${body}`;
+  };
+  const full = buildContent(0);
+  if (full.length <= MAX_MEMORY_CONTENT)
+    return full;
+  return buildContent(TRUNCATED_USER_MSG);
+}
 function isNarration(text) {
   const stripped = text.trim();
   if (stripped.length < MIN_SUBSTANTIVE)
@@ -97,7 +118,7 @@ function clearIngested(source) {
     mkdirSync(dir, { recursive: true });
   writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2));
 }
-var MANIFEST_PATH, MIN_SUBSTANTIVE = 200, NARRATION_RE;
+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");
   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))/;
@@ -2088,7 +2109,6 @@ 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";
-var MAX_CONTENT = 48000;
 var MIN_TURN_LEN = 50;
 function resolveProjectName(dirName) {
   const segments = dirName.replace(/^-/, "").split("-");
@@ -2231,22 +2251,7 @@ function ingestClaude() {
         continue;
       }
       const header = `# Chat: ${project}${date ? ` | ${date}` : ""}`;
-      const body = turns.map((t) => {
-        return `## Q: ${t.user}
-
-${t.assistant}`;
-      }).join(`
-
----
-
-`);
-      let content = `${header}
-
-${body}`;
-      if (content.length > MAX_CONTENT)
-        content = content.slice(0, MAX_CONTENT) + `
-
-[truncated]`;
+      const content = fitContent(header, turns);
       const contentHash = createContentHash(content);
       const dedupKey = `claude:${sessionId}`;
       const fingerprint = `${dedupKey}:${contentHash}`;
@@ -2277,7 +2282,6 @@ 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";
-var MAX_CONTENT2 = 48000;
 function isCodexBoilerplate(text) {
   return text.startsWith("# AGENTS.md instructions for") || text.startsWith("<INSTRUCTIONS>") || text.startsWith("<user_instructions>") || text.startsWith("<user_action>");
 }
@@ -2385,25 +2389,14 @@ function walkCodexSessions(dir, memories, sessionIds, stats) {
             stats.filtered++;
             continue;
           }
-          const body = rounds.map((r) => {
-            const assistant = r.assistantParts.join(`
-
-`);
-            return `## Q: ${r.user}
-
-${assistant}`;
-          }).join(`
+          const header = `# Codex Session${project ? `: ${project}` : ""} | ${date || "unknown"}`;
+          const turns = rounds.map((r) => ({
+            user: r.user,
+            assistant: r.assistantParts.join(`
 
----
-
-`);
-          let content = `# Codex Session${project ? `: ${project}` : ""} | ${date || "unknown"}
-
-${body}`;
-          if (content.length > MAX_CONTENT2)
-            content = content.slice(0, MAX_CONTENT2) + `
-
-[truncated]`;
+`)
+          }));
+          const content = fitContent(header, turns);
           const contentHash = createContentHash(content);
           const dedupKey = `codex:${sessionId}`;
           const fingerprint = `${dedupKey}:${contentHash}`;
@@ -2435,7 +2428,6 @@ init_shared();
 import { readFileSync as readFileSync5, statSync } from "node:fs";
 import { join as join5 } from "node:path";
 import { createRequire as createRequire3 } from "node:module";
-var MAX_CONTENT3 = 48000;
 var MAX_DB_SIZE = 2 * 1024 * 1024 * 1024;
 var WARN_DB_SIZE = 500 * 1024 * 1024;
 var MIN_TURN_LEN2 = 50;
@@ -2551,22 +2543,7 @@ async function ingestCursor(dbPath, wasmDir) {
       const sessionName = parsed.name || "Cursor Chat";
       const date = parsed.createdAt ? new Date(parsed.createdAt).toISOString().slice(0, 10) : "unknown";
       const header = `# ${sessionName} | ${date}`;
-      const body = turns.map((t) => {
-        return `## Q: ${t.user}
-
-${t.assistant}`;
-      }).join(`
-
----
-
-`);
-      let content = `${header}
-
-${body}`;
-      if (content.length > MAX_CONTENT3)
-        content = content.slice(0, MAX_CONTENT3) + `
-
-[truncated]`;
+      const content = fitContent(header, turns);
       const contentHash = createContentHash(content);
       const dedupKey = `cursor:${composerId}`;
       const fingerprint = `${dedupKey}:${contentHash}`;
@@ -3115,31 +3092,6 @@ echo "$(date -u +%Y-%m-%dT%H:%M:%SZ) START sync" >> "$LOG"
   2>> "$LOG"
 echo "$(date -u +%Y-%m-%dT%H:%M:%SZ) DONE sync (exit $?)" >> "$LOG"
 `;
-function makePlist(intervalMinutes) {
-  const home = homedir7();
-  return `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-  "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>${PLIST_LABEL}</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>/bin/bash</string>
-        <string>${home}/.conare/bin/run.sh</string>
-    </array>
-    <key>StartInterval</key>
-    <integer>${intervalMinutes * 60}</integer>
-    <key>StandardOutPath</key>
-    <string>${home}/.conare/ingest.log</string>
-    <key>StandardErrorPath</key>
-    <string>${home}/.conare/ingest.log</string>
-    <key>RunAtLoad</key>
-    <true/>
-</dict>
-</plist>`;
-}
 var SYSTEMD_SERVICE_CONTENT = `[Unit]
 Description=Conare Memory — background sync
 
@@ -3241,22 +3193,12 @@ function findSqlJs() {
   }
   return null;
 }
-function setupMacOS(intervalMinutes) {
-  const plistDir = dirname2(PLIST_PATH);
-  mkdirSync4(plistDir, { recursive: true });
-  writeFileSync4(PLIST_PATH, makePlist(intervalMinutes));
-  const id = uid();
+function cleanupOldLaunchAgent() {
   try {
-    execSync3(`launchctl bootout gui/${id} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
+    execSync3(`launchctl bootout gui/${uid()} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
   } catch {}
-  try {
-    execSync3(`launchctl bootstrap gui/${id} "${PLIST_PATH}"`, { stdio: "ignore" });
-  } catch {
-    try {
-      execSync3(`launchctl load "${PLIST_PATH}"`, { stdio: "ignore" });
-    } catch {
-      throw new Error("Failed to load launchd agent. Try manually: launchctl load " + PLIST_PATH);
-    }
+  if (existsSync8(PLIST_PATH)) {
+    unlinkSync(PLIST_PATH);
   }
 }
 function setupLinuxSystemd(intervalMinutes) {
@@ -3266,13 +3208,30 @@ function setupLinuxSystemd(intervalMinutes) {
   execSync3("systemctl --user daemon-reload", { stdio: "ignore" });
   execSync3("systemctl --user enable --now conare-sync.timer", { stdio: "ignore" });
 }
-function setupLinuxCron(intervalMinutes) {
-  const cronCmd = `${homedir7()}/.conare/bin/run.sh`;
-  const cronLine = `*/${intervalMinutes} * * * * ${cronCmd}`;
+var CRON_SAFE_INTERVALS = [1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30];
+function clampCronInterval(intervalMinutes) {
+  const n = Number.isFinite(intervalMinutes) ? Math.round(intervalMinutes) : 10;
+  if (n <= 0)
+    return 10;
+  let best = 10;
+  let bestDist = Infinity;
+  for (const safe of CRON_SAFE_INTERVALS) {
+    const dist = Math.abs(n - safe);
+    if (dist < bestDist) {
+      bestDist = dist;
+      best = safe;
+    }
+  }
+  return best;
+}
+function setupCron(intervalMinutes) {
+  const clamped = clampCronInterval(intervalMinutes);
+  const cronCmd = `"${homedir7()}/.conare/bin/run.sh"`;
+  const cronLine = `*/${clamped} * * * * ${cronCmd}  # conare-sync`;
   try {
     const existing = execSync3("crontab -l 2>/dev/null", { encoding: "utf-8" });
     const filtered = existing.split(`
-`).filter((l) => !l.includes("conare")).join(`
+`).filter((l) => !l.endsWith("# conare-sync") && !l.includes(".conare/bin/run.sh")).join(`
 `);
     const newCrontab = (filtered.trim() ? filtered.trim() + `
 ` : "") + cronLine + `
@@ -3283,6 +3242,47 @@ function setupLinuxCron(intervalMinutes) {
 `, stdio: ["pipe", "ignore", "ignore"] });
   }
 }
+function removeCronEntry() {
+  try {
+    const existing = execSync3("crontab -l 2>/dev/null", { encoding: "utf-8" });
+    const lines = existing.split(`
+`);
+    const filtered = lines.filter((l) => !l.endsWith("# conare-sync") && !l.includes(".conare/bin/run.sh"));
+    if (filtered.length === lines.length)
+      return false;
+    const newCrontab = filtered.join(`
+`).trim();
+    if (newCrontab) {
+      execSync3("crontab -", { input: newCrontab + `
+`, stdio: ["pipe", "ignore", "ignore"] });
+    } else {
+      execSync3("crontab -", { input: `
+`, stdio: ["pipe", "ignore", "ignore"] });
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+function runSyncNow() {
+  const os = platform6();
+  try {
+    if (os === "win32") {
+      const runCmd = join9(BIN_DIR, "run.cmd");
+      if (existsSync8(runCmd)) {
+        execSync3(`"${runCmd}"`, { stdio: "ignore", timeout: 60000 });
+        return true;
+      }
+    } else {
+      const runSh = join9(BIN_DIR, "run.sh");
+      if (existsSync8(runSh)) {
+        execSync3(`/bin/bash "${runSh}"`, { stdio: "ignore", timeout: 60000 });
+        return true;
+      }
+    }
+  } catch {}
+  return false;
+}
 function installGlobalCommand() {
   const isWindows = platform6() === "win32";
   if (isWindows) {
@@ -3398,13 +3398,20 @@ function persistAndInstallGlobal(apiKey) {
     messages.push(globalMsg);
   return messages;
 }
+function sanitizeInterval(n) {
+  if (!Number.isFinite(n) || n <= 0)
+    return 10;
+  return Math.max(1, Math.round(n));
+}
 function installSync(apiKey, intervalMinutes = 10) {
   const messages = persistAndInstallGlobal(apiKey);
   const os = platform6();
+  intervalMinutes = sanitizeInterval(intervalMinutes);
   if (os === "darwin") {
-    setupMacOS(intervalMinutes);
-    messages.push(`Installed launchd agent (every ${intervalMinutes} min)`);
-    messages.push(`Plist: ${PLIST_PATH}`);
+    cleanupOldLaunchAgent();
+    const actual = clampCronInterval(intervalMinutes);
+    setupCron(intervalMinutes);
+    messages.push(`Installed cron job (every ${actual} min)`);
   } else if (os === "win32") {
     setupWindows(intervalMinutes);
     messages.push(`Installed Windows Task Scheduler (every ${intervalMinutes} min)`);
@@ -3413,25 +3420,23 @@ function installSync(apiKey, intervalMinutes = 10) {
       setupLinuxSystemd(intervalMinutes);
       messages.push(`Installed systemd timer (every ${intervalMinutes} min)`);
     } else {
-      setupLinuxCron(intervalMinutes);
-      messages.push(`Installed cron job (every ${intervalMinutes} min)`);
+      const actual = clampCronInterval(intervalMinutes);
+      setupCron(intervalMinutes);
+      messages.push(`Installed cron job (every ${actual} min)`);
     }
   } else {
     messages.push(`Unsupported platform: ${os}. Run manually: ~/.conare/bin/run.sh`);
   }
+  const syncOk = runSyncNow();
+  messages.push(syncOk ? "First sync completed" : "First sync deferred to next timer tick");
   return messages;
 }
 function uninstallSync() {
   const messages = [];
   const os = platform6();
   if (os === "darwin") {
-    try {
-      execSync3(`launchctl bootout gui/${uid()} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
-    } catch {}
-    if (existsSync8(PLIST_PATH)) {
-      unlinkSync(PLIST_PATH);
-      messages.push("Removed launchd agent");
-    }
+    removeCronEntry() && messages.push("Removed cron job");
+    cleanupOldLaunchAgent();
   } else if (os === "win32") {
     try {
       execSync3(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: "ignore" });
@@ -3451,25 +3456,18 @@ function uninstallSync() {
       } catch {}
       messages.push("Removed systemd timer");
     } else {
-      try {
-        const existing = execSync3("crontab -l 2>/dev/null", { encoding: "utf-8" });
-        const filtered = existing.split(`
-`).filter((l) => !l.includes("conare")).join(`
-`);
-        execSync3("crontab -", { input: filtered.trim() + `
-`, stdio: ["pipe", "ignore", "ignore"] });
-        messages.push("Removed cron job");
-      } catch {}
+      removeCronEntry() && messages.push("Removed cron job");
     }
   }
-  const filesToRemove = [
-    join9(CONARE_DIR, "config.json"),
-    join9(CONARE_DIR, "sync.lock")
-  ];
-  for (const f of filesToRemove) {
-    if (existsSync8(f))
-      unlinkSync(f);
-  }
+  const configPath = join9(CONARE_DIR, "config.json");
+  if (existsSync8(configPath))
+    unlinkSync(configPath);
+  const lockDir = join9(CONARE_DIR, "sync.lock.d");
+  if (existsSync8(lockDir))
+    rmSync2(lockDir, { recursive: true, force: true });
+  const lockFile = join9(CONARE_DIR, "sync.lock");
+  if (existsSync8(lockFile))
+    unlinkSync(lockFile);
   if (existsSync8(BIN_DIR)) {
     rmSync2(BIN_DIR, { recursive: true, force: true });
     messages.push("Removed ~/.conare/bin/");

package/package.json

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