Separate returns from longer statement blocks

[onechat] / compactor_test.go

diff --git a/compactor_test.go b/compactor_test.go
index 0d591ee9e5602135ef113712e405bddbe3c11bb8..f4c51f4af12621e3b64ffd853955a1afa119f773 100644 (file)
--- a/compactor_test.go
+++ b/compactor_test.go
@@ -28,7 +28,7 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
        require.Equal(t, 1, server.Calls())
 
        body := server.Call(0).body
        require.Equal(t, 1, server.Calls())
 
        body := server.Call(0).body

-       require.Equal(t, prompt("Ada", ""), body["instructions"])
+       require.Equal(t, prompt("Ada", "/AGENT/instructions.md", ""), body["instructions"])

        require.Equal(t, "gpt-test", body["model"])
        require.Equal(t, map[string]any{"effort": "high"}, body["reasoning"])
        require.Equal(t, "agent-key", body["prompt_cache_key"])
        require.Equal(t, "gpt-test", body["model"])
        require.Equal(t, map[string]any{"effort": "high"}, body["reasoning"])
        require.Equal(t, "agent-key", body["prompt_cache_key"])


@@ -209,7 +209,7 @@ func TestCompactorFailsWithoutALine(t *testing.T) {
        }{
                {
                        name: "failed call",
        }{
                {
                        name: "failed call",

-                       reply: func(w http.ResponseWriter, call ModelFakeCall) {
+                       reply: func(w http.ResponseWriter, _ ModelFakeCall) {

                                w.WriteHeader(http.StatusInternalServerError)
                                _, _ = io.WriteString(w, "down")
                        },
                                w.WriteHeader(http.StatusInternalServerError)
                                _, _ = io.WriteString(w, "down")
                        },


@@ -217,7 +217,7 @@ func TestCompactorFailsWithoutALine(t *testing.T) {
                },
                {
                        name: "tool call and no text",
                },
                {
                        name: "tool call and no text",

-                       reply: func(w http.ResponseWriter, call ModelFakeCall) {
+                       reply: func(w http.ResponseWriter, _ ModelFakeCall) {

                                modelWriteEvents(w, modelCompletedEvent([]any{map[string]any{"type": "function_call", "name": "zoom", "arguments": "{}"}}, 100, 0, 5))
                        },
                        want: "no line",
                                modelWriteEvents(w, modelCompletedEvent([]any{map[string]any{"type": "function_call", "name": "zoom", "arguments": "{}"}}, 100, 0, 5))
                        },
                        want: "no line",


@@ -255,7 +255,7 @@ func TestCompactorBuildsNodesInTheCore(t *testing.T) {
                modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem("summary of the long output")}, 100, 0, 5))
        }
 
                modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem("summary of the long output")}, 100, 0, 5))
        }
 

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, newTestCompactor(t, server))
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, newTestCompactor(t, server), discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -327,5 +327,5 @@ func compactorLeafTask() Task {
 
 // compactorAdaPrompt returns the prompt of the agent Ada, without instructions.
 func compactorAdaPrompt() (string, error) {
 
 // compactorAdaPrompt returns the prompt of the agent Ada, without instructions.
 func compactorAdaPrompt() (string, error) {

-       return prompt("Ada", ""), nil
+       return prompt("Ada", "/AGENT/instructions.md", ""), nil

 }
 }