@austinthesing/magic-shell 0.1.0 → 0.1.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Magic Shell Contributors
+Copyright (c) 2026 Magic Shell Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/cli.js

@@ -19587,7 +19587,7 @@ var init_types = __esm(() => {
 });
 
 // src/lib/keychain.ts
-import { execSync, spawnSync } from "child_process";
+import { spawnSync } from "child_process";
 async function setSecret(key, value) {
   switch (process.platform) {
     case "darwin":
@@ -19614,20 +19614,57 @@ async function getSecret(key) {
 }
 function setSecretMacOS(key, value) {
   try {
-    try {
-      execSync(`security delete-generic-password -s "${SERVICE_NAME}" -a "${key}" 2>/dev/null`, { encoding: "utf-8" });
-    } catch {}
-    execSync(`security add-generic-password -s "${SERVICE_NAME}" -a "${key}" -w "${value}"`, { encoding: "utf-8" });
-    return true;
-  } catch {
+    spawnSync("security", [
+      "delete-generic-password",
+      "-s",
+      SERVICE_NAME,
+      "-a",
+      key
+    ], {
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    const result = spawnSync("security", [
+      "add-generic-password",
+      "-s",
+      SERVICE_NAME,
+      "-a",
+      key,
+      "-w",
+      value
+    ], {
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    return result.status === 0;
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] macOS keychain set error:", error instanceof Error ? error.message : String(error));
+    }
     return false;
   }
 }
 function getSecretMacOS(key) {
   try {
-    const result = execSync(`security find-generic-password -s "${SERVICE_NAME}" -a "${key}" -w 2>/dev/null`, { encoding: "utf-8" });
-    return result.trim();
-  } catch {
+    const result = spawnSync("security", [
+      "find-generic-password",
+      "-s",
+      SERVICE_NAME,
+      "-a",
+      key,
+      "-w"
+    ], {
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    if (result.status !== 0) {
+      return null;
+    }
+    return result.stdout?.trim() || null;
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] macOS keychain get error:", error instanceof Error ? error.message : String(error));
+    }
     return null;
   }
 }
@@ -19646,34 +19683,105 @@ function setSecretLinux(key, value) {
       encoding: "utf-8"
     });
     return result.status === 0;
-  } catch {
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] Linux secret-tool set error:", error instanceof Error ? error.message : String(error));
+    }
     return false;
   }
 }
 function getSecretLinux(key) {
   try {
-    const result = execSync(`secret-tool lookup service "${SERVICE_NAME}" account "${key}" 2>/dev/null`, { encoding: "utf-8" });
-    return result.trim() || null;
-  } catch {
+    const result = spawnSync("secret-tool", [
+      "lookup",
+      "service",
+      SERVICE_NAME,
+      "account",
+      key
+    ], {
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    if (result.status !== 0) {
+      return null;
+    }
+    return result.stdout?.trim() || null;
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] Linux secret-tool get error:", error instanceof Error ? error.message : String(error));
+    }
     return null;
   }
 }
 function setSecretWindows(key, value) {
   try {
     const targetName = `${SERVICE_NAME}:${key}`;
-    try {
-      execSync(`cmdkey /delete:${targetName}`, {
-        encoding: "utf-8",
-        stdio: "pipe"
-      });
-    } catch {}
-    const escapedValue = value.replace(/"/g, '""');
-    execSync(`cmdkey /generic:${targetName} /user:${targetName} /pass:"${escapedValue}"`, {
+    spawnSync("cmdkey", [`/delete:${targetName}`], {
       encoding: "utf-8",
       stdio: "pipe"
     });
-    return true;
-  } catch {
+    const psScript = `
+$targetName = $input | Select-Object -First 1
+$password = $input | Select-Object -Skip 1 -First 1
+
+Add-Type -TypeDefinition @"
+using System;
+using System.Runtime.InteropServices;
+
+public class CredentialManager {
+    [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    public static extern bool CredWrite(ref CREDENTIAL credential, int flags);
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    public struct CREDENTIAL {
+        public int Flags;
+        public int Type;
+        public string TargetName;
+        public string Comment;
+        public long LastWritten;
+        public int CredentialBlobSize;
+        public IntPtr CredentialBlob;
+        public int Persist;
+        public int AttributeCount;
+        public IntPtr Attributes;
+        public string TargetAlias;
+        public string UserName;
+    }
+
+    public static bool SaveCredential(string target, string password) {
+        var passwordBytes = System.Text.Encoding.Unicode.GetBytes(password);
+        var credentialBlob = Marshal.AllocHGlobal(passwordBytes.Length);
+        Marshal.Copy(passwordBytes, 0, credentialBlob, passwordBytes.Length);
+
+        var credential = new CREDENTIAL {
+            Type = 1, // CRED_TYPE_GENERIC
+            TargetName = target,
+            CredentialBlobSize = passwordBytes.Length,
+            CredentialBlob = credentialBlob,
+            Persist = 2, // CRED_PERSIST_LOCAL_MACHINE
+            UserName = target
+        };
+
+        var result = CredWrite(ref credential, 0);
+        Marshal.FreeHGlobal(credentialBlob);
+        return result;
+    }
+}
+"@
+
+[CredentialManager]::SaveCredential($targetName, $password)
+`.trim();
+    const result = spawnSync("powershell", ["-NoProfile", "-Command", psScript], {
+      input: `${targetName}
+${value}`,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    return result.stdout?.trim() === "True";
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] Windows credential set error:", error instanceof Error ? error.message : String(error));
+    }
     return false;
   }
 }
@@ -19739,33 +19847,27 @@ public class CredentialManager {
     });
     const password = result.stdout?.trim();
     return password || null;
-  } catch {
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] Windows credential get error:", error instanceof Error ? error.message : String(error));
+    }
     return null;
   }
 }
 function isSecureStorageAvailable() {
   switch (process.platform) {
-    case "darwin":
-      try {
-        execSync("which security", { encoding: "utf-8", stdio: "pipe" });
-        return true;
-      } catch {
-        return false;
-      }
-    case "linux":
-      try {
-        execSync("which secret-tool", { encoding: "utf-8", stdio: "pipe" });
-        return true;
-      } catch {
-        return false;
-      }
-    case "win32":
-      try {
-        execSync("where cmdkey", { encoding: "utf-8", stdio: "pipe" });
-        return true;
-      } catch {
-        return false;
-      }
+    case "darwin": {
+      const result = spawnSync("which", ["security"], { encoding: "utf-8", stdio: "pipe" });
+      return result.status === 0;
+    }
+    case "linux": {
+      const result = spawnSync("which", ["secret-tool"], { encoding: "utf-8", stdio: "pipe" });
+      return result.status === 0;
+    }
+    case "win32": {
+      const result = spawnSync("where", ["cmdkey"], { encoding: "utf-8", stdio: "pipe" });
+      return result.status === 0;
+    }
     default:
       return false;
   }
@@ -20024,7 +20126,7 @@ var init_safety = __esm(() => {
 });
 
 // src/lib/shell.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 import { existsSync as existsSync5 } from "fs";
 import { homedir as homedir2 } from "os";
 function detectShell() {
@@ -20059,7 +20161,7 @@ function detectWSL() {
   if (process.platform !== "linux")
     return false;
   try {
-    const release = execSync2("uname -r", { encoding: "utf-8" }).toLowerCase();
+    const release = execSync("uname -r", { encoding: "utf-8" }).toLowerCase();
     if (release.includes("microsoft") || release.includes("wsl")) {
       return true;
     }
@@ -20087,7 +20189,7 @@ function getShellPath() {
   if (process.platform !== "win32") {
     try {
       const ppid = process.ppid;
-      const cmdline = execSync2(`ps -p ${ppid} -o comm=`, { encoding: "utf-8" }).trim();
+      const cmdline = execSync(`ps -p ${ppid} -o comm=`, { encoding: "utf-8" }).trim();
       if (cmdline)
         return cmdline;
     } catch {}
@@ -20291,7 +20393,8 @@ function cleanCommand(command) {
   let cleaned = command;
   cleaned = cleaned.replace(/^```[\w]*\n?/gm, "");
   cleaned = cleaned.replace(/\n?```$/gm, "");
-  cleaned = cleaned.replace(/^`+|`+$/g, "");
+  cleaned = cleaned.replace(/^`+/, "");
+  cleaned = cleaned.replace(/`+$/, "");
   cleaned = cleaned.replace(/^(command:|shell:|bash:|zsh:|sh:)\s*/i, "");
   const lines = cleaned.split(`
 `);
@@ -21502,12 +21605,15 @@ function showThemeSelector() {
     themeSelector = null;
   }
   const currentTheme2 = getTheme();
+  const themeContainerWidth = 45;
+  const terminalWidth = process.stdout.columns || 80;
+  const themeContainerLeft = Math.max(2, Math.floor((terminalWidth - themeContainerWidth) / 2));
   const container = new BoxRenderable(renderer, {
     id: "theme-selector-container",
     position: "absolute",
-    left: "center",
+    left: themeContainerLeft,
     top: 4,
-    width: 45,
+    width: themeContainerWidth,
     height: themeNames.length + 4,
     backgroundColor: currentTheme2.colors.backgroundPanel,
     border: true,
@@ -21650,12 +21756,15 @@ function showCommandPalette() {
     return;
   }
   const commands = getCommandPaletteOptions();
+  const paletteWidth = 55;
+  const termWidth = process.stdout.columns || 80;
+  const paletteLeft = Math.max(2, Math.floor((termWidth - paletteWidth) / 2));
   const container = new BoxRenderable(renderer, {
     id: "command-palette-container",
     position: "absolute",
-    left: "center",
+    left: paletteLeft,
     top: 3,
-    width: 55,
+    width: paletteWidth,
     height: Math.min(commands.length + 4, 16),
     backgroundColor: "#1e293b",
     border: true,

package/dist/index.js

@@ -30,7 +30,7 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/lib/keychain.ts
-import { execSync, spawnSync } from "child_process";
+import { spawnSync } from "child_process";
 async function setSecret(key, value) {
   switch (process.platform) {
     case "darwin":
@@ -57,20 +57,57 @@ async function getSecret(key) {
 }
 function setSecretMacOS(key, value) {
   try {
-    try {
-      execSync(`security delete-generic-password -s "${SERVICE_NAME}" -a "${key}" 2>/dev/null`, { encoding: "utf-8" });
-    } catch {}
-    execSync(`security add-generic-password -s "${SERVICE_NAME}" -a "${key}" -w "${value}"`, { encoding: "utf-8" });
-    return true;
-  } catch {
+    spawnSync("security", [
+      "delete-generic-password",
+      "-s",
+      SERVICE_NAME,
+      "-a",
+      key
+    ], {
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    const result = spawnSync("security", [
+      "add-generic-password",
+      "-s",
+      SERVICE_NAME,
+      "-a",
+      key,
+      "-w",
+      value
+    ], {
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    return result.status === 0;
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] macOS keychain set error:", error instanceof Error ? error.message : String(error));
+    }
     return false;
   }
 }
 function getSecretMacOS(key) {
   try {
-    const result = execSync(`security find-generic-password -s "${SERVICE_NAME}" -a "${key}" -w 2>/dev/null`, { encoding: "utf-8" });
-    return result.trim();
-  } catch {
+    const result = spawnSync("security", [
+      "find-generic-password",
+      "-s",
+      SERVICE_NAME,
+      "-a",
+      key,
+      "-w"
+    ], {
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    if (result.status !== 0) {
+      return null;
+    }
+    return result.stdout?.trim() || null;
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] macOS keychain get error:", error instanceof Error ? error.message : String(error));
+    }
     return null;
   }
 }
@@ -89,34 +126,105 @@ function setSecretLinux(key, value) {
       encoding: "utf-8"
     });
     return result.status === 0;
-  } catch {
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] Linux secret-tool set error:", error instanceof Error ? error.message : String(error));
+    }
     return false;
   }
 }
 function getSecretLinux(key) {
   try {
-    const result = execSync(`secret-tool lookup service "${SERVICE_NAME}" account "${key}" 2>/dev/null`, { encoding: "utf-8" });
-    return result.trim() || null;
-  } catch {
+    const result = spawnSync("secret-tool", [
+      "lookup",
+      "service",
+      SERVICE_NAME,
+      "account",
+      key
+    ], {
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    if (result.status !== 0) {
+      return null;
+    }
+    return result.stdout?.trim() || null;
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] Linux secret-tool get error:", error instanceof Error ? error.message : String(error));
+    }
     return null;
   }
 }
 function setSecretWindows(key, value) {
   try {
     const targetName = `${SERVICE_NAME}:${key}`;
-    try {
-      execSync(`cmdkey /delete:${targetName}`, {
-        encoding: "utf-8",
-        stdio: "pipe"
-      });
-    } catch {}
-    const escapedValue = value.replace(/"/g, '""');
-    execSync(`cmdkey /generic:${targetName} /user:${targetName} /pass:"${escapedValue}"`, {
+    spawnSync("cmdkey", [`/delete:${targetName}`], {
       encoding: "utf-8",
       stdio: "pipe"
     });
-    return true;
-  } catch {
+    const psScript = `
+$targetName = $input | Select-Object -First 1
+$password = $input | Select-Object -Skip 1 -First 1
+
+Add-Type -TypeDefinition @"
+using System;
+using System.Runtime.InteropServices;
+
+public class CredentialManager {
+    [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    public static extern bool CredWrite(ref CREDENTIAL credential, int flags);
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    public struct CREDENTIAL {
+        public int Flags;
+        public int Type;
+        public string TargetName;
+        public string Comment;
+        public long LastWritten;
+        public int CredentialBlobSize;
+        public IntPtr CredentialBlob;
+        public int Persist;
+        public int AttributeCount;
+        public IntPtr Attributes;
+        public string TargetAlias;
+        public string UserName;
+    }
+
+    public static bool SaveCredential(string target, string password) {
+        var passwordBytes = System.Text.Encoding.Unicode.GetBytes(password);
+        var credentialBlob = Marshal.AllocHGlobal(passwordBytes.Length);
+        Marshal.Copy(passwordBytes, 0, credentialBlob, passwordBytes.Length);
+
+        var credential = new CREDENTIAL {
+            Type = 1, // CRED_TYPE_GENERIC
+            TargetName = target,
+            CredentialBlobSize = passwordBytes.Length,
+            CredentialBlob = credentialBlob,
+            Persist = 2, // CRED_PERSIST_LOCAL_MACHINE
+            UserName = target
+        };
+
+        var result = CredWrite(ref credential, 0);
+        Marshal.FreeHGlobal(credentialBlob);
+        return result;
+    }
+}
+"@
+
+[CredentialManager]::SaveCredential($targetName, $password)
+`.trim();
+    const result = spawnSync("powershell", ["-NoProfile", "-Command", psScript], {
+      input: `${targetName}
+${value}`,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    return result.stdout?.trim() === "True";
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] Windows credential set error:", error instanceof Error ? error.message : String(error));
+    }
     return false;
   }
 }
@@ -182,33 +290,27 @@ public class CredentialManager {
     });
     const password = result.stdout?.trim();
     return password || null;
-  } catch {
+  } catch (error) {
+    if (process.env.DEBUG_API === "1") {
+      console.error("[DEBUG] Windows credential get error:", error instanceof Error ? error.message : String(error));
+    }
     return null;
   }
 }
 function isSecureStorageAvailable() {
   switch (process.platform) {
-    case "darwin":
-      try {
-        execSync("which security", { encoding: "utf-8", stdio: "pipe" });
-        return true;
-      } catch {
-        return false;
-      }
-    case "linux":
-      try {
-        execSync("which secret-tool", { encoding: "utf-8", stdio: "pipe" });
-        return true;
-      } catch {
-        return false;
-      }
-    case "win32":
-      try {
-        execSync("where cmdkey", { encoding: "utf-8", stdio: "pipe" });
-        return true;
-      } catch {
-        return false;
-      }
+    case "darwin": {
+      const result = spawnSync("which", ["security"], { encoding: "utf-8", stdio: "pipe" });
+      return result.status === 0;
+    }
+    case "linux": {
+      const result = spawnSync("which", ["secret-tool"], { encoding: "utf-8", stdio: "pipe" });
+      return result.status === 0;
+    }
+    case "win32": {
+      const result = spawnSync("where", ["cmdkey"], { encoding: "utf-8", stdio: "pipe" });
+      return result.status === 0;
+    }
     default:
       return false;
   }
@@ -217,7 +319,7 @@ var SERVICE_NAME = "magic-shell";
 var init_keychain = () => {};
 
 // src/lib/shell.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 import { existsSync as existsSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 function detectShell() {
@@ -252,7 +354,7 @@ function detectWSL() {
   if (process.platform !== "linux")
     return false;
   try {
-    const release = execSync2("uname -r", { encoding: "utf-8" }).toLowerCase();
+    const release = execSync("uname -r", { encoding: "utf-8" }).toLowerCase();
     if (release.includes("microsoft") || release.includes("wsl")) {
       return true;
     }
@@ -280,7 +382,7 @@ function getShellPath() {
   if (process.platform !== "win32") {
     try {
       const ppid = process.ppid;
-      const cmdline = execSync2(`ps -p ${ppid} -o comm=`, { encoding: "utf-8" }).trim();
+      const cmdline = execSync(`ps -p ${ppid} -o comm=`, { encoding: "utf-8" }).trim();
       if (cmdline)
         return cmdline;
     } catch {}
@@ -20292,7 +20394,8 @@ function cleanCommand2(command) {
   let cleaned = command;
   cleaned = cleaned.replace(/^```[\w]*\n?/gm, "");
   cleaned = cleaned.replace(/\n?```$/gm, "");
-  cleaned = cleaned.replace(/^`+|`+$/g, "");
+  cleaned = cleaned.replace(/^`+/, "");
+  cleaned = cleaned.replace(/`+$/, "");
   cleaned = cleaned.replace(/^(command:|shell:|bash:|zsh:|sh:)\s*/i, "");
   const lines = cleaned.split(`
 `);
@@ -21479,12 +21582,15 @@ function showThemeSelector() {
     themeSelector = null;
   }
   const currentTheme3 = getTheme2();
+  const themeContainerWidth = 45;
+  const terminalWidth = process.stdout.columns || 80;
+  const themeContainerLeft = Math.max(2, Math.floor((terminalWidth - themeContainerWidth) / 2));
   const container = new BoxRenderable(renderer, {
     id: "theme-selector-container",
     position: "absolute",
-    left: "center",
+    left: themeContainerLeft,
     top: 4,
-    width: 45,
+    width: themeContainerWidth,
     height: themeNames2.length + 4,
     backgroundColor: currentTheme3.colors.backgroundPanel,
     border: true,
@@ -21625,12 +21731,15 @@ function showCommandPalette() {
     return;
   }
   const commands = getCommandPaletteOptions();
+  const paletteWidth = 55;
+  const termWidth = process.stdout.columns || 80;
+  const paletteLeft = Math.max(2, Math.floor((termWidth - paletteWidth) / 2));
   const container = new BoxRenderable(renderer, {
     id: "command-palette-container",
     position: "absolute",
-    left: "center",
+    left: paletteLeft,
     top: 3,
-    width: 55,
+    width: paletteWidth,
     height: Math.min(commands.length + 4, 16),
     backgroundColor: "#1e293b",
     border: true,
@@ -22352,7 +22461,8 @@ function cleanCommand(command) {
   let cleaned = command;
   cleaned = cleaned.replace(/^```[\w]*\n?/gm, "");
   cleaned = cleaned.replace(/\n?```$/gm, "");
-  cleaned = cleaned.replace(/^`+|`+$/g, "");
+  cleaned = cleaned.replace(/^`+/, "");
+  cleaned = cleaned.replace(/`+$/, "");
   cleaned = cleaned.replace(/^(command:|shell:|bash:|zsh:|sh:)\s*/i, "");
   const lines = cleaned.split(`
 `);
@@ -22933,6 +23043,27 @@ ${colors.bold}OpenRouter Models${colors.reset}
   }
   console.log();
 }
+function validateApiKey(key, provider) {
+  const trimmed = key.trim();
+  if (trimmed.length === 0) {
+    return "API key cannot be empty";
+  }
+  if (trimmed.length < 20) {
+    return "API key seems too short (expected at least 20 characters)";
+  }
+  if (!trimmed.startsWith("sk-")) {
+    const providerName = provider === "opencode-zen" ? "OpenCode Zen" : "OpenRouter";
+    return `${providerName} API keys typically start with 'sk-'`;
+  }
+  if (trimmed.includes(" ")) {
+    return "API key contains spaces - check for copy-paste errors";
+  }
+  if (trimmed.includes(`
+`) || trimmed.includes("\r")) {
+    return "API key contains newlines - check for copy-paste errors";
+  }
+  return null;
+}
 async function setup() {
   const readline = await import("readline");
   const rl = readline.createInterface({
@@ -22963,24 +23094,49 @@ API key already configured. Keep it? [Y/n]: `);
       const url = provider === "opencode-zen" ? "https://opencode.ai/auth" : "https://openrouter.ai/keys";
       console.log(`
 Get your API key from: ${colors.cyan}${url}${colors.reset}`);
-      const newKey = await question("Enter API key: ");
-      if (newKey.trim()) {
+      let validKey = false;
+      while (!validKey) {
+        const newKey = await question("Enter API key: ");
+        if (!newKey.trim()) {
+          console.log(`${colors.yellow}Keeping existing API key${colors.reset}`);
+          break;
+        }
+        const validationError = validateApiKey(newKey, provider);
+        if (validationError) {
+          console.log(`${colors.yellow}Warning: ${validationError}${colors.reset}`);
+          const proceed = await question("Continue anyway? [y/N]: ");
+          if (proceed.toLowerCase() !== "y") {
+            continue;
+          }
+        }
         await setApiKey(provider, newKey.trim());
         console.log(`${colors.green}\u2713 API key saved${colors.reset}`);
+        validKey = true;
       }
     }
   } else {
     const url = provider === "opencode-zen" ? "https://opencode.ai/auth" : "https://openrouter.ai/keys";
     console.log(`
 Get your API key from: ${colors.cyan}${url}${colors.reset}`);
-    const newKey = await question("Enter API key: ");
-    if (newKey.trim()) {
+    let validKey = false;
+    while (!validKey) {
+      const newKey = await question("Enter API key: ");
+      if (!newKey.trim()) {
+        console.log(`${colors.red}No API key provided. Exiting.${colors.reset}`);
+        rl.close();
+        process.exit(1);
+      }
+      const validationError = validateApiKey(newKey, provider);
+      if (validationError) {
+        console.log(`${colors.yellow}Warning: ${validationError}${colors.reset}`);
+        const proceed = await question("Continue anyway? [y/N]: ");
+        if (proceed.toLowerCase() !== "y") {
+          continue;
+        }
+      }
       await setApiKey(provider, newKey.trim());
       console.log(`${colors.green}\u2713 API key saved${colors.reset}`);
-    } else {
-      console.log(`${colors.red}No API key provided. Exiting.${colors.reset}`);
-      rl.close();
-      process.exit(1);
+      validKey = true;
     }
   }
   const models = provider === "opencode-zen" ? OPENCODE_ZEN_MODELS : OPENROUTER_MODELS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@austinthesing/magic-shell",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Natural language to terminal commands with safety features. Supports OpenCode Zen (with free models) and OpenRouter.",
   "type": "module",
   "main": "dist/index.js",