Separate returns from longer statement blocks

[onechat] / terminal.go

diff --git a/terminal.go b/terminal.go
index 96a8cc5cf5605671700802710ed757561a2b16e3..eff009cd9f7e225f45e96b72f8e72e3f79f20eca 100644 (file)
--- a/terminal.go
+++ b/terminal.go
@@ -18,11 +18,12 @@ const terminalResultLines = 10
 // errTerminalDaemonClosed tells that the daemon closed the connection.
 var errTerminalDaemonClosed = errors.New("the daemon closed the connection")
 
 // 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 {
 func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
        dir, err := dataDir()
        if err != nil {


@@ -70,7 +71,11 @@ func terminalSession(ctx context.Context, conn net.Conn, in io.Reader, out io.Wr
                <-shown
        }
 
                <-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.
 }
 
 // terminalSendLines sends each line of in as a request until the input ends.


@@ -86,19 +91,23 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
                }
 
                name, stop := stopSubagentName(line)
                }
 
                name, stop := stopSubagentName(line)

-               switch strings.TrimSpace(line) {
-               case "":
+               args, whatsapp := whatsappCommandArgs(line)
+               switch {
+               case strings.TrimSpace(line) == "":

                        continue
                        continue

-               case stopCommand:
+               case strings.TrimSpace(line) == stopCommand:

                        request = SocketRequest{
                                Type: "interrupt",
                        }
                        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,7 +117,12 @@ 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
 }
 
 // terminalShowEvents writes each event from the daemon to out until the


@@ -130,11 +144,16 @@ func terminalShowEvents(conn net.Conn, out io.Writer) error {
 
                _, err = io.WriteString(out, text+"\n")
                if err != nil {
 
                _, 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.
 }
 
 // terminalCmpError returns err, or fallback when err is nil.


@@ -177,6 +196,8 @@ func terminalEventText(event Event) string {
                return "[done]"
        case "error":
                return "[error] " + event.Text
                return "[done]"
        case "error":
                return "[error] " + event.Text

+       case "notice":
+               return event.Text

        default:
                return ""
        }
        default:
                return ""
        }