conare 0.5.16 → 0.5.18

package/dist/index.js

@@ -1898,7 +1898,7 @@ async function promptAuth(options) {
 }
 async function selectChatSources(targets) {
   return ensureValue(await fe({
-    message: "Select chat sources to index",
+    message: "Select chat sources to index (space to toggle, enter to confirm)",
     required: false,
     initialValues: targets.filter((target) => target.available !== false && (target.detectedCount ?? 0) > 0).map((target) => target.id),
     options: targets.map((target) => ({
@@ -1910,7 +1910,7 @@ async function selectChatSources(targets) {
 }
 async function selectMcpTargets(targets) {
   return ensureValue(await fe({
-    message: "Select where to install the MCP",
+    message: "Select where to install the MCP (space to toggle, enter to confirm)",
     required: false,
     initialValues: targets.filter((target) => target.available !== false && (target.detectedCount ?? 0) > 0).map((target) => target.id),
     options: targets.map((target) => ({
@@ -3454,43 +3454,64 @@ function configureMcp(apiKey, targets = ["claude", "codex"]) {
 }
 
 // src/config.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync7, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync7, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { join as join8 } from "node:path";
 import { homedir as homedir7 } from "node:os";
-var CONFIG_DIR = join8(homedir7(), ".conare");
-var CONFIG_PATH = join8(CONFIG_DIR, "config.json");
 function readConfig() {
+  const configPath = getConfigPath();
   try {
-    if (!existsSync8(CONFIG_PATH))
+    if (!existsSync8(configPath))
       return {};
-    return JSON.parse(readFileSync7(CONFIG_PATH, "utf-8"));
+    return JSON.parse(readFileSync7(configPath, "utf-8"));
   } catch {
     return {};
   }
 }
 function writeConfig(config) {
-  mkdirSync3(CONFIG_DIR, { recursive: true, mode: 448 });
-  writeFileSync3(CONFIG_PATH, JSON.stringify(config, null, 2) + `
+  mkdirSync3(getConfigDir(), { recursive: true, mode: 448 });
+  writeFileSync3(getConfigPath(), JSON.stringify(config, null, 2) + `
 `, { mode: 384 });
 }
+function getConfigDir() {
+  return join8(homedir7(), ".conare");
+}
+function getConfigPath() {
+  return join8(getConfigDir(), "config.json");
+}
 function saveApiKey(apiKey) {
   const config = readConfig();
   config.apiKey = apiKey;
+  delete config.key;
   writeConfig(config);
 }
 function getSavedApiKey() {
-  return readConfig().apiKey;
+  const config = readConfig();
+  return config.apiKey || config.key;
+}
+function clearSavedApiKey() {
+  const config = readConfig();
+  const hadApiKey = !!(config.apiKey || config.key);
+  delete config.apiKey;
+  delete config.key;
+  if (Object.keys(config).length === 0) {
+    const configPath = getConfigPath();
+    if (existsSync8(configPath))
+      unlinkSync(configPath);
+  } else {
+    writeConfig(config);
+  }
+  return hadApiKey;
 }
 
 // src/sync.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync, readFileSync as readFileSync8, chmodSync, cpSync, rmSync as rmSync2, symlinkSync as symlinkSync2, readlinkSync as readlinkSync2, appendFileSync } from "node:fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync4, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2, readFileSync as readFileSync8, chmodSync, cpSync, rmSync as rmSync2, symlinkSync as symlinkSync2, readlinkSync as readlinkSync2, appendFileSync } from "node:fs";
 import { join as join9, dirname as dirname3 } from "node:path";
 import { homedir as homedir8, platform as platform6 } from "node:os";
 import { execSync as execSync3 } from "node:child_process";
 import { createRequire as createRequire3 } from "node:module";
 var CONARE_DIR = join9(homedir8(), ".conare");
 var BIN_DIR = join9(CONARE_DIR, "bin");
-var CONFIG_PATH2 = join9(CONARE_DIR, "config.json");
+var CONFIG_PATH = join9(CONARE_DIR, "config.json");
 var PLIST_LABEL = "ai.conare.ingest";
 var PLIST_PATH = join9(homedir8(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
 var SYSTEMD_DIR = join9(homedir8(), ".config", "systemd", "user");
@@ -3654,7 +3675,7 @@ function persistBinary(apiKey) {
   writeFileSync4(runCmdPath, RUN_CMD);
   const runVbsPath = join9(BIN_DIR, "run.vbs");
   writeFileSync4(runVbsPath, RUN_VBS);
-  writeFileSync4(CONFIG_PATH2, JSON.stringify({ apiKey }, null, 2) + `
+  writeFileSync4(CONFIG_PATH, JSON.stringify({ apiKey }, null, 2) + `
 `, { mode: 384 });
 }
 function isValidJsBundle(path) {
@@ -3712,7 +3733,7 @@ function cleanupOldLaunchAgent() {
     execSync3(`launchctl bootout gui/${uid()} "${PLIST_PATH}" 2>/dev/null`, { stdio: "ignore" });
   } catch {}
   if (existsSync9(PLIST_PATH)) {
-    unlinkSync(PLIST_PATH);
+    unlinkSync2(PLIST_PATH);
   }
 }
 function setupLinuxSystemd(intervalMinutes) {
@@ -3830,7 +3851,7 @@ exec "$NODE" "$CONARE_DIR/bin/conare-ingest.mjs" "$@"
         if (existing === wrapper)
           return "Global command: conare (already linked)";
       } catch {}
-      unlinkSync(symlinkTarget);
+      unlinkSync2(symlinkTarget);
     }
     symlinkSync2(wrapper, symlinkTarget);
     return "Global command: conare (linked to /usr/local/bin)";
@@ -3925,7 +3946,7 @@ function installSync(apiKey, intervalMinutes = 10) {
   messages.push("First sync scheduled");
   return messages;
 }
-function uninstallSync() {
+function removeSyncTimer() {
   const messages = [];
   const os = platform6();
   if (os === "darwin") {
@@ -3942,9 +3963,9 @@ function uninstallSync() {
         execSync3("systemctl --user disable --now conare-sync.timer 2>/dev/null", { stdio: "ignore" });
       } catch {}
       if (existsSync9(SYSTEMD_SERVICE))
-        unlinkSync(SYSTEMD_SERVICE);
+        unlinkSync2(SYSTEMD_SERVICE);
       if (existsSync9(SYSTEMD_TIMER))
-        unlinkSync(SYSTEMD_TIMER);
+        unlinkSync2(SYSTEMD_TIMER);
       try {
         execSync3("systemctl --user daemon-reload", { stdio: "ignore" });
       } catch {}
@@ -3953,15 +3974,21 @@ function uninstallSync() {
       removeCronEntry() && messages.push("Removed cron job");
     }
   }
-  const configPath = join9(CONARE_DIR, "config.json");
-  if (existsSync9(configPath))
-    unlinkSync(configPath);
+  return messages;
+}
+function clearSyncLocks() {
   const lockDir = join9(CONARE_DIR, "sync.lock.d");
   if (existsSync9(lockDir))
     rmSync2(lockDir, { recursive: true, force: true });
   const lockFile = join9(CONARE_DIR, "sync.lock");
   if (existsSync9(lockFile))
-    unlinkSync(lockFile);
+    unlinkSync2(lockFile);
+}
+function uninstallSync() {
+  const messages = removeSyncTimer();
+  if (existsSync9(CONFIG_PATH))
+    unlinkSync2(CONFIG_PATH);
+  clearSyncLocks();
   if (existsSync9(BIN_DIR)) {
     rmSync2(BIN_DIR, { recursive: true, force: true });
     messages.push("Removed ~/.conare/bin/");
@@ -4112,7 +4139,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 logout                             Clear saved API key and local hashes; keep conare installed
   conare --key <api_key>                    Index chat history (key optional with browser auth)
   conare --key <api_key> --index [path]     Index codebase
 
@@ -4206,20 +4233,17 @@ async function runInstall() {
   console.log("");
 }
 async function runLogout() {
-  const { unlinkSync: unlinkSync2, existsSync: existsSync11 } = await import("node:fs");
-  const { join: join11 } = await import("node:path");
-  const { homedir: homedir9 } = await import("node:os");
-  const messages = uninstallSync();
-  const manifestPath = join11(homedir9(), ".conare", "ingested.json");
-  if (existsSync11(manifestPath)) {
-    unlinkSync2(manifestPath);
-    messages.push("Removed local index history");
-  }
+  const messages = removeSyncTimer();
+  clearSyncLocks();
+  const hadApiKey = clearSavedApiKey();
+  messages.push(hadApiKey ? "Cleared saved API key" : "No saved API key found");
+  clearIngested();
+  messages.push("Reset local hashes");
   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("  \x1B[32m✓\x1B[0m Logged out. The conare command is still installed.");
   console.log("");
 }
 async function main() {
@@ -4265,6 +4289,7 @@ async function main() {
     detectedCountApproximate: undefined
   }));
   let interactiveMode = false;
+  let detectedTools;
   if (shouldRunInteractive) {
     startSetup();
     interactiveMode = true;
@@ -4287,7 +4312,7 @@ async function main() {
       }
     }
     showCountingLocalChats();
-    const detectedTools = await detect({ onProgress: renderDetectProgress });
+    detectedTools = await detect({ onProgress: renderDetectProgress });
     showLocalChatsCounted();
     interactiveTargets = MCP_TARGETS.map((target) => {
       const detected = detectedTools.find((tool) => tool.id === target.id);
@@ -4475,7 +4500,7 @@ Nothing new to index.`);
     }
     log();
   }
-  const tools = await detect();
+  const tools = detectedTools ?? await detect();
   if (!interactiveMode) {
     log("Detected AI tools:");
     for (const t of tools) {

package/package.json

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