Return known failures without redundant checks

[onechat] / subagent_run_test.go

diff --git a/subagent_run_test.go b/subagent_run_test.go
index efd387cccde2270fab18a6459758c3e8d112c446..047e6a874e97cc13b8c193b88b0b208a5b8f1b8e 100644 (file)
--- a/subagent_run_test.go
+++ b/subagent_run_test.go
@@ -182,7 +182,10 @@ func TestFullContextGivesAFailedReport(t *testing.T) {
                if subagentTestCall(call) {
                        w.WriteHeader(http.StatusBadRequest)
 
                if subagentTestCall(call) {
                        w.WriteHeader(http.StatusBadRequest)
 

-                       _, _ = io.WriteString(w, subagentTestFullContext)
+                       _, err := io.WriteString(w, subagentTestFullContext)
+                       if err != nil {
+                               panic(err)
+                       }

 
                        return
                }
 
                        return
                }


@@ -197,12 +200,12 @@ func TestFullContextGivesAFailedReport(t *testing.T) {
 
        name := test.events.Last("subagent")
        require.Equal(t, []string{
 
        name := test.events.Last("subagent")
        require.Equal(t, []string{

-               "work: [" + name + "]\nfailed: create model response: model call: HTTP 400: " + subagentTestFullContext + "\n\nFull chat: zoom(\"" + name + "\")",
+               "work: [" + name + "]\nfailed: run worker chain: create model response: model call: HTTP 400: " + subagentTestFullContext + "\n\nFull chat: zoom(\"" + name + "\")",

                "reply: It failed.",
        }, test.Log(t))
 
        require.Equal(t, subagentFailed, test.events.LastEvent("work").Status)
                "reply: It failed.",
        }, test.Log(t))
 
        require.Equal(t, subagentFailed, test.events.LastEvent("work").Status)

-       require.Equal(t, "<6>subagent started name="+name+"\n<3>subagent failed name="+name+" after=0s: create model response: model call: HTTP 400: "+subagentTestFullContext+"\n", test.logs.String())
+       require.Equal(t, "<6>subagent started name="+name+"\n<3>subagent failed name="+name+" after=0s: run worker chain: create model response: model call: HTTP 400: "+subagentTestFullContext+"\n", test.logs.String())

 }
 
 func TestSubagentHasItsOwnEffortAndNoSpawn(t *testing.T) {
 }
 
 func TestSubagentHasItsOwnEffortAndNoSpawn(t *testing.T) {


@@ -354,7 +357,7 @@ func TestTellToAFinishedSubagentGoesOnFromItsLog(t *testing.T) {
        require.Equal(t, "work: "+subagentReport(name, []string{"Reply 2."}), test.Log(t)[2])
 
        _, err = runs.Tell(t.Context(), "BlueFox", "Hello.")
        require.Equal(t, "work: "+subagentReport(name, []string{"Reply 2."}), test.Log(t)[2])
 
        _, err = runs.Tell(t.Context(), "BlueFox", "Hello.")

-       require.EqualError(t, err, "no agent BlueFox")
+       require.EqualError(t, err, "open worker log: no agent BlueFox")

 }
 
 func TestStopEndsASubagentAndItsCommand(t *testing.T) {
 }
 
 func TestStopEndsASubagentAndItsCommand(t *testing.T) {


@@ -519,21 +522,50 @@ func TestRestartReportsASubagentThatCannotGoOn(t *testing.T) {
        events.WaitFor(t, "idle", 1)
        require.Equal(t, []string{
                "note: The daemon restarted, cutting BlueFox; nothing was lost: go on.",
        events.WaitFor(t, "idle", 1)
        require.Equal(t, []string{
                "note: The daemon restarted, cutting BlueFox; nothing was lost: go on.",

-               "work: " + subagentReport("BlueFox", []string{"failed: no agent BlueFox"}),
+               "work: " + subagentReport("BlueFox", []string{"failed: open worker log: no agent BlueFox"}),

                "reply: a line",
        }, subagentTestChat(t, memory))
 
        require.Equal(t, subagentFailed, events.LastEvent("work").Status)
                "reply: a line",
        }, subagentTestChat(t, memory))
 
        require.Equal(t, subagentFailed, events.LastEvent("work").Status)

-       require.Equal(t, "<3>subagent lost at restart name=BlueFox: no agent BlueFox\n", logs.String())
+       require.Equal(t, "<3>subagent lost at restart name=BlueFox: open worker log: no agent BlueFox\n", logs.String())

 
        data, err := os.ReadFile(filepath.Join(agent.dir, subagentWorkFileName))
        require.NoError(t, err)
        require.JSONEq(t, `{"running": []}`, string(data))
 }
 
 
        data, err := os.ReadFile(filepath.Join(agent.dir, subagentWorkFileName))
        require.NoError(t, err)
        require.JSONEq(t, `{"running": []}`, string(data))
 }
 

+// subagentTestLastItem returns the last input item of call.
+func subagentTestLastItem(call ModelFakeCall) map[string]any {
+       input := call.body["input"].([]any)
+
+       return input[len(input)-1].(map[string]any)
+}
+
+// subagentTestCall tells if call is a call of a subagent.
+func subagentTestCall(call ModelFakeCall) bool {
+       instructions, _ := call.body["instructions"].(string)
+
+       return strings.HasPrefix(instructions, "You are a subagent")
+}
+
+// subagentTestText returns the text of the user message item, or "" for another
+// item.
+func subagentTestText(item map[string]any) string {
+       content, _ := item["content"].([]any)
+
+       var text strings.Builder
+
+       for _, part := range content {
+               value, _ := part.(map[string]any)["text"].(string)
+               text.WriteString(value)
+       }
+
+       return text.String()
+}
+

 // subagentTestStart runs a loop of agent with its memory and subagents in the
 // subagentTestStart runs a loop of agent with its memory and subagents in the

-// agent directory, as the daemon does. The returned function stops the loop
-// and closes the files.
+// agent directory, as the daemon does. The returned function stops the loop and
+// closes the files.

 func subagentTestStart(t *testing.T, agent *Agent, server *ModelFake, events *TurnEventRecorder, logger *slog.Logger) (*TurnLoop, *Memory, func()) {
        t.Helper()
 
 func subagentTestStart(t *testing.T, agent *Agent, server *ModelFake, events *TurnEventRecorder, logger *slog.Logger) (*TurnLoop, *Memory, func()) {
        t.Helper()
 


@@ -562,8 +594,7 @@ func subagentTestStart(t *testing.T, agent *Agent, server *ModelFake, events *Tu
        }
 }
 
        }
 }
 

-// subagentTestChat returns each message of the chat in memory as
-// "kind: text".
+// subagentTestChat returns each message of the chat in memory as "kind: text".

 func subagentTestChat(t *testing.T, memory *Memory) []string {
        t.Helper()
 
 func subagentTestChat(t *testing.T, memory *Memory) []string {
        t.Helper()
 


@@ -578,32 +609,3 @@ func subagentTestChat(t *testing.T, memory *Memory) []string {
 
        return lines
 }
 
        return lines
 }

-
-// subagentTestCall tells if call is a call of a subagent.
-func subagentTestCall(call ModelFakeCall) bool {
-       instructions, _ := call.body["instructions"].(string)
-
-       return strings.HasPrefix(instructions, "You are a subagent")
-}
-
-// subagentTestLastItem returns the last input item of call.
-func subagentTestLastItem(call ModelFakeCall) map[string]any {
-       input := call.body["input"].([]any)
-
-       return input[len(input)-1].(map[string]any)
-}
-
-// subagentTestText returns the text of the user message item, or "" for
-// another item.
-func subagentTestText(item map[string]any) string {
-       content, _ := item["content"].([]any)
-
-       var text strings.Builder
-
-       for _, part := range content {
-               value, _ := part.(map[string]any)["text"].(string)
-               text.WriteString(value)
-       }
-
-       return text.String()
-}