term: replace lipgloss/v2/compat with lazy OSC 11 background detection

Author: fcharlie

cmd/hot/command/command_cat.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"charm.land/glamour/v2"
-	"charm.land/lipgloss/v2"
 	"github.com/alecthomas/chroma/v2"
 	"github.com/alecthomas/chroma/v2/formatters"
 	"github.com/alecthomas/chroma/v2/lexers"
@@ -174,7 +173,7 @@ func (c *Cat) markdownOut(w io.Writer, input io.Reader) error {
 	}
 	// Detect background color to pick appropriate style
 	style := "light"
-	if lipgloss.HasDarkBackground(os.Stdin, os.Stdout) {
+	if term.HasDarkBackground() {
 		style = "dark"
 	}
 	r, err := glamour.NewTermRenderer(
@@ -214,7 +213,7 @@ func (c *Cat) syntaxHighlightOut(w io.Writer, input io.Reader, termLevel term.Le
 
 	// Detect background color to pick appropriate style
 	styleName := "github"
-	if lipgloss.HasDarkBackground(os.Stdin, os.Stdout) {
+	if term.HasDarkBackground() {
 		styleName = "dracula"
 	}
 

cmd/hot/command/command_scan_refs.go

@@ -12,7 +12,6 @@ import (
 	"charm.land/bubbles/v2/table"
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
-	"charm.land/lipgloss/v2/compat"
 	"github.com/antgroup/hugescm/cmd/hot/pkg/refs"
 	"github.com/antgroup/hugescm/cmd/hot/pkg/tr"
 	"github.com/antgroup/hugescm/modules/fnmatch"
@@ -25,8 +24,8 @@ func newModel(references *refs.References) model {
 	p := paginator.New()
 	p.Type = paginator.Dots
 	p.PerPage = 20
-	p.ActiveDot = lipgloss.NewStyle().Foreground(compat.AdaptiveColor{Light: lipgloss.Color("235"), Dark: lipgloss.Color("252")}).Render("•")
-	p.InactiveDot = lipgloss.NewStyle().Foreground(compat.AdaptiveColor{Light: lipgloss.Color("250"), Dark: lipgloss.Color("238")}).Render("•")
+	p.ActiveDot = lipgloss.NewStyle().Foreground(term.AdaptiveColor{Light: lipgloss.Color("235"), Dark: lipgloss.Color("252")}).Render("•")
+	p.InactiveDot = lipgloss.NewStyle().Foreground(term.AdaptiveColor{Light: lipgloss.Color("250"), Dark: lipgloss.Color("238")}).Render("•")
 	p.SetTotalPages(len(references.Items))
 
 	return model{

go.sum

@@ -38,6 +38,8 @@ github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG
 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/ultraviolet v0.0.0-20260601155805-6cf7526a1b3f h1:vKsPSlO4g4jKfJ9enESgNZ45BkbHngTIq3UxNOzic74=
 github.com/charmbracelet/ultraviolet v0.0.0-20260601155805-6cf7526a1b3f/go.mod h1:hFpumms29Smx3LStRfku8vcCTBe1Kq8aCXtHUJa3mjY=
+github.com/charmbracelet/ultraviolet v0.0.0-20260608091853-35bcb7319efa h1:rRT2qwk9xbontVloCXEUIsl1ePz0XFcIWkGi2bvmSTY=
+github.com/charmbracelet/ultraviolet v0.0.0-20260608091853-35bcb7319efa/go.mod h1:hFpumms29Smx3LStRfku8vcCTBe1Kq8aCXtHUJa3mjY=
 github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
 github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
 github.com/charmbracelet/x/conpty v0.1.1 h1:s1bUxjoi7EpqiXysVtC+a8RrvPPNcNvAjfi4jxsAuEs=
@@ -46,12 +48,16 @@ github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9
 github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
 github.com/charmbracelet/x/exp/charmtone v0.0.0-20260607010151-cd19a2bba55f h1:k4kKyMHzsSNnS74mRTuU+QehvrJnWVrFaSovHh8u9vY=
 github.com/charmbracelet/x/exp/charmtone v0.0.0-20260607010151-cd19a2bba55f/go.mod h1:nsExn0DGyX0lh9LwLHTn2Gg+hafdzfSXnC+QmEJTZFY=
+github.com/charmbracelet/x/exp/charmtone v0.0.0-20260608090822-c3ad58c6c9e5 h1:Xl3+pllTbd0iZWeTQixTHClROwU/Gs79ANuOGILkA5g=
+github.com/charmbracelet/x/exp/charmtone v0.0.0-20260608090822-c3ad58c6c9e5/go.mod h1:nsExn0DGyX0lh9LwLHTn2Gg+hafdzfSXnC+QmEJTZFY=
 github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=
 github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
 github.com/charmbracelet/x/exp/ordered v0.1.0 h1:55/qLwjIh0gL0Vni+QAWk7T/qRVP6sBf+2agPBgnOFE=
 github.com/charmbracelet/x/exp/ordered v0.1.0/go.mod h1:5UHwmG+is5THxMyCJHNPCn2/ecI07aKNrW+LcResjJ8=
 github.com/charmbracelet/x/exp/slice v0.0.0-20260607010151-cd19a2bba55f h1:qfvRQEbGZ0bNU/IlPz4SGpyVfx9hSSPB2h8kGnE6Jpc=
 github.com/charmbracelet/x/exp/slice v0.0.0-20260607010151-cd19a2bba55f/go.mod h1:vqEfX6xzqW1pKKZUUiFOKg0OQ7bCh54Q2vR/tserrRA=
+github.com/charmbracelet/x/exp/slice v0.0.0-20260608090822-c3ad58c6c9e5 h1:K+bEhQCdvynpwszgcTF3MqvP/ouj7ocrZi+24viw0zc=
+github.com/charmbracelet/x/exp/slice v0.0.0-20260608090822-c3ad58c6c9e5/go.mod h1:vqEfX6xzqW1pKKZUUiFOKg0OQ7bCh54Q2vR/tserrRA=
 github.com/charmbracelet/x/exp/strings v0.1.0 h1:i69S2XI7uG1u4NLGeJPSYU++Nmjvpo9nwd6aoEm7gkA=
 github.com/charmbracelet/x/exp/strings v0.1.0/go.mod h1:/ehtMPNh9K4odGFkqYJKpIYyePhdp1hLBRvyY4bWkH8=
 github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
@@ -142,17 +148,27 @@ github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
 github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
 golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
 golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
+golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
+golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
 golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
 golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
 golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
 golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
 golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
+golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
+golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
 golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
 golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
+golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

modules/patchview/styles.go

@@ -3,9 +3,10 @@ package patchview
 import (
 	"fmt"
 	"image/color"
-	"os"
 
 	"charm.land/lipgloss/v2"
+
+	"github.com/antgroup/hugescm/modules/term"
 	"github.com/charmbracelet/x/exp/charmtone"
 )
 
@@ -62,7 +63,7 @@ type Style struct {
 
 // hasDarkBackground detects terminal background color.
 func hasDarkBackground() bool {
-	return lipgloss.HasDarkBackground(os.Stdin, os.Stdout)
+	return term.HasDarkBackground()
 }
 
 // DefaultStyle returns the default style with auto-detected theme.

modules/term/terminal.go

@@ -148,3 +148,16 @@ func IsNativeTerminal(fd uintptr) bool {
 func GetSize(fd int) (width, height int, err error) {
 	return term.GetSize(fd)
 }
+
+// MakeRaw puts the terminal connected to the given file descriptor into raw
+// mode and returns the previous state of the terminal so that it can be
+// restored.
+func MakeRaw(fd int) (*term.State, error) {
+	return term.MakeRaw(fd)
+}
+
+// Restore restores the terminal connected to the given file descriptor to a
+// previous state.
+func Restore(fd int, oldState *term.State) error {
+	return term.Restore(fd, oldState)
+}

modules/term/theme.go

@@ -0,0 +1,69 @@
+// Copyright (c) Ant Group. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package term
+
+import (
+	"image/color"
+	"os"
+	"sync"
+
+	"charm.land/lipgloss/v2"
+)
+
+// supportsOSCQuery returns true if the current terminal is likely to
+// support OSC 11 background color queries without leaking escape responses.
+//
+// The heuristic: if detectColorLevel (environment-based, ignoring FORCE_COLOR)
+// reports Level16M, the terminal is modern enough to handle OSC 11.
+// Additionally, VTE_VERSION is checked as a supplementary signal for terminals
+// that may not advertise truecolor via COLORTERM/TERM.
+func supportsOSCQuery() bool {
+	if detectColorLevel() >= Level16M {
+		return true
+	}
+	// VTE-based terminals (GNOME Terminal, Tilix, Xfce Terminal, etc.)
+	if _, ok := os.LookupEnv("VTE_VERSION"); ok {
+		return true
+	}
+	return false
+}
+
+var (
+	detectOnce sync.Once
+	hasDarkBg  = true // default to dark when detection is skipped or fails
+)
+
+func detectBackground() {
+	if !supportsOSCQuery() {
+		return // keep default (dark)
+	}
+	if !IsTerminal(os.Stdin.Fd()) || !IsTerminal(os.Stdout.Fd()) {
+		return // not a terminal, keep default
+	}
+	hasDarkBg = lipgloss.HasDarkBackground(os.Stdin, os.Stdout)
+}
+
+// HasDarkBackground reports whether the terminal has a dark background.
+// Detection is lazy (executed at most once) and only queries the terminal
+// if it is known to support OSC 11 reliably. Otherwise it defaults to true.
+func HasDarkBackground() bool {
+	detectOnce.Do(detectBackground)
+	return hasDarkBg
+}
+
+// AdaptiveColor holds a pair of colors for light and dark backgrounds.
+// It implements [image/color.Color] and selects the appropriate variant
+// based on the terminal's background at runtime.
+type AdaptiveColor struct {
+	Light color.Color
+	Dark  color.Color
+}
+
+// RGBA implements [image/color.Color].
+func (c AdaptiveColor) RGBA() (uint32, uint32, uint32, uint32) {
+	if HasDarkBackground() {
+		return c.Dark.RGBA()
+	}
+	return c.Light.RGBA()
+}

modules/tui/color.go

@@ -2,9 +2,7 @@ package tui
 
 import (
 	"maps"
-	"os"
 
-	"charm.land/lipgloss/v2"
 	"github.com/antgroup/hugescm/modules/diferenco"
 	"github.com/antgroup/hugescm/modules/diferenco/color"
 	"github.com/antgroup/hugescm/modules/term"
@@ -135,7 +133,7 @@ func EncoderOptions(level term.Level) []diferenco.EncoderOption {
 	case term.Level16M:
 		// Use truecolor with current theme based on background
 		theme := currentTheme.Dark
-		if !lipgloss.HasDarkBackground(os.Stdin, os.Stdout) {
+		if !term.HasDarkBackground() {
 			theme = currentTheme.Light
 		}
 		maps.Copy(cc, theme)

modules/tui/confirm.go

@@ -5,14 +5,14 @@ import (
 
 	"charm.land/huh/v2"
 	"charm.land/lipgloss/v2"
-	"charm.land/lipgloss/v2/compat"
+	"github.com/antgroup/hugescm/modules/term"
 )
 
 // Color definitions for huh theme
 var (
-	normalFg = compat.AdaptiveColor{Light: lipgloss.Color("235"), Dark: lipgloss.Color("252")}
+	normalFg = term.AdaptiveColor{Light: lipgloss.Color("235"), Dark: lipgloss.Color("252")}
 	fuchsia  = lipgloss.Color("#F780E2")
-	green    = compat.AdaptiveColor{Light: lipgloss.Color("#02BA84"), Dark: lipgloss.Color("#02BF87")}
+	green    = term.AdaptiveColor{Light: lipgloss.Color("#02BA84"), Dark: lipgloss.Color("#02BF87")}
 )
 
 // baseTheme returns a custom theme for huh widgets.
@@ -24,7 +24,7 @@ func baseTheme() huh.Theme {
 		t.Focused.ErrorIndicator = t.Focused.ErrorIndicator.Foreground(red)
 		t.Focused.ErrorMessage = t.Focused.ErrorMessage.Foreground(red)
 		t.Focused.TextInput.Cursor = t.Focused.TextInput.Cursor.Foreground(green)
-		t.Focused.TextInput.Placeholder = t.Focused.TextInput.Placeholder.Foreground(compat.AdaptiveColor{Light: lipgloss.Color("248"), Dark: lipgloss.Color("238")})
+		t.Focused.TextInput.Placeholder = t.Focused.TextInput.Placeholder.Foreground(term.AdaptiveColor{Light: lipgloss.Color("248"), Dark: lipgloss.Color("238")})
 		t.Focused.TextInput.Prompt = t.Focused.TextInput.Prompt.Foreground(fuchsia)
 		t.Focused.TextInput.Text = t.Focused.TextInput.Text.Foreground(normalFg)
 

modules/tui/input.go

@@ -11,8 +11,7 @@ import (
 	"unicode/utf8"
 
 	"charm.land/lipgloss/v2"
-	"charm.land/lipgloss/v2/compat"
-	"golang.org/x/term"
+	"github.com/antgroup/hugescm/modules/term"
 )
 
 // ErrInterrupted is returned when user presses Ctrl+C or Ctrl+D.
@@ -22,8 +21,8 @@ const maxAttempts = 3
 
 // Color definitions (package-level to avoid recreation)
 var (
-	blue = compat.AdaptiveColor{Light: lipgloss.Color("#ace0f9"), Dark: lipgloss.Color("#ace0f9")}
-	red  = compat.AdaptiveColor{Light: lipgloss.Color("#FF4672"), Dark: lipgloss.Color("#ED567A")}
+	blue = term.AdaptiveColor{Light: lipgloss.Color("#ace0f9"), Dark: lipgloss.Color("#ace0f9")}
+	red  = term.AdaptiveColor{Light: lipgloss.Color("#FF4672"), Dark: lipgloss.Color("#ED567A")}
 )
 
 var (

pkg/zeta/repository.go

@@ -16,7 +16,6 @@ import (
 	"time"
 
 	"charm.land/lipgloss/v2"
-	"charm.land/lipgloss/v2/compat"
 	"github.com/antgroup/hugescm/modules/plumbing"
 	"github.com/antgroup/hugescm/modules/strengthen"
 	"github.com/antgroup/hugescm/modules/term"
@@ -49,7 +48,7 @@ var (
 	}
 
 	// fsNameHighlight is the style for highlighting filesystem names in warnings.
-	fsNameHighlight = lipgloss.NewStyle().Foreground(compat.AdaptiveColor{
+	fsNameHighlight = lipgloss.NewStyle().Foreground(term.AdaptiveColor{
 		Light: lipgloss.Color("#D70000"), Dark: lipgloss.Color("#FF6B6B"),
 	}).Bold(true)
 )