X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/75b9579355e1adcdbb1255a7e8e4582e0a431f3d..03ef9525ba0e62037b55606b851ee746967a003f:/daemon_test.go?ds=sidebyside

diff --git a/daemon_test.go b/daemon_test.go
index 9f45792..5670f6f 100644
--- a/daemon_test.go
+++ b/daemon_test.go
@@ -1,21 +1,134 @@
 package main
 
 import (
+	"encoding/json"
 	"io"
+	"net"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
 
+func TestNotificationReceiptIsPrivateToItsSubmittingSocket(t *testing.T) {
+	server := newModelFake(t)
+	socket := daemonStartTest(t, server)
+	observer, err := net.Dial("unix", socket)
+	require.NoError(t, err)
+	require.NoError(t, observer.SetDeadline(time.Now().Add(10*time.Second)))
+
+	decoder := json.NewDecoder(observer)
+
+	var event Event
+
+	require.NoError(t, decoder.Decode(&event))
+	require.Equal(t, "ready", event.Kind)
+
+	submitter, err := net.Dial("unix", socket)
+	require.NoError(t, err)
+	require.NoError(t, submitter.SetDeadline(time.Now().Add(10*time.Second)))
+	require.NoError(t, json.NewEncoder(submitter).Encode(SocketRequest{
+		Type: "notify",
+		Notify: &NotifyInput{
+			Source: "check",
+			ID:     "1",
+			Text:   "A new result.",
+		},
+	}))
+
+	accepted := false
+	answer := json.NewDecoder(submitter)
+	for !accepted {
+		require.NoError(t, answer.Decode(&event))
+
+		accepted = event.Kind == "notify"
+	}
+
+	require.Equal(t, "accepted", event.Status)
+
+	for {
+		require.NoError(t, decoder.Decode(&event))
+		require.NotEqual(t, "notify", event.Kind)
+
+		if event.Kind == "idle" {
+			break
+		}
+	}
+
+	require.NoError(t, submitter.Close())
+	require.NoError(t, observer.Close())
+}
+
+func TestNotificationSocketRejectsMissingOrInvalidData(t *testing.T) {
+	server := newModelFake(t)
+	socket := daemonStartTest(t, server)
+	conn, err := net.Dial("unix", socket)
+	require.NoError(t, err)
+	require.NoError(t, conn.SetDeadline(time.Now().Add(10*time.Second)))
+
+	decoder := json.NewDecoder(conn)
+	encoder := json.NewEncoder(conn)
+
+	var event Event
+
+	require.NoError(t, decoder.Decode(&event))
+	require.Equal(t, "ready", event.Kind)
+
+	testCases := []*NotifyInput{
+		nil,
+		{
+			Source: "invalid source",
+			ID:     "1",
+			Text:   "data",
+		},
+		{
+			AgentID: "Garden",
+			Source:  "check",
+			ID:      "1",
+			Text:    "data",
+		},
+		{
+			AgentID: strings.Repeat("f", 2*agentIDBytes),
+			Source:  "check",
+			ID:      "1",
+			Text:    "data",
+		},
+	}
+
+	for _, tc := range testCases {
+		require.NoError(t, encoder.Encode(SocketRequest{
+			Type:   "notify",
+			Notify: tc,
+		}))
+		require.NoError(t, decoder.Decode(&event))
+		require.Equal(t, "error", event.Kind)
+		require.NotContains(t, event.Text, "invalid source")
+	}
+
+	_, err = io.WriteString(conn, `{"type":"notify","agent":"Garden","notify":{"source":"check","id":"1","text":"data"}}`+"\n")
+	require.NoError(t, err)
+	require.NoError(t, decoder.Decode(&event))
+	require.Equal(t, "error", event.Kind)
+
+	_, err = io.WriteString(conn, `{"type":"notify","notify":{"agent":"Garden","source":"check","id":"1","text":"data"}}`+"\n")
+	require.NoError(t, err)
+	require.NoError(t, decoder.Decode(&event))
+	require.Equal(t, "error", event.Kind)
+
+	require.Zero(t, server.Calls())
+	require.NoError(t, conn.Close())
+}
+
 func TestClientsSeeTheTurnAsItHappens(t *testing.T) {
 	server := newModelFake(t)
 	server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
 		if call.number == 0 {
 			modelWriteEvents(w, modelCompletedEvent([]any{modelFunctionCallItem("fc_1", "call_1", "shell", `{"command":"echo hi"}`)}, 100, 0, 5))
+
 			return
 		}
 
@@ -29,6 +142,7 @@ func TestClientsSeeTheTurnAsItHappens(t *testing.T) {
 	second.WaitFor(t, "[connected to OneChat]")
 
 	first.Type("Run echo hi.")
+
 	for _, client := range []*TerminalTestClient{first, second} {
 		client.WaitFor(t, "[done]")
 		require.Equal(t, "[connected to OneChat]\n[working]\n[tool] shell {\"command\":\"echo hi\"}\n[result] hi\nIt said hi.\n[done]\n", client.Output())
@@ -37,7 +151,7 @@ func TestClientsSeeTheTurnAsItHappens(t *testing.T) {
 	first.Type(stopCommand)
 	first.WaitFor(t, "[error] no turn runs")
 	first.Type(stopCommand + " BlueFox")
-	first.WaitFor(t, "[error] no subagent BlueFox runs")
+	first.WaitFor(t, "[error] stop subagent: no subagent BlueFox runs")
 	require.NotContains(t, second.Output(), "no turn runs")
 	require.NoError(t, first.Close())
 }
@@ -50,7 +164,7 @@ func TestStopInterruptsTheTurn(t *testing.T) {
 		close(release)
 	})
 
-	server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+	server.reply = func(_ http.ResponseWriter, _ ModelFakeCall) {
 		close(arrived)
 		<-release
 	}
@@ -107,12 +221,12 @@ func TestDaemonLogHasATimeStampOnlyOutsideTheJournal(t *testing.T) {
 		{
 			name:    "the journal adds the time itself",
 			journal: "8:12345",
-			line:    `^onechat: the agent is ready\n$`,
+			line:    `^<6>onechat: the agent is ready\n$`,
 		},
 		{
 			name:    "a terminal gets the time in the line",
 			journal: "",
-			line:    `^onechat: \d{4}/\d\d/\d\d \d\d:\d\d:\d\d the agent is ready\n$`,
+			line:    `^\d{4}/\d\d/\d\d \d\d:\d\d:\d\d INFO onechat: the agent is ready\n$`,
 		},
 	}
 
@@ -121,7 +235,8 @@ func TestDaemonLogHasATimeStampOnlyOutsideTheJournal(t *testing.T) {
 			t.Setenv("JOURNAL_STREAM", tc.journal)
 
 			var out strings.Builder
-			daemonLogger(&out, "onechat: ").Print("the agent is ready")
+
+			daemonLogger(&out, "onechat: ").Info("the agent is ready")
 			require.Regexp(t, tc.line, out.String())
 		})
 	}