chore: add VERSION v0.4.1

.github/release-drafter.yml

@@ -7,9 +7,6 @@ exclude-labels:
   - automated
 
 categories:
-  - title: "Breaking Changes"
-    labels:
-      - breaking
   - title: "🚀 Features"
     labels:
       - feature

.gitignore

@@ -16,9 +16,6 @@
 db.sqlite
 data/settings.db
 
-# ssh keys (sensitive)
-data/ssh-keys/
-
 # next.js
 /.next/
 /out/
@@ -49,5 +46,4 @@ yarn-error.log*
 *.tsbuildinfo
 
 # idea files
-.idea
-/generated/prisma
+.idea

README.md

@@ -210,249 +210,6 @@ The application uses SQLite for storing server configurations:
 - **Backup**: Copy `data/settings.db` to backup your server configurations
 - **Reset**: Delete `data/settings.db` to reset all server configurations
 
-## 📖 Feature Guide
-
-This section provides detailed information about the application's key features and how to use them effectively.
-
-### Server Settings
-
-Manage your Proxmox VE servers and configure connection settings.
-
-**Adding PVE Servers:**
-- **Server Name**: A friendly name to identify your server
-- **IP Address**: The IP address or hostname of your PVE server
-- **Username**: PVE user account (usually root or a dedicated user)
-- **SSH Port**: Default is 22, change if your server uses a different port
-
-**Authentication Types:**
-- **Password**: Use username and password authentication
-- **SSH Key**: Use SSH key pair for secure authentication
-- **Both**: Try SSH key first, fallback to password if needed
-
-**Server Color Coding:**
-Assign colors to servers for visual distinction throughout the application. This helps identify which server you're working with when managing scripts. This needs to be enabled in the General Settings.
-
-### General Settings
-
-Configure application preferences and behavior.
-
-**Save Filters:**
-When enabled, your script filter preferences (search terms, categories, sorting) will be automatically saved and restored when you return to the application:
-- Search queries are preserved
-- Selected script types are remembered
-- Sort preferences are maintained
-- Category selections are saved
-
-**Server Color Coding:**
-Enable visual color coding for servers throughout the application. This makes it easier to identify which server you're working with.
-
-**GitHub Integration:**
-Add a GitHub Personal Access Token to increase API rate limits and improve performance:
-- Bypasses GitHub's rate limiting for unauthenticated requests
-- Improves script loading and syncing performance
-- Token is stored securely and only used for API calls
-
-**Authentication:**
-Secure your application with username and password authentication:
-- Set up username and password for app access
-- Enable/disable authentication as needed
-- Credentials are stored securely
-
-### Sync Button
-
-Synchronize script metadata from the ProxmoxVE GitHub repository.
-
-**What Does Syncing Do?**
-- **Updates Script Metadata**: Downloads the latest script information (JSON files)
-- **Refreshes Available Scripts**: Updates the list of scripts you can download
-- **Updates Categories**: Refreshes script categories and organization
-- **Checks for Updates**: Identifies which downloaded scripts have newer versions
-
-**Important Notes:**
-- **Metadata Only**: Syncing only updates script information, not the actual script files
-- **No Downloads**: Script files are downloaded separately when you choose to install them
-- **Last Sync Time**: Shows when the last successful sync occurred
-- **Rate Limits**: GitHub API limits may apply without a personal access token
-
-**When to Sync:**
-- When you want to see the latest available scripts
-- To check for updates to your downloaded scripts
-- If you notice scripts are missing or outdated
-- After the ProxmoxVE repository has been updated
-
-### Available Scripts
-
-Browse and discover scripts from the ProxmoxVE repository.
-
-**Browsing Scripts:**
-- **Category Sidebar**: Filter scripts by category (Storage, Network, Security, etc.)
-- **Search**: Find scripts by name or description
-- **View Modes**: Switch between card and list view
-- **Sorting**: Sort by name or creation date
-
-**Filtering Options:**
-- **Script Types**: Filter by CT (Container) or other script types
-- **Update Status**: Show only scripts with available updates
-- **Search Query**: Search within script names and descriptions
-- **Categories**: Filter by specific script categories
-
-**Script Actions:**
-- **View Details**: Click on a script to see full information and documentation
-- **Download**: Download script files to your local system
-- **Install**: Run scripts directly on your PVE servers
-- **Preview**: View script content before downloading
-
-### Downloaded Scripts
-
-Manage scripts that have been downloaded to your local system.
-
-**What Are Downloaded Scripts?**
-These are scripts that you've downloaded from the repository and are stored locally on your system:
-- Script files are stored in your local scripts directory
-- You can run these scripts on your PVE servers
-- Scripts can be updated when newer versions are available
-
-**Update Detection:**
-The system automatically checks if newer versions of your downloaded scripts are available:
-- Scripts with updates available are marked with an update indicator
-- You can filter to show only scripts with available updates
-- Update detection happens when you sync with the repository
-
-**Managing Downloaded Scripts:**
-- **Update Scripts**: Download the latest version of a script
-- **View Details**: See script information and documentation
-- **Install/Run**: Execute scripts on your PVE servers
-- **Filter & Search**: Use the same filtering options as Available Scripts
-
-### Installed Scripts
-
-Track and manage scripts that are installed on your PVE servers.
-
-**Auto-Detection (Primary Feature):**
-The system can automatically detect LXC containers that have community-script tags on your PVE servers:
-- **Automatic Discovery**: Scans your PVE servers for containers with community-script tags
-- **Container Detection**: Identifies LXC containers running Proxmox helper scripts
-- **Server Association**: Links detected scripts to the specific PVE server
-- **Bulk Import**: Automatically creates records for all detected scripts
-
-**How Auto-Detection Works:**
-1. Connects to your configured PVE servers
-2. Scans LXC container configurations
-3. Looks for containers with community-script tags
-4. Creates installed script records automatically
-
-**Manual Script Management:**
-- **Add Scripts Manually**: Create records for scripts not auto-detected
-- **Edit Script Details**: Update script names and container IDs
-- **Delete Scripts**: Remove scripts from tracking
-- **Bulk Operations**: Clean up old or invalid script records
-
-**Script Tracking Features:**
-- **Installation Status**: Track success, failure, or in-progress installations
-- **Server Association**: Know which server each script is installed on
-- **Container ID**: Link scripts to specific LXC containers
-- **Web UI Access**: Track and access Web UI IP addresses and ports
-- **Execution Logs**: View output and logs from script installations
-- **Filtering**: Filter by server, status, or search terms
-
-**Managing Installed Scripts:**
-- **View All Scripts**: See all tracked scripts across all servers
-- **Filter by Server**: Show scripts for a specific PVE server
-- **Filter by Status**: Show successful, failed, or in-progress installations
-- **Sort Options**: Sort by name, container ID, server, status, or date
-- **Update Scripts**: Re-run or update existing script installations
-
-**Web UI Access:**
-Automatically detect and access Web UI interfaces for your installed scripts:
-- **Auto-Detection**: Automatically detects Web UI URLs from script installation output
-- **IP & Port Tracking**: Stores and displays Web UI IP addresses and ports
-- **One-Click Access**: Click IP:port to open Web UI in new tab
-- **Manual Detection**: Re-detect IP using `hostname -I` inside container
-- **Port Detection**: Uses script metadata to get correct port (e.g., actualbudget:5006)
-- **Editable Fields**: Manually edit IP and port values as needed
-
-**Actions Dropdown:**
-Clean interface with all actions organized in a dropdown menu:
-- **Edit Button**: Always visible for quick script editing
-- **Actions Dropdown**: Contains Update, Shell, Open UI, Start/Stop, Destroy, Delete
-- **Smart Visibility**: Dropdown only appears when actions are available
-- **Auto-Close**: Dropdown closes after clicking any action
-- **Disabled States**: Actions are disabled when container is stopped
-
-**Container Control:**
-Directly control LXC containers from the installed scripts page via SSH:
-- **Start/Stop Button**: Control container state with `pct start/stop <ID>`
-- **Container Status**: Real-time status indicator (running/stopped/unknown)
-- **Destroy Button**: Permanently remove LXC container with `pct destroy <ID>`
-- **Confirmation Modals**: Simple OK/Cancel for start/stop, type container ID to confirm destroy
-- **SSH Execution**: All commands executed remotely via configured SSH connections
-
-**Safety Features:**
-- Start/Stop actions require simple confirmation
-- Destroy action requires typing the container ID to confirm
-- All actions show loading states and error handling
-- Only works with SSH scripts that have valid container IDs
-
-### Update System
-
-Keep your PVE Scripts Management application up to date with the latest features and improvements.
-
-**What Does Updating Do?**
-- **Downloads Latest Version**: Fetches the newest release from the GitHub repository
-- **Updates Application Files**: Replaces current files with the latest version
-- **Installs Dependencies**: Updates Node.js packages and dependencies
-- **Rebuilds Application**: Compiles the application with latest changes
-- **Restarts Server**: Automatically restarts the application server
-
-**How to Update:**
-
-**Automatic Update (Recommended):**
-- Click the "Update Now" button when an update is available
-- The system will handle everything automatically
-- You'll see a progress overlay with update logs
-- The page will reload automatically when complete
-
-**Manual Update (Advanced):**
-If automatic update fails, you can update manually:
-```bash
-# Navigate to the application directory
-cd $PVESCRIPTLOCAL_DIR
-
-# Pull latest changes
-git pull
-
-# Install dependencies
-npm install
-
-# Build the application
-npm run build
-
-# Start the application
-npm start
-```
-
-**Update Process:**
-1. **Check for Updates**: System automatically checks GitHub for new releases
-2. **Download Update**: Downloads the latest release files
-3. **Backup Current Version**: Creates backup of current installation
-4. **Install New Version**: Replaces files and updates dependencies
-5. **Build Application**: Compiles the updated code
-6. **Restart Server**: Stops old server and starts new version
-7. **Reload Page**: Automatically refreshes the browser
-
-**Release Notes:**
-Click the external link icon next to the update button to view detailed release notes on GitHub:
-- See what's new in each version
-- Read about bug fixes and improvements
-- Check for any breaking changes
-- View installation requirements
-
-**Important Notes:**
-- **Backup**: Your data and settings are preserved during updates
-- **Downtime**: Brief downtime occurs during the update process
-- **Compatibility**: Updates maintain backward compatibility with your data
-- **Rollback**: If issues occur, you can manually revert to previous version
-
 ## 📁 Project Structure
 
 ```

VERSION

@@ -1 +1 @@
-0.4.3
+0.4.1

package.json

@@ -22,12 +22,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@prisma/client": "^6.17.1",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
     "@radix-ui/react-slot": "^1.2.3",
     "@t3-oss/env-nextjs": "^0.13.8",
-    "@tailwindcss/typography": "^0.5.19",
-    "@tanstack/react-query": "^5.90.5",
+    "@tanstack/react-query": "^5.90.3",
     "@trpc/client": "^11.6.0",
     "@trpc/react-query": "^11.6.0",
     "@trpc/server": "^11.6.0",
@@ -37,18 +35,17 @@
     "@xterm/addon-web-links": "^0.11.0",
     "@xterm/xterm": "^5.5.0",
     "bcryptjs": "^3.0.2",
+    "better-sqlite3": "^12.4.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "jsonwebtoken": "^9.0.2",
-    "lucide-react": "^0.546.0",
+    "lucide-react": "^0.545.0",
     "next": "^15.5.5",
     "node-pty": "^1.0.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-markdown": "^10.1.0",
     "react-syntax-highlighter": "^15.6.6",
     "refractor": "^5.0.0",
-    "remark-gfm": "^4.0.1",
     "server-only": "^0.0.1",
     "strip-ansi": "^7.1.2",
     "superjson": "^2.2.1",
@@ -65,19 +62,18 @@
     "@types/bcryptjs": "^3.0.0",
     "@types/better-sqlite3": "^7.6.8",
     "@types/jsonwebtoken": "^9.0.10",
-    "@types/node": "^24.8.0",
+    "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.2.2",
     "@vitejs/plugin-react": "^5.0.2",
     "@vitest/coverage-v8": "^3.2.4",
     "@vitest/ui": "^3.2.4",
     "eslint": "^9.23.0",
-    "eslint-config-next": "^15.5.5",
+    "eslint-config-next": "^15.5.4",
     "jsdom": "^27.0.0",
     "postcss": "^8.5.3",
     "prettier": "^3.5.3",
-    "prettier-plugin-tailwindcss": "^0.7.0",
-    "prisma": "^6.17.1",
+    "prettier-plugin-tailwindcss": "^0.6.11",
     "tailwindcss": "^4.1.14",
     "typescript": "^5.8.2",
     "typescript-eslint": "^8.46.1",

prisma/schema.prisma

@@ -1,45 +0,0 @@
-generator client {
-  provider = "prisma-client-js"
-}
-
-datasource db {
-  provider = "sqlite"
-  url      = env("DATABASE_URL")
-}
-
-model InstalledScript {
-  id                Int       @id @default(autoincrement())
-  script_name       String
-  script_path       String
-  container_id      String?
-  server_id         Int?
-  execution_mode    String
-  installation_date DateTime? @default(now())
-  status            String
-  output_log        String?
-  web_ui_ip         String?
-  web_ui_port       Int?
-  server            Server?   @relation(fields: [server_id], references: [id], onDelete: SetNull)
-  
-  @@map("installed_scripts")
-}
-
-model Server {
-  id                 Int                @id @default(autoincrement())
-  name               String             @unique
-  ip                 String
-  user               String
-  password           String?
-  auth_type          String?            @default("password")
-  ssh_key            String?
-  ssh_key_passphrase String?
-  ssh_port           Int?               @default(22)
-  color              String?
-  created_at         DateTime?          @default(now())
-  updated_at         DateTime?          @updatedAt
-  ssh_key_path       String?
-  key_generated      Boolean?           @default(false)
-  installed_scripts  InstalledScript[]
-  
-  @@map("servers")
-}

server.js

@@ -7,7 +7,7 @@ import { join, resolve } from 'path';
 import stripAnsi from 'strip-ansi';
 import { spawn as ptySpawn } from 'node-pty';
 import { getSSHExecutionService } from './src/server/ssh-execution-service.js';
-import { getDatabase } from './src/server/database-prisma.js';
+import { getDatabase } from './src/server/database.js';
 
 const dev = process.env.NODE_ENV !== 'production';
 const hostname = '0.0.0.0';
@@ -186,11 +186,11 @@ class ScriptExecutionHandler {
    * @param {string} scriptPath - Path to the script
    * @param {string} executionMode - 'local' or 'ssh'
    * @param {number|null} serverId - Server ID for SSH executions
-   * @returns {Promise<number|null>} - Installation record ID
+   * @returns {number|null} - Installation record ID
    */
-  async createInstallationRecord(scriptName, scriptPath, executionMode, serverId = null) {
+  createInstallationRecord(scriptName, scriptPath, executionMode, serverId = null) {
     try {
-      const result = await this.db.createInstalledScript({
+      const result = this.db.createInstalledScript({
         script_name: scriptName,
         script_path: scriptPath,
         container_id: undefined,
@@ -199,7 +199,7 @@ class ScriptExecutionHandler {
         status: 'in_progress',
         output_log: ''
       });
-      return Number(result.id);
+      return Number(result.lastInsertRowid);
     } catch (error) {
       console.error('Error creating installation record:', error);
       return null;
@@ -211,9 +211,9 @@ class ScriptExecutionHandler {
    * @param {number} installationId - Installation record ID
    * @param {Object} updateData - Data to update
    */
-  async updateInstallationRecord(installationId, updateData) {
+  updateInstallationRecord(installationId, updateData) {
     try {
-      await this.db.updateInstalledScript(installationId, updateData);
+      this.db.updateInstalledScript(installationId, updateData);
     } catch (error) {
       console.error('Error updating installation record:', error);
     }
@@ -327,7 +327,7 @@ class ScriptExecutionHandler {
       
       // Create installation record
       const serverId = server ? (server.id ?? null) : null;
-      installationId = await this.createInstallationRecord(scriptName, scriptPath, mode, serverId);
+      installationId = this.createInstallationRecord(scriptName, scriptPath, mode, serverId);
       
       if (!installationId) {
         console.error('Failed to create installation record');
@@ -356,7 +356,7 @@ class ScriptExecutionHandler {
         
         // Update installation record with failure
         if (installationId) {
-          await this.updateInstallationRecord(installationId, { status: 'failed' });
+          this.updateInstallationRecord(installationId, { status: 'failed' });
         }
         return;
       }
@@ -394,7 +394,7 @@ class ScriptExecutionHandler {
       });
 
       // Handle pty data (both stdout and stderr combined)
-      childProcess.onData(async (data) => {
+      childProcess.onData((data) => {
         const output = data.toString();
         
         // Store output in buffer for logging
@@ -410,7 +410,7 @@ class ScriptExecutionHandler {
         // Parse for Container ID
         const containerId = this.parseContainerId(output);
         if (containerId && installationId) {
-          await this.updateInstallationRecord(installationId, { container_id: containerId });
+          this.updateInstallationRecord(installationId, { container_id: containerId });
         }
         
         // Parse for Web UI URL
@@ -418,7 +418,7 @@ class ScriptExecutionHandler {
         if (webUIUrl && installationId) {
           const { ip, port } = webUIUrl;
           if (ip && port) {
-            await this.updateInstallationRecord(installationId, { 
+            this.updateInstallationRecord(installationId, { 
               web_ui_ip: ip, 
               web_ui_port: port 
             });
@@ -464,7 +464,7 @@ class ScriptExecutionHandler {
       
       // Update installation record with failure
       if (installationId) {
-        await this.updateInstallationRecord(installationId, { status: 'failed' });
+        this.updateInstallationRecord(installationId, { status: 'failed' });
       }
     }
   }
@@ -491,7 +491,7 @@ class ScriptExecutionHandler {
       const execution = /** @type {ExecutionResult} */ (await sshService.executeScript(
         server,
         scriptPath,
-        /** @param {string} data */ async (data) => {
+        /** @param {string} data */ (data) => {
           // Store output in buffer for logging
           const exec = this.activeExecutions.get(executionId);
           if (exec) {
@@ -505,7 +505,7 @@ class ScriptExecutionHandler {
           // Parse for Container ID
           const containerId = this.parseContainerId(data);
           if (containerId && installationId) {
-            await this.updateInstallationRecord(installationId, { container_id: containerId });
+            this.updateInstallationRecord(installationId, { container_id: containerId });
           }
           
           // Parse for Web UI URL
@@ -513,7 +513,7 @@ class ScriptExecutionHandler {
           if (webUIUrl && installationId) {
             const { ip, port } = webUIUrl;
             if (ip && port) {
-              await this.updateInstallationRecord(installationId, { 
+              this.updateInstallationRecord(installationId, { 
                 web_ui_ip: ip, 
                 web_ui_port: port 
               });
@@ -545,13 +545,13 @@ class ScriptExecutionHandler {
             timestamp: Date.now()
           });
         },
-        /** @param {number} code */ async (code) => {
+        /** @param {number} code */ (code) => {
           const exec = this.activeExecutions.get(executionId);
           const isSuccess = code === 0;
           
           // Update installation record with final status and output
           if (installationId && exec) {
-            await this.updateInstallationRecord(installationId, {
+            this.updateInstallationRecord(installationId, {
               status: isSuccess ? 'success' : 'failed',
               output_log: exec.outputBuffer
             });
@@ -586,7 +586,7 @@ class ScriptExecutionHandler {
       
       // Update installation record with failure
       if (installationId) {
-        await this.updateInstallationRecord(installationId, { status: 'failed' });
+        this.updateInstallationRecord(installationId, { status: 'failed' });
       }
     }
   }

src/app/_components/FilterBar.tsx

@@ -93,6 +93,17 @@ export function FilterBar({
         </div>
       )}
 
+      {/* Filter Persistence Status */}
+      {!isLoadingFilters && saveFiltersEnabled && (
+        <div className="mb-4 flex items-center justify-center py-1">
+          <div className="flex items-center space-x-2 text-xs text-green-600">
+            <svg className="h-3 w-3" fill="currentColor" viewBox="0 0 20 20">
+              <path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />
+            </svg>
+            <span>Filters are being saved automatically</span>
+          </div>
+        </div>
+      )}
 
       {/* Filter Header */}
       {!isLoadingFilters && (
@@ -380,30 +391,18 @@ export function FilterBar({
 
       {/* Filter Summary and Clear All */}
       <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-2">
-        <div className="flex items-center gap-4">
-          <div className="text-sm text-muted-foreground">
-            {filteredCount === totalScripts ? (
-              <span>Showing all {totalScripts} scripts</span>
-            ) : (
-              <span>
-                {filteredCount} of {totalScripts} scripts{" "}
-                {hasActiveFilters && (
-                  <span className="font-medium text-blue-600">
-                    (filtered)
-                  </span>
-                )}
-              </span>
-            )}
-          </div>
-          
-          {/* Filter Persistence Status */}
-          {!isLoadingFilters && saveFiltersEnabled && (
-            <div className="flex items-center space-x-1 text-xs text-green-600">
-              <svg className="h-3 w-3" fill="currentColor" viewBox="0 0 20 20">
-                <path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />
-              </svg>
-              <span>Filters are being saved automatically</span>
-            </div>
+        <div className="text-sm text-muted-foreground">
+          {filteredCount === totalScripts ? (
+            <span>Showing all {totalScripts} scripts</span>
+          ) : (
+            <span>
+              {filteredCount} of {totalScripts} scripts{" "}
+              {hasActiveFilters && (
+                <span className="font-medium text-blue-600">
+                  (filtered)
+                </span>
+              )}
+            </span>
           )}
         </div>
 

src/app/_components/HelpModal.tsx

@@ -55,15 +55,8 @@ export function HelpModal({ isOpen, onClose, initialSection = 'server-settings'
                 <ul className="text-sm text-muted-foreground space-y-2">
                   <li>• <strong>Password:</strong> Use username and password authentication</li>
                   <li>• <strong>SSH Key:</strong> Use SSH key pair for secure authentication</li>
+                  <li>• <strong>Both:</strong> Try SSH key first, fallback to password if needed</li>
                 </ul>
-                <div className="mt-3 p-3 bg-blue-50 dark:bg-blue-950/20 rounded-md">
-                  <h5 className="font-medium text-blue-900 dark:text-blue-100 mb-2">SSH Key Features:</h5>
-                  <ul className="text-xs text-blue-800 dark:text-blue-200 space-y-1">
-                    <li>• <strong>Generate Key Pair:</strong> Create new SSH keys automatically</li>
-                    <li>• <strong>View Public Key:</strong> Copy public key for server setup</li>
-                    <li>• <strong>Persistent Storage:</strong> Keys are stored securely on disk</li>
-                  </ul>
-                </div>
               </div>
 
               <div className="p-4 border border-border rounded-lg">

src/app/_components/InstalledScriptsTab.tsx

@@ -8,7 +8,6 @@ import { Button } from './ui/button';
 import { ScriptInstallationCard } from './ScriptInstallationCard';
 import { ConfirmationModal } from './ConfirmationModal';
 import { ErrorModal } from './ErrorModal';
-import { LoadingModal } from './LoadingModal';
 import { getContrastColor } from '../../lib/colorUtils';
 import {
   DropdownMenu,
@@ -85,12 +84,6 @@ export function InstalledScriptsTab() {
     type?: 'error' | 'success';
   } | null>(null);
 
-  // Loading modal state
-  const [loadingModal, setLoadingModal] = useState<{
-    isOpen: boolean;
-    action: string;
-  } | null>(null);
-
   // Fetch installed scripts
   const { data: scriptsData, refetch: refetchScripts, isLoading } = api.installedScripts.getAllInstalledScripts.useQuery();
   const { data: statsData } = api.installedScripts.getInstallationStats.useQuery();
@@ -254,7 +247,6 @@ export function InstalledScriptsTab() {
 
   const controlContainerMutation = api.installedScripts.controlContainer.useMutation({
     onSuccess: (data, variables) => {
-      setLoadingModal(null);
       setControllingScriptId(null);
       
       if (data.success) {
@@ -295,7 +287,6 @@ export function InstalledScriptsTab() {
     },
     onError: (error) => {
       console.error('Container control error:', error);
-      setLoadingModal(null);
       setControllingScriptId(null);
       
       // Show detailed error message
@@ -311,7 +302,6 @@ export function InstalledScriptsTab() {
 
   const destroyContainerMutation = api.installedScripts.destroyContainer.useMutation({
     onSuccess: (data) => {
-      setLoadingModal(null);
       setControllingScriptId(null);
       
       if (data.success) {
@@ -336,7 +326,6 @@ export function InstalledScriptsTab() {
     },
     onError: (error) => {
       console.error('Container destroy error:', error);
-      setLoadingModal(null);
       setControllingScriptId(null);
       
       // Show detailed error message
@@ -388,7 +377,7 @@ export function InstalledScriptsTab() {
         containerStatusMutation.mutate({ serverIds });
       }
     }, 500);
-  }, []);
+  }, [containerStatusMutation]);
 
   // Run cleanup when component mounts and scripts are loaded (only once)
   useEffect(() => {
@@ -526,7 +515,6 @@ export function InstalledScriptsTab() {
       message: `Are you sure you want to ${action} container ${script.container_id} (${script.script_name})?`,
       onConfirm: () => {
         setControllingScriptId(script.id);
-        setLoadingModal({ isOpen: true, action: `${action === 'start' ? 'Starting' : 'Stopping'} container ${script.container_id}...` });
         void controlContainerMutation.mutate({ id: script.id, action });
         setConfirmationModal(null);
       }
@@ -547,7 +535,6 @@ export function InstalledScriptsTab() {
       confirmText: script.container_id,
       onConfirm: () => {
         setControllingScriptId(script.id);
-        setLoadingModal({ isOpen: true, action: `Destroying container ${script.container_id}...` });
         void destroyContainerMutation.mutate({ id: script.id });
         setConfirmationModal(null);
       }
@@ -1378,17 +1365,21 @@ export function InstalledScriptsTab() {
                           </div>
                         ) : (
                           script.web_ui_ip ? (
-                            <div className="flex items-center space-x-3">
-                              <span className="text-sm text-foreground">
+                            <div className="flex items-center justify-between w-full">
+                              <button
+                                onClick={() => handleOpenWebUI(script)}
+                                className="text-sm font-mono text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300 hover:underline flex-shrink-0"
+                              >
                                 {script.web_ui_ip}:{script.web_ui_port ?? 80}
-                              </span>
-                              {containerStatuses.get(script.id) === 'running' && (
+                              </button>
+                              {script.container_id && script.execution_mode === 'ssh' && (
                                 <button
-                                  onClick={() => handleOpenWebUI(script)}
-                                  className="text-xs px-2 py-1 bg-blue-900/20 hover:bg-blue-900/30 border border-blue-700/50 text-blue-300 hover:text-blue-200 hover:border-blue-600/60 transition-all duration-200 hover:scale-105 hover:shadow-md rounded disabled:opacity-50 flex-shrink-0"
-                                  title="Open Web UI"
+                                  onClick={() => handleAutoDetectWebUI(script)}
+                                  disabled={autoDetectWebUIMutation.isPending}
+                                  className="text-xs px-2 py-1 bg-blue-900 hover:bg-blue-800 text-blue-300 border border-blue-700 rounded disabled:opacity-50 transition-colors flex-shrink-0 ml-2"
+                                  title="Re-detect IP and port"
                                 >
-                                  Open UI
+                                  {autoDetectWebUIMutation.isPending ? '...' : 'Re-detect'}
                                 </button>
                               )}
                             </div>
@@ -1496,15 +1487,6 @@ export function InstalledScriptsTab() {
                                         Open UI
                                       </DropdownMenuItem>
                                     )}
-                                    {script.container_id && script.execution_mode === 'ssh' && script.web_ui_ip && (
-                                      <DropdownMenuItem
-                                        onClick={() => handleAutoDetectWebUI(script)}
-                                        disabled={autoDetectWebUIMutation.isPending || containerStatuses.get(script.id) === 'stopped'}
-                                        className="text-blue-300 hover:text-blue-200 hover:bg-blue-900/20 focus:bg-blue-900/20"
-                                      >
-                                        {autoDetectWebUIMutation.isPending ? 'Re-detect...' : 'Re-detect IP/Port'}
-                                      </DropdownMenuItem>
-                                    )}
                                     {script.container_id && script.execution_mode === 'ssh' && (
                                       <>
                                         <DropdownMenuSeparator className="bg-gray-700" />
@@ -1579,14 +1561,6 @@ export function InstalledScriptsTab() {
             type={errorModal.type ?? 'error'}
           />
         )}
-
-        {/* Loading Modal */}
-        {loadingModal && (
-          <LoadingModal
-            isOpen={loadingModal.isOpen}
-            action={loadingModal.action}
-          />
-        )}
     </div>
   );
 }

src/app/_components/LoadingModal.tsx

@@ -1,37 +0,0 @@
-'use client';
-
-import { Loader2 } from 'lucide-react';
-
-interface LoadingModalProps {
-  isOpen: boolean;
-  action: string;
-}
-
-export function LoadingModal({ isOpen, action }: LoadingModalProps) {
-  if (!isOpen) return null;
-
-  return (
-    <div className="fixed inset-0 backdrop-blur-sm bg-black/50 flex items-center justify-center z-50 p-4">
-      <div className="bg-card rounded-lg shadow-xl max-w-md w-full border border-border p-8">
-        <div className="flex flex-col items-center space-y-4">
-          <div className="relative">
-            <Loader2 className="h-12 w-12 animate-spin text-primary" />
-            <div className="absolute inset-0 rounded-full border-2 border-primary/20 animate-pulse"></div>
-          </div>
-          <div className="text-center">
-            <h3 className="text-lg font-semibold text-card-foreground mb-2">
-              Processing
-            </h3>
-            <p className="text-sm text-muted-foreground">
-              {action}
-            </p>
-            <p className="text-xs text-muted-foreground mt-2">
-              Please wait...
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
-

src/app/_components/PublicKeyModal.tsx

@@ -1,147 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { X, Copy, Check, Server, Globe } from 'lucide-react';
-import { Button } from './ui/button';
-
-interface PublicKeyModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  publicKey: string;
-  serverName: string;
-  serverIp: string;
-}
-
-export function PublicKeyModal({ isOpen, onClose, publicKey, serverName, serverIp }: PublicKeyModalProps) {
-  const [copied, setCopied] = useState(false);
-
-  if (!isOpen) return null;
-
-  const handleCopy = async () => {
-    try {
-      // Try modern clipboard API first
-      if (navigator.clipboard && window.isSecureContext) {
-        await navigator.clipboard.writeText(publicKey);
-        setCopied(true);
-        setTimeout(() => setCopied(false), 2000);
-      } else {
-        // Fallback for older browsers or non-HTTPS
-        const textArea = document.createElement('textarea');
-        textArea.value = publicKey;
-        textArea.style.position = 'fixed';
-        textArea.style.left = '-999999px';
-        textArea.style.top = '-999999px';
-        document.body.appendChild(textArea);
-        textArea.focus();
-        textArea.select();
-        
-        try {
-          document.execCommand('copy');
-          setCopied(true);
-          setTimeout(() => setCopied(false), 2000);
-        } catch (fallbackError) {
-          console.error('Fallback copy failed:', fallbackError);
-          // If all else fails, show the key in an alert
-          alert('Please manually copy this key:\n\n' + publicKey);
-        }
-        
-        document.body.removeChild(textArea);
-      }
-    } catch (error) {
-      console.error('Failed to copy to clipboard:', error);
-      // Fallback: show the key in an alert
-      alert('Please manually copy this key:\n\n' + publicKey);
-    }
-  };
-
-  return (
-    <div className="fixed inset-0 backdrop-blur-sm bg-black/50 flex items-center justify-center z-50 p-4">
-      <div className="bg-card rounded-lg shadow-xl max-w-2xl w-full border border-border">
-        {/* Header */}
-        <div className="flex items-center justify-between p-6 border-b border-border">
-          <div className="flex items-center gap-3">
-            <div className="p-2 bg-blue-100 rounded-lg">
-              <Server className="h-6 w-6 text-blue-600" />
-            </div>
-            <div>
-              <h2 className="text-xl font-semibold text-card-foreground">SSH Public Key</h2>
-              <p className="text-sm text-muted-foreground">Add this key to your server&apos;s authorized_keys</p>
-            </div>
-          </div>
-          <Button
-            variant="ghost"
-            size="icon"
-            onClick={onClose}
-            className="h-8 w-8"
-          >
-            <X className="h-4 w-4" />
-          </Button>
-        </div>
-
-        {/* Content */}
-        <div className="p-6 space-y-6">
-          {/* Server Info */}
-          <div className="flex items-center gap-4 p-4 bg-muted/50 rounded-lg">
-            <div className="flex items-center gap-2 text-sm text-muted-foreground">
-              <Server className="h-4 w-4" />
-              <span className="font-medium">{serverName}</span>
-            </div>
-            <div className="flex items-center gap-2 text-sm text-muted-foreground">
-              <Globe className="h-4 w-4" />
-              <span>{serverIp}</span>
-            </div>
-          </div>
-
-          {/* Instructions */}
-          <div className="space-y-2">
-            <h3 className="font-medium text-foreground">Instructions:</h3>
-            <ol className="text-sm text-muted-foreground space-y-1 list-decimal list-inside">
-              <li>Copy the public key below</li>
-              <li>SSH into your server: <code className="bg-muted px-1 rounded">ssh root@{serverIp}</code></li>
-              <li>Add the key to authorized_keys: <code className="bg-muted px-1 rounded">echo &quot;&lt;paste-key&gt;&quot; &gt;&gt; ~/.ssh/authorized_keys</code></li>
-              <li>Set proper permissions: <code className="bg-muted px-1 rounded">chmod 600 ~/.ssh/authorized_keys</code></li>
-            </ol>
-          </div>
-
-          {/* Public Key */}
-          <div className="space-y-2">
-            <div className="flex items-center justify-between">
-              <label className="text-sm font-medium text-foreground">Public Key:</label>
-              <Button
-                variant="outline"
-                size="sm"
-                onClick={handleCopy}
-                className="gap-2"
-              >
-                {copied ? (
-                  <>
-                    <Check className="h-4 w-4" />
-                    Copied!
-                  </>
-                ) : (
-                  <>
-                    <Copy className="h-4 w-4" />
-                    Copy
-                  </>
-                )}
-              </Button>
-            </div>
-            <textarea
-              value={publicKey}
-              readOnly
-              className="w-full px-3 py-2 border rounded-md shadow-sm bg-card text-foreground font-mono text-xs min-h-[120px] resize-none border-border focus:outline-none focus:ring-2 focus:ring-ring focus:border-ring"
-              placeholder="Public key will appear here..."
-            />
-          </div>
-
-          {/* Footer */}
-          <div className="flex justify-end gap-3 pt-4 border-t border-border">
-            <Button variant="outline" onClick={onClose}>
-              Close
-            </Button>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

src/app/_components/ReleaseNotesModal.tsx

@@ -5,8 +5,6 @@ import { api } from '~/trpc/react';
 import { Button } from './ui/button';
 import { Badge } from './ui/badge';
 import { X, ExternalLink, Calendar, Tag, Loader2 } from 'lucide-react';
-import ReactMarkdown from 'react-markdown';
-import remarkGfm from 'remark-gfm';
 
 interface ReleaseNotesModalProps {
   isOpen: boolean;
@@ -172,23 +170,9 @@ export function ReleaseNotesModal({ isOpen, onClose, highlightVersion }: Release
                     {/* Release Body */}
                     {release.body && (
                       <div className="prose prose-sm max-w-none dark:prose-invert">
-                        <ReactMarkdown 
-                          remarkPlugins={[remarkGfm]}
-                          components={{
-                            h1: ({children}) => <h1 className="text-2xl font-bold text-card-foreground mb-4 mt-6">{children}</h1>,
-                            h2: ({children}) => <h2 className="text-xl font-semibold text-card-foreground mb-3 mt-5">{children}</h2>,
-                            h3: ({children}) => <h3 className="text-lg font-medium text-card-foreground mb-2 mt-4">{children}</h3>,
-                            p: ({children}) => <p className="text-card-foreground mb-3 leading-relaxed">{children}</p>,
-                            ul: ({children}) => <ul className="list-disc list-inside text-card-foreground mb-3 space-y-1">{children}</ul>,
-                            ol: ({children}) => <ol className="list-decimal list-inside text-card-foreground mb-3 space-y-1">{children}</ol>,
-                            li: ({children}) => <li className="text-card-foreground">{children}</li>,
-                            a: ({href, children}) => <a href={href} className="text-blue-500 hover:text-blue-400 underline" target="_blank" rel="noopener noreferrer">{children}</a>,
-                            strong: ({children}) => <strong className="font-semibold text-card-foreground">{children}</strong>,
-                            em: ({children}) => <em className="italic text-card-foreground">{children}</em>,
-                          }}
-                        >
+                        <div className="whitespace-pre-wrap text-sm text-card-foreground leading-relaxed">
                           {release.body}
-                        </ReactMarkdown>
+                        </div>
                       </div>
                     )}
                   </div>

src/app/_components/ScriptDetailModal.tsx

@@ -359,91 +359,91 @@ export function ScriptDetailModal({
             })()}
         </div>
 
+        {/* Load Message */}
+        {loadMessage && (
+          <div className="mx-4 sm:mx-6 mb-4 rounded-lg bg-primary/10 p-3 text-sm text-primary">
+            {loadMessage}
+          </div>
+        )}
+
+        {/* Script Files Status */}
+        {(scriptFilesLoading || comparisonLoading) && (
+          <div className="mx-4 sm:mx-6 mb-4 rounded-lg bg-primary/10 p-3 text-sm text-primary">
+            <div className="flex items-center space-x-2">
+              <div className="h-4 w-4 animate-spin rounded-full border-b-2 border-blue-600"></div>
+              <span>Loading script status...</span>
+            </div>
+          </div>
+        )}
+
+        {scriptFilesData?.success &&
+          !scriptFilesLoading &&
+          (() => {
+            // Determine script type from the first install method
+            const firstScript = script?.install_methods?.[0]?.script;
+            let scriptType = "Script";
+            if (firstScript?.startsWith("ct/")) {
+              scriptType = "CT Script";
+            } else if (firstScript?.startsWith("tools/")) {
+              scriptType = "Tools Script";
+            } else if (firstScript?.startsWith("vm/")) {
+              scriptType = "VM Script";
+            } else if (firstScript?.startsWith("vw/")) {
+              scriptType = "VW Script";
+            }
+
+            return (
+              <div className="mx-4 sm:mx-6 mb-4 rounded-lg bg-muted p-3 text-sm text-muted-foreground">
+                <div className="flex flex-col sm:flex-row sm:items-center space-y-2 sm:space-y-0 sm:space-x-4">
+                  <div className="flex items-center space-x-2">
+                    <div
+                      className={`h-2 w-2 rounded-full ${scriptFilesData.ctExists ? "bg-green-500" : "bg-muted"}`}
+                    ></div>
+                    <span>
+                      {scriptType}:{" "}
+                      {scriptFilesData.ctExists ? "Available" : "Not loaded"}
+                    </span>
+                  </div>
+                  <div className="flex items-center space-x-2">
+                    <div
+                      className={`h-2 w-2 rounded-full ${scriptFilesData.installExists ? "bg-green-500" : "bg-muted"}`}
+                    ></div>
+                    <span>
+                      Install Script:{" "}
+                      {scriptFilesData.installExists
+                        ? "Available"
+                        : "Not loaded"}
+                    </span>
+                  </div>
+                  {scriptFilesData?.success &&
+                    (scriptFilesData.ctExists ||
+                      scriptFilesData.installExists) &&
+                    comparisonData?.success &&
+                    !comparisonLoading && (
+                      <div className="flex items-center space-x-2">
+                        <div
+                          className={`h-2 w-2 rounded-full ${comparisonData.hasDifferences ? "bg-orange-500" : "bg-green-500"}`}
+                        ></div>
+                        <span>
+                          Status:{" "}
+                          {comparisonData.hasDifferences
+                            ? "Update available"
+                            : "Up to date"}
+                        </span>
+                      </div>
+                    )}
+                </div>
+                {scriptFilesData.files.length > 0 && (
+                  <div className="mt-2 text-xs text-muted-foreground break-words">
+                    Files: {scriptFilesData.files.join(", ")}
+                  </div>
+                )}
+              </div>
+            );
+          })()}
+
         {/* Content */}
         <div className="space-y-4 sm:space-y-6 p-4 sm:p-6">
-          {/* Script Files Status */}
-          {(scriptFilesLoading || comparisonLoading) && (
-            <div className="mb-4 rounded-lg bg-primary/10 p-3 text-sm text-primary">
-              <div className="flex items-center space-x-2">
-                <div className="h-4 w-4 animate-spin rounded-full border-b-2 border-blue-600"></div>
-                <span>Loading script status...</span>
-              </div>
-            </div>
-          )}
-
-          {scriptFilesData?.success &&
-            !scriptFilesLoading &&
-            (() => {
-              // Determine script type from the first install method
-              const firstScript = script?.install_methods?.[0]?.script;
-              let scriptType = "Script";
-              if (firstScript?.startsWith("ct/")) {
-                scriptType = "CT Script";
-              } else if (firstScript?.startsWith("tools/")) {
-                scriptType = "Tools Script";
-              } else if (firstScript?.startsWith("vm/")) {
-                scriptType = "VM Script";
-              } else if (firstScript?.startsWith("vw/")) {
-                scriptType = "VW Script";
-              }
-
-              return (
-                <div className="mb-4 rounded-lg bg-muted p-3 text-sm text-muted-foreground">
-                  <div className="flex flex-col sm:flex-row sm:items-center space-y-2 sm:space-y-0 sm:space-x-4">
-                    <div className="flex items-center space-x-2">
-                      <div
-                        className={`h-2 w-2 rounded-full ${scriptFilesData.ctExists ? "bg-green-500" : "bg-muted"}`}
-                      ></div>
-                      <span>
-                        {scriptType}:{" "}
-                        {scriptFilesData.ctExists ? "Available" : "Not loaded"}
-                      </span>
-                    </div>
-                    <div className="flex items-center space-x-2">
-                      <div
-                        className={`h-2 w-2 rounded-full ${scriptFilesData.installExists ? "bg-green-500" : "bg-muted"}`}
-                      ></div>
-                      <span>
-                        Install Script:{" "}
-                        {scriptFilesData.installExists
-                          ? "Available"
-                          : "Not loaded"}
-                      </span>
-                    </div>
-                    {scriptFilesData?.success &&
-                      (scriptFilesData.ctExists ||
-                        scriptFilesData.installExists) &&
-                      comparisonData?.success &&
-                      !comparisonLoading && (
-                        <div className="flex items-center space-x-2">
-                          <div
-                            className={`h-2 w-2 rounded-full ${comparisonData.hasDifferences ? "bg-orange-500" : "bg-green-500"}`}
-                          ></div>
-                          <span>
-                            Status:{" "}
-                            {comparisonData.hasDifferences
-                              ? "Update available"
-                              : "Up to date"}
-                          </span>
-                        </div>
-                      )}
-                  </div>
-                  {scriptFilesData.files.length > 0 && (
-                    <div className="mt-2 text-xs text-muted-foreground break-words">
-                      Files: {scriptFilesData.files.join(", ")}
-                    </div>
-                  )}
-                </div>
-              );
-            })()}
-
-          {/* Load Message */}
-          {loadMessage && (
-            <div className="mb-4 rounded-lg bg-primary/10 p-3 text-sm text-primary">
-              {loadMessage}
-            </div>
-          )}
-
           {/* Description */}
           <div>
             <h3 className="mb-2 text-base sm:text-lg font-semibold text-foreground">

src/app/_components/ServerForm.tsx

@@ -4,8 +4,6 @@ import { useState, useEffect } from 'react';
 import type { CreateServerData } from '../../types/server';
 import { Button } from './ui/button';
 import { SSHKeyInput } from './SSHKeyInput';
-import { PublicKeyModal } from './PublicKeyModal';
-import { Key } from 'lucide-react';
 
 interface ServerFormProps {
   onSubmit: (data: CreateServerData) => void;
@@ -32,11 +30,6 @@ export function ServerForm({ onSubmit, initialData, isEditing = false, onCancel
   const [errors, setErrors] = useState<Partial<Record<keyof CreateServerData, string>>>({});
   const [sshKeyError, setSshKeyError] = useState<string>('');
   const [colorCodingEnabled, setColorCodingEnabled] = useState(false);
-  const [isGeneratingKey, setIsGeneratingKey] = useState(false);
-  const [showPublicKeyModal, setShowPublicKeyModal] = useState(false);
-  const [generatedPublicKey, setGeneratedPublicKey] = useState('');
-  const [, setIsGeneratedKey] = useState(false);
-  const [, setGeneratedServerId] = useState<number | null>(null);
 
   useEffect(() => {
     const loadColorCodingSetting = async () => {
@@ -82,18 +75,25 @@ export function ServerForm({ onSubmit, initialData, isEditing = false, onCancel
     // Validate authentication based on auth_type
     const authType = formData.auth_type ?? 'password';
     
-    if (authType === 'password') {
+    if (authType === 'password' || authType === 'both') {
       if (!formData.password?.trim()) {
         newErrors.password = 'Password is required for password authentication';
       }
     }
     
-    if (authType === 'key') {
+    if (authType === 'key' || authType === 'both') {
       if (!formData.ssh_key?.trim()) {
         newErrors.ssh_key = 'SSH key is required for key authentication';
       }
     }
 
+    // Check if at least one authentication method is provided
+    if (authType === 'both') {
+      if (!formData.password?.trim() && !formData.ssh_key?.trim()) {
+        newErrors.password = 'At least one authentication method (password or SSH key) is required';
+        newErrors.ssh_key = 'At least one authentication method (password or SSH key) is required';
+      }
+    }
 
     setErrors(newErrors);
     return Object.keys(newErrors).length === 0 && !sshKeyError;
@@ -127,54 +127,6 @@ export function ServerForm({ onSubmit, initialData, isEditing = false, onCancel
     if (errors[field]) {
       setErrors(prev => ({ ...prev, [field]: undefined }));
     }
-    
-    // Reset generated key state when switching auth types
-    if (field === 'auth_type') {
-      setIsGeneratedKey(false);
-      setGeneratedPublicKey('');
-    }
-  };
-
-  const handleGenerateKeyPair = async () => {
-    setIsGeneratingKey(true);
-    try {
-      const response = await fetch('/api/servers/generate-keypair', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      });
-
-      if (!response.ok) {
-        throw new Error('Failed to generate key pair');
-      }
-
-      const data = await response.json() as { success: boolean; privateKey?: string; publicKey?: string; serverId?: number; error?: string };
-      
-      if (data.success) {
-        const serverId = data.serverId ?? 0;
-        const keyPath = `data/ssh-keys/server_${serverId}_key`;
-        
-        setFormData(prev => ({ 
-          ...prev, 
-          ssh_key: data.privateKey ?? '',
-          ssh_key_path: keyPath,
-          key_generated: true
-        }));
-        setGeneratedPublicKey(data.publicKey ?? '');
-        setGeneratedServerId(serverId);
-        setIsGeneratedKey(true);
-        setShowPublicKeyModal(true);
-        setSshKeyError('');
-      } else {
-        throw new Error(data.error ?? 'Failed to generate key pair');
-      }
-    } catch (error) {
-      console.error('Error generating key pair:', error);
-        setSshKeyError(error instanceof Error ? error.message : 'Failed to generate key pair');
-    } finally {
-      setIsGeneratingKey(false);
-    }
   };
 
   const handleSSHKeyChange = (value: string) => {
@@ -185,7 +137,6 @@ export function ServerForm({ onSubmit, initialData, isEditing = false, onCancel
   };
 
   return (
-    <>
     <form onSubmit={handleSubmit} className="space-y-6">
       <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
         <div>
@@ -270,6 +221,7 @@ export function ServerForm({ onSubmit, initialData, isEditing = false, onCancel
           >
             <option value="password">Password Only</option>
             <option value="key">SSH Key Only</option>
+            <option value="both">Both Password & SSH Key</option>
           </select>
         </div>
 
@@ -295,10 +247,10 @@ export function ServerForm({ onSubmit, initialData, isEditing = false, onCancel
       </div>
 
       {/* Password Authentication */}
-      {formData.auth_type === 'password' && (
+      {(formData.auth_type === 'password' || formData.auth_type === 'both') && (
         <div>
           <label htmlFor="password" className="block text-sm font-medium text-muted-foreground mb-1">
-            Password *
+            Password {formData.auth_type === 'both' ? '(Optional)' : '*'}
           </label>
           <input
             type="password"
@@ -315,55 +267,19 @@ export function ServerForm({ onSubmit, initialData, isEditing = false, onCancel
       )}
 
       {/* SSH Key Authentication */}
-      {formData.auth_type === 'key' && (
+      {(formData.auth_type === 'key' || formData.auth_type === 'both') && (
         <div className="space-y-4">
           <div>
-            <div className="flex items-center justify-between mb-1">
-              <label className="block text-sm font-medium text-muted-foreground">
-                SSH Private Key *
-              </label>
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                onClick={handleGenerateKeyPair}
-                disabled={isGeneratingKey}
-                className="gap-2"
-              >
-                <Key className="h-4 w-4" />
-                {isGeneratingKey ? 'Generating...' : 'Generate Key Pair'}
-              </Button>
-            </div>
-            
-            {/* Show manual key input only if no key has been generated */}
-            {!formData.key_generated && (
-              <>
-                <SSHKeyInput
-                  value={formData.ssh_key ?? ''}
-                  onChange={handleSSHKeyChange}
-                  onError={setSshKeyError}
-                />
-                {errors.ssh_key && <p className="mt-1 text-sm text-destructive">{errors.ssh_key}</p>}
-                {sshKeyError && <p className="mt-1 text-sm text-destructive">{sshKeyError}</p>}
-              </>
-            )}
-            
-            {/* Show generated key status */}
-            {formData.key_generated && (
-              <div className="p-3 bg-green-50 dark:bg-green-950/20 border border-green-200 dark:border-green-800 rounded-md">
-                <div className="flex items-center gap-2">
-                  <svg className="w-4 h-4 text-green-600 dark:text-green-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
-                  </svg>
-                  <span className="text-sm font-medium text-green-800 dark:text-green-200">
-                    SSH key pair generated successfully
-                  </span>
-                </div>
-                <p className="text-xs text-green-700 dark:text-green-300 mt-1">
-                  The private key has been generated and will be saved with the server.
-                </p>
-              </div>
-            )}
+            <label className="block text-sm font-medium text-muted-foreground mb-1">
+              SSH Private Key {formData.auth_type === 'both' ? '(Optional)' : '*'}
+            </label>
+            <SSHKeyInput
+              value={formData.ssh_key ?? ''}
+              onChange={handleSSHKeyChange}
+              onError={setSshKeyError}
+            />
+            {errors.ssh_key && <p className="mt-1 text-sm text-destructive">{errors.ssh_key}</p>}
+            {sshKeyError && <p className="mt-1 text-sm text-destructive">{sshKeyError}</p>}
           </div>
 
           <div>
@@ -407,16 +323,6 @@ export function ServerForm({ onSubmit, initialData, isEditing = false, onCancel
         </Button>
       </div>
     </form>
-    
-    {/* Public Key Modal */}
-    <PublicKeyModal
-      isOpen={showPublicKeyModal}
-      onClose={() => setShowPublicKeyModal(false)}
-      publicKey={generatedPublicKey}
-      serverName={formData.name || 'New Server'}
-      serverIp={formData.ip}
-    />
-    </>
   );
 }
 

src/app/_components/ServerList.tsx

@@ -5,8 +5,6 @@ import type { Server, CreateServerData } from '../../types/server';
 import { ServerForm } from './ServerForm';
 import { Button } from './ui/button';
 import { ConfirmationModal } from './ConfirmationModal';
-import { PublicKeyModal } from './PublicKeyModal';
-import { Key } from 'lucide-react';
 
 interface ServerListProps {
   servers: Server[];
@@ -26,12 +24,6 @@ export function ServerList({ servers, onUpdate, onDelete }: ServerListProps) {
     confirmText: string;
     onConfirm: () => void;
   } | null>(null);
-  const [showPublicKeyModal, setShowPublicKeyModal] = useState(false);
-  const [publicKeyData, setPublicKeyData] = useState<{
-    publicKey: string;
-    serverName: string;
-    serverIp: string;
-  } | null>(null);
 
   const handleEdit = (server: Server) => {
     setEditingId(server.id);
@@ -48,32 +40,6 @@ export function ServerList({ servers, onUpdate, onDelete }: ServerListProps) {
     setEditingId(null);
   };
 
-  const handleViewPublicKey = async (server: Server) => {
-    try {
-      const response = await fetch(`/api/servers/${server.id}/public-key`);
-      
-      if (!response.ok) {
-        throw new Error('Failed to retrieve public key');
-      }
-
-      const data = await response.json() as { success: boolean; publicKey?: string; serverName?: string; serverIp?: string; error?: string };
-      
-      if (data.success) {
-        setPublicKeyData({
-          publicKey: data.publicKey ?? '',
-          serverName: data.serverName ?? '',
-          serverIp: data.serverIp ?? ''
-        });
-        setShowPublicKeyModal(true);
-      } else {
-        throw new Error(data.error ?? 'Failed to retrieve public key');
-      }
-    } catch (error) {
-      console.error('Error retrieving public key:', error);
-      // You could show a toast notification here
-    }
-  };
-
   const handleDelete = (id: number) => {
     const server = servers.find(s => s.id === id);
     if (!server) return;
@@ -192,8 +158,8 @@ export function ServerList({ servers, onUpdate, onDelete }: ServerListProps) {
                       </span>
                     </div>
                     <div className="mt-1 text-xs text-muted-foreground">
-                      Created: {server.created_at ? new Date(server.created_at).toLocaleDateString() : 'Unknown'}
-                      {server.updated_at && server.updated_at !== server.created_at && (
+                      Created: {new Date(server.created_at).toLocaleDateString()}
+                      {server.updated_at !== server.created_at && (
                         <span> • Updated: {new Date(server.updated_at).toLocaleDateString()}</span>
                       )}
                     </div>
@@ -252,19 +218,6 @@ export function ServerList({ servers, onUpdate, onDelete }: ServerListProps) {
                   )}
                 </Button>
                 <div className="flex space-x-2">
-                  {/* View Public Key button - only show for generated keys */}
-                  {server.key_generated === true && (
-                    <Button
-                      onClick={() => handleViewPublicKey(server)}
-                      variant="outline"
-                      size="sm"
-                      className="flex-1 sm:flex-none border-blue-500/20 text-blue-400 bg-blue-500/10 hover:bg-blue-500/20"
-                    >
-                      <Key className="w-4 h-4 mr-1" />
-                      <span className="hidden sm:inline">View Public Key</span>
-                      <span className="sm:hidden">Key</span>
-                    </Button>
-                  )}
                   <Button
                     onClick={() => handleEdit(server)}
                     variant="outline"
@@ -310,20 +263,6 @@ export function ServerList({ servers, onUpdate, onDelete }: ServerListProps) {
           cancelButtonText="Cancel"
         />
       )}
-      
-      {/* Public Key Modal */}
-      {publicKeyData && (
-        <PublicKeyModal
-          isOpen={showPublicKeyModal}
-          onClose={() => {
-            setShowPublicKeyModal(false);
-            setPublicKeyData(null);
-          }}
-          publicKey={publicKeyData.publicKey}
-          serverName={publicKeyData.serverName}
-          serverIp={publicKeyData.serverIp}
-        />
-      )}
     </div>
   );
 }

src/app/api/servers/[id]/public-key/route.ts

@@ -1,64 +0,0 @@
-import type { NextRequest } from 'next/server';
-import { NextResponse } from 'next/server';
-import { getDatabase } from '../../../../../server/database-prisma.js';
-import { getSSHService } from '../../../../../server/ssh-service';
-
-export async function GET(
-  request: NextRequest,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  try {
-    const { id: idParam } = await params;
-    const id = parseInt(idParam);
-    if (isNaN(id)) {
-      return NextResponse.json(
-        { error: 'Invalid server ID' },
-        { status: 400 }
-      );
-    }
-
-    const db = getDatabase();
-    const server = await db.getServerById(id);
-    
-    if (!server) {
-      return NextResponse.json(
-        { error: 'Server not found' },
-        { status: 404 }
-      );
-    }
-
-    // Only allow viewing public key if it was generated by the system
-    if (!(server as any).key_generated) {
-      return NextResponse.json(
-        { error: 'Public key not available for user-provided keys' },
-        { status: 403 }
-      );
-    }
-
-    if (!(server as any).ssh_key_path) {
-      return NextResponse.json(
-        { error: 'SSH key path not found' },
-        { status: 404 }
-      );
-    }
-
-    const sshService = getSSHService();
-    const publicKey = sshService.getPublicKey((server as any).ssh_key_path as string);
-    
-    return NextResponse.json({
-      success: true,
-      publicKey,
-      serverName: (server as any).name,
-      serverIp: (server as any).ip
-    });
-  } catch (error) {
-    console.error('Error retrieving public key:', error);
-    return NextResponse.json(
-      { 
-        success: false,
-        error: error instanceof Error ? error.message : String(error)
-      },
-      { status: 500 }
-    );
-  }
-}

src/app/api/servers/[id]/route.ts

@@ -1,6 +1,6 @@
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
-import { getDatabase } from '../../../../server/database-prisma.js';
+import { getDatabase } from '../../../../server/database';
 import type { CreateServerData } from '../../../../types/server';
 
 export async function GET(
@@ -18,7 +18,7 @@ export async function GET(
     }
 
     const db = getDatabase();
-    const server = await db.getServerById(id);
+    const server = db.getServerById(id);
     
     if (!server) {
       return NextResponse.json(
@@ -52,7 +52,7 @@ export async function PUT(
     }
 
     const body = await request.json();
-    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color, key_generated, ssh_key_path }: CreateServerData = body;
+    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color }: CreateServerData = body;
 
     // Validate required fields
     if (!name || !ip || !user) {
@@ -73,7 +73,7 @@ export async function PUT(
     // Validate authentication based on auth_type
     const authType = auth_type ?? 'password';
     
-    if (authType === 'password') {
+    if (authType === 'password' || authType === 'both') {
       if (!password?.trim()) {
         return NextResponse.json(
           { error: 'Password is required for password authentication' },
@@ -82,7 +82,7 @@ export async function PUT(
       }
     }
     
-    if (authType === 'key') {
+    if (authType === 'key' || authType === 'both') {
       if (!ssh_key?.trim()) {
         return NextResponse.json(
           { error: 'SSH key is required for key authentication' },
@@ -91,11 +91,20 @@ export async function PUT(
       }
     }
 
+    // Check if at least one authentication method is provided
+    if (authType === 'both') {
+      if (!password?.trim() && !ssh_key?.trim()) {
+        return NextResponse.json(
+          { error: 'At least one authentication method (password or SSH key) is required' },
+          { status: 400 }
+        );
+      }
+    }
 
     const db = getDatabase();
     
     // Check if server exists
-    const existingServer = await db.getServerById(id);
+    const existingServer = db.getServerById(id);
     if (!existingServer) {
       return NextResponse.json(
         { error: 'Server not found' },
@@ -103,7 +112,7 @@ export async function PUT(
       );
     }
 
-    await db.updateServer(id, { 
+    const result = db.updateServer(id, { 
       name, 
       ip, 
       user, 
@@ -112,15 +121,13 @@ export async function PUT(
       ssh_key,
       ssh_key_passphrase,
       ssh_port: ssh_port ?? 22,
-      color,
-      key_generated: key_generated ?? false,
-      ssh_key_path
+      color
     });
     
     return NextResponse.json(
       { 
         message: 'Server updated successfully',
-        changes: 1 
+        changes: result.changes 
       }
     );
   } catch (error) {
@@ -158,7 +165,7 @@ export async function DELETE(
     const db = getDatabase();
     
     // Check if server exists
-    const existingServer = await db.getServerById(id);
+    const existingServer = db.getServerById(id);
     if (!existingServer) {
       return NextResponse.json(
         { error: 'Server not found' },
@@ -167,14 +174,14 @@ export async function DELETE(
     }
 
     // Delete all installed scripts associated with this server
-    await db.deleteInstalledScriptsByServer(id);
+    db.deleteInstalledScriptsByServer(id);
 
-    await db.deleteServer(id);
+    const result = db.deleteServer(id);
     
     return NextResponse.json(
       { 
         message: 'Server deleted successfully',
-        changes: 1 
+        changes: result.changes 
       }
     );
   } catch (error) {

src/app/api/servers/[id]/test-connection/route.ts

@@ -1,6 +1,6 @@
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
-import { getDatabase } from '../../../../../server/database-prisma.js';
+import { getDatabase } from '../../../../../server/database';
 import { getSSHService } from '../../../../../server/ssh-service';
 import type { Server } from '../../../../../types/server';
 
@@ -19,7 +19,7 @@ export async function POST(
     }
 
     const db = getDatabase();
-    const server = await db.getServerById(id) as Server;
+    const server = db.getServerById(id) as Server;
     
     if (!server) {
       return NextResponse.json(

src/app/api/servers/generate-keypair/route.ts

@@ -1,32 +0,0 @@
-import type { NextRequest } from 'next/server';
-import { NextResponse } from 'next/server';
-import { getSSHService } from '../../../../server/ssh-service';
-import { getDatabase } from '../../../../server/database-prisma.js';
-
-export async function POST(_request: NextRequest) {
-  try {
-    const sshService = getSSHService();
-    const db = getDatabase();
-    
-    // Get the next available server ID for key file naming
-    const serverId = await db.getNextServerId();
-    
-    const keyPair = await sshService.generateKeyPair(serverId);
-    
-    return NextResponse.json({
-      success: true,
-      privateKey: keyPair.privateKey,
-      publicKey: keyPair.publicKey,
-      serverId: serverId
-    });
-  } catch (error) {
-    console.error('Error generating SSH key pair:', error);
-    return NextResponse.json(
-      { 
-        success: false,
-        error: error instanceof Error ? error.message : 'Failed to generate SSH key pair'
-      },
-      { status: 500 }
-    );
-  }
-}

src/app/api/servers/route.ts

@@ -1,12 +1,12 @@
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
-import { getDatabase } from '../../../server/database-prisma.js';
+import { getDatabase } from '../../../server/database';
 import type { CreateServerData } from '../../../types/server';
 
 export async function GET() {
   try {
     const db = getDatabase();
-    const servers = await db.getAllServers();
+    const servers = db.getAllServers();
     return NextResponse.json(servers);
   } catch (error) {
     console.error('Error fetching servers:', error);
@@ -20,7 +20,7 @@ export async function GET() {
 export async function POST(request: NextRequest) {
   try {
     const body = await request.json();
-    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color, key_generated, ssh_key_path }: CreateServerData = body;
+    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color }: CreateServerData = body;
 
     // Validate required fields
     if (!name || !ip || !user) {
@@ -41,7 +41,7 @@ export async function POST(request: NextRequest) {
     // Validate authentication based on auth_type
     const authType = auth_type ?? 'password';
     
-    if (authType === 'password') {
+    if (authType === 'password' || authType === 'both') {
       if (!password?.trim()) {
         return NextResponse.json(
           { error: 'Password is required for password authentication' },
@@ -50,7 +50,7 @@ export async function POST(request: NextRequest) {
       }
     }
     
-    if (authType === 'key') {
+    if (authType === 'key' || authType === 'both') {
       if (!ssh_key?.trim()) {
         return NextResponse.json(
           { error: 'SSH key is required for key authentication' },
@@ -59,9 +59,18 @@ export async function POST(request: NextRequest) {
       }
     }
 
+    // Check if at least one authentication method is provided
+    if (authType === 'both') {
+      if (!password?.trim() && !ssh_key?.trim()) {
+        return NextResponse.json(
+          { error: 'At least one authentication method (password or SSH key) is required' },
+          { status: 400 }
+        );
+      }
+    }
 
     const db = getDatabase();
-    const result = await db.createServer({ 
+    const result = db.createServer({ 
       name, 
       ip, 
       user, 
@@ -70,15 +79,13 @@ export async function POST(request: NextRequest) {
       ssh_key,
       ssh_key_passphrase,
       ssh_port: ssh_port ?? 22,
-      color,
-      key_generated: key_generated ?? false,
-      ssh_key_path
+      color
     });
     
     return NextResponse.json(
       { 
         message: 'Server created successfully',
-        id: result.id 
+        id: result.lastInsertRowid 
       },
       { status: 201 }
     );

src/app/page.tsx

@@ -147,7 +147,7 @@ export default function Home() {
         {/* Header */}
         <div className="text-center mb-6 sm:mb-8">
           <h1 className="text-2xl sm:text-3xl lg:text-4xl font-bold text-foreground mb-2 flex items-center justify-center gap-2 sm:gap-3">
-            
+            <Rocket className="h-6 w-6 sm:h-8 w-8 lg:h-9 lg:w-9" />
             <span className="break-words">PVE Scripts Management</span>
           </h1>
           <p className="text-sm sm:text-base text-muted-foreground mb-4 px-2">

src/server/api/routers/installedScripts.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { createTRPCRouter, publicProcedure } from "~/server/api/trpc";
-import { getDatabase } from "~/server/database-prisma.js";
+import { getDatabase } from "~/server/database";
 // Removed unused imports
 
 
@@ -10,26 +10,10 @@ export const installedScriptsRouter = createTRPCRouter({
     .query(async () => {
       try {
         const db = getDatabase();
-        const scripts = await db.getAllInstalledScripts();
-        
-        // Transform scripts to flatten server data for frontend compatibility
-        const transformedScripts = scripts.map(script => ({
-          ...script,
-          server_name: script.server?.name ?? null,
-          server_ip: script.server?.ip ?? null,
-          server_user: script.server?.user ?? null,
-          server_password: script.server?.password ?? null,
-          server_auth_type: script.server?.auth_type ?? null,
-          server_ssh_key: script.server?.ssh_key ?? null,
-          server_ssh_key_passphrase: script.server?.ssh_key_passphrase ?? null,
-          server_ssh_port: script.server?.ssh_port ?? null,
-          server_color: script.server?.color ?? null,
-          server: undefined // Remove nested server object
-        }));
-        
+        const scripts = db.getAllInstalledScripts();
         return {
           success: true,
-          scripts: transformedScripts
+          scripts
         };
       } catch (error) {
         console.error('Error in getAllInstalledScripts:', error);
@@ -47,26 +31,10 @@ export const installedScriptsRouter = createTRPCRouter({
     .query(async ({ input }) => {
       try {
         const db = getDatabase();
-        const scripts = await db.getInstalledScriptsByServer(input.serverId);
-        
-        // Transform scripts to flatten server data for frontend compatibility
-        const transformedScripts = scripts.map(script => ({
-          ...script,
-          server_name: script.server?.name ?? null,
-          server_ip: script.server?.ip ?? null,
-          server_user: script.server?.user ?? null,
-          server_password: script.server?.password ?? null,
-          server_auth_type: script.server?.auth_type ?? null,
-          server_ssh_key: script.server?.ssh_key ?? null,
-          server_ssh_key_passphrase: script.server?.ssh_key_passphrase ?? null,
-          server_ssh_port: script.server?.ssh_port ?? null,
-          server_color: script.server?.color ?? null,
-          server: undefined // Remove nested server object
-        }));
-        
+        const scripts = db.getInstalledScriptsByServer(input.serverId);
         return {
           success: true,
-          scripts: transformedScripts
+          scripts
         };
       } catch (error) {
         console.error('Error in getInstalledScriptsByServer:', error);
@@ -84,7 +52,7 @@ export const installedScriptsRouter = createTRPCRouter({
     .query(async ({ input }) => {
       try {
         const db = getDatabase();
-        const script = await db.getInstalledScriptById(input.id);
+        const script = db.getInstalledScriptById(input.id);
         if (!script) {
           return {
             success: false,
@@ -92,24 +60,9 @@ export const installedScriptsRouter = createTRPCRouter({
             script: null
           };
         }
-        // Transform script to flatten server data for frontend compatibility
-        const transformedScript = {
-          ...script,
-          server_name: script.server?.name ?? null,
-          server_ip: script.server?.ip ?? null,
-          server_user: script.server?.user ?? null,
-          server_password: script.server?.password ?? null,
-          server_auth_type: script.server?.auth_type ?? null,
-          server_ssh_key: script.server?.ssh_key ?? null,
-          server_ssh_key_passphrase: script.server?.ssh_key_passphrase ?? null,
-          server_ssh_port: script.server?.ssh_port ?? null,
-          server_color: script.server?.color ?? null,
-          server: undefined // Remove nested server object
-        };
-        
         return {
           success: true,
-          script: transformedScript
+          script
         };
       } catch (error) {
         console.error('Error in getInstalledScriptById:', error);
@@ -137,10 +90,10 @@ export const installedScriptsRouter = createTRPCRouter({
     .mutation(async ({ input }) => {
       try {
         const db = getDatabase();
-        const result = await db.createInstalledScript(input);
+        const result = db.createInstalledScript(input);
         return {
           success: true,
-          id: result.id,
+          id: result.lastInsertRowid,
           message: 'Installed script record created successfully'
         };
       } catch (error) {
@@ -167,9 +120,9 @@ export const installedScriptsRouter = createTRPCRouter({
       try {
         const { id, ...updateData } = input;
         const db = getDatabase();
-        const result = await db.updateInstalledScript(id, updateData);
+        const result = db.updateInstalledScript(id, updateData);
         
-        if (!result) {
+        if (result.changes === 0) {
           return {
             success: false,
             error: 'No changes made or script not found'
@@ -195,9 +148,9 @@ export const installedScriptsRouter = createTRPCRouter({
     .mutation(async ({ input }) => {
       try {
         const db = getDatabase();
-        const result = await db.deleteInstalledScript(input.id);
+        const result = db.deleteInstalledScript(input.id);
         
-        if (!result) {
+        if (result.changes === 0) {
           return {
             success: false,
             error: 'Script not found or already deleted'
@@ -222,7 +175,7 @@ export const installedScriptsRouter = createTRPCRouter({
     .query(async () => {
       try {
         const db = getDatabase();
-        const allScripts = await db.getAllInstalledScripts();
+        const allScripts = db.getAllInstalledScripts();
         
         const stats = {
           total: allScripts.length,
@@ -266,7 +219,7 @@ export const installedScriptsRouter = createTRPCRouter({
       try {
         
         const db = getDatabase();
-        const server = await db.getServerById(input.serverId);
+        const server = db.getServerById(input.serverId);
         
         if (!server) {
           console.error('Server not found for ID:', input.serverId);
@@ -397,7 +350,7 @@ export const installedScriptsRouter = createTRPCRouter({
 
 
         // Get existing scripts to check for duplicates
-        const existingScripts = await db.getAllInstalledScripts();
+        const existingScripts = db.getAllInstalledScripts();
 
         // Create installed script records for detected containers (skip duplicates)
         const createdScripts = [];
@@ -420,7 +373,7 @@ export const installedScriptsRouter = createTRPCRouter({
               continue;
             }
 
-            const result = await db.createInstalledScript({
+            const result = db.createInstalledScript({
               script_name: container.hostname,
               script_path: `detected/${container.hostname}`,
               container_id: container.containerId,
@@ -431,7 +384,7 @@ export const installedScriptsRouter = createTRPCRouter({
             });
             
             createdScripts.push({
-              id: result.id,
+              id: result.lastInsertRowid,
               containerId: container.containerId,
               hostname: container.hostname,
               serverName: container.serverName
@@ -467,8 +420,8 @@ export const installedScriptsRouter = createTRPCRouter({
       try {
         
         const db = getDatabase();
-        const allScripts = await db.getAllInstalledScripts();
-        const allServers = await db.getAllServers();
+        const allScripts = db.getAllInstalledScripts();
+        const allServers = db.getAllServers();
         
         
         if (allScripts.length === 0) {
@@ -499,7 +452,7 @@ export const installedScriptsRouter = createTRPCRouter({
             const scriptData = script as any;
             const server = allServers.find((s: any) => s.id === scriptData.server_id);
             if (!server) {
-              await db.deleteInstalledScript(Number(scriptData.id));
+              db.deleteInstalledScript(Number(scriptData.id));
               deletedScripts.push(String(scriptData.script_name));
               continue;
             }
@@ -535,7 +488,7 @@ export const installedScriptsRouter = createTRPCRouter({
             });
 
             if (!containerExists) {
-              await db.deleteInstalledScript(Number(scriptData.id));
+              db.deleteInstalledScript(Number(scriptData.id));
               deletedScripts.push(String(scriptData.script_name));
             } else {
             }
@@ -572,7 +525,7 @@ export const installedScriptsRouter = createTRPCRouter({
       try {
         
         const db = getDatabase();
-        const allServers = await db.getAllServers();
+        const allServers = db.getAllServers();
         const statusMap: Record<string, 'running' | 'stopped' | 'unknown'> = {};
 
         // Import SSH services
@@ -677,7 +630,7 @@ export const installedScriptsRouter = createTRPCRouter({
     .query(async ({ input }) => {
       try {
         const db = getDatabase();
-        const script = await db.getInstalledScriptById(input.id);
+        const script = db.getInstalledScriptById(input.id);
         
         if (!script) {
           return {
@@ -699,7 +652,7 @@ export const installedScriptsRouter = createTRPCRouter({
         }
 
         // Get server info
-        const server = await db.getServerById(Number(scriptData.server_id));
+        const server = db.getServerById(Number(scriptData.server_id));
         if (!server) {
           return {
             success: false,
@@ -779,7 +732,7 @@ export const installedScriptsRouter = createTRPCRouter({
     .mutation(async ({ input }) => {
       try {
         const db = getDatabase();
-        const script = await db.getInstalledScriptById(input.id);
+        const script = db.getInstalledScriptById(input.id);
         
         if (!script) {
           return {
@@ -799,7 +752,7 @@ export const installedScriptsRouter = createTRPCRouter({
         }
 
         // Get server info
-        const server = await db.getServerById(Number(scriptData.server_id));
+        const server = db.getServerById(Number(scriptData.server_id));
         if (!server) {
           return {
             success: false,
@@ -870,7 +823,7 @@ export const installedScriptsRouter = createTRPCRouter({
     .mutation(async ({ input }) => {
       try {
         const db = getDatabase();
-        const script = await db.getInstalledScriptById(input.id);
+        const script = db.getInstalledScriptById(input.id);
         
         if (!script) {
           return {
@@ -890,7 +843,7 @@ export const installedScriptsRouter = createTRPCRouter({
         }
 
         // Get server info
-        const server = await db.getServerById(Number(scriptData.server_id));
+        const server = db.getServerById(Number(scriptData.server_id));
         if (!server) {
           return {
             success: false,
@@ -997,9 +950,9 @@ export const installedScriptsRouter = createTRPCRouter({
         });
 
         // If destroy was successful, delete the database record
-        const deleteResult = await db.deleteInstalledScript(input.id);
+        const deleteResult = db.deleteInstalledScript(input.id);
         
-        if (!deleteResult) {
+        if (deleteResult.changes === 0) {
           return {
             success: false,
             error: 'Container destroyed but failed to delete database record'
@@ -1032,7 +985,7 @@ export const installedScriptsRouter = createTRPCRouter({
       try {
         console.log('🔍 Auto-detect WebUI called with id:', input.id);
         const db = getDatabase();
-        const script = await db.getInstalledScriptById(input.id);
+        const script = db.getInstalledScriptById(input.id);
         
         if (!script) {
           console.log('❌ Script not found for id:', input.id);
@@ -1060,7 +1013,7 @@ export const installedScriptsRouter = createTRPCRouter({
         }
 
         // Get server info
-        const server = await db.getServerById(Number(scriptData.server_id));
+        const server = db.getServerById(Number(scriptData.server_id));
         if (!server) {
           console.log('❌ Server not found for id:', scriptData.server_id);
           return {
@@ -1168,12 +1121,12 @@ export const installedScriptsRouter = createTRPCRouter({
         
         // Update the database with detected IP and port
         console.log('💾 Updating database with IP:', detectedIp, 'Port:', detectedPort);
-        const updateResult = await db.updateInstalledScript(input.id, {
+        const updateResult = db.updateInstalledScript(input.id, {
           web_ui_ip: detectedIp,
           web_ui_port: detectedPort
         });
 
-        if (!updateResult) {
+        if (updateResult.changes === 0) {
           console.log('❌ Database update failed - no changes made');
           return {
             success: false,
@@ -1184,11 +1137,9 @@ export const installedScriptsRouter = createTRPCRouter({
         console.log('✅ Successfully updated database');
         return {
           success: true,
-          message: `Successfully detected IP: ${detectedIp}:${detectedPort} for LXC ${scriptData.container_id} on ${(server as any).name}`,
+          message: `Successfully detected IP: ${detectedIp}:${detectedPort}`,
           detectedIp,
-          detectedPort: detectedPort,
-          containerId: scriptData.container_id,
-          serverName: (server as any).name
+          detectedPort: detectedPort
         };
       } catch (error) {
         console.error('Error in autoDetectWebUI:', error);

src/server/api/routers/servers.ts

@@ -1,13 +1,13 @@
 import { z } from "zod";
 import { createTRPCRouter, publicProcedure } from "~/server/api/trpc";
-import { getDatabase } from "~/server/database-prisma.js";
+import { getDatabase } from "~/server/database";
 
 export const serversRouter = createTRPCRouter({
   getAllServers: publicProcedure
     .query(async () => {
       try {
         const db = getDatabase();
-        const servers = await db.getAllServers();
+        const servers = db.getAllServers();
         return { success: true, servers };
       } catch (error) {
         console.error('Error fetching servers:', error);
@@ -24,7 +24,7 @@ export const serversRouter = createTRPCRouter({
     .query(async ({ input }) => {
       try {
         const db = getDatabase();
-        const server = await db.getServerById(input.id);
+        const server = db.getServerById(input.id);
         if (!server) {
           return { success: false, error: 'Server not found', server: null };
         }

src/server/database-prisma.js

@@ -1,254 +0,0 @@
-import { prisma } from './db.js';
-import { join } from 'path';
-import { writeFileSync, unlinkSync, chmodSync, mkdirSync } from 'fs';
-import { existsSync } from 'fs';
-
-class DatabaseServicePrisma {
-  constructor() {
-    this.init();
-  }
-
-  init() {
-    // Ensure data/ssh-keys directory exists
-    const sshKeysDir = join(process.cwd(), 'data', 'ssh-keys');
-    if (!existsSync(sshKeysDir)) {
-      mkdirSync(sshKeysDir, { mode: 0o700 });
-    }
-  }
-
-  // Server CRUD operations
-  async createServer(serverData) {
-    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color, key_generated } = serverData;
-    
-    let ssh_key_path = null;
-    
-    // If using SSH key authentication, create persistent key file
-    if (auth_type === 'key' && ssh_key) {
-      const serverId = await this.getNextServerId();
-      ssh_key_path = this.createSSHKeyFile(serverId, ssh_key);
-    }
-    
-    return await prisma.server.create({
-      data: {
-        name,
-        ip,
-        user,
-        password,
-        auth_type: auth_type ?? 'password',
-        ssh_key,
-        ssh_key_passphrase,
-        ssh_port: ssh_port ?? 22,
-        ssh_key_path,
-        key_generated: Boolean(key_generated),
-        color,
-      }
-    });
-  }
-
-  async getAllServers() {
-    return await prisma.server.findMany({
-      orderBy: { created_at: 'desc' }
-    });
-  }
-
-  async getServerById(id) {
-    return await prisma.server.findUnique({
-      where: { id }
-    });
-  }
-
-  async updateServer(id, serverData) {
-    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color, key_generated } = serverData;
-    
-    // Get existing server to check for key changes
-    const existingServer = await this.getServerById(id);
-    let ssh_key_path = existingServer?.ssh_key_path;
-    
-    // Handle SSH key changes
-    if (auth_type === 'key' && ssh_key) {
-      // Delete old key file if it exists
-      if (existingServer?.ssh_key_path && existsSync(existingServer.ssh_key_path)) {
-        try {
-          unlinkSync(existingServer.ssh_key_path);
-          // Also delete public key file if it exists
-          const pubKeyPath = existingServer.ssh_key_path + '.pub';
-          if (existsSync(pubKeyPath)) {
-            unlinkSync(pubKeyPath);
-          }
-        } catch (error) {
-          console.warn('Failed to delete old SSH key file:', error);
-        }
-      }
-      
-      // Create new key file
-      ssh_key_path = this.createSSHKeyFile(id, ssh_key);
-    } else if (auth_type !== 'key') {
-      // If switching away from key auth, delete key files
-      if (existingServer?.ssh_key_path && existsSync(existingServer.ssh_key_path)) {
-        try {
-          unlinkSync(existingServer.ssh_key_path);
-          const pubKeyPath = existingServer.ssh_key_path + '.pub';
-          if (existsSync(pubKeyPath)) {
-            unlinkSync(pubKeyPath);
-          }
-        } catch (error) {
-          console.warn('Failed to delete SSH key file:', error);
-        }
-      }
-      ssh_key_path = null;
-    }
-    
-    return await prisma.server.update({
-      where: { id },
-      data: {
-        name,
-        ip,
-        user,
-        password,
-        auth_type: auth_type ?? 'password',
-        ssh_key,
-        ssh_key_passphrase,
-        ssh_port: ssh_port ?? 22,
-        ssh_key_path,
-        key_generated: key_generated !== undefined ? Boolean(key_generated) : (existingServer?.key_generated ?? false),
-        color,
-      }
-    });
-  }
-
-  async deleteServer(id) {
-    // Get server info before deletion to clean up key files
-    const server = await this.getServerById(id);
-    
-    // Delete SSH key files if they exist
-    if (server?.ssh_key_path && existsSync(server.ssh_key_path)) {
-      try {
-        unlinkSync(server.ssh_key_path);
-        const pubKeyPath = server.ssh_key_path + '.pub';
-        if (existsSync(pubKeyPath)) {
-          unlinkSync(pubKeyPath);
-        }
-      } catch (error) {
-        console.warn('Failed to delete SSH key file:', error);
-      }
-    }
-    
-    return await prisma.server.delete({
-      where: { id }
-    });
-  }
-
-  // Installed Scripts CRUD operations
-  async createInstalledScript(scriptData) {
-    const { script_name, script_path, container_id, server_id, execution_mode, status, output_log, web_ui_ip, web_ui_port } = scriptData;
-    
-    return await prisma.installedScript.create({
-      data: {
-        script_name,
-        script_path,
-        container_id: container_id ?? null,
-        server_id: server_id ?? null,
-        execution_mode,
-        status,
-        output_log: output_log ?? null,
-        web_ui_ip: web_ui_ip ?? null,
-        web_ui_port: web_ui_port ?? null,
-      }
-    });
-  }
-
-  async getAllInstalledScripts() {
-    return await prisma.installedScript.findMany({
-      include: {
-        server: true
-      },
-      orderBy: { installation_date: 'desc' }
-    });
-  }
-
-  async getInstalledScriptById(id) {
-    return await prisma.installedScript.findUnique({
-      where: { id },
-      include: {
-        server: true
-      }
-    });
-  }
-
-  async getInstalledScriptsByServer(server_id) {
-    return await prisma.installedScript.findMany({
-      where: { server_id },
-      include: {
-        server: true
-      },
-      orderBy: { installation_date: 'desc' }
-    });
-  }
-
-  async updateInstalledScript(id, updateData) {
-    const { script_name, container_id, status, output_log, web_ui_ip, web_ui_port } = updateData;
-    
-    const updateFields = {};
-    if (script_name !== undefined) updateFields.script_name = script_name;
-    if (container_id !== undefined) updateFields.container_id = container_id;
-    if (status !== undefined) updateFields.status = status;
-    if (output_log !== undefined) updateFields.output_log = output_log;
-    if (web_ui_ip !== undefined) updateFields.web_ui_ip = web_ui_ip;
-    if (web_ui_port !== undefined) updateFields.web_ui_port = web_ui_port;
-
-    if (Object.keys(updateFields).length === 0) {
-      return { changes: 0 };
-    }
-
-    return await prisma.installedScript.update({
-      where: { id },
-      data: updateFields
-    });
-  }
-
-  async deleteInstalledScript(id) {
-    return await prisma.installedScript.delete({
-      where: { id }
-    });
-  }
-
-  async deleteInstalledScriptsByServer(server_id) {
-    return await prisma.installedScript.deleteMany({
-      where: { server_id }
-    });
-  }
-
-  async getNextServerId() {
-    const result = await prisma.server.findFirst({
-      orderBy: { id: 'desc' },
-      select: { id: true }
-    });
-    return (result?.id ?? 0) + 1;
-  }
-
-  createSSHKeyFile(serverId, sshKey) {
-    const sshKeysDir = join(process.cwd(), 'data', 'ssh-keys');
-    const keyPath = join(sshKeysDir, `server_${serverId}_key`);
-    
-    // Normalize the key: trim any trailing whitespace and ensure exactly one newline at the end
-    const normalizedKey = sshKey.trimEnd() + '\n';
-    writeFileSync(keyPath, normalizedKey);
-    chmodSync(keyPath, 0o600); // Set proper permissions
-    
-    return keyPath;
-  }
-
-  async close() {
-    await prisma.$disconnect();
-  }
-}
-
-// Singleton instance
-let dbInstance = null;
-
-export function getDatabase() {
-  dbInstance ??= new DatabaseServicePrisma();
-  return dbInstance;
-}
-
-export default DatabaseServicePrisma;

src/server/database-prisma.ts

@@ -1,279 +0,0 @@
-import { prisma } from './db';
-import { join } from 'path';
-import { writeFileSync, unlinkSync, chmodSync, mkdirSync } from 'fs';
-import { existsSync } from 'fs';
-import type { CreateServerData } from '../types/server';
-
-class DatabaseServicePrisma {
-  constructor() {
-    this.init();
-  }
-
-  init() {
-    // Ensure data/ssh-keys directory exists
-    const sshKeysDir = join(process.cwd(), 'data', 'ssh-keys');
-    if (!existsSync(sshKeysDir)) {
-      mkdirSync(sshKeysDir, { mode: 0o700 });
-    }
-  }
-
-  // Server CRUD operations
-  async createServer(serverData: CreateServerData) {
-    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color, key_generated } = serverData;
-    
-    let ssh_key_path = null;
-    
-    // If using SSH key authentication, create persistent key file
-    if (auth_type === 'key' && ssh_key) {
-      const serverId = await this.getNextServerId();
-      ssh_key_path = this.createSSHKeyFile(serverId, ssh_key);
-    }
-    
-    return await prisma.server.create({
-      data: {
-        name,
-        ip,
-        user,
-        password,
-        auth_type: auth_type ?? 'password',
-        ssh_key,
-        ssh_key_passphrase,
-        ssh_port: ssh_port ?? 22,
-        ssh_key_path,
-        key_generated: Boolean(key_generated),
-        color,
-      }
-    });
-  }
-
-  async getAllServers() {
-    return await prisma.server.findMany({
-      orderBy: { created_at: 'desc' }
-    });
-  }
-
-  async getServerById(id: number) {
-    return await prisma.server.findUnique({
-      where: { id }
-    });
-  }
-
-  async updateServer(id: number, serverData: CreateServerData) {
-    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color, key_generated } = serverData;
-    
-    // Get existing server to check for key changes
-    const existingServer = await this.getServerById(id);
-    let ssh_key_path = existingServer?.ssh_key_path;
-    
-    // Handle SSH key changes
-    if (auth_type === 'key' && ssh_key) {
-      // Delete old key file if it exists
-      if (existingServer?.ssh_key_path && existsSync(existingServer.ssh_key_path)) {
-        try {
-          unlinkSync(existingServer.ssh_key_path);
-          // Also delete public key file if it exists
-          const pubKeyPath = existingServer.ssh_key_path + '.pub';
-          if (existsSync(pubKeyPath)) {
-            unlinkSync(pubKeyPath);
-          }
-        } catch (error) {
-          console.warn('Failed to delete old SSH key file:', error);
-        }
-      }
-      
-      // Create new key file
-      ssh_key_path = this.createSSHKeyFile(id, ssh_key);
-    } else if (auth_type !== 'key') {
-      // If switching away from key auth, delete key files
-      if (existingServer?.ssh_key_path && existsSync(existingServer.ssh_key_path)) {
-        try {
-          unlinkSync(existingServer.ssh_key_path);
-          const pubKeyPath = existingServer.ssh_key_path + '.pub';
-          if (existsSync(pubKeyPath)) {
-            unlinkSync(pubKeyPath);
-          }
-        } catch (error) {
-          console.warn('Failed to delete SSH key file:', error);
-        }
-      }
-      ssh_key_path = null;
-    }
-    
-    return await prisma.server.update({
-      where: { id },
-      data: {
-        name,
-        ip,
-        user,
-        password,
-        auth_type: auth_type ?? 'password',
-        ssh_key,
-        ssh_key_passphrase,
-        ssh_port: ssh_port ?? 22,
-        ssh_key_path,
-        key_generated: key_generated !== undefined ? Boolean(key_generated) : (existingServer?.key_generated ?? false),
-        color,
-      }
-    });
-  }
-
-  async deleteServer(id: number) {
-    // Get server info before deletion to clean up key files
-    const server = await this.getServerById(id);
-    
-    // Delete SSH key files if they exist
-    if (server?.ssh_key_path && existsSync(server.ssh_key_path)) {
-      try {
-        unlinkSync(server.ssh_key_path);
-        const pubKeyPath = server.ssh_key_path + '.pub';
-        if (existsSync(pubKeyPath)) {
-          unlinkSync(pubKeyPath);
-        }
-      } catch (error) {
-        console.warn('Failed to delete SSH key file:', error);
-      }
-    }
-    
-    return await prisma.server.delete({
-      where: { id }
-    });
-  }
-
-  // Installed Scripts CRUD operations
-  async createInstalledScript(scriptData: {
-    script_name: string;
-    script_path: string;
-    container_id?: string;
-    server_id?: number;
-    execution_mode: string;
-    status: 'in_progress' | 'success' | 'failed';
-    output_log?: string;
-    web_ui_ip?: string;
-    web_ui_port?: number;
-  }) {
-    const { script_name, script_path, container_id, server_id, execution_mode, status, output_log, web_ui_ip, web_ui_port } = scriptData;
-    
-    return await prisma.installedScript.create({
-      data: {
-        script_name,
-        script_path,
-        container_id: container_id ?? null,
-        server_id: server_id ?? null,
-        execution_mode,
-        status,
-        output_log: output_log ?? null,
-        web_ui_ip: web_ui_ip ?? null,
-        web_ui_port: web_ui_port ?? null,
-      }
-    });
-  }
-
-  async getAllInstalledScripts() {
-    return await prisma.installedScript.findMany({
-      include: {
-        server: true
-      },
-      orderBy: { installation_date: 'desc' }
-    });
-  }
-
-  async getInstalledScriptById(id: number) {
-    return await prisma.installedScript.findUnique({
-      where: { id },
-      include: {
-        server: true
-      }
-    });
-  }
-
-  async getInstalledScriptsByServer(server_id: number) {
-    return await prisma.installedScript.findMany({
-      where: { server_id },
-      include: {
-        server: true
-      },
-      orderBy: { installation_date: 'desc' }
-    });
-  }
-
-  async updateInstalledScript(id: number, updateData: {
-    script_name?: string;
-    container_id?: string;
-    status?: 'in_progress' | 'success' | 'failed';
-    output_log?: string;
-    web_ui_ip?: string;
-    web_ui_port?: number;
-  }) {
-    const { script_name, container_id, status, output_log, web_ui_ip, web_ui_port } = updateData;
-    
-    const updateFields: {
-      script_name?: string;
-      container_id?: string;
-      status?: 'in_progress' | 'success' | 'failed';
-      output_log?: string;
-      web_ui_ip?: string;
-      web_ui_port?: number;
-    } = {};
-    if (script_name !== undefined) updateFields.script_name = script_name;
-    if (container_id !== undefined) updateFields.container_id = container_id;
-    if (status !== undefined) updateFields.status = status;
-    if (output_log !== undefined) updateFields.output_log = output_log;
-    if (web_ui_ip !== undefined) updateFields.web_ui_ip = web_ui_ip;
-    if (web_ui_port !== undefined) updateFields.web_ui_port = web_ui_port;
-
-    if (Object.keys(updateFields).length === 0) {
-      return { changes: 0 };
-    }
-
-    return await prisma.installedScript.update({
-      where: { id },
-      data: updateFields
-    });
-  }
-
-  async deleteInstalledScript(id: number) {
-    return await prisma.installedScript.delete({
-      where: { id }
-    });
-  }
-
-  async deleteInstalledScriptsByServer(server_id: number) {
-    return await prisma.installedScript.deleteMany({
-      where: { server_id }
-    });
-  }
-
-  async getNextServerId() {
-    const result = await prisma.server.findFirst({
-      orderBy: { id: 'desc' },
-      select: { id: true }
-    });
-    return (result?.id ?? 0) + 1;
-  }
-
-  createSSHKeyFile(serverId: number, sshKey: string) {
-    const sshKeysDir = join(process.cwd(), 'data', 'ssh-keys');
-    const keyPath = join(sshKeysDir, `server_${serverId}_key`);
-    
-    // Normalize the key: trim any trailing whitespace and ensure exactly one newline at the end
-    const normalizedKey = sshKey.trimEnd() + '\n';
-    writeFileSync(keyPath, normalizedKey);
-    chmodSync(keyPath, 0o600); // Set proper permissions
-    
-    return keyPath;
-  }
-
-  async close() {
-    await prisma.$disconnect();
-  }
-}
-
-// Singleton instance
-let dbInstance: DatabaseServicePrisma | null = null;
-
-export function getDatabase() {
-  dbInstance ??= new DatabaseServicePrisma();
-  return dbInstance;
-}
-
-export default DatabaseServicePrisma;

src/server/database.js

@@ -0,0 +1,336 @@
+import Database from 'better-sqlite3';
+import { join } from 'path';
+
+class DatabaseService {
+  constructor() {
+    const dbPath = join(process.cwd(), 'data', 'settings.db');
+    this.db = new Database(dbPath);
+    this.init();
+  }
+
+  init() {
+    // Create servers table if it doesn't exist
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS servers (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        name TEXT NOT NULL UNIQUE,
+        ip TEXT NOT NULL,
+        user TEXT NOT NULL,
+        password TEXT,
+        auth_type TEXT DEFAULT 'password' CHECK(auth_type IN ('password', 'key', 'both')),
+        ssh_key TEXT,
+        ssh_key_passphrase TEXT,
+        ssh_port INTEGER DEFAULT 22,
+        color TEXT,
+        created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+        updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
+      )
+    `);
+
+    // Migration: Add new columns to existing servers table
+    try {
+      this.db.exec(`
+        ALTER TABLE servers ADD COLUMN auth_type TEXT DEFAULT 'password' CHECK(auth_type IN ('password', 'key', 'both'))
+      `);
+    } catch (e) {
+      // Column already exists, ignore error
+    }
+
+    try {
+      this.db.exec(`
+        ALTER TABLE servers ADD COLUMN ssh_key TEXT
+      `);
+    } catch (e) {
+      // Column already exists, ignore error
+    }
+
+    try {
+      this.db.exec(`
+        ALTER TABLE servers ADD COLUMN ssh_key_passphrase TEXT
+      `);
+    } catch (e) {
+      // Column already exists, ignore error
+    }
+
+    try {
+      this.db.exec(`
+        ALTER TABLE servers ADD COLUMN ssh_port INTEGER DEFAULT 22
+      `);
+    } catch (e) {
+      // Column already exists, ignore error
+    }
+
+    try {
+      this.db.exec(`
+        ALTER TABLE servers ADD COLUMN color TEXT
+      `);
+    } catch (e) {
+      // Column already exists, ignore error
+    }
+
+    // Update existing servers to have auth_type='password' if not set
+    this.db.exec(`
+      UPDATE servers SET auth_type = 'password' WHERE auth_type IS NULL
+    `);
+
+    // Update existing servers to have ssh_port=22 if not set
+    this.db.exec(`
+      UPDATE servers SET ssh_port = 22 WHERE ssh_port IS NULL
+    `);
+
+    // Migration: Add web_ui_ip column to existing installed_scripts table
+    try {
+      this.db.exec(`
+        ALTER TABLE installed_scripts ADD COLUMN web_ui_ip TEXT
+      `);
+    } catch (e) {
+      // Column already exists, ignore error
+    }
+
+    // Migration: Add web_ui_port column to existing installed_scripts table
+    try {
+      this.db.exec(`
+        ALTER TABLE installed_scripts ADD COLUMN web_ui_port INTEGER
+      `);
+    } catch (e) {
+      // Column already exists, ignore error
+    }
+
+    // Create installed_scripts table if it doesn't exist
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS installed_scripts (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        script_name TEXT NOT NULL,
+        script_path TEXT NOT NULL,
+        container_id TEXT,
+        server_id INTEGER,
+        execution_mode TEXT NOT NULL CHECK(execution_mode IN ('local', 'ssh')),
+        installation_date DATETIME DEFAULT CURRENT_TIMESTAMP,
+        status TEXT NOT NULL CHECK(status IN ('in_progress', 'success', 'failed')),
+        output_log TEXT,
+        web_ui_ip TEXT,
+        web_ui_port INTEGER,
+        FOREIGN KEY (server_id) REFERENCES servers(id) ON DELETE SET NULL
+      )
+    `);
+
+    // Create trigger to update updated_at on row update
+    this.db.exec(`
+      CREATE TRIGGER IF NOT EXISTS update_servers_timestamp 
+      AFTER UPDATE ON servers
+      BEGIN
+        UPDATE servers SET updated_at = CURRENT_TIMESTAMP WHERE id = NEW.id;
+      END
+    `);
+  }
+
+  // Server CRUD operations
+  /**
+   * @param {import('../types/server').CreateServerData} serverData
+   */
+  createServer(serverData) {
+    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color } = serverData;
+    const stmt = this.db.prepare(`
+      INSERT INTO servers (name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color) 
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    return stmt.run(name, ip, user, password, auth_type || 'password', ssh_key, ssh_key_passphrase, ssh_port || 22, color);
+  }
+
+  getAllServers() {
+    const stmt = this.db.prepare('SELECT * FROM servers ORDER BY created_at DESC');
+    return stmt.all();
+  }
+
+  /**
+   * @param {number} id
+   */
+  getServerById(id) {
+    const stmt = this.db.prepare('SELECT * FROM servers WHERE id = ?');
+    return stmt.get(id);
+  }
+
+  /**
+   * @param {number} id
+   * @param {import('../types/server').CreateServerData} serverData
+   */
+  updateServer(id, serverData) {
+    const { name, ip, user, password, auth_type, ssh_key, ssh_key_passphrase, ssh_port, color } = serverData;
+    const stmt = this.db.prepare(`
+      UPDATE servers 
+      SET name = ?, ip = ?, user = ?, password = ?, auth_type = ?, ssh_key = ?, ssh_key_passphrase = ?, ssh_port = ?, color = ?
+      WHERE id = ?
+    `);
+    return stmt.run(name, ip, user, password, auth_type || 'password', ssh_key, ssh_key_passphrase, ssh_port || 22, color, id);
+  }
+
+  /**
+   * @param {number} id
+   */
+  deleteServer(id) {
+    const stmt = this.db.prepare('DELETE FROM servers WHERE id = ?');
+    return stmt.run(id);
+  }
+
+  // Installed Scripts CRUD operations
+  /**
+   * @param {Object} scriptData
+   * @param {string} scriptData.script_name
+   * @param {string} scriptData.script_path
+   * @param {string} [scriptData.container_id]
+   * @param {number} [scriptData.server_id]
+   * @param {string} scriptData.execution_mode
+   * @param {string} scriptData.status
+   * @param {string} [scriptData.output_log]
+   * @param {string} [scriptData.web_ui_ip]
+   * @param {number} [scriptData.web_ui_port]
+   */
+  createInstalledScript(scriptData) {
+    const { script_name, script_path, container_id, server_id, execution_mode, status, output_log, web_ui_ip, web_ui_port } = scriptData;
+    const stmt = this.db.prepare(`
+      INSERT INTO installed_scripts (script_name, script_path, container_id, server_id, execution_mode, status, output_log, web_ui_ip, web_ui_port) 
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    return stmt.run(script_name, script_path, container_id || null, server_id || null, execution_mode, status, output_log || null, web_ui_ip || null, web_ui_port || null);
+  }
+
+  getAllInstalledScripts() {
+    const stmt = this.db.prepare(`
+      SELECT 
+        inst.*,
+        s.name as server_name,
+        s.ip as server_ip,
+        s.user as server_user,
+        s.password as server_password,
+        s.auth_type as server_auth_type,
+        s.ssh_key as server_ssh_key,
+        s.ssh_key_passphrase as server_ssh_key_passphrase,
+        s.ssh_port as server_ssh_port,
+        s.color as server_color
+      FROM installed_scripts inst
+      LEFT JOIN servers s ON inst.server_id = s.id
+      ORDER BY inst.installation_date DESC
+    `);
+    return stmt.all();
+  }
+
+  /**
+   * @param {number} id
+   */
+  getInstalledScriptById(id) {
+    const stmt = this.db.prepare(`
+      SELECT 
+        inst.*,
+        s.name as server_name,
+        s.ip as server_ip
+      FROM installed_scripts inst
+      LEFT JOIN servers s ON inst.server_id = s.id
+      WHERE inst.id = ?
+    `);
+    return stmt.get(id);
+  }
+
+  /**
+   * @param {number} server_id
+   */
+  getInstalledScriptsByServer(server_id) {
+    const stmt = this.db.prepare(`
+      SELECT 
+        inst.*,
+        s.name as server_name,
+        s.ip as server_ip
+      FROM installed_scripts inst
+      LEFT JOIN servers s ON inst.server_id = s.id
+      WHERE inst.server_id = ?
+      ORDER BY inst.installation_date DESC
+    `);
+    return stmt.all(server_id);
+  }
+
+  /**
+   * @param {number} id
+   * @param {Object} updateData
+   * @param {string} [updateData.script_name]
+   * @param {string} [updateData.container_id]
+   * @param {string} [updateData.status]
+   * @param {string} [updateData.output_log]
+   * @param {string} [updateData.web_ui_ip]
+   * @param {number} [updateData.web_ui_port]
+   */
+  updateInstalledScript(id, updateData) {
+    const { script_name, container_id, status, output_log, web_ui_ip, web_ui_port } = updateData;
+    const updates = [];
+    const values = [];
+
+    if (script_name !== undefined) {
+      updates.push('script_name = ?');
+      values.push(script_name);
+    }
+    if (container_id !== undefined) {
+      updates.push('container_id = ?');
+      values.push(container_id);
+    }
+    if (status !== undefined) {
+      updates.push('status = ?');
+      values.push(status);
+    }
+    if (output_log !== undefined) {
+      updates.push('output_log = ?');
+      values.push(output_log);
+    }
+    if (web_ui_ip !== undefined) {
+      updates.push('web_ui_ip = ?');
+      values.push(web_ui_ip);
+    }
+    if (web_ui_port !== undefined) {
+      updates.push('web_ui_port = ?');
+      values.push(web_ui_port);
+    }
+
+    if (updates.length === 0) {
+      return { changes: 0 };
+    }
+
+    values.push(id);
+    const stmt = this.db.prepare(`
+      UPDATE installed_scripts 
+      SET ${updates.join(', ')}
+      WHERE id = ?
+    `);
+    return stmt.run(...values);
+  }
+
+  /**
+   * @param {number} id
+   */
+  deleteInstalledScript(id) {
+    const stmt = this.db.prepare('DELETE FROM installed_scripts WHERE id = ?');
+    return stmt.run(id);
+  }
+
+  /**
+   * @param {number} server_id
+   */
+  deleteInstalledScriptsByServer(server_id) {
+    const stmt = this.db.prepare('DELETE FROM installed_scripts WHERE server_id = ?');
+    return stmt.run(server_id);
+  }
+
+  close() {
+    this.db.close();
+  }
+}
+
+// Singleton instance
+/** @type {DatabaseService | null} */
+let dbInstance = null;
+
+export function getDatabase() {
+  if (!dbInstance) {
+    dbInstance = new DatabaseService();
+  }
+  return dbInstance;
+}
+
+export default DatabaseService;
+

src/server/db.js

@@ -1,7 +0,0 @@
-import { PrismaClient } from '@prisma/client';
-
-const globalForPrisma = globalThis;
-
-export const prisma = globalForPrisma.prisma ?? new PrismaClient();
-
-if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma;

src/server/db.ts

@@ -1,9 +0,0 @@
-import { PrismaClient } from '@prisma/client';
-
-const globalForPrisma = globalThis as unknown as {
-  prisma: PrismaClient | undefined;
-};
-
-export const prisma = globalForPrisma.prisma ?? new PrismaClient();
-
-if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma;

src/server/ssh-execution-service.js

@@ -1,6 +1,8 @@
 import { spawn } from 'child_process';
 import { spawn as ptySpawn } from 'node-pty';
-import { existsSync } from 'fs';
+import { writeFileSync, unlinkSync, chmodSync, mkdtempSync, rmdirSync } from 'fs';
+import { join } from 'path';
+import { tmpdir } from 'os';
 
 
 /**
@@ -9,22 +11,43 @@ import { existsSync } from 'fs';
  * @property {string} user - Username
  * @property {string} [password] - Password (optional)
  * @property {string} name - Server name
- * @property {string} [auth_type] - Authentication type ('password', 'key')
+ * @property {string} [auth_type] - Authentication type ('password', 'key', 'both')
  * @property {string} [ssh_key] - SSH private key content
  * @property {string} [ssh_key_passphrase] - SSH key passphrase
- * @property {string} [ssh_key_path] - Path to persistent SSH key file
  * @property {number} [ssh_port] - SSH port (default: 22)
  */
 
 class SSHExecutionService {
+  /**
+   * Create a temporary SSH key file for authentication
+   * @param {Server} server - Server configuration
+   * @returns {string} Path to temporary key file
+   */
+  createTempKeyFile(server) {
+    const { ssh_key } = server;
+    if (!ssh_key) {
+      throw new Error('SSH key not provided');
+    }
+    
+    const tempDir = mkdtempSync(join(tmpdir(), 'ssh-key-'));
+    const tempKeyPath = join(tempDir, 'private_key');
+    
+    // Normalize the key: trim any trailing whitespace and ensure exactly one newline at the end
+    const normalizedKey = ssh_key.trimEnd() + '\n';
+    writeFileSync(tempKeyPath, normalizedKey);
+    chmodSync(tempKeyPath, 0o600); // Set proper permissions
+    
+    return tempKeyPath;
+  }
 
   /**
    * Build SSH command arguments based on authentication type
    * @param {Server} server - Server configuration
+   * @param {string|null} [tempKeyPath=null] - Path to temporary key file (if using key auth)
    * @returns {{command: string, args: string[]}} Command and arguments for SSH
    */
-  buildSSHCommand(server) {
-    const { ip, user, password, auth_type = 'password', ssh_key_passphrase, ssh_key_path, ssh_port = 22 } = server;
+  buildSSHCommand(server, tempKeyPath = null) {
+    const { ip, user, password, auth_type = 'password', ssh_key_passphrase, ssh_port = 22 } = server;
     
     const baseArgs = [
       '-t',
@@ -46,14 +69,12 @@ class SSHExecutionService {
 
     if (auth_type === 'key') {
       // SSH key authentication
-      if (!ssh_key_path || !existsSync(ssh_key_path)) {
-        throw new Error('SSH key file not found');
+      if (tempKeyPath) {
+        baseArgs.push('-i', tempKeyPath);
+        baseArgs.push('-o', 'PasswordAuthentication=no');
+        baseArgs.push('-o', 'PubkeyAuthentication=yes');
       }
       
-      baseArgs.push('-i', ssh_key_path);
-      baseArgs.push('-o', 'PasswordAuthentication=no');
-      baseArgs.push('-o', 'PubkeyAuthentication=yes');
-      
       if (ssh_key_passphrase) {
         return {
           command: 'sshpass',
@@ -65,6 +86,35 @@ class SSHExecutionService {
           args: [...baseArgs, `${user}@${ip}`]
         };
       }
+    } else if (auth_type === 'both') {
+      // Try SSH key first, then password
+      if (tempKeyPath) {
+        baseArgs.push('-i', tempKeyPath);
+        baseArgs.push('-o', 'PasswordAuthentication=yes');
+        baseArgs.push('-o', 'PubkeyAuthentication=yes');
+        
+        if (ssh_key_passphrase) {
+          return {
+            command: 'sshpass',
+            args: ['-P', 'passphrase', '-p', ssh_key_passphrase, 'ssh', ...baseArgs, `${user}@${ip}`]
+          };
+        } else {
+          return {
+            command: 'ssh',
+            args: [...baseArgs, `${user}@${ip}`]
+          };
+        }
+      } else {
+        // Fallback to password
+        if (password) {
+          return {
+            command: 'sshpass',
+            args: ['-p', password, 'ssh', ...baseArgs, '-o', 'PasswordAuthentication=yes', '-o', 'PubkeyAuthentication=no', `${user}@${ip}`]
+          };
+        } else {
+          throw new Error('Password is required for password authentication');
+        }
+      }
     } else {
       // Password authentication (default)
       if (password) {
@@ -88,6 +138,9 @@ class SSHExecutionService {
    * @returns {Promise<Object>} Process information
    */
   async executeScript(server, scriptPath, onData, onError, onExit) {
+    /** @type {string|null} */
+    let tempKeyPath = null;
+    
     try {
       await this.transferScriptsFolder(server, onData, onError);
       
@@ -95,8 +148,13 @@ class SSHExecutionService {
         const relativeScriptPath = scriptPath.startsWith('scripts/') ? scriptPath.substring(8) : scriptPath;
         
         try {
+          // Create temporary key file if using key authentication
+          if (server.auth_type === 'key' || server.auth_type === 'both') {
+            tempKeyPath = this.createTempKeyFile(server);
+          }
+          
           // Build SSH command based on authentication type
-          const { command, args } = this.buildSSHCommand(server);
+          const { command, args } = this.buildSSHCommand(server, tempKeyPath);
           
           // Add the script execution command to the args
           args.push(`cd /tmp/scripts && chmod +x ${relativeScriptPath} && export TERM=xterm-256color && export COLUMNS=120 && export LINES=30 && export COLORTERM=truecolor && export FORCE_COLOR=1 && export NO_COLOR=0 && export CLICOLOR=1 && export CLICOLOR_FORCE=1 && bash ${relativeScriptPath}`);
@@ -135,10 +193,30 @@ class SSHExecutionService {
           process: sshCommand,
           kill: () => {
             sshCommand.kill('SIGTERM');
+            // Clean up temporary key file
+            if (tempKeyPath) {
+              try {
+                unlinkSync(tempKeyPath);
+                const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+                rmdirSync(tempDir);
+              } catch (cleanupError) {
+                console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+              }
+            }
           }
         });
         
         } catch (error) {
+          // Clean up temporary key file on error
+          if (tempKeyPath) {
+            try {
+              unlinkSync(tempKeyPath);
+              const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+              rmdirSync(tempDir);
+            } catch (cleanupError) {
+              console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+            }
+          }
           reject(error);
         }
       });
@@ -157,24 +235,35 @@ class SSHExecutionService {
    * @returns {Promise<void>}
    */
   async transferScriptsFolder(server, onData, onError) {
-    const { ip, user, password, auth_type = 'password', ssh_key_passphrase, ssh_key_path, ssh_port = 22 } = server;
+    const { ip, user, password, auth_type = 'password', ssh_key, ssh_key_passphrase, ssh_port = 22 } = server;
+    /** @type {string|null} */
+    let tempKeyPath = null;
     
     return new Promise((resolve, reject) => {
       try {
+        // Create temporary key file if using key authentication
+        if (auth_type === 'key' || auth_type === 'both') {
+          if (ssh_key) {
+            tempKeyPath = this.createTempKeyFile(server);
+          }
+        }
+        
         // Build rsync command based on authentication type
         let rshCommand;
-        if (auth_type === 'key') {
-          if (!ssh_key_path || !existsSync(ssh_key_path)) {
-            throw new Error('SSH key file not found');
-          }
-          
+        if (auth_type === 'key' && tempKeyPath) {
           if (ssh_key_passphrase) {
-            rshCommand = `sshpass -P passphrase -p ${ssh_key_passphrase} ssh -i ${ssh_key_path} -p ${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null`;
+            rshCommand = `sshpass -P passphrase -p ${ssh_key_passphrase} ssh -i ${tempKeyPath} -p ${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null`;
           } else {
-            rshCommand = `ssh -i ${ssh_key_path} -p ${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null`;
+            rshCommand = `ssh -i ${tempKeyPath} -p ${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null`;
+          }
+        } else if (auth_type === 'both' && tempKeyPath) {
+          if (ssh_key_passphrase) {
+            rshCommand = `sshpass -P passphrase -p ${ssh_key_passphrase} ssh -i ${tempKeyPath} -p ${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null`;
+          } else {
+            rshCommand = `ssh -i ${tempKeyPath} -p ${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null`;
           }
         } else {
-          // Password authentication
+          // Fallback to password authentication
           rshCommand = `sshpass -p ${password} ssh -p ${ssh_port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null`;
         }
         
@@ -203,6 +292,17 @@ class SSHExecutionService {
       });
 
       rsyncCommand.on('close', (code) => {
+        // Clean up temporary key file
+        if (tempKeyPath) {
+          try {
+            unlinkSync(tempKeyPath);
+            const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+            rmdirSync(tempDir);
+          } catch (cleanupError) {
+            console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+          }
+        }
+        
         if (code === 0) {
           resolve();
         } else {
@@ -211,10 +311,30 @@ class SSHExecutionService {
       });
 
       rsyncCommand.on('error', (error) => {
+        // Clean up temporary key file on error
+        if (tempKeyPath) {
+          try {
+            unlinkSync(tempKeyPath);
+            const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+            rmdirSync(tempDir);
+          } catch (cleanupError) {
+            console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+          }
+        }
         reject(error);
       });
       
       } catch (error) {
+        // Clean up temporary key file on error
+        if (tempKeyPath) {
+          try {
+            unlinkSync(tempKeyPath);
+            const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+            rmdirSync(tempDir);
+          } catch (cleanupError) {
+            console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+          }
+        }
         reject(error);
       }
     });
@@ -230,10 +350,18 @@ class SSHExecutionService {
    * @returns {Promise<Object>} Process information
    */
   async executeCommand(server, command, onData, onError, onExit) {
+    /** @type {string|null} */
+    let tempKeyPath = null;
+    
     return new Promise((resolve, reject) => {
       try {
+        // Create temporary key file if using key authentication
+        if (server.auth_type === 'key' || server.auth_type === 'both') {
+          tempKeyPath = this.createTempKeyFile(server);
+        }
+        
         // Build SSH command based on authentication type
-        const { command: sshCommandName, args } = this.buildSSHCommand(server);
+        const { command: sshCommandName, args } = this.buildSSHCommand(server, tempKeyPath);
         
         // Add the command to execute to the args
         args.push(command);
@@ -252,6 +380,16 @@ class SSHExecutionService {
       });
 
       sshCommand.onExit((e) => {
+        // Clean up temporary key file
+        if (tempKeyPath) {
+          try {
+            unlinkSync(tempKeyPath);
+            const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+            rmdirSync(tempDir);
+          } catch (cleanupError) {
+            console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+          }
+        }
         onExit(e.exitCode);
       });
 
@@ -259,10 +397,30 @@ class SSHExecutionService {
         process: sshCommand,
         kill: () => {
           sshCommand.kill('SIGTERM');
+          // Clean up temporary key file
+          if (tempKeyPath) {
+            try {
+              unlinkSync(tempKeyPath);
+              const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+              rmdirSync(tempDir);
+            } catch (cleanupError) {
+              console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+            }
+          }
         }
       });
       
       } catch (error) {
+        // Clean up temporary key file on error
+        if (tempKeyPath) {
+          try {
+            unlinkSync(tempKeyPath);
+            const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+            rmdirSync(tempDir);
+          } catch (cleanupError) {
+            console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+          }
+        }
         reject(error);
       }
     });

src/server/ssh-service.js

@@ -1,5 +1,5 @@
 import { spawn } from 'child_process';
-import { writeFileSync, unlinkSync, chmodSync, mkdtempSync, rmdirSync, readFileSync, existsSync } from 'fs';
+import { writeFileSync, unlinkSync, chmodSync, mkdtempSync, rmdirSync } from 'fs';
 import { join } from 'path';
 import { tmpdir } from 'os';
 
@@ -21,6 +21,9 @@ class SSHService {
       let authPromise;
       if (auth_type === 'key') {
         authPromise = this.testWithSSHKey(server);
+      } else if (auth_type === 'both') {
+        // Try SSH key first, then password
+        authPromise = this.testWithSSHKey(server).catch(() => this.testWithSshpass(server));
       } else {
         // Default to password authentication
         authPromise = this.testWithSshpass(server).catch(() => this.testWithExpect(server));
@@ -537,20 +540,31 @@ expect {
    * @returns {Promise<Object>} Connection test result
    */
   async testWithSSHKey(server) {
-    const { ip, user, ssh_key_path, ssh_key_passphrase, ssh_port = 22 } = server;
+    const { ip, user, ssh_key, ssh_key_passphrase, ssh_port = 22 } = server;
     
-    if (!ssh_key_path || !existsSync(ssh_key_path)) {
-      throw new Error('SSH key file not found');
+    if (!ssh_key) {
+      throw new Error('SSH key not provided');
     }
 
     return new Promise((resolve, reject) => {
       const timeout = 10000;
       let resolved = false;
+      let tempKeyPath = null;
       
       try {
+        // Create temporary key file
+        const tempDir = mkdtempSync(join(tmpdir(), 'ssh-key-'));
+        tempKeyPath = join(tempDir, 'private_key');
+        
+        // Write the private key to temporary file
+        // Normalize the key: trim any trailing whitespace and ensure exactly one newline at the end
+        const normalizedKey = ssh_key.trimEnd() + '\n';
+        writeFileSync(tempKeyPath, normalizedKey);
+        chmodSync(tempKeyPath, 0o600); // Set proper permissions
+        
         // Build SSH command
         const sshArgs = [
-          '-i', ssh_key_path,
+          '-i', tempKeyPath,
           '-p', ssh_port.toString(),
           '-o', 'ConnectTimeout=10',
           '-o', 'StrictHostKeyChecking=no',
@@ -648,82 +662,22 @@ expect {
           resolved = true;
           reject(error);
         }
+      } finally {
+        // Clean up temporary key file
+        if (tempKeyPath) {
+          try {
+            unlinkSync(tempKeyPath);
+            // Also remove the temp directory
+            const tempDir = tempKeyPath.substring(0, tempKeyPath.lastIndexOf('/'));
+            rmdirSync(tempDir);
+          } catch (cleanupError) {
+            console.warn('Failed to clean up temporary SSH key file:', cleanupError);
+          }
+        }
       }
     });
   }
 
-  /**
-   * Generate SSH key pair for a server
-   * @param {number} serverId - Server ID for key file naming
-   * @returns {Promise<{privateKey: string, publicKey: string}>}
-   */
-  async generateKeyPair(serverId) {
-    const sshKeysDir = join(process.cwd(), 'data', 'ssh-keys');
-    const keyPath = join(sshKeysDir, `server_${serverId}_key`);
-    
-    return new Promise((resolve, reject) => {
-      const sshKeygen = spawn('ssh-keygen', [
-        '-t', 'ed25519',
-        '-f', keyPath,
-        '-N', '', // No passphrase
-        '-C', 'pve-scripts-local'
-      ], {
-        stdio: ['pipe', 'pipe', 'pipe']
-      });
-
-      let errorOutput = '';
-      
-      sshKeygen.stderr.on('data', (data) => {
-        errorOutput += data.toString();
-      });
-
-      sshKeygen.on('close', (code) => {
-        if (code === 0) {
-          try {
-            // Read the generated private key
-            const privateKey = readFileSync(keyPath, 'utf8');
-            
-            // Read the generated public key
-            const publicKeyPath = keyPath + '.pub';
-            const publicKey = readFileSync(publicKeyPath, 'utf8');
-            
-            // Set proper permissions
-            chmodSync(keyPath, 0o600);
-            chmodSync(publicKeyPath, 0o644);
-            
-            resolve({
-              privateKey,
-              publicKey: publicKey.trim()
-            });
-          } catch (error) {
-            reject(new Error(`Failed to read generated key files: ${error instanceof Error ? error.message : String(error)}`));
-          }
-        } else {
-          reject(new Error(`ssh-keygen failed: ${errorOutput}`));
-        }
-      });
-
-      sshKeygen.on('error', (error) => {
-        reject(new Error(`Failed to run ssh-keygen: ${error.message}`));
-      });
-    });
-  }
-
-  /**
-   * Get public key from private key file
-   * @param {string} keyPath - Path to private key file
-   * @returns {string} Public key content
-   */
-  getPublicKey(keyPath) {
-    const publicKeyPath = keyPath + '.pub';
-    
-    if (!existsSync(publicKeyPath)) {
-      throw new Error('Public key file not found');
-    }
-    
-    return readFileSync(publicKeyPath, 'utf8').trim();
-  }
-
 }
 
 // Singleton instance

src/styles/globals.css

@@ -1,5 +1,4 @@
 @import "tailwindcss";
-@plugin "@tailwindcss/typography";
 
 @layer base {
   :root {

src/types/server.ts

@@ -4,15 +4,13 @@ export interface Server {
   ip: string;
   user: string;
   password?: string;
-  auth_type?: 'password' | 'key';
+  auth_type?: 'password' | 'key' | 'both';
   ssh_key?: string;
   ssh_key_passphrase?: string;
-  ssh_key_path?: string;
-  key_generated?: boolean;
   ssh_port?: number;
   color?: string;
-  created_at: Date | null;
-  updated_at: Date | null;
+  created_at: string;
+  updated_at: string;
 }
 
 export interface CreateServerData {
@@ -20,11 +18,9 @@ export interface CreateServerData {
   ip: string;
   user: string;
   password?: string;
-  auth_type?: 'password' | 'key';
+  auth_type?: 'password' | 'key' | 'both';
   ssh_key?: string;
   ssh_key_passphrase?: string;
-  ssh_key_path?: string;
-  key_generated?: boolean;
   ssh_port?: number;
   color?: string;
 }

update.sh

@@ -412,36 +412,6 @@ restore_backup_files() {
     fi
 }
 
-# Ensure DATABASE_URL is set in .env file for Prisma
-ensure_database_url() {
-    log "Ensuring DATABASE_URL is set in .env file..."
-    
-    # Check if .env file exists
-    if [ ! -f ".env" ]; then
-        log_warning ".env file not found, creating from .env.example..."
-        if [ -f ".env.example" ]; then
-            cp ".env.example" ".env"
-        else
-            log_error ".env.example not found, cannot create .env file"
-            return 1
-        fi
-    fi
-    
-    # Check if DATABASE_URL is already set
-    if grep -q "^DATABASE_URL=" .env; then
-        log "DATABASE_URL already exists in .env file"
-        return 0
-    fi
-    
-    # Add DATABASE_URL to .env file
-    log "Adding DATABASE_URL to .env file..."
-    echo "" >> .env
-    echo "# Database" >> .env
-    echo "DATABASE_URL=\"file:./data/database.sqlite\"" >> .env
-    
-    log_success "DATABASE_URL added to .env file"
-}
-
 # Check if systemd service exists
 check_service() {
     # systemctl status returns 0-3 if service exists (running, exited, failed, etc.)
@@ -637,32 +607,6 @@ install_and_build() {
     log_success "Dependencies installed successfully"
     rm -f "$npm_log"
     
-    # Generate Prisma client
-    log "Generating Prisma client..."
-    if ! npx prisma generate > "$npm_log" 2>&1; then
-        log_error "Failed to generate Prisma client"
-        log_error "Prisma generate output:"
-        cat "$npm_log" | while read -r line; do
-            log_error "PRISMA: $line"
-        done
-        rm -f "$npm_log"
-        return 1
-    fi
-    log_success "Prisma client generated successfully"
-    
-    # Run Prisma migrations
-    log "Running Prisma migrations..."
-    if ! npx prisma migrate deploy > "$npm_log" 2>&1; then
-        log_warning "Prisma migrations failed or no migrations to run"
-        log "Prisma migrate output:"
-        cat "$npm_log" | while read -r line; do
-            log "PRISMA: $line"
-        done
-    else
-        log_success "Prisma migrations completed successfully"
-    fi
-    rm -f "$npm_log"
-    
     log "Building application..."
     # Set NODE_ENV to production for build
     export NODE_ENV=production
@@ -894,9 +838,6 @@ main() {
     # Restore .env and data directory before building
     restore_backup_files
     
-    # Ensure DATABASE_URL is set for Prisma
-    ensure_database_url
-    
     # Install dependencies and build
     if ! install_and_build; then
         log_error "Install and build failed, rolling back..."