@austinthesing/magic-shell 0.2.4 → 0.2.7

package/README.md

@@ -176,7 +176,7 @@ OpenCode Zen provides curated models optimized for coding tasks, including **fre
 **Free Models:**
 - `big-pickle` - Stealth model (default)
 - `grok-code` - xAI's Grok Code Fast 1
-- `glm-4.7-free` - GLM 4.7
+- `glm-4.7` - GLM 4.7
 - `minimax-m2.1-free` - MiniMax M2.1
 
 **Premium Models:**

package/dist/cli.js

@@ -20569,13 +20569,12 @@ var OPENCODE_ZEN_MODELS = [
     free: true
   },
   {
-    id: "glm-4.7-free",
+    id: "glm-4.7",
     name: "GLM 4.7",
-    description: "Free GLM model (limited time)",
+    description: "GLM model",
     category: "fast",
     provider: "opencode-zen",
-    contextLength: 128000,
-    free: true
+    contextLength: 128000
   },
   {
     id: "minimax-m2.1-free",
@@ -22377,21 +22376,23 @@ function createMainUI() {
 function getStatusBarContent() {
   const theme = getTheme();
   const providerName = config.provider === "opencode-zen" ? "OpenCode Zen" : "OpenRouter";
-  const safeModeIndicator = dryRunMode ? fg(theme.colors.warning)("[DRY RUN]") : fg(theme.colors.success)("Safe");
+  const safeModeIndicator = dryRunMode ? fg(theme.colors.warning)("[DRY RUN]") : "";
+  const safetyLevelColor = config.safetyLevel === "strict" ? theme.colors.warning : config.safetyLevel === "relaxed" ? theme.colors.error : theme.colors.success;
+  const safetyIndicator = fg(safetyLevelColor)(`[${config.safetyLevel}]`);
   const repoContextIndicator = config.repoContext ? fg(theme.colors.info)("[Repo]") : "";
-  return t`${fg(theme.colors.textMuted)("Provider:")} ${fg(theme.colors.text)(providerName)}  ${fg(theme.colors.textMuted)("Model:")} ${fg(theme.colors.text)(currentModel.name)}  ${safeModeIndicator}${repoContextIndicator ? " " : ""}${repoContextIndicator}`;
+  return t`${fg(theme.colors.textMuted)("Provider:")} ${fg(theme.colors.text)(providerName)}  ${fg(theme.colors.textMuted)("Model:")} ${fg(theme.colors.text)(currentModel.name)}  ${safetyIndicator}${safeModeIndicator ? " " : ""}${safeModeIndicator}${repoContextIndicator ? " " : ""}${repoContextIndicator}`;
 }
 function getHelpBarContent() {
   const theme = getTheme();
   if (awaitingConfirmation) {
     return t`${fg(theme.colors.warning)(">>> Press Enter to execute command <<<")} ${fg(theme.colors.textMuted)("|")} ${fg(theme.colors.error)("Esc")}${fg(theme.colors.textMuted)(" Cancel")} ${fg(theme.colors.primary)("e")}${fg(theme.colors.textMuted)(" Edit")} ${fg(theme.colors.primary)("c")}${fg(theme.colors.textMuted)(" Copy")}`;
   }
-  return t`${fg(theme.colors.textMuted)("Ctrl+X")} ${fg(theme.colors.primary)("P")}${fg(theme.colors.textMuted)(" Palette")}  ${fg(theme.colors.primary)("M")}${fg(theme.colors.textMuted)(" Model")}  ${fg(theme.colors.primary)("T")}${fg(theme.colors.textMuted)(" Theme")}  ${fg(theme.colors.primary)("D")}${fg(theme.colors.textMuted)(" Dry-run")}  ${fg(theme.colors.primary)("?")}${fg(theme.colors.textMuted)(" Help")}`;
+  return t`${fg(theme.colors.primary)("Ctrl+X P")}${fg(theme.colors.textMuted)(" Commands")}  ${fg(theme.colors.primary)("Ctrl+Y")}${fg(theme.colors.textMuted)(" Safety")}  ${fg(theme.colors.primary)("Ctrl+Z")}${fg(theme.colors.textMuted)(" Exit")}`;
 }
 function getWelcomeMessage() {
   const providerName = config.provider === "opencode-zen" ? "OpenCode Zen" : "OpenRouter";
   const freeNote = config.provider === "opencode-zen" ? `
-Free models: big-pickle, glm-4.7-free` : "";
+Free models: big-pickle` : "";
   return `Ready. Using ${providerName}.${freeNote}
 Type what you want to do, or press Ctrl+X P for command palette.`;
 }
@@ -22851,16 +22852,22 @@ function clearChat() {
   addSystemMessage(getWelcomeMessage());
 }
 function showHelp() {
-  const helpText = `Keyboard Shortcuts (Ctrl+X then...):
+  const helpText = `Direct Shortcuts:
+Ctrl+Y  Cycle safety level (strict/moderate/relaxed)
+Ctrl+Z  Exit magic-shell
+Ctrl+C  Cancel / Close popup
+
+Chord Shortcuts (Ctrl+X then...):
 P  Command palette    M  Change model
 S  Switch provider    D  Toggle dry-run
 T  Change theme       R  Toggle repo context
 H  Show history       L  Clear chat
 C  Show config        ?  This help
-Q  Exit
 
-Other:
-Ctrl+C  Exit / Cancel     Esc  Close palette
+Safety Levels:
+- strict:   Confirm ALL potentially dangerous commands
+- moderate: Confirm high/critical severity commands (default)
+- relaxed:  Only confirm critical commands
 
 Tips:
 - Type naturally: "list all files" -> ls -la
@@ -23149,6 +23156,26 @@ function getCommandPaletteOptions() {
         addSystemMessage(`Dry-run mode: ${dryRunMode ? "ON" : "OFF"}`);
       }
     },
+    {
+      name: "Cycle Safety Level",
+      description: `Current: ${config.safetyLevel}`,
+      key: "y",
+      chord: "y",
+      action: () => {
+        const levels = ["moderate", "strict", "relaxed"];
+        const currentIndex = levels.indexOf(config.safetyLevel);
+        const nextIndex = (currentIndex + 1) % levels.length;
+        config.safetyLevel = levels[nextIndex];
+        saveConfig(config);
+        statusBarText.content = getStatusBarContent();
+        const descriptions = {
+          strict: "confirms ALL potentially dangerous commands",
+          moderate: "confirms high/critical severity commands",
+          relaxed: "only confirms critical commands"
+        };
+        addSystemMessage(`Safety level: ${config.safetyLevel} (${descriptions[config.safetyLevel]})`);
+      }
+    },
     {
       name: "Toggle Project Context",
       description: config.repoContext ? "Currently ON (sends script names to AI)" : "Currently OFF",
@@ -23271,6 +23298,25 @@ function closeCommandPalette() {
 }
 function handleKeypress(key) {
   const commands = getCommandPaletteOptions();
+  if (key.ctrl && key.name === "y") {
+    const levels = ["moderate", "strict", "relaxed"];
+    const currentIndex = levels.indexOf(config.safetyLevel);
+    const nextIndex = (currentIndex + 1) % levels.length;
+    config.safetyLevel = levels[nextIndex];
+    saveConfig(config);
+    statusBarText.content = getStatusBarContent();
+    const descriptions = {
+      strict: "confirms ALL potentially dangerous commands",
+      moderate: "confirms high/critical severity commands",
+      relaxed: "only confirms critical commands"
+    };
+    addSystemMessage(`Safety level: ${config.safetyLevel} (${descriptions[config.safetyLevel]})`);
+    return;
+  }
+  if (key.ctrl && key.name === "z") {
+    renderer.destroy();
+    process.exit(0);
+  }
   if (key.ctrl && key.name === "x") {
     chordMode = "ctrl-x";
     return;
@@ -23309,12 +23355,24 @@ function handleKeypress(key) {
       inputField.focus();
       return;
     }
+    if (themeSelector) {
+      renderer.root.remove("theme-selector-container");
+      themeSelector = null;
+      inputField.focus();
+      return;
+    }
+    if (awaitingConfirmation && pendingMessageId) {
+      clearCommandState();
+      addSystemMessage("Command cancelled.");
+      inputField.focus();
+      return;
+    }
     if (providerSelector) {
       renderer.destroy();
       process.exit(0);
     }
-    renderer.destroy();
-    process.exit(0);
+    addSystemMessage("Press Ctrl+Z to exit.");
+    return;
   }
   if (key.name === "escape") {
     chordMode = "none";

package/dist/index.js

@@ -112,13 +112,12 @@ var OPENCODE_ZEN_MODELS = [
     free: true
   },
   {
-    id: "glm-4.7-free",
+    id: "glm-4.7",
     name: "GLM 4.7",
-    description: "Free GLM model (limited time)",
+    description: "GLM model",
     category: "fast",
     provider: "opencode-zen",
-    contextLength: 128000,
-    free: true
+    contextLength: 128000
   },
   {
     id: "minimax-m2.1-free",
@@ -1899,6 +1898,7 @@ ${colors.bold}USAGE${colors.reset}
   msh --theme <name>       Set color theme
   msh --repo-context       Enable project context detection
   msh --no-repo-context    Disable project context detection
+  msh --safety <level>     Set safety level (strict, moderate, relaxed)
   msh --version            Show version
   msh --check-update       Check for updates
   msh --help               Show this help
@@ -2332,6 +2332,22 @@ ${colors.bold}Available Themes${colors.reset}
     console.log(`${colors.success}\u2713 Project context disabled${colors.reset}`);
     return;
   }
+  if (args[0] === "--safety" && args[1]) {
+    const level = args[1].toLowerCase();
+    if (level !== "strict" && level !== "moderate" && level !== "relaxed") {
+      console.error(`${colors.error}Unknown safety level: ${level}${colors.reset}`);
+      console.error(`Valid levels: strict, moderate, relaxed`);
+      console.error(`  strict   - Confirm all potentially dangerous commands`);
+      console.error(`  moderate - Confirm high/critical severity commands (default)`);
+      console.error(`  relaxed  - Only confirm critical commands`);
+      process.exit(1);
+    }
+    const config = loadConfig();
+    config.safetyLevel = level;
+    saveConfig(config);
+    console.log(`${colors.success}\u2713 Safety level set to ${level}${colors.reset}`);
+    return;
+  }
   let execute = false;
   let dryRun = false;
   let repoContext = undefined;

package/dist/tui.js

@@ -20569,13 +20569,12 @@ var OPENCODE_ZEN_MODELS = [
     free: true
   },
   {
-    id: "glm-4.7-free",
+    id: "glm-4.7",
     name: "GLM 4.7",
-    description: "Free GLM model (limited time)",
+    description: "GLM model",
     category: "fast",
     provider: "opencode-zen",
-    contextLength: 128000,
-    free: true
+    contextLength: 128000
   },
   {
     id: "minimax-m2.1-free",
@@ -22377,21 +22376,23 @@ function createMainUI() {
 function getStatusBarContent() {
   const theme = getTheme();
   const providerName = config.provider === "opencode-zen" ? "OpenCode Zen" : "OpenRouter";
-  const safeModeIndicator = dryRunMode ? fg(theme.colors.warning)("[DRY RUN]") : fg(theme.colors.success)("Safe");
+  const safeModeIndicator = dryRunMode ? fg(theme.colors.warning)("[DRY RUN]") : "";
+  const safetyLevelColor = config.safetyLevel === "strict" ? theme.colors.warning : config.safetyLevel === "relaxed" ? theme.colors.error : theme.colors.success;
+  const safetyIndicator = fg(safetyLevelColor)(`[${config.safetyLevel}]`);
   const repoContextIndicator = config.repoContext ? fg(theme.colors.info)("[Repo]") : "";
-  return t`${fg(theme.colors.textMuted)("Provider:")} ${fg(theme.colors.text)(providerName)}  ${fg(theme.colors.textMuted)("Model:")} ${fg(theme.colors.text)(currentModel.name)}  ${safeModeIndicator}${repoContextIndicator ? " " : ""}${repoContextIndicator}`;
+  return t`${fg(theme.colors.textMuted)("Provider:")} ${fg(theme.colors.text)(providerName)}  ${fg(theme.colors.textMuted)("Model:")} ${fg(theme.colors.text)(currentModel.name)}  ${safetyIndicator}${safeModeIndicator ? " " : ""}${safeModeIndicator}${repoContextIndicator ? " " : ""}${repoContextIndicator}`;
 }
 function getHelpBarContent() {
   const theme = getTheme();
   if (awaitingConfirmation) {
     return t`${fg(theme.colors.warning)(">>> Press Enter to execute command <<<")} ${fg(theme.colors.textMuted)("|")} ${fg(theme.colors.error)("Esc")}${fg(theme.colors.textMuted)(" Cancel")} ${fg(theme.colors.primary)("e")}${fg(theme.colors.textMuted)(" Edit")} ${fg(theme.colors.primary)("c")}${fg(theme.colors.textMuted)(" Copy")}`;
   }
-  return t`${fg(theme.colors.textMuted)("Ctrl+X")} ${fg(theme.colors.primary)("P")}${fg(theme.colors.textMuted)(" Palette")}  ${fg(theme.colors.primary)("M")}${fg(theme.colors.textMuted)(" Model")}  ${fg(theme.colors.primary)("T")}${fg(theme.colors.textMuted)(" Theme")}  ${fg(theme.colors.primary)("D")}${fg(theme.colors.textMuted)(" Dry-run")}  ${fg(theme.colors.primary)("?")}${fg(theme.colors.textMuted)(" Help")}`;
+  return t`${fg(theme.colors.primary)("Ctrl+X P")}${fg(theme.colors.textMuted)(" Commands")}  ${fg(theme.colors.primary)("Ctrl+Y")}${fg(theme.colors.textMuted)(" Safety")}  ${fg(theme.colors.primary)("Ctrl+Z")}${fg(theme.colors.textMuted)(" Exit")}`;
 }
 function getWelcomeMessage() {
   const providerName = config.provider === "opencode-zen" ? "OpenCode Zen" : "OpenRouter";
   const freeNote = config.provider === "opencode-zen" ? `
-Free models: big-pickle, glm-4.7-free` : "";
+Free models: big-pickle` : "";
   return `Ready. Using ${providerName}.${freeNote}
 Type what you want to do, or press Ctrl+X P for command palette.`;
 }
@@ -22851,16 +22852,22 @@ function clearChat() {
   addSystemMessage(getWelcomeMessage());
 }
 function showHelp() {
-  const helpText = `Keyboard Shortcuts (Ctrl+X then...):
+  const helpText = `Direct Shortcuts:
+Ctrl+Y  Cycle safety level (strict/moderate/relaxed)
+Ctrl+Z  Exit magic-shell
+Ctrl+C  Cancel / Close popup
+
+Chord Shortcuts (Ctrl+X then...):
 P  Command palette    M  Change model
 S  Switch provider    D  Toggle dry-run
 T  Change theme       R  Toggle repo context
 H  Show history       L  Clear chat
 C  Show config        ?  This help
-Q  Exit
 
-Other:
-Ctrl+C  Exit / Cancel     Esc  Close palette
+Safety Levels:
+- strict:   Confirm ALL potentially dangerous commands
+- moderate: Confirm high/critical severity commands (default)
+- relaxed:  Only confirm critical commands
 
 Tips:
 - Type naturally: "list all files" -> ls -la
@@ -23149,6 +23156,26 @@ function getCommandPaletteOptions() {
         addSystemMessage(`Dry-run mode: ${dryRunMode ? "ON" : "OFF"}`);
       }
     },
+    {
+      name: "Cycle Safety Level",
+      description: `Current: ${config.safetyLevel}`,
+      key: "y",
+      chord: "y",
+      action: () => {
+        const levels = ["moderate", "strict", "relaxed"];
+        const currentIndex = levels.indexOf(config.safetyLevel);
+        const nextIndex = (currentIndex + 1) % levels.length;
+        config.safetyLevel = levels[nextIndex];
+        saveConfig(config);
+        statusBarText.content = getStatusBarContent();
+        const descriptions = {
+          strict: "confirms ALL potentially dangerous commands",
+          moderate: "confirms high/critical severity commands",
+          relaxed: "only confirms critical commands"
+        };
+        addSystemMessage(`Safety level: ${config.safetyLevel} (${descriptions[config.safetyLevel]})`);
+      }
+    },
     {
       name: "Toggle Project Context",
       description: config.repoContext ? "Currently ON (sends script names to AI)" : "Currently OFF",
@@ -23271,6 +23298,25 @@ function closeCommandPalette() {
 }
 function handleKeypress(key) {
   const commands = getCommandPaletteOptions();
+  if (key.ctrl && key.name === "y") {
+    const levels = ["moderate", "strict", "relaxed"];
+    const currentIndex = levels.indexOf(config.safetyLevel);
+    const nextIndex = (currentIndex + 1) % levels.length;
+    config.safetyLevel = levels[nextIndex];
+    saveConfig(config);
+    statusBarText.content = getStatusBarContent();
+    const descriptions = {
+      strict: "confirms ALL potentially dangerous commands",
+      moderate: "confirms high/critical severity commands",
+      relaxed: "only confirms critical commands"
+    };
+    addSystemMessage(`Safety level: ${config.safetyLevel} (${descriptions[config.safetyLevel]})`);
+    return;
+  }
+  if (key.ctrl && key.name === "z") {
+    renderer.destroy();
+    process.exit(0);
+  }
   if (key.ctrl && key.name === "x") {
     chordMode = "ctrl-x";
     return;
@@ -23309,12 +23355,24 @@ function handleKeypress(key) {
       inputField.focus();
       return;
     }
+    if (themeSelector) {
+      renderer.root.remove("theme-selector-container");
+      themeSelector = null;
+      inputField.focus();
+      return;
+    }
+    if (awaitingConfirmation && pendingMessageId) {
+      clearCommandState();
+      addSystemMessage("Command cancelled.");
+      inputField.focus();
+      return;
+    }
     if (providerSelector) {
       renderer.destroy();
       process.exit(0);
     }
-    renderer.destroy();
-    process.exit(0);
+    addSystemMessage("Press Ctrl+Z to exit.");
+    return;
   }
   if (key.name === "escape") {
     chordMode = "none";

package/package.json

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