lightman-agent 1.0.8 → 1.0.11

package/bin/cms-agent.js

@@ -16,13 +16,13 @@ function printUsage() {
 cms-agent <command> [options]
 
 Commands:
-  install             Prompt slug, install agent with ShellReplace, reboot
+  install             Prompt slug and server IP, install agent with ShellReplace, reboot
   setup               Alias of install
   update              Reinstall/update using installed config, reboot
 
 Options:
   --slug <value>      Device slug (example: C-AV01)
-  --server <url>      Server URL (example: http://192.168.1.100:3401)
+  --server <url>      Server URL or IP (example: 192.168.1.100 or http://192.168.1.100:3401)
   --timezone <tz>     Timezone override (default: Asia/Kolkata)
   --pair-timeout <s>  Wait time for pairing in seconds (default: 900, 0 = no timeout)
   --no-restart        Skip reboot after successful install/update
@@ -79,6 +79,33 @@ function isValidSlug(slug) {
   return /^[A-Za-z0-9][A-Za-z0-9-]{0,62}$/.test(slug);
 }
 
+function normalizeServer(server) {
+  const value = (server || '').trim();
+  if (!value) {
+    return '';
+  }
+
+  const hasProtocol = /^[a-z]+:\/\//i.test(value);
+  const candidate = hasProtocol ? value : `http://${value}`;
+
+  let parsed;
+  try {
+    parsed = new URL(candidate);
+  } catch {
+    throw new Error('Invalid server IP/URL. Use an IP like 192.168.1.100 or a URL like http://192.168.1.100:3401.');
+  }
+
+  if (!parsed.port) {
+    parsed.port = '3401';
+  }
+
+  if (parsed.pathname === '/') {
+    parsed.pathname = '';
+  }
+
+  return parsed.toString().replace(/\/$/, '');
+}
+
 function collectMacAddresses() {
   const nets = networkInterfaces();
   const macs = new Set();
@@ -129,6 +156,27 @@ async function promptSlug(defaultSlug) {
   }
 }
 
+async function promptServer(defaultServer) {
+  const rl = createInterface({ input, output });
+  try {
+    while (true) {
+      const prompt = defaultServer
+        ? `Enter server IP or URL [${defaultServer}]: `
+        : 'Enter server IP or URL (example 192.168.1.100 or http://192.168.1.100:3401): ';
+      const answer = (await rl.question(prompt)).trim();
+      const server = answer || defaultServer || '';
+
+      try {
+        return normalizeServer(server);
+      } catch (error) {
+        console.error(error instanceof Error ? error.message : String(error));
+      }
+    }
+  } finally {
+    rl.close();
+  }
+}
+
 function resolveInstallScript() {
   const here = dirname(fileURLToPath(import.meta.url));
   const packaged = resolve(here, '../scripts/install-windows.ps1');
@@ -166,7 +214,7 @@ async function runInstall(opts) {
   const localConfig = safeReadJson(resolve(cwd(), 'agent.config.json')) || {};
   const installedConfig = safeReadJson(INSTALL_CONFIG_PATH) || {};
   const defaultSlug = opts.slug || localConfig.deviceSlug || installedConfig.deviceSlug || '';
-  const server = opts.server || DEFAULT_SERVER;
+  const defaultServer = localConfig.serverUrl || installedConfig.serverUrl || DEFAULT_SERVER;
   const timezone = opts.timezone || localConfig?.powerSchedule?.timezone || installedConfig?.powerSchedule?.timezone || 'Asia/Kolkata';
   const pairingTimeoutSeconds = Number.isFinite(Number(opts.pairTimeout)) ? Number.parseInt(String(opts.pairTimeout), 10) : 900;
   const noRestart = Boolean(opts.noRestart);
@@ -183,6 +231,7 @@ async function runInstall(opts) {
   console.log('');
 
   const slug = opts.slug || await promptSlug(defaultSlug);
+  const server = opts.server ? normalizeServer(opts.server) : await promptServer(defaultServer);
   const scriptPath = resolveInstallScript();
 
   console.log(`Installing with slug=${slug}, server=${server}, shellReplace=true`);
@@ -199,7 +248,7 @@ async function runUpdate(opts) {
 
   const installedConfig = safeReadJson(INSTALL_CONFIG_PATH) || {};
   const slug = opts.slug || installedConfig.deviceSlug;
-  const server = opts.server || DEFAULT_SERVER;
+  const server = normalizeServer(opts.server || installedConfig.serverUrl || DEFAULT_SERVER);
   const timezone = opts.timezone || installedConfig?.powerSchedule?.timezone || 'Asia/Kolkata';
   const pairingTimeoutSeconds = Number.isFinite(Number(opts.pairTimeout)) ? Number.parseInt(String(opts.pairTimeout), 10) : 900;
   const noRestart = Boolean(opts.noRestart);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightman-agent",
-  "version": "1.0.8",
+  "version": "1.0.11",
   "description": "LIGHTMAN Agent - System-level daemon for museum display machines",
   "private": false,
   "type": "module",

package/scripts/guardian.ps1

@@ -6,6 +6,7 @@ $LogDir = "C:\ProgramData\Lightman\logs"
 $LogFile = Join-Path $LogDir "guardian.log"
 $ServiceName = "LightmanAgent"
 $NssmExe = "C:\ProgramData\Lightman\nssm\nssm.exe"
+$ConfigPath = "C:\Program Files\Lightman\Agent\agent.config.json"
 
 function Write-GuardianLog($msg) {
     $ts = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
@@ -20,6 +21,23 @@ function Write-GuardianLog($msg) {
     } catch { }
 }
 
+function Get-BrowserProcessName {
+    try {
+        if (Test-Path $ConfigPath) {
+            $config = Get-Content $ConfigPath -Raw | ConvertFrom-Json
+            $browserPath = $config.kiosk.browserPath
+            if ($browserPath) {
+                $browserLeaf = Split-Path $browserPath -Leaf
+                if ($browserLeaf) {
+                    return [System.IO.Path]::GetFileNameWithoutExtension($browserLeaf)
+                }
+            }
+        }
+    } catch { }
+
+    return "chrome"
+}
+
 try {
     # 1. Check LIGHTMAN service
     $svc = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
@@ -57,15 +75,16 @@ try {
         }
     }
 
-    # 2. Check Chrome kiosk
-    $chrome = Get-Process -Name "chrome" -ErrorAction SilentlyContinue
-    if (-not $chrome) {
+    # 2. Check kiosk browser
+    $browserProcess = Get-BrowserProcessName
+    $browser = Get-Process -Name $browserProcess -ErrorAction SilentlyContinue
+    if (-not $browser) {
         $vbsPath = "C:\Program Files\Lightman\Agent\launch-kiosk.vbs"
         if (Test-Path $vbsPath) {
             Start-Sleep -Seconds 10
-            $chromeRecheck = Get-Process -Name "chrome" -ErrorAction SilentlyContinue
-            if (-not $chromeRecheck) {
-                Write-GuardianLog "Chrome not running. Launching via VBS..."
+            $browserRecheck = Get-Process -Name $browserProcess -ErrorAction SilentlyContinue
+            if (-not $browserRecheck) {
+                Write-GuardianLog "Browser '$browserProcess' not running. Launching via VBS..."
                 Start-Process "wscript.exe" -ArgumentList """$vbsPath""" -WindowStyle Hidden
             }
         }

package/scripts/install-windows.ps1

@@ -34,6 +34,80 @@ $AgentDir      = Split-Path -Parent $ScriptDir
 
 if (-not $Username) { $Username = $env:USERNAME }
 
+function Get-ChromePath {
+    $candidates = @(
+        "C:\Program Files\Google\Chrome\Application\chrome.exe",
+        "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe",
+        (Join-Path $env:LOCALAPPDATA "Google\Chrome\Application\chrome.exe")
+    )
+
+    foreach ($candidate in $candidates) {
+        if ($candidate -and (Test-Path $candidate)) {
+            return $candidate
+        }
+    }
+
+    return $null
+}
+
+function Install-ChromeFromMsi {
+    $is64Bit = [Environment]::Is64BitOperatingSystem
+    $downloadUrl = if ($is64Bit) {
+        "https://dl.google.com/dl/chrome/install/googlechromestandaloneenterprise64.msi"
+    } else {
+        "https://dl.google.com/dl/chrome/install/googlechromestandaloneenterprise.msi"
+    }
+    $installerName = if ($is64Bit) { "googlechromestandaloneenterprise64.msi" } else { "googlechromestandaloneenterprise.msi" }
+    $installerPath = Join-Path $env:TEMP $installerName
+
+    Write-Host "  Chrome not found. Downloading official Google Chrome MSI..." -ForegroundColor Yellow
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+    Invoke-WebRequest -Uri $downloadUrl -OutFile $installerPath -UseBasicParsing -TimeoutSec 180
+
+    if (-not (Test-Path $installerPath)) {
+        throw "Chrome MSI was not downloaded."
+    }
+
+    $msiArgs = "/i `"$installerPath`" /qn /norestart"
+    Start-Process msiexec.exe -ArgumentList $msiArgs -Wait -NoNewWindow
+    Remove-Item $installerPath -Force -ErrorAction SilentlyContinue
+}
+
+function Install-ChromeFromWinget {
+    if (-not (Get-Command winget -ErrorAction SilentlyContinue)) {
+        throw "winget is not available."
+    }
+
+    Write-Host "  MSI install failed. Trying winget for Google Chrome..." -ForegroundColor Yellow
+    & winget install --id Google.Chrome --exact --silent --accept-package-agreements --accept-source-agreements 2>&1 | Out-Host
+    if ($LASTEXITCODE -ne 0) {
+        throw "winget install failed with exit code $LASTEXITCODE."
+    }
+}
+
+function Ensure-ChromeInstalled {
+    $existingChrome = Get-ChromePath
+    if ($existingChrome) {
+        Write-Host "  Found Chrome: $existingChrome" -ForegroundColor Green
+        return $existingChrome
+    }
+
+    try {
+        Install-ChromeFromMsi
+    } catch {
+        Write-Host "  Chrome MSI install failed: $($_.Exception.Message)" -ForegroundColor DarkYellow
+        Install-ChromeFromWinget
+    }
+
+    $installedChrome = Get-ChromePath
+    if (-not $installedChrome) {
+        throw "Chrome install did not produce chrome.exe."
+    }
+
+    Write-Host "  Chrome installed: $installedChrome" -ForegroundColor Green
+    return $installedChrome
+}
+
 Write-Host ""
 Write-Host "=============================================" -ForegroundColor Cyan
 Write-Host "  LIGHTMAN Agent - Complete Windows Installer" -ForegroundColor Cyan
@@ -70,7 +144,7 @@ foreach ($tn in @($AgentTask, $KioskTask, $GuardianTask)) {
 }
 
 # Kill processes
-Write-Host "[0c] Killing node.exe and Chrome..." -ForegroundColor Yellow
+Write-Host "[0c] Killing node.exe and kiosk browser..." -ForegroundColor Yellow
 # IMPORTANT:
 # If install-windows.ps1 is launched from the npm CLI wrapper (node.exe),
 # killing all node.exe would terminate the installer mid-run.
@@ -86,6 +160,7 @@ Get-Process -Name "node" -ErrorAction SilentlyContinue | ForEach-Object {
     }
 }
 Get-Process -Name "chrome" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
+Get-Process -Name "msedge" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
 Start-Sleep -Seconds 2
 
 # Remove old files (keep NSSM and logs)
@@ -155,6 +230,16 @@ if ($LASTEXITCODE -ne 0) { & npm install --omit=dev --ignore-scripts 2>&1 | Out-
 $ErrorActionPreference = "Stop"
 Pop-Location
 
+# --- 5b. Chrome ---
+Write-Host "[5b/19] Ensuring Google Chrome is installed..." -ForegroundColor Yellow
+try {
+    $chromePath = Ensure-ChromeInstalled
+} catch {
+    Write-Host "  FATAL: $($_.Exception.Message)" -ForegroundColor Red
+    Write-Host "  Install Google Chrome manually, then re-run the installer." -ForegroundColor Yellow
+    exit 1
+}
+
 # --- 6. Generate config ---
 Write-Host "[6/19] Generating config..." -ForegroundColor Yellow
 if ($ShellReplace) {
@@ -551,7 +636,7 @@ $svcStatus = if ($finalSvc) { "$($finalSvc.Status)" } else { "NOT FOUND" }
 $cfgOk = $false
 try {
     Push-Location $InstallDir
-    $cfgResult = & node -e "const c=JSON.parse(require('fs').readFileSync('agent.config.json','utf8'));console.log(JSON.stringify({slug:c.deviceSlug,shell:c.kiosk&&c.kiosk.shellMode||false}))" 2>&1
+    $cfgResult = & node -e "const c=JSON.parse(require('fs').readFileSync('agent.config.json','utf8'));console.log(JSON.stringify({slug:c.deviceSlug,shell:c.kiosk&&c.kiosk.shellMode||false,browser:c.kiosk&&c.kiosk.browserPath||''}))" 2>&1
     $cfgData = $cfgResult | ConvertFrom-Json
     Pop-Location
     $cfgOk = $true
@@ -572,6 +657,7 @@ Write-Host "  Service    : $svcStatus" -ForegroundColor $(if ($svcStatus -eq 'Ru
 if ($cfgOk) {
     Write-Host "  Config slug: $($cfgData.slug)" -ForegroundColor $(if ($cfgData.slug -eq $Slug) { 'Green' } else { 'Red' })
     Write-Host "  Shell mode : $($cfgData.shell)" -ForegroundColor $(if ($cfgData.shell -eq $ShellReplace.IsPresent) { 'Green' } else { 'Red' })
+    Write-Host "  Browser    : $($cfgData.browser)" -ForegroundColor Green
 }
 Write-Host ""
 Write-Host "  Manage:" -ForegroundColor DarkGray

package/scripts/launch-kiosk.vbs

@@ -26,6 +26,11 @@ objFile.Close
 
 browserPath = ExtractJsonValue(jsonText, "browserPath")
 defaultUrl = ExtractJsonValue(jsonText, "defaultUrl")
+browserExeName = LCase(ExtractFileName(browserPath))
+
+If browserExeName = "" Then
+    browserExeName = "chrome.exe"
+End If
 
 If browserPath = "" Or defaultUrl = "" Then
     WScript.Quit 1
@@ -35,11 +40,11 @@ End If
 ' Try to ping the server (extract hostname from URL)
 waitedMs = 0
 Do While waitedMs < (maxWaitSeconds * 1000)
-    ' Check if Chrome is already running (agent's KioskManager may have launched it)
+    ' Check if the browser is already running (agent's KioskManager may have launched it)
     Set objWMI = GetObject("winmgmts:\\.\root\cimv2")
-    Set colProcesses = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = 'chrome.exe'")
+    Set colProcesses = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = '" & browserExeName & "'")
     If colProcesses.Count > 0 Then
-        ' Chrome already running - agent is handling it. Exit gracefully.
+        ' Browser already running - agent is handling it. Exit gracefully.
         WScript.Quit 0
     End If
 
@@ -56,14 +61,14 @@ Do While waitedMs < (maxWaitSeconds * 1000)
         ' Service is running - give it a few more seconds to launch Chrome itself
         WScript.Sleep 15000
 
-        ' Re-check if Chrome appeared (agent launched it)
-        Set colProcesses2 = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = 'chrome.exe'")
+        ' Re-check if the browser appeared (agent launched it)
+        Set colProcesses2 = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = '" & browserExeName & "'")
         If colProcesses2.Count > 0 Then
-            ' Agent launched Chrome successfully. Exit.
+            ' Agent launched the browser successfully. Exit.
             WScript.Quit 0
         End If
 
-        ' Agent is running but hasn't launched Chrome yet - we'll do it
+        ' Agent is running but hasn't launched the browser yet - we'll do it
         Exit Do
     End If
 
@@ -99,3 +104,14 @@ Function ExtractJsonValue(json, key)
     If endPos = 0 Then Exit Function
     ExtractJsonValue = Mid(json, pos, endPos - pos)
 End Function
+
+Function ExtractFileName(path)
+    ExtractFileName = ""
+    If path = "" Then Exit Function
+    On Error Resume Next
+    ExtractFileName = objFSO.GetFileName(path)
+    If ExtractFileName = "" Then
+        ExtractFileName = path
+    End If
+    On Error GoTo 0
+End Function

package/scripts/lightman-shell.bat

@@ -84,8 +84,12 @@ if "%BROWSER%"=="" (
         set "BROWSER=C:\Program Files\Google\Chrome\Application\chrome.exe"
     ) else if exist "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" (
         set "BROWSER=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
+    ) else if exist "C:\Program Files\Microsoft\Edge\Application\msedge.exe" (
+        set "BROWSER=C:\Program Files\Microsoft\Edge\Application\msedge.exe"
+    ) else if exist "C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe" (
+        set "BROWSER=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"
     ) else (
-        echo [%date% %time%] ERROR: Chrome not found! >> "%LOG_FILE%"
+        echo [%date% %time%] ERROR: No supported kiosk browser found! >> "%LOG_FILE%"
         start explorer.exe
         exit /b 1
     )
@@ -135,11 +139,11 @@ REM ----------------------------------------------------------------
         )
     )
 
-    echo [%date% %time%] Launching Chrome: %URL% >> "%LOG_FILE%"
+    echo [%date% %time%] Launching browser: %URL% >> "%LOG_FILE%"
 
     start /wait "" "%BROWSER%" --kiosk --noerrdialogs --disable-infobars --disable-session-crashed-bubble --no-first-run --no-default-browser-check --start-fullscreen --disable-translate --disable-extensions --autoplay-policy=no-user-gesture-required --disable-features=TranslateUI --user-data-dir="%CHROME_DATA%" "%URL%"
 
-    echo [%date% %time%] Chrome exited (code: %errorlevel%). Restarting in 3s... >> "%LOG_FILE%"
+    echo [%date% %time%] Browser exited (code: %errorlevel%). Restarting in 3s... >> "%LOG_FILE%"
     timeout /t 3 /nobreak >nul
 
 goto loop

package/scripts/setup.ps1

@@ -42,6 +42,23 @@ Write-Host "  Install dir: $InstallDir"
 Write-Host "  Timezone:    $Timezone"
 Write-Host ""
 
+function Get-KioskBrowserPath {
+    $candidates = @(
+        "C:\Program Files\Google\Chrome\Application\chrome.exe",
+        "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe",
+        (Join-Path $env:LOCALAPPDATA "Google\Chrome\Application\chrome.exe"),
+        "C:\Program Files\Microsoft\Edge\Application\msedge.exe",
+        "C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe",
+        (Join-Path $env:LOCALAPPDATA "Microsoft\Edge\Application\msedge.exe")
+    ) | Where-Object { $_ -and (Test-Path $_) }
+
+    if ($candidates.Count -gt 0) {
+        return $candidates[0]
+    }
+
+    throw "Neither Google Chrome nor Microsoft Edge was found. Install one of them and re-run setup."
+}
+
 # 1. Clear cached identity (CRITICAL - prevents old device credentials leaking)
 $IdentityFile = Join-Path $InstallDir ".lightman-identity.json"
 if (Test-Path $IdentityFile) {
@@ -55,13 +72,12 @@ if (Test-Path $IdentityFile) {
 $KioskUrl  = "http://localhost:3403/display/$Slug"
 
 # 3. Detect browser path
-$BrowserPath = "C:\Program Files\Google\Chrome\Application\chrome.exe"
-if (-not (Test-Path $BrowserPath)) {
-    $BrowserPath = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
-}
-if (-not (Test-Path $BrowserPath)) {
-    $BrowserPath = "chromium-browser"
-    Write-Host "[WARN] Chrome not found - using 'chromium-browser'" -ForegroundColor Yellow
+try {
+    $BrowserPath = Get-KioskBrowserPath
+    Write-Host "[OK] Using kiosk browser: $BrowserPath" -ForegroundColor Green
+} catch {
+    Write-Host "[ERROR] $($_.Exception.Message)" -ForegroundColor Red
+    exit 1
 }
 
 $ChromeDataDir = "C:\ProgramData\Lightman\chrome-kiosk"

package/src/index.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
-import { loadConfig } from './lib/config.js';
+import { getDefaultKioskBrowserPath, loadConfig } from './lib/config.js';
 import { Logger } from './lib/logger.js';
 import { provision } from './services/provisioning.js';
 import { WsClient } from './services/websocket.js';
@@ -135,7 +135,7 @@ async function main(): Promise<void> {
 
   // Create KioskManager if kiosk config is present
   const baseKioskConfig: KioskConfig = config.kiosk || {
-    browserPath: 'chromium-browser',
+    browserPath: getDefaultKioskBrowserPath(),
     defaultUrl: `${config.serverUrl.replace(/:\d+$/, ':3401')}/display`,
     extraArgs: [],
     pollIntervalMs: 10_000,

package/src/lib/config.ts

@@ -3,8 +3,29 @@ import { resolve } from 'path';
 import { z } from 'zod';
 import type { AgentConfig } from './types.js';
 
+export function getDefaultKioskBrowserPath(): string {
+  if (process.platform === 'win32') {
+    const candidates = [
+      'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
+      'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
+      'C:\\Program Files\\Microsoft\\Edge\\Application\\msedge.exe',
+      'C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe',
+    ];
+
+    for (const candidate of candidates) {
+      if (existsSync(candidate)) {
+        return candidate;
+      }
+    }
+
+    return 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe';
+  }
+
+  return 'chromium-browser';
+}
+
 const kioskSchema = z.object({
-  browserPath: z.string().default('chromium-browser'),
+  browserPath: z.string().default(getDefaultKioskBrowserPath()),
   defaultUrl: z.string().url().default('http://localhost:3401/display'),
   extraArgs: z.array(z.string()).default([]),
   pollIntervalMs: z.number().int().min(1000).default(10_000),

package/src/services/kiosk.ts

@@ -1,6 +1,6 @@
 import { spawn, execSync } from 'child_process';
 import { writeFileSync, readFileSync, existsSync } from 'fs';
-import { resolve } from 'path';
+import { basename } from 'path';
 import type { ChildProcess } from 'child_process';
 import type { KioskConfig, KioskStatus } from '../lib/types.js';
 import type { Logger } from '../lib/logger.js';
@@ -57,7 +57,7 @@ export class KioskManager {
   async kill(): Promise<void> {
     if (this.shellMode) {
       // In shell mode, we just kill Chrome — the shell BAT will relaunch it
-      this.killAllChrome();
+      this.killAllBrowser();
       return;
     }
 
@@ -110,7 +110,7 @@ export class KioskManager {
       // Write new URL → kill Chrome → shell relaunches with new URL
       this.writeUrlSidecar(url);
       this.currentUrl = url;
-      this.killAllChrome();
+      this.killAllBrowser();
       return;
     }
 
@@ -123,7 +123,7 @@ export class KioskManager {
 
     if (this.shellMode) {
       // Just kill Chrome — shell relaunches it with same URL from sidecar
-      this.killAllChrome();
+      this.killAllBrowser();
       // Give shell time to relaunch
       await new Promise((r) => setTimeout(r, 5_000));
       return this.getStatus();
@@ -176,11 +176,11 @@ export class KioskManager {
 
     // Shell mode: Chrome is managed by lightman-shell.bat.
     // Shell prefers sidecar URL (if present), then falls back to slug in config.
-    if (this.isChromeRunning()) {
-      this.logger.info('Shell mode: Chrome already running. Restarting once to apply sidecar URL.');
-      this.killAllChrome();
+    if (this.isBrowserRunning()) {
+      this.logger.info('Shell mode: browser already running. Restarting once to apply sidecar URL.');
+      this.killAllBrowser();
     } else {
-      this.logger.info('Shell mode: Chrome not running. Shell BAT will launch it.');
+      this.logger.info('Shell mode: browser not running. Shell BAT will launch it.');
     }
 
     this.startedAt = this.startedAt || Date.now();
@@ -188,10 +188,10 @@ export class KioskManager {
   }
 
   private getShellModeStatus(): KioskStatus {
-    const running = this.isChromeRunning();
+    const running = this.isBrowserRunning();
     return {
       running,
-      pid: running ? this.getChromePid() : null,
+      pid: running ? this.getBrowserPid() : null,
       url: this.currentUrl || this.readUrlSidecar(),
       crashCount: 0, // Shell handles crash recovery, not us
       crashLoopDetected: false,
@@ -220,16 +220,17 @@ export class KioskManager {
     return null;
   }
 
-  /** Check if any chrome.exe process is running */
-  private isChromeRunning(): boolean {
+  /** Check if the configured kiosk browser process is running */
+  private isBrowserRunning(): boolean {
     try {
       if (process.platform === 'win32') {
-        const result = execSync('tasklist /FI "IMAGENAME eq chrome.exe" /NH', {
+        const browserExe = this.getWindowsBrowserExecutableName();
+        const result = execSync(`tasklist /FI "IMAGENAME eq ${browserExe}" /NH`, {
           encoding: 'utf-8',
           timeout: 5_000,
           stdio: ['pipe', 'pipe', 'ignore'],
         });
-        return result.toLowerCase().includes('chrome.exe');
+        return result.toLowerCase().includes(browserExe.toLowerCase());
       } else {
         execSync('pgrep -x chrome || pgrep -x chromium-browser', {
           stdio: 'ignore',
@@ -242,12 +243,13 @@ export class KioskManager {
     }
   }
 
-  /** Get PID of main Chrome process */
-  private getChromePid(): number | null {
+  /** Get PID of main kiosk browser process */
+  private getBrowserPid(): number | null {
     try {
       if (process.platform === 'win32') {
+        const browserExe = this.getWindowsBrowserExecutableName();
         const result = execSync(
-          'wmic process where "name=\'chrome.exe\' and CommandLine like \'%--kiosk%\'" get ProcessId /format:value',
+          `wmic process where "name='${browserExe}' and CommandLine like '%--kiosk%'" get ProcessId /format:value`,
           { encoding: 'utf-8', timeout: 5_000, stdio: ['pipe', 'pipe', 'ignore'] }
         );
         const match = result.match(/ProcessId=(\d+)/);
@@ -259,6 +261,20 @@ export class KioskManager {
     return null;
   }
 
+  private getWindowsBrowserExecutableName(): string {
+    const browserPath = this.config.browserPath?.trim();
+    if (!browserPath) {
+      return 'chrome.exe';
+    }
+
+    const fileName = basename(browserPath).trim().toLowerCase();
+    if (!fileName) {
+      return 'chrome.exe';
+    }
+
+    return fileName.endsWith('.exe') ? fileName : `${fileName}.exe`;
+  }
+
   // =====================================================================
   // Standard Mode Methods (original behavior)
   // =====================================================================
@@ -270,7 +286,7 @@ export class KioskManager {
     }
 
     // Kill any leftover Chrome kiosk instances
-    this.killAllChrome();
+    this.killAllBrowser();
 
     // Delay to let Chrome fully release profile lock
     await new Promise((r) => setTimeout(r, 2_000));
@@ -315,14 +331,15 @@ export class KioskManager {
     return this.getStatus();
   }
 
-  private killAllChrome(): void {
+  private killAllBrowser(): void {
     try {
       if (process.platform === 'win32') {
+        const browserExe = this.getWindowsBrowserExecutableName();
         try {
-          execSync('taskkill /IM chrome.exe /F', { stdio: 'ignore', timeout: 5_000 });
-          this.logger.info('Killed Chrome instances');
+          execSync(`taskkill /IM ${browserExe} /F`, { stdio: 'ignore', timeout: 5_000 });
+          this.logger.info(`Killed kiosk browser instances (${browserExe})`);
         } catch {
-          // No Chrome running, that's fine
+          // No browser running, that's fine
         }
       } else {
         try {