lemonade-interactive-loader 1.0.1 → 1.0.3

package/README.md

@@ -73,7 +73,7 @@ The main menu adapts based on whether you have a configuration saved:
 ```
 
 | Command | Description |
-|---------|-------------||
+|---------|-------------|
 | **▶️ Start Server** | Launch Lemonade Server with saved config (when config exists) |
 | **✏️ Edit Configuration** | Update your saved settings interactively |
 | **👁️ View Configuration** | See your current configuration and installed builds |
@@ -169,7 +169,7 @@ Point Lemonade Server to your existing model directory (like LM Studio's):
 
 Configuration is automatically saved and loaded:
 
-- **Location**: `~/.lemonade-launcher/config.json` (Linux/macOS) or `%USERPROFILE%\.lemonade-launcher\config.json` (Windows)
+- **Location**: `~/.lemonade-interactive-launcher/config.json` (Linux/macOS) or `%USERPROFILE%\.lemonade-interactive-launcher\config.json` (Windows)
 - **Format**: JSON
 - **Auto-saved**: After every setup or edit
 
@@ -250,7 +250,7 @@ Run Command Prompt or PowerShell as Administrator.
 
 #### Build download fails
 - Check your internet connection
-- Ensure you have write permissions to `~/.lemonade-launcher/`
+- Ensure you have write permissions to `~/.lemonade-interactive-launcher/`
 - Try downloading the asset manually from GitHub
 
 #### Server won't start

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lemonade-interactive-loader",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Interactive CLI tool to launch Lemonade Server with custom arguments and download llama.cpp releases - Cross-platform (Windows/Linux)",
   "main": "index.js",
   "bin": {

package/src/cli/menu.js

@@ -3,7 +3,7 @@ const { loadConfig } = require('../config');
 const { getAllInstalledAssets, getLlamaServerPath, downloadAndExtractLlamaCpp, deleteInstalledAsset } = require('../services/asset-manager');
 const { selectLlamaCppRelease, selectAsset, askLaunchServer } = require('./prompts');
 const { runSetupWizard } = require('./setup-wizard');
-const { launchLemonadeServer } = require('../services/server');
+const { launchLemonadeServer, setupShutdownHandlers } = require('../services/server');
 const { inferBackendType, formatBytes } = require('../utils/system');
 
 /**
@@ -263,15 +263,20 @@ async function resetConfiguration() {
 /**
  * Handle main menu command
  * @param {string} command - Selected command
+ * @returns {Promise<boolean>} True if should exit the app
  */
 async function handleCommand(command) {
+  let shouldExit = false;
+  
   switch (command) {
     case 'setup':
       await runSetupWizard(false);
       if (await askLaunchServer()) {
         const config = loadConfig();
         if (Object.keys(config).length > 0) {
+          setupShutdownHandlers();
           await launchLemonadeServer(config);
+          shouldExit = true;
         }
       }
       break;
@@ -281,7 +286,9 @@ async function handleCommand(command) {
       if (await askLaunchServer()) {
         const config = loadConfig();
         if (Object.keys(config).length > 0) {
+          setupShutdownHandlers();
           await launchLemonadeServer(config);
+          shouldExit = true;
         }
       }
       break;
@@ -294,7 +301,7 @@ async function handleCommand(command) {
       await resetConfiguration();
       break;
       
-
+    
       
     case 'manage':
       let manageAction;
@@ -319,11 +326,17 @@ async function handleCommand(command) {
       const config = loadConfig();
       if (Object.keys(config).length === 0) {
         console.log('No configuration found. Please run "setup" first.');
-        return;
+        return false;
       }
+      // Set up shutdown handlers to kill server on exit
+      setupShutdownHandlers();
       await launchLemonadeServer(config);
+      // After server exits, exit the app completely
+      shouldExit = true;
       break;
   }
+  
+  return shouldExit;
 }
 
 /**
@@ -334,7 +347,12 @@ async function runCLI() {
   
   while (continueRunning) {
     const command = await showMainMenu();
-    await handleCommand(command);
+    const shouldExit = await handleCommand(command);
+    
+    // Exit the app if we just exited from the server
+    if (shouldExit) {
+      return;
+    }
     
     const { continueRunning: shouldContinue } = await inquirer.prompt([
       {
@@ -349,6 +367,10 @@ async function runCLI() {
   }
   
   console.log('\n👋 Goodbye!\n');
+  
+  // Ensure server is shut down when exiting the CLI
+  const { shutdownLemonadeServer } = require('../services/server');
+  shutdownLemonadeServer();
 }
 
 module.exports = {

package/src/cli/setup-wizard.js

@@ -63,7 +63,7 @@ async function runSetupWizard(isEdit = false) {
       type: 'confirm',
       name: 'useCustomModelDir',
       message: 'Is there another model directory to use? (example: LM Studio)',
-      default: false
+      default: hasExistingModelDir
     }
   ]);
   

package/src/config/constants.js

@@ -2,14 +2,14 @@ const path = require('path');
 const os = require('os');
 
 // Configuration directories
-const USER_CONFIG_DIR = path.join(os.homedir(), '.lemonade-launcher');
+const USER_CONFIG_DIR = path.join(os.homedir(), '.lemonade-interactive-launcher');
 const USER_CONFIG_FILE = path.join(USER_CONFIG_DIR, 'config.json');
-const DEFAULT_LLAMACPP_INSTALL_DIR = path.join(os.homedir(), '.lemonade-launcher', 'llama-cpp');
+const DEFAULT_LLAMACPP_INSTALL_DIR = path.join(os.homedir(), '.lemonade-interactive-launcher', 'llama-cpp');
 
 // GitHub API
 const GITHUB_RELEASES_URL = 'https://api.github.com/repos/ggml-org/llama.cpp/releases';
 const GITHUB_API_HEADERS = {
-  'User-Agent': 'lemonade-launcher',
+  'User-Agent': 'lemonade-interactive-launcher',
   'Accept': 'application/vnd.github.v3+json'
 };
 

package/src/services/download.js

@@ -20,7 +20,7 @@ function downloadFile(url, outputPath) {
     
     const file = fs.createWriteStream(outputPath);
     
-    const req = protocol.get(url, { headers: { 'User-Agent': 'lemonade-launcher' } }, (res) => {
+    const req = protocol.get(url, { headers: { 'User-Agent': 'lemonade-interactive-launcher' } }, (res) => {
       if (res.statusCode === 302 || res.statusCode === 301) {
         downloadFile(res.headers.location, outputPath)
           .then(resolve)

package/src/services/server.js

@@ -1,9 +1,12 @@
 const fs = require('fs');
-const { execSync } = require('child_process');
+const { execSync, spawn } = require('child_process');
 const { LEMONADE_SERVER_DEFAULT_PATH } = require('../config/constants');
 const { findLlamaServer } = require('../utils/system');
 const { getLlamaServerPath } = require('./asset-manager');
 
+// Track the server process for graceful shutdown
+let serverProcess = null;
+
 /**
  * Build server command arguments
  * @param {Object} config - Server configuration
@@ -154,21 +157,90 @@ async function launchLemonadeServer(config) {
   console.log('\nStarting server...\n');
   
   try {
-    const command = formatCommand(serverPath, args, {});
-    execSync(command, {
+    // Build the command for spawning
+    const commandStr = formatCommand(serverPath, args, {});
+    
+    // Parse the command into executable and arguments
+    const parts = commandStr.trim().split(/\s+/);
+    const executable = parts[0];
+    const execArgs = parts.slice(1);
+    
+    console.log(`Spawning: ${executable} ${execArgs.join(' ')}`);
+    
+    // Spawn the server process
+    serverProcess = spawn(executable, execArgs, {
       stdio: 'inherit',
       env: process.env
     });
+    
+    // Wait for the process to exit (blocking)
+    await new Promise((resolve, reject) => {
+      serverProcess.on('close', (code) => {
+        console.log(`\nServer exited with code ${code}`);
+        serverProcess = null;
+        resolve(code);
+      });
+      
+      serverProcess.on('error', (err) => {
+        console.error(`Server process error: ${err.message}`);
+        serverProcess = null;
+        reject(err);
+      });
+    });
+    
   } catch (error) {
-    console.error(`Server exited with error code: ${error.status}`);
+    console.error(`Server exited with error: ${error.message}`);
     if (error.status !== null) {
       process.exit(error.status);
     }
   }
 }
 
+/**
+ * Gracefully shutdown the lemonade server
+ */
+function shutdownLemonadeServer() {
+  if (serverProcess) {
+    console.log('\n\nShutting down Lemonade Server...');
+    
+    // Try graceful shutdown first (SIGTERM)
+    serverProcess.on('exit', () => {
+      console.log('Server shut down successfully.');
+    });
+    
+    serverProcess.on('error', (err) => {
+      console.error(`Error shutting down server: ${err.message}`);
+    });
+    
+    // Send SIGTERM signal
+    serverProcess.kill('SIGTERM');
+    
+    // Force kill after 5 seconds if still running
+    setTimeout(() => {
+      if (serverProcess && !serverProcess.killed) {
+        console.log('Force killing server...');
+        serverProcess.kill('SIGKILL');
+      }
+    }, 5000);
+  }
+}
+
+// Set up signal handlers for graceful shutdown
+function setupShutdownHandlers() {
+  const shutdown = (signal) => {
+    console.log(`\n\nReceived ${signal}. Shutting down...`);
+    shutdownLemonadeServer();
+    setTimeout(() => process.exit(0), 2000);
+  };
+  
+  process.on('SIGINT', () => shutdown('SIGINT')); // Ctrl+C
+  process.on('SIGTERM', () => shutdown('SIGTERM')); // Termination signal
+}
+
 module.exports = {
   buildServerArgs,
   formatCommand,
-  launchLemonadeServer
+  launchLemonadeServer,
+  shutdownLemonadeServer,
+  setupShutdownHandlers
 };