lacy 1.7.1 → 1.7.3

package/index.mjs

@@ -12,13 +12,38 @@ import {
   rmSync,
 } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
 
 const INSTALL_DIR = join(homedir(), ".lacy");
 const INSTALL_DIR_OLD = join(homedir(), ".lacy-shell");
 const CONFIG_FILE = join(INSTALL_DIR, "config.yaml");
 const REPO_URL = "https://github.com/lacymorrow/lacy.git";
 
+// Version — read from installed package.json (single source of truth),
+// fall back to this npm package's own package.json
+function getVersion() {
+  // Try the installed copy first
+  for (const dir of [INSTALL_DIR, INSTALL_DIR_OLD]) {
+    const pkgPath = join(dir, "package.json");
+    if (existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+        if (pkg.version) return pkg.version;
+      } catch {}
+    }
+  }
+  // Fall back to this package's own version
+  try {
+    const __dirname = dirname(fileURLToPath(import.meta.url));
+    const pkg = JSON.parse(readFileSync(join(__dirname, "package.json"), "utf-8"));
+    if (pkg.version) return pkg.version;
+  } catch {}
+  return "unknown";
+}
+
+const VERSION = getVersion();
+
 // ============================================================================
 // Terminal state safety net
 // ============================================================================
@@ -220,7 +245,7 @@ function removeLacyFromFile(filePath) {
   return true;
 }
 
-// Shared uninstall logic — removes RC lines and install dirs, optionally keeps config
+// Shared uninstall logic — removes RC lines and install dirs completely
 async function doUninstall({ askConfirm = true } = {}) {
   if (askConfirm) {
     const confirm = await p.confirm({
@@ -234,24 +259,6 @@ async function doUninstall({ askConfirm = true } = {}) {
     }
   }
 
-  // Ask about config
-  let keepConfig = false;
-  if (existsSync(CONFIG_FILE)) {
-    const configChoice = await p.confirm({
-      message: "Keep configuration for future reinstall?",
-      initialValue: true,
-    });
-    if (!p.isCancel(configChoice)) {
-      keepConfig = configChoice;
-    }
-  }
-
-  // Backup config if keeping
-  let configBackup = null;
-  if (keepConfig && existsSync(CONFIG_FILE)) {
-    configBackup = readFileSync(CONFIG_FILE, "utf-8");
-  }
-
   // Remove from all possible RC files
   const rcSpinner = p.spinner();
   rcSpinner.start("Removing from shell configs");
@@ -280,15 +287,7 @@ async function doUninstall({ askConfirm = true } = {}) {
     rmSync(INSTALL_DIR_OLD, { recursive: true, force: true });
   }
 
-  // Restore config if keeping
-  if (configBackup) {
-    mkdirSync(INSTALL_DIR, { recursive: true });
-    writeFileSync(CONFIG_FILE, configBackup);
-  }
-
-  removeSpinner.stop(
-    configBackup ? "Installation removed (config preserved)" : "Installation removed",
-  );
+  removeSpinner.stop("Installation removed");
 
   p.log.success("Lacy Shell uninstalled");
 
@@ -299,7 +298,7 @@ async function doUninstall({ askConfirm = true } = {}) {
 
 async function uninstall() {
   console.clear();
-  p.intro(pc.magenta(pc.bold(`  Lacy Shell  `)));
+  p.intro(pc.magenta(pc.bold(`  Lacy Shell  `)) + pc.dim(` v${VERSION}`));
 
   if (!isInstalled()) {
     p.log.warn("Lacy Shell is not installed");
@@ -318,7 +317,7 @@ async function uninstall() {
 
 async function install() {
   console.clear();
-  p.intro(pc.magenta(pc.bold(`  Lacy Shell  `)));
+  p.intro(pc.magenta(pc.bold(`  Lacy Shell  `)) + pc.dim(` v${VERSION}`));
 
   // Detect shell
   const shell = detectShell();
@@ -396,7 +395,7 @@ async function install() {
 
       try {
         if (commandExists("npm")) {
-          execSync("npm install -g lash-cli", { stdio: "pipe" });
+          execSync("npm install -g lashcode", { stdio: "pipe" });
           lashSpinner.stop("lash installed");
           detected.push("lash");
         } else if (commandExists("brew")) {
@@ -408,13 +407,13 @@ async function install() {
         } else {
           lashSpinner.stop("Could not install lash");
           p.log.warn(
-            "Please install npm or homebrew, then run: npm install -g lash-cli",
+            "Please install npm or homebrew, then run: npm install -g lashcode",
           );
         }
       } catch (e) {
         lashSpinner.stop("lash installation failed");
         p.log.warn(
-          "You can install it manually later: npm install -g lash-cli",
+          "You can install it manually later: npm install -g lashcode",
         );
       }
     }
@@ -457,10 +456,22 @@ async function install() {
     p.log.info(`Custom command: ${pc.cyan(customCommand)}`);
   }
 
-  // Offer to install lash if selected but not installed
-  if (selectedTool === "lash" && !commandExists("lash")) {
+  // Show which tool auto-detect resolves to
+  if (selectedTool === "auto" && detected.length > 0) {
+    p.log.info(`Using: ${pc.green("auto-detect")} (currently: ${pc.green(detected[0])})`);
+  }
+
+  // Offer to install lash if selected but not installed,
+  // or if auto-detect was chosen but no tools are available
+  const needsLashInstall =
+    (selectedTool === "lash" && !commandExists("lash")) ||
+    (selectedTool === "auto" && detected.length === 0);
+
+  if (needsLashInstall) {
     const installLash = await p.confirm({
-      message: "lash is not installed. Would you like to install it now?",
+      message: selectedTool === "auto"
+        ? `No AI CLI tools are installed. Would you like to install ${pc.green("lash")} (recommended)?`
+        : "lash is not installed. Would you like to install it now?",
       initialValue: true,
     });
 
@@ -475,7 +486,7 @@ async function install() {
 
       try {
         if (commandExists("npm")) {
-          execSync("npm install -g lash-cli", { stdio: "pipe" });
+          execSync("npm install -g lashcode", { stdio: "pipe" });
           lashSpinner.stop("lash installed");
         } else if (commandExists("brew")) {
           execSync("brew tap lacymorrow/tap && brew install lash", {
@@ -485,13 +496,13 @@ async function install() {
         } else {
           lashSpinner.stop("Could not install lash");
           p.log.warn(
-            "Please install npm or homebrew, then run: npm install -g lash-cli",
+            "Please install npm or homebrew, then run: npm install -g lashcode",
           );
         }
       } catch (e) {
         lashSpinner.stop("lash installation failed");
         p.log.warn(
-          "You can install it manually later: npm install -g lash-cli",
+          "You can install it manually later: npm install -g lashcode",
         );
       }
     }
@@ -616,8 +627,11 @@ auto_detection:
     configSpinner.stop("Configuration created");
   }
 
+  // Re-read version after install (repo was just cloned/updated)
+  const installedVersion = getVersion();
+
   // Success message
-  p.log.success(pc.green("Installation complete!"));
+  p.log.success(pc.green(`Installation complete!`) + pc.dim(` v${installedVersion}`));
 
   p.note(
     `${pc.cyan("what files are here")}  ${pc.dim("→ AI answers")}
@@ -636,7 +650,7 @@ Commands:
     (selectedTool === "auto" && detected.length === 0)
   ) {
     p.log.warn("Remember to install an AI CLI tool:");
-    console.log(`  ${pc.cyan("npm install -g lash-cli")}`);
+    console.log(`  ${pc.cyan("npm install -g lashcode")}`);
   }
 
   await restartShell();
@@ -658,7 +672,7 @@ async function main() {
       const content = readFileSync(infoPath, "utf-8");
       console.log(content);
     } else {
-      console.log(`\n${pc.magenta(pc.bold("🔧 Lacy Shell"))} v${require("./package.json").version || "1.6.5"}\n`);
+      console.log(`\n${pc.magenta(pc.bold("🔧 Lacy Shell"))} v${VERSION}\n`);
       console.log("Lacy Shell detects natural language and routes it to AI coding agents.\n");
       console.log("Quick tips:");
       console.log("  • Type normally for shell commands");
@@ -683,7 +697,7 @@ async function main() {
 
   if (args.includes("--help") || args.includes("-h")) {
     console.log(`
-${pc.magenta(pc.bold("Lacy Shell"))} - Talk directly to your shell
+${pc.magenta(pc.bold("Lacy Shell"))} ${pc.dim(`v${VERSION}`)} - Talk directly to your shell
 
 ${pc.bold("Usage:")}
   npx lacy              Install Lacy Shell
@@ -710,7 +724,7 @@ ${pc.dim("https://github.com/lacymorrow/lacy")}
   // If already installed, show dashboard + menu
   if (isInstalled()) {
     console.clear();
-    p.intro(pc.magenta(pc.bold(`  Lacy Shell  `)));
+    p.intro(pc.magenta(pc.bold(`  Lacy Shell  `)) + pc.dim(` v${VERSION}`));
 
     // Show current status
     const active = readConfigValue("active");
@@ -870,7 +884,7 @@ ${pc.dim("https://github.com/lacymorrow/lacy")}
 
         const lines = [
           `  Installed:  ${pc.green(dir)}`,
-          sha ? `  Version:    git ${pc.dim(sha)}` : null,
+          `  Version:    ${pc.cyan("v" + VERSION)}${sha ? pc.dim(` (${sha})`) : ""}`,
           `  Shell:      ${pc.cyan(shell)} ${rcConfigured ? pc.green("configured") : pc.yellow("not configured")}`,
           `  Config:     ${hasConfig ? pc.green("exists") : pc.yellow("missing")}`,
           `  Tool:       ${pc.cyan(active || "auto-detect")}`,
@@ -901,7 +915,8 @@ ${pc.dim("https://github.com/lacymorrow/lacy")}
           : INSTALL_DIR_OLD;
         try {
           execSync("git pull origin main", { cwd: updateDir, stdio: "pipe" });
-          updateSpinner.stop("Lacy updated");
+          const updatedVersion = getVersion();
+          updateSpinner.stop(`Lacy updated to v${updatedVersion}`);
           p.log.success("Update complete!");
           await restartShell();
           p.outro("Restart your terminal to apply changes.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lacy",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "Install lacy — talk to your terminal",
   "type": "module",
   "bin": {