X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/eeb821ff17ad79c87ca9b64cd9be26f8612f4a03..0bc8db71aa5d2c55b215a7a15b073bb85a1172eb:/terminal.go?ds=sidebyside

diff --git a/terminal.go b/terminal.go
index 96a8cc5..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.
@@ -18,11 +20,12 @@ const terminalResultLines = 10
 // errTerminalDaemonClosed tells that the daemon closed the connection.
 var errTerminalDaemonClosed = errors.New("the daemon closed the connection")
 
-// terminal runs "onechat chat": the terminal client of the daemon. Each line of
-// input is a user message, the line /stop interrupts the running turn, and the
-// line /stop NAME stops the subagent NAME. The client shows the replies, the
-// tool calls, and their results as they happen. It ends at the end of the input
-// or when the daemon closes the connection.
+// terminal runs "onechat" and "onechat chat": the terminal client of the
+// daemon. Each line of input is a user message, the line /stop interrupts the
+// running turn, the line /stop NAME stops the subagent NAME, and a line that
+// starts with /whatsapp is a WhatsApp command. The client shows the replies,
+// the tool calls, and their results as they happen. It ends at the end of the
+// input or when the daemon closes the connection.
 func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
 	dir, err := dataDir()
 	if err != nil {
@@ -36,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)
@@ -59,18 +63,25 @@ 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
 	}
 
-	return err
+	if err != nil {
+		return fmt.Errorf("run terminal client: %w", err)
+	}
+
+	return nil
 }
 
 // terminalSendLines sends each line of in as a request until the input ends.
@@ -78,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{
@@ -86,19 +98,23 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
 		}
 
 		name, stop := stopSubagentName(line)
-		switch strings.TrimSpace(line) {
-		case "":
+		args, whatsapp := whatsappCommandArgs(line)
+		switch {
+		case strings.TrimSpace(line) == "":
 			continue
-		case stopCommand:
+		case strings.TrimSpace(line) == stopCommand:
 			request = SocketRequest{
 				Type: "interrupt",
 			}
-		default:
-			if stop {
-				request = SocketRequest{
-					Type: "stop",
-					Text: name,
-				}
+		case stop:
+			request = SocketRequest{
+				Type: "stop",
+				Text: name,
+			}
+		case whatsapp:
+			request = SocketRequest{
+				Type: "whatsapp",
+				Text: args,
 			}
 		}
 
@@ -108,16 +124,24 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
 		}
 	}
 
-	return scanner.Err()
+	err := scanner.Err()
+	if err != nil {
+		return fmt.Errorf("read terminal input: %w", err)
+	}
+
+	return nil
 }
 
 // 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)
+
 	for scanner.Scan() {
 		var event Event
+
 		err := json.Unmarshal(scanner.Bytes(), &event)
 		if err != nil {
 			return fmt.Errorf("decode event: %w", err)
@@ -128,13 +152,23 @@ 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 err
+			return fmt.Errorf("write terminal event: %w", err)
 		}
 	}
 
-	return scanner.Err()
+	err := scanner.Err()
+	if err != nil {
+		return fmt.Errorf("read daemon events: %w", err)
+	}
+
+	return nil
 }
 
 // terminalCmpError returns err, or fallback when err is nil.
@@ -177,11 +211,33 @@ func terminalEventText(event Event) string {
 		return "[done]"
 	case "error":
 		return "[error] " + event.Text
+	case "notice":
+		return event.Text
 	default:
 		return ""
 	}
 }
 
+// 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 {