use moby/term instead of x/term, same as docker/cli

austin5456 · austin5456 · commit 2585b6da8351 · 2025-10-16T14:55:32.000-04:00
diff --git a/cmd/docker-mcp/catalog/show.go b/cmd/docker-mcp/catalog/show.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
-	"golang.org/x/term"
+	"github.com/moby/term"
 	"gopkg.in/yaml.v3"
 
 	"github.com/docker/mcp-gateway/pkg/yq"
@@ -171,11 +171,12 @@ func isURL(fileOrURL string) bool {
 }
 
 func getTerminalWidth() int {
-	width, _, err := term.GetSize(int(os.Stdout.Fd()))
+	fd, _ := term.GetFdInfo(os.Stdout)
+	ws, err := term.GetWinsize(fd)
 	if err != nil {
 		return 80
 	}
-	return width
+	return int(ws.Width)
 }
 
 func wrapText(text string, width int, indent string) string {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"time"`
`11`	`11`
`12`	`12`	`"github.com/mikefarah/yq/v4/pkg/yqlib"`
`13`		`- "golang.org/x/term"`
	`13`	`+ "github.com/moby/term"`
`14`	`14`	`"gopkg.in/yaml.v3"`
`15`	`15`
`16`	`16`	`"github.com/docker/mcp-gateway/pkg/yq"`
`@@ -171,11 +171,12 @@ func isURL(fileOrURL string) bool {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`func getTerminalWidth() int {`
`174`		`- width, _, err := term.GetSize(int(os.Stdout.Fd()))`
	`174`	`+ fd, _ := term.GetFdInfo(os.Stdout)`
	`175`	`+ ws, err := term.GetWinsize(fd)`
`175`	`176`	`if err != nil {`
`176`	`177`	`return 80`
`177`	`178`	`}`
`178`		`- return width`
	`179`	`+ return int(ws.Width)`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`func wrapText(text string, width int, indent string) string {`