From 6a4ff37ae85c1c16fdc1c9c3c15b1a826df68bb9 Mon Sep 17 00:00:00 2001 From: Jean Machuca Date: Tue, 7 Jul 2026 02:54:11 +0000 Subject: [PATCH] fix: resolve duplicate type declarations from merge --- internal/tui/model.go | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/internal/tui/model.go b/internal/tui/model.go index b937a1d..b5e666d 100644 --- a/internal/tui/model.go +++ b/internal/tui/model.go @@ -89,22 +89,7 @@ func reconnectCmd(conn *client.Conn) tea.Cmd { return func() tea.Msg { for { if err := conn.Connect(); err == nil { - _ = conn.RequestStatus() - return connStatusMsg(ConnConnected) - } - if i >= 30 { - return connStatusMsg(ConnFailed) - } - time.Sleep(time.Second) - } - } -} - -func reconnectCmd(conn *client.Conn) tea.Cmd { - return func() tea.Msg { - for { - if err := conn.Connect(); err == nil { - _ = conn.RequestStatus() + conn.RequestStatus() return connStatusMsg(ConnConnected) } time.Sleep(time.Second) @@ -182,18 +167,24 @@ func listenCmd(conn *client.Conn) tea.Cmd { if !ok { return reconnectMsg{} } - if err := json.Unmarshal(env.Payload, &payload); err == nil { - return outputMsg(payload.Content) + switch env.Type { + case "output_deliver": + var payload struct { + Content string `json:"content"` + ContentType string `json:"content_type"` + } + if err := json.Unmarshal(env.Payload, &payload); err == nil { + return outputMsg(payload.Content) + } + case "status_response": + return statusMsg("connected") + case "input_accepted": + return statusMsg("sent") + case "audit_report": + return statusMsg("audit received") } - case "status_response": - return statusMsg("connected") - case "input_accepted": - return statusMsg("sent") - case "audit_report": - return statusMsg("audit received") } } - return reconnectMsg{} } }