X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/d9fddc0f506eb4ead7049f5638674b2b8773fcaa..6004a6d0f7af1ecf3d0ac976f50bb4f93c619887:/terminal.go?ds=sidebyside

diff --git a/terminal.go b/terminal.go
index eff009c..9945620 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.
@@ -37,6 +39,7 @@ func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
 	}
 
 	var dialer net.Dialer
+
 	conn, err := dialer.DialContext(ctx, "unix", path)
 	if err != nil {
 		return fmt.Errorf(`connect to the daemon (start it with "onechat daemon"): %w`, err)
@@ -60,14 +63,17 @@ func terminalSession(ctx context.Context, conn net.Conn, in io.Reader, out io.Wr
 	}()
 
 	var err error
+
 	select {
 	case err = <-sent:
 		err = errors.Join(err, conn.Close())
+
 		<-shown
 	case err = <-shown:
 		err = errors.Join(terminalCmpError(err, errTerminalDaemonClosed), conn.Close())
 	case <-ctx.Done():
 		err = conn.Close()
+
 		<-shown
 	}
 
@@ -83,6 +89,7 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
 	encoder := json.NewEncoder(conn)
 	scanner := bufio.NewScanner(in)
 	scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
+
 	for ctx.Err() == nil && scanner.Scan() {
 		line := scanner.Text()
 		request := SocketRequest{
@@ -126,12 +133,17 @@ 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. Terminal output ends each shown idle event with
+// an input prompt and clears that prompt before the next shown event.
 func terminalShowEvents(conn net.Conn, out io.Writer) error {
+	busy, prompt := false, false
 	scanner := bufio.NewScanner(conn)
 	scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
+
 	for scanner.Scan() {
 		var event Event
+
 		err := json.Unmarshal(scanner.Bytes(), &event)
 		if err != nil {
 			return fmt.Errorf("decode event: %w", err)
@@ -142,7 +154,29 @@ func terminalShowEvents(conn net.Conn, out io.Writer) error {
 			continue
 		}
 
-		_, err = io.WriteString(out, text+"\n")
+		columns := terminalColumns(out)
+		if columns > 0 && (event.Kind == "reply" || event.Kind == "work") {
+			text = strings.Join(terminalMarkdown(text, columns), "\n")
+		}
+
+		switch event.Kind {
+		case "busy":
+			busy = true
+		case "idle":
+			busy = false
+		}
+
+		text += "\n"
+		if prompt {
+			text = "\r\x1b[2K" + text
+		}
+
+		prompt = columns > 0 && !busy
+		if prompt {
+			text += "> "
+		}
+
+		_, err = io.WriteString(out, text)
 		if err != nil {
 			return fmt.Errorf("write terminal event: %w", err)
 		}
@@ -203,6 +237,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 {