X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/522d7fd117285e4e4ce3ea5ec9b5a1722521b681..12bd9e96f3b3e67290484e3829461e054110db27:/terminal.go?ds=sidebyside

diff --git a/terminal.go b/terminal.go
index 4f1c378..da0d78a 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.
@@ -21,9 +23,10 @@ var errTerminalDaemonClosed = errors.New("the daemon closed 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.
+// starts with /whatsapp is a WhatsApp command. /image PATH [caption] sends an
+// image from the client working directory. 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 {
@@ -97,6 +100,7 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
 
 		name, stop := stopSubagentName(line)
 		args, whatsapp := whatsappCommandArgs(line)
+		image, isImage := terminalImageRequest(line)
 		switch {
 		case strings.TrimSpace(line) == "":
 			continue
@@ -109,6 +113,16 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
 				Type: "stop",
 				Text: name,
 			}
+		case isImage:
+			request = image
+			if request.Path != "" {
+				var err error
+
+				request.Path, err = filepath.Abs(request.Path)
+				if err != nil {
+					return fmt.Errorf("find terminal image path: %w", err)
+				}
+			}
 		case whatsapp:
 			request = SocketRequest{
 				Type: "whatsapp",
@@ -131,8 +145,11 @@ 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)
 
@@ -149,7 +166,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)
 		}
@@ -210,6 +249,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 {