@xevy/cli 0.1.2 → 0.1.5

package/bin/xevy.mjs

@@ -167,15 +167,22 @@ async function downloadExtension(base, file, destDir, markers) {
   return dest;
 }
 
+// One shared readline interface for the whole prompt sequence. Creating a fresh
+// interface per question drops buffered stdin (the next answer is lost), so we
+// reuse one and close it explicitly when prompting is done.
+let _rl;
 function promptLine(question) {
+  if (!_rl) _rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    rl.question(question, (answer) => {
-      rl.close();
-      resolve(String(answer || "").trim());
-    });
+    _rl.question(question, (answer) => resolve(String(answer || "").trim()));
   });
 }
+function closePrompts() {
+  if (_rl) {
+    _rl.close();
+    _rl = undefined;
+  }
+}
 
 function writeCredentials(base, token) {
   fs.mkdirSync(CREDENTIALS_DIR, { recursive: true });
@@ -191,31 +198,85 @@ function writeCredentials(base, token) {
   }
 }
 
+/** Return the stored xevy_pk_ token from the credentials file, or null. */
+function readStoredToken() {
+  try {
+    if (!fs.existsSync(CREDENTIALS_FILE)) return null;
+    for (const line of fs.readFileSync(CREDENTIALS_FILE, "utf-8").split(/\r?\n/)) {
+      const trimmed = line.trim();
+      if (trimmed.startsWith("token=")) {
+        const value = trimmed.slice("token=".length).trim();
+        return value.startsWith(API_KEY_PREFIX) ? value : null;
+      }
+    }
+  } catch {
+    // ignore unreadable credentials
+  }
+  return null;
+}
+
+function isYes(answer, defaultYes = true) {
+  const a = String(answer || "").trim().toLowerCase();
+  if (!a) return defaultYes;
+  return a === "y" || a === "yes";
+}
+
+async function promptNewApiKey(base) {
+  console.log("\nGet your API key (this link opens the API keys tab directly):");
+  console.log(`  ${apiKeysUrl(base)}`);
+  console.log("  Sign in if prompted, then click “Create API key” and copy it.\n");
+  const token = await promptLine(`Paste your Xevy API key (${API_KEY_PREFIX}…): `);
+  if (!token) die("API key is required. Re-run `xevy setup` when you have one.");
+  if (!token.startsWith(API_KEY_PREFIX)) {
+    die(`That doesn't look like a Xevy API key (expected '${API_KEY_PREFIX}…'). Not saved.`);
+  }
+  return token;
+}
+
 async function setup(opts) {
   console.log("Setting up Xevy for pi\n");
 
-  // 1. pi + the extension
+  // 1. Ensure pi is installed (installs it if missing).
   ensurePi();
+
+  // 2. Extensions:
+  //    • xevy-core.ts  → pi's GLOBAL extensions dir (shared base: ask_question
+  //      tool + setup/context). Global so it loads in EVERY pi session and is
+  //      always present for xevy.ts (which requires it). Global-only avoids a
+  //      double-load: if it were also in ~/.xevy it'd register ask_question twice.
+  //    • xevy-model.ts → GLOBAL too, so the xevy/* models are available in every
+  //      pi session (plain `pi` included), not just via `xevy`.
+  //    • xevy.ts       → ~/.xevy/extensions (tools/workflow; loaded by `xevy`,
+  //      which also auto-loads the global dir → core + model come along).
+  await downloadExtension(opts.base, "xevy-core.ts", PI_EXTENSION_DIR, [
+    "xevyCoreExtension",
+    "registerCommand",
+  ]);
+  await downloadExtension(opts.base, "xevy-model.ts", PI_EXTENSION_DIR, [
+    "xevyModelExtension",
+    "registerCommand",
+  ]);
   await downloadExtension(opts.base, XEVY_EXTENSION_FILE, XEVY_EXTENSIONS_DIR, [
     "EXTENSION_VERSION",
     "registerCommand",
   ]);
 
-  // 2. API key — with a direct link to the exact page to generate one.
-  console.log("\nGet your API key (this link opens the API keys tab directly):");
-  console.log(`  ${apiKeysUrl(opts.base)}`);
-  console.log("  Sign in if prompted, then click “Create API key” and copy it.\n");
-
-  const token = await promptLine(`Paste your Xevy API key (${API_KEY_PREFIX}…): `);
-  if (!token) die("API key is required. Re-run `xevy setup` when you have one.");
-  if (!token.startsWith(API_KEY_PREFIX)) {
-    die(`That doesn't look like a Xevy API key (expected '${API_KEY_PREFIX}…'). Not saved.`);
+  // 3. API key — reuse the saved one if present, otherwise ask for a new one.
+  const existing = readStoredToken();
+  let token;
+  if (existing) {
+    const reuse = await promptLine(`An API key is already saved (…${existing.slice(-4)}). Reuse it? [Y/n]: `);
+    token = isYes(reuse) ? existing : await promptNewApiKey(opts.base);
+  } else {
+    token = await promptNewApiKey(opts.base);
   }
+  closePrompts();
   writeCredentials(opts.base, token);
   console.log(`✓ API key stored at ${CREDENTIALS_FILE} (key not shown).`);
 
   console.log("\n✓ Setup complete.");
-  console.log("  • Run `xevy` to open pi with the Xevy extension loaded.");
+  console.log("  • Xevy models (xevy/auto, xevy/fast, …) are available in any pi session — no /login needed.");
+  console.log("  • Run `xevy` to open pi with the Xevy tools + models loaded.");
   if (opts.base !== DEFAULT_BASE) console.log(`  • Host: ${opts.base}`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xevy/cli",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "Xevy CLI — `xevy setup` installs the pi agent + the Xevy pi extension and stores your API key; `xevy` opens pi with it.",
   "type": "module",
   "keywords": [