X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/522d7fd117285e4e4ce3ea5ec9b5a1722521b681..0bc8db71aa5d2c55b215a7a15b073bb85a1172eb:/terminal.go?ds=inline diff --git a/terminal.go b/terminal.go index 4f1c378..203cb5e 100644 --- a/terminal.go +++ b/terminal.go @@ -10,6 +10,8 @@ import ( "net" "path/filepath" "strings" + + "golang.org/x/sys/unix" ) // terminalResultLines is the most lines of a tool result that the client shows. @@ -131,7 +133,8 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error { } // terminalShowEvents writes each event from the daemon to out until the -// connection closes. +// connection closes. Only replies and work messages use Markdown styles, and +// only when out is a terminal. func terminalShowEvents(conn net.Conn, out io.Writer) error { scanner := bufio.NewScanner(conn) scanner.Buffer(make([]byte, 64*1024), socketRequestBytes) @@ -149,6 +152,11 @@ func terminalShowEvents(conn net.Conn, out io.Writer) error { continue } + columns := terminalColumns(out) + if columns > 0 && (event.Kind == "reply" || event.Kind == "work") { + text = strings.Join(terminalMarkdown(text, columns), "\n") + } + _, err = io.WriteString(out, text+"\n") if err != nil { return fmt.Errorf("write terminal event: %w", err) @@ -210,6 +218,26 @@ func terminalEventText(event Event) string { } } +// terminalColumns returns the current terminal width, or zero for other output. +// A terminal that reports no columns uses 80. +func terminalColumns(out io.Writer) int { + file, ok := out.(interface{ Fd() uintptr }) + if !ok { + return 0 + } + + size, err := unix.IoctlGetWinsize(int(file.Fd()), unix.TIOCGWINSZ) + if err != nil { + return 0 + } + + if size.Col == 0 { + return 80 + } + + return int(size.Col) +} + // terminalFirstLines returns the first count lines of text, with the number of // the lines left out. func terminalFirstLines(text string, count int) string {