conare 0.3.7 → 0.3.9

package/dist/index.js

@@ -1024,7 +1024,7 @@ var import_sisteransi, import_picocolors, uD, W, tD, eD, FD = function() {
 ` && (s && o && (F += z(s)), i && (F += K(i)));
   }
   return F;
-}, xD, B, AD, S, gD, vD = (e, u, t) => (u in e) ? gD(e, u, { enumerable: true, configurable: true, writable: true, value: t }) : e[u] = t, h = (e, u, t) => (vD(e, typeof u != "symbol" ? u + "" : u, t), t), dD, A, kD, $D = (e, u, t) => (u in e) ? kD(e, u, { enumerable: true, configurable: true, writable: true, value: t }) : e[u] = t, H = (e, u, t) => ($D(e, typeof u != "symbol" ? u + "" : u, t), t), SD, TD, jD = (e, u, t) => (u in e) ? TD(e, u, { enumerable: true, configurable: true, writable: true, value: t }) : e[u] = t, U = (e, u, t) => (jD(e, typeof u != "symbol" ? u + "" : u, t), t), MD, OD, PD = (e, u, t) => (u in e) ? OD(e, u, { enumerable: true, configurable: true, writable: true, value: t }) : e[u] = t, J = (e, u, t) => (PD(e, typeof u != "symbol" ? u + "" : u, t), t), LD;
+}, xD, B, AD, S, gD, vD = (e, u, t) => (u in e) ? gD(e, u, { enumerable: true, configurable: true, writable: true, value: t }) : e[u] = t, h = (e, u, t) => (vD(e, typeof u != "symbol" ? u + "" : u, t), t), A, kD, $D = (e, u, t) => (u in e) ? kD(e, u, { enumerable: true, configurable: true, writable: true, value: t }) : e[u] = t, H = (e, u, t) => ($D(e, typeof u != "symbol" ? u + "" : u, t), t), SD, TD, jD = (e, u, t) => (u in e) ? TD(e, u, { enumerable: true, configurable: true, writable: true, value: t }) : e[u] = t, U = (e, u, t) => (jD(e, typeof u != "symbol" ? u + "" : u, t), t), MD, OD, PD = (e, u, t) => (u in e) ? OD(e, u, { enumerable: true, configurable: true, writable: true, value: t }) : e[u] = t, J = (e, u, t) => (PD(e, typeof u != "symbol" ? u + "" : u, t), t), LD;
 var init_dist = __esm(() => {
   import_sisteransi = __toESM(require_src(), 1);
   import_picocolors = __toESM(require_picocolors(), 1);
@@ -1076,23 +1076,6 @@ var init_dist = __esm(() => {
   AD = globalThis.process.platform.startsWith("win");
   S = Symbol("clack:cancel");
   gD = Object.defineProperty;
-  dD = class dD extends x {
-    get cursor() {
-      return this.value ? 0 : 1;
-    }
-    get _value() {
-      return this.cursor === 0;
-    }
-    constructor(u) {
-      super(u, false), this.value = !!u.initialValue, this.on("value", () => {
-        this.value = this._value;
-      }), this.on("confirm", (t) => {
-        this.output.write(import_sisteransi.cursor.move(0, -1)), this.value = t, this.state = "submit", this.close();
-      }), this.on("cursor", () => {
-        this.value = !this.value;
-      });
-    }
-  };
   A = new WeakMap;
   kD = Object.defineProperty;
   SD = class extends x {
@@ -1221,25 +1204,7 @@ ${import_picocolors2.default.gray(o)}` : ""}`;
 ${import_picocolors2.default.cyan(d2)}
 `;
   }
-} }).prompt(), ye = (t) => {
-  const n = t.active ?? "Yes", r2 = t.inactive ?? "No";
-  return new dD({ active: n, inactive: r2, initialValue: t.initialValue ?? true, render() {
-    const i = `${import_picocolors2.default.gray(o)}
-${b2(this.state)}  ${t.message}
-`, s = this.value ? n : r2;
-    switch (this.state) {
-      case "submit":
-        return `${i}${import_picocolors2.default.gray(o)}  ${import_picocolors2.default.dim(s)}`;
-      case "cancel":
-        return `${i}${import_picocolors2.default.gray(o)}  ${import_picocolors2.default.strikethrough(import_picocolors2.default.dim(s))}
-${import_picocolors2.default.gray(o)}`;
-      default:
-        return `${i}${import_picocolors2.default.cyan(o)}  ${this.value ? `${import_picocolors2.default.green(k2)} ${n}` : `${import_picocolors2.default.dim(P2)} ${import_picocolors2.default.dim(n)}`} ${import_picocolors2.default.dim("/")} ${this.value ? `${import_picocolors2.default.dim(P2)} ${import_picocolors2.default.dim(r2)}` : `${import_picocolors2.default.green(k2)} ${r2}`}
-${import_picocolors2.default.cyan(d2)}
-`;
-    }
-  } }).prompt();
-}, ve = (t) => {
+} }).prompt(), ve = (t) => {
   const n = (r2, i) => {
     const s = r2.label ?? String(r2.value);
     switch (i) {
@@ -1475,18 +1440,6 @@ async function promptAuth(options) {
   if (options.providedApiKey) {
     return options.providedApiKey;
   }
-  if (options.savedApiKey) {
-    const useSaved = await ye({
-      message: `Use saved API key ending in ${options.savedApiKey.slice(-6)}?`,
-      initialValue: true
-    });
-    if (pD(useSaved)) {
-      xe("Setup cancelled.");
-      process.exit(0);
-    }
-    if (useSaved)
-      return options.savedApiKey;
-  }
   const method = await ve({
     message: "How would you like to authenticate?",
     options: [
@@ -1544,7 +1497,7 @@ async function selectMcpTargets(targets) {
   }));
 }
 async function confirmIndexCodebase() {
-  return ensureValue(await ye({
+  return ensureValue(await confirm({
     message: "Index this codebase too?",
     initialValue: false
   }));
@@ -3225,24 +3178,26 @@ async function runInstall() {
     }
   }
   const savedApiKey = getSavedApiKey();
-  let apiKey = key || process.env.CONARE_API_KEY || savedApiKey;
   const hasTty = !!process.stdin.isTTY && !!process.stdout.isTTY;
+  let apiKey = key || process.env.CONARE_API_KEY || savedApiKey;
   if (!apiKey && hasTty) {
     const { promptAuth: promptAuthFn } = await Promise.resolve().then(() => (init_interactive(), exports_interactive));
     const { spinner: clackSpinner } = await Promise.resolve().then(() => (init_interactive(), exports_interactive));
-    const authResult = await promptAuthFn({ savedApiKey });
-    if (authResult === "__BROWSER_AUTH__") {
-      const authSpinner = clackSpinner();
-      authSpinner.start("Waiting for browser sign-in...");
-      try {
-        apiKey = await browserAuth();
-        authSpinner.stop("Signed in successfully.");
-      } catch (e2) {
-        authSpinner.stop(`Authentication failed: ${e2.message}`);
-        process.exit(1);
+    if (!apiKey) {
+      const authResult = await promptAuthFn({});
+      if (authResult === "__BROWSER_AUTH__") {
+        const authSpinner = clackSpinner();
+        authSpinner.start("Waiting for browser sign-in...");
+        try {
+          apiKey = await browserAuth();
+          authSpinner.stop("Signed in successfully.");
+        } catch (e2) {
+          authSpinner.stop(`Authentication failed: ${e2.message}`);
+          process.exit(1);
+        }
+      } else {
+        apiKey = authResult || "";
       }
-    } else {
-      apiKey = authResult || "";
     }
   }
   if (!apiKey) {
@@ -3316,22 +3271,23 @@ async function main() {
       };
     });
     startSetup();
-    const authResult = await promptAuth({
-      savedApiKey,
-      providedApiKey: opts.key
-    });
-    if (authResult === "__BROWSER_AUTH__") {
-      const authSpinner = Y2();
-      authSpinner.start("Waiting for browser sign-in...");
-      try {
-        apiKey = await browserAuth();
-        authSpinner.stop("Signed in successfully.");
-      } catch (e2) {
-        authSpinner.stop(`Authentication failed: ${e2.message}`);
-        process.exit(1);
+    if (!apiKey) {
+      const authResult = await promptAuth({
+        providedApiKey: opts.key
+      });
+      if (authResult === "__BROWSER_AUTH__") {
+        const authSpinner = Y2();
+        authSpinner.start("Waiting for browser sign-in...");
+        try {
+          apiKey = await browserAuth();
+          authSpinner.stop("Signed in successfully.");
+        } catch (e2) {
+          authSpinner.stop(`Authentication failed: ${e2.message}`);
+          process.exit(1);
+        }
+      } else {
+        apiKey = authResult || apiKey;
       }
-    } else {
-      apiKey = authResult || apiKey;
     }
     showDetectedApps(interactiveTargets);
     selectedSources = await selectChatSources(interactiveTargets);

package/package.json

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