Merge pull request Light-Heart-Labs#987 from Light-Heart-Labs/codex/windows-installer-llm-endpoint-fixes

[codex] Fix Windows local LLM endpoint resolution

Author: Lightheartdevs

dream-server/installers/windows/dream.ps1

@@ -39,6 +39,7 @@ $LibDir = Join-Path $ScriptDir "lib"
 . (Join-Path $LibDir "ui.ps1")
 . (Join-Path $LibDir "compose-diagnostics.ps1")
 . (Join-Path $LibDir "detection.ps1")
+. (Join-Path $LibDir "llm-endpoint.ps1")
 . (Join-Path $LibDir "install-report.ps1")
 
 # ── Resolve install directory ──
@@ -124,20 +125,7 @@ function Read-DreamEnv {
     .SYNOPSIS
         Safely load .env file into a hashtable (no eval, no injection).
     #>
-    $envFile = Join-Path $InstallDir ".env"
-    $result = @{}
-    if (-not (Test-Path $envFile)) { return $result }
-
-    Get-Content $envFile | ForEach-Object {
-        $line = $_.Trim()
-        if ($line -match "^#" -or $line -eq "") { return }
-        if ($line -match "^([A-Za-z_][A-Za-z0-9_]*)=(.*)$") {
-            $key = $Matches[1]
-            $val = $Matches[2].Trim('"').Trim("'")
-            $result[$key] = $val
-        }
-    }
-    return $result
+    return Get-WindowsDreamEnvMap -InstallDir $InstallDir
 }
 
 function Set-DreamEnvValue {
@@ -464,13 +452,9 @@ function Invoke-Status {
         Write-Host "  Health Checks" -ForegroundColor Cyan
         Write-Host ("  " + ("-" * 40)) -ForegroundColor DarkGray
 
-        $llmHealthUrl = $(if ((Get-NativeInferenceBackend) -eq "lemonade") {
-            $script:LEMONADE_HEALTH_URL
-        } else {
-            "http://localhost:8080/health"
-        })
+        $llmEndpoint = Get-WindowsLocalLlmEndpoint -InstallDir $InstallDir -NativeBackend (Get-NativeInferenceBackend)
         $endpoints = @(
-            @{ Name = "LLM API";    Url = $llmHealthUrl }
+            @{ Name = "LLM API";    Url = $llmEndpoint.HealthUrl }
             @{ Name = "Chat UI";    Url = "http://localhost:3000" }
             @{ Name = "Dashboard";  Url = "http://localhost:3001" }
         )
@@ -702,9 +686,9 @@ function Invoke-Chat {
         )
     } | ConvertTo-Json -Depth 3
 
-    $chatBasePath = $(if ((Get-NativeInferenceBackend) -eq "lemonade") { "/api/v1" } else { "/v1" })
+    $llmEndpoint = Get-WindowsLocalLlmEndpoint -InstallDir $InstallDir -NativeBackend (Get-NativeInferenceBackend)
     try {
-        $resp = Invoke-RestMethod -Uri "http://localhost:8080${chatBasePath}/chat/completions" `
+        $resp = Invoke-RestMethod -Uri $llmEndpoint.ChatCompletionsUrl `
             -Method POST -Body $body -ContentType "application/json" -TimeoutSec 120
 
         if ($resp.choices -and $resp.choices[0].message) {

dream-server/installers/windows/install-windows.ps1

@@ -69,6 +69,8 @@ $LibDir = Join-Path $ScriptDir "lib"
 . (Join-Path $LibDir "tier-map.ps1")
 . (Join-Path $LibDir "detection.ps1")
 . (Join-Path $LibDir "env-generator.ps1")
+. (Join-Path $LibDir "llm-endpoint.ps1")
+. (Join-Path $LibDir "opencode-config.ps1")
 
 # ── Phase context variables ───────────────────────────────────────────────────
 # These are plain (non-$script:) variables set in the orchestrator scope.
@@ -93,6 +95,65 @@ $installDir     = $script:DS_INSTALL_DIR
 $sourceRoot     = $SourceRoot
 
 # ── Phase dispatcher ──────────────────────────────────────────────────────────
+function Get-UsableWindowsBash {
+    <#
+    .SYNOPSIS
+        Prefer a Git Bash-style shell for bootstrap-upgrade.sh on Windows.
+    #>
+    param(
+        [string]$InstallPath = $installDir
+    )
+
+    $probeCommand = "command -v bash >/dev/null 2>&1"
+    if ($InstallPath -match "^([A-Za-z]):") {
+        $probeCommand += " && test -d /$($Matches[1].ToLower())"
+    }
+
+    $candidates = New-Object 'System.Collections.Generic.List[string]'
+
+    $gitCmd = Get-Command git -ErrorAction SilentlyContinue
+    if ($gitCmd -and $gitCmd.Source) {
+        $gitRoot = Split-Path (Split-Path $gitCmd.Source -Parent) -Parent
+        $gitBash = Join-Path $gitRoot "bin\bash.exe"
+        if (Test-Path $gitBash) {
+            [void]$candidates.Add($gitBash)
+        }
+    }
+
+    $programFilesBash = Join-Path $env:ProgramFiles "Git\bin\bash.exe"
+    if (Test-Path $programFilesBash) {
+        [void]$candidates.Add($programFilesBash)
+    }
+
+    if (${env:ProgramFiles(x86)} -and $env:ProgramFiles -ne ${env:ProgramFiles(x86)}) {
+        $programFilesX86Bash = Join-Path ${env:ProgramFiles(x86)} "Git\bin\bash.exe"
+        if (Test-Path $programFilesX86Bash) {
+            [void]$candidates.Add($programFilesX86Bash)
+        }
+    }
+
+    $bashCmd = Get-Command bash -ErrorAction SilentlyContinue
+    if ($bashCmd -and $bashCmd.Source) {
+        [void]$candidates.Add($bashCmd.Source)
+    }
+
+    $seen = @{}
+    foreach ($candidate in $candidates) {
+        if ([string]::IsNullOrWhiteSpace($candidate)) { continue }
+        if ($seen.ContainsKey($candidate)) { continue }
+        $seen[$candidate] = $true
+
+        try {
+            & $candidate -lc $probeCommand *> $null
+            if ($LASTEXITCODE -eq 0) {
+                return $candidate
+            }
+        } catch { }
+    }
+
+    return $null
+}
+
 $PhasesDir = Join-Path $ScriptDir "phases"
 
 Write-DreamBanner
@@ -575,13 +636,29 @@ exec bash "$bashScript" "$bashInstallDir" "$($fullTierConfig.GgufFile)" "$($full
 "@
                 [System.IO.File]::WriteAllText($wrapperScript, $wrapperContent.Replace("`r`n", "`n"), (New-Object System.Text.UTF8Encoding($false)))
 
-                Start-Process -FilePath "bash" -ArgumentList $wrapperScript `
-                    -WindowStyle Hidden `
-                    -RedirectStandardOutput $upgradeLog `
-                    -RedirectStandardError $upgradeErrLog
-
-                Write-AI "Full model ($($fullTierConfig.LlmModel)) downloading in background."
-                Write-AI "Check progress: Get-Content '$upgradeLog' -Tail 10"
+                $bashPath = Get-UsableWindowsBash -InstallPath $installDir
+                if ($bashPath) {
+                    $upgradeProc = Start-Process -FilePath $bashPath -ArgumentList $wrapperScript `
+                        -WindowStyle Hidden `
+                        -RedirectStandardOutput $upgradeLog `
+                        -RedirectStandardError $upgradeErrLog `
+                        -PassThru
+
+                    Start-Sleep -Seconds 2
+                    $upgradeProc.Refresh()
+
+                    if ($upgradeProc.HasExited) {
+                        Write-AIWarn "Background full-model download exited immediately (exit code: $($upgradeProc.ExitCode))."
+                        Write-AI "  Retry manually with: & '$bashPath' '$wrapperScript'"
+                        Write-AI "  Error log: $upgradeErrLog"
+                    } else {
+                        Write-AI "Full model ($($fullTierConfig.LlmModel)) downloading in background."
+                        Write-AI "Check progress: Get-Content '$upgradeLog' -Tail 10"
+                    }
+                } else {
+                    Write-AIWarn "No Git Bash-compatible shell was found for bootstrap-upgrade.sh."
+                    Write-AI "  Install Git for Windows or run the upgrade script manually after adding bash.exe to PATH."
+                }
             } else {
                 Write-AIWarn "bootstrap-upgrade.sh not found at $upgradeScript"
                 Write-AIWarn "Download the full model manually or re-run the installer."
@@ -608,22 +685,31 @@ if ($dryRun) {
 }
 
 # ── Service health checks ─────────────────────────────────────────────────────
-# Use Lemonade health endpoint when AMD + Lemonade is active, llama-server otherwise
-$llmHealthUrl = $(if ($useLemonade) {
-    $script:LEMONADE_HEALTH_URL
-} else {
-    "http://localhost:8080/health"
-})
-$llmHealthName = $(if ($useLemonade) { "LLM (Lemonade)" } else { "LLM (llama-server)" })
+$opencodeSync = Sync-WindowsOpenCodeConfigFromEnv -InstallDir $installDir `
+    -GpuBackend $gpuInfo.Backend -UseLemonade:$useLemonade -CloudMode:$cloudMode `
+    -DefaultModelId $tierConfig.GgufFile -DefaultModelName $tierConfig.LlmModel `
+    -DefaultContextLimit ([int]$tierConfig.MaxContext) -SkipIfUnavailable
+switch ($opencodeSync.Status) {
+    "created" {
+        Write-AISuccess "OpenCode config synced to active model (model: $($opencodeSync.ModelName))"
+    }
+    "updated" {
+        Write-AISuccess "OpenCode config synced to active model (model: $($opencodeSync.ModelName))"
+    }
+    "regenerated" {
+        Write-AISuccess "OpenCode config regenerated for active model (model: $($opencodeSync.ModelName))"
+    }
+}
+
+$llmEndpoint = Get-WindowsLocalLlmEndpoint -InstallDir $installDir `
+    -EnvMap (Get-WindowsDreamEnvMap -InstallDir $installDir) `
+    -UseLemonade:$useLemonade -GpuBackend $gpuInfo.Backend -CloudMode:$cloudMode
 $healthChecks = @(
-    @{ Name = $llmHealthName; Url = $llmHealthUrl }
+    @{ Name = $llmEndpoint.Name; Url = $llmEndpoint.HealthUrl }
     @{ Name = "Chat UI (Open WebUI)"; Url = "http://localhost:3000" }
 )
 if ($enableVoice)     { $healthChecks += @{ Name = "Whisper (STT)";    Url = "http://localhost:9000/health" } }
 if ($enableWorkflows) { $healthChecks += @{ Name = "n8n (Workflows)";   Url = "http://localhost:5678/healthz" } }
-if (Test-Path $script:OPENCODE_EXE) {
-    $healthChecks += @{ Name = "OpenCode (IDE)"; Url = "http://localhost:$($script:OPENCODE_PORT)/" }
-}
 
 Write-AI "Running health checks..."
 $maxAttempts = 60; $allHealthy = $true

dream-server/installers/windows/lib/install-report.ps1

@@ -3,7 +3,7 @@
 # ============================================================================
 # Part of: installers/windows/lib/
 # Purpose: Build a shareable support bundle with compose + system diagnostics.
-# Requires: ui.ps1 and detection.ps1 sourced first.
+# Requires: ui.ps1, detection.ps1, and llm-endpoint.ps1 sourced first.
 # ============================================================================
 
 function Invoke-OptionalCommand {
@@ -66,6 +66,7 @@ function Test-HttpEndpoint {
 
 function New-DreamInstallReport {
     param(
+        [string]$InstallDir = $script:DS_INSTALL_DIR,
         [Parameter(Mandatory = $true)]
         [AllowEmptyCollection()]
         [string[]]$ComposeFlags
@@ -80,6 +81,7 @@ function New-DreamInstallReport {
     if (Get-Command Get-NativeInferenceBackend -ErrorAction SilentlyContinue) {
         $nativeBackend = Get-NativeInferenceBackend
     }
+    $llmEndpoint = Get-WindowsLocalLlmEndpoint -InstallDir $InstallDir -GpuBackend $gpu.Backend -NativeBackend $nativeBackend
 
     $composeConfigArgs = @("compose") + $ComposeFlags + @("config")
     $composePsArgs = @("compose") + $ComposeFlags + @("ps", "-a")
@@ -108,7 +110,7 @@ function New-DreamInstallReport {
             compose_ps = Invoke-OptionalCommand -Command "docker" -CommandArgs $composePsArgs -MaxLines 80
         }
         health = [ordered]@{
-            llm_api = Test-HttpEndpoint -Url "http://localhost:8080/health"
+            llm_api = Test-HttpEndpoint -Url $llmEndpoint.HealthUrl
             open_webui = Test-HttpEndpoint -Url "http://localhost:3000"
             dashboard = Test-HttpEndpoint -Url "http://localhost:3001"
             dashboard_api = Test-HttpEndpoint -Url "http://localhost:3002/health"
@@ -133,7 +135,7 @@ function Write-DreamInstallReport {
     $jsonPath = Join-Path $artifactsDir "report.json"
     $txtPath = Join-Path $artifactsDir "report.txt"
 
-    $report = New-DreamInstallReport -ComposeFlags $ComposeFlags
+    $report = New-DreamInstallReport -InstallDir $InstallDir -ComposeFlags $ComposeFlags
     ($report | ConvertTo-Json -Depth 8) | Set-Content -Path $jsonPath -Encoding UTF8
 
     $lines = @()