centersl/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-03-27 02:58:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

tui: fix signin on headless Linux systems (#14627)

Browse Source 
Defensively handle environments without a display server to ensure signin remains usable on headless VMs and SSH sessions.

- Skip calling xdg-open when neither DISPLAY nor WAYLAND_DISPLAY is set, preventing silent failures or unexpected browser handlers
- Render the signin URL as plain text instead of wrapping it in OSC 8 hyperlink escape sequences, which can be garbled or hidden by terminals that don't support them
This commit is contained in:
Bruce MacDonald
2026-03-18 11:11:17 -07:00
committed by GitHub
parent f622b0c5fc
commit 727d69ddf3
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/launch/models.go
View File

@@ -92,6 +92,10 @@ func OpenBrowser(url string) {
case "darwin": case "darwin":
_ = exec.Command("open", url).Start() _ = exec.Command("open", url).Start()
case "linux": case "linux":
// Skip on headless systems where no display server is available
if os.Getenv("DISPLAY") == "" && os.Getenv("WAYLAND_DISPLAY") == "" {
return
}
_ = exec.Command("xdg-open", url).Start() _ = exec.Command("xdg-open", url).Start()
case "windows": case "windows":
_ = exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start() _ = exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start()

5
cmd/tui/signin.go
View File

@@ -97,11 +97,8 @@ func renderSignIn(modelName, signInURL string, spinner, width int) string {
fmt.Fprintf(&s, "To use %s, please sign in.\n\n", selectorSelectedItemStyle.Render(modelName)) fmt.Fprintf(&s, "To use %s, please sign in.\n\n", selectorSelectedItemStyle.Render(modelName))
// Wrap in OSC 8 hyperlink so the entire URL is clickable even when wrapped.
// Padding is outside the hyperlink so spaces don't get underlined.
link := fmt.Sprintf("\033]8;;%s\033\\%s\033]8;;\033\\", signInURL, urlColor.Render(signInURL))
s.WriteString("Navigate to:\n") s.WriteString("Navigate to:\n")
s.WriteString(urlWrap.Render(link)) s.WriteString(urlWrap.Render(urlColor.Render(signInURL)))
s.WriteString("\n\n") s.WriteString("\n\n")
s.WriteString(lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "242", Dark: "246"}).Render( s.WriteString(lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "242", Dark: "246"}).Render(

16
cmd/tui/signin_test.go
View File

@@ -25,22 +25,6 @@ func TestRenderSignIn_ContainsURL(t *testing.T) {
} }
} }
func TestRenderSignIn_OSC8Hyperlink(t *testing.T) {
url := "https://ollama.com/connect?key=abc123"
got := renderSignIn("test:cloud", url, 0, 120)
// Should contain OSC 8 open sequence with the URL
osc8Open := "\033]8;;" + url + "\033\\"
if !strings.Contains(got, osc8Open) {
t.Error("should contain OSC 8 open sequence with URL")
}
// Should contain OSC 8 close sequence
osc8Close := "\033]8;;\033\\"
if !strings.Contains(got, osc8Close) {
t.Error("should contain OSC 8 close sequence")
}
}
func TestRenderSignIn_ContainsSpinner(t *testing.T) { func TestRenderSignIn_ContainsSpinner(t *testing.T) {
got := renderSignIn("test:cloud", "https://example.com", 0, 80) got := renderSignIn("test:cloud", "https://example.com", 0, 80)