X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/56129a5fcbcbe51a7ac7d6b009d4551ed9f71109..d206de3a2e839ffbda9cbdb10a3ed93c4915fce3:/compactor_test.go?ds=sidebyside

diff --git a/compactor_test.go b/compactor_test.go
index cc99f33..4573fdd 100644
--- a/compactor_test.go
+++ b/compactor_test.go
@@ -20,7 +20,7 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
 	line, err := compactor.Summarize(t.Context(), Task{
 		Level:   0,
 		Index:   7,
-		Context: "<chat>\n0+4|a\n4+1|b\n5+1|c\n6+1|d\n7+1|e\n</chat>",
+		Context: "<chat>\n0+4|user: earlier\n</chat>",
 		Input:   []string{"user: " + strings.Repeat("x", 600)},
 	})
 	require.NoError(t, err)
@@ -28,7 +28,7 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
 	require.Equal(t, 1, server.Calls())
 
 	body := server.Call(0).body
-	require.Equal(t, prompt("Ada"), body["instructions"])
+	require.Equal(t, prompt("Ada", ""), 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"])
@@ -42,9 +42,7 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
 
 	parts := inputParts(t, server.Call(0))
 	require.Equal(t, []string{
-		"<chat>\n",
-		"0+4|a\n4+1|b\n5+1|c\n6+1|d\n",
-		"7+1|e\n</chat>\n",
+		"<chat>\n0+4|user: earlier\n</chat>\n",
 		"Compaction: compress message 7 into one line of at most 512 bytes\n" +
 			"(about 70 words), the length of this ruler:\n" +
 			strings.Repeat("-", 512) + "\n" +
@@ -52,55 +50,6 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
 	}, parts)
 }
 
-func TestViewPartsSendWholeBlocksOfLines(t *testing.T) {
-	testCases := []struct {
-		name    string
-		context string
-		want    []string
-	}{
-		{
-			name:    "empty view has the tags only",
-			context: "<chat>\n</chat>",
-			want:    []string{"<chat>\n", "</chat>\n"},
-		},
-		{
-			name:    "lines short of a block go with the closing tag",
-			context: "<chat>\n0+1|a\n1+1|b\n2+1|c\n</chat>",
-			want:    []string{"<chat>\n", "0+1|a\n1+1|b\n2+1|c\n</chat>\n"},
-		},
-		{
-			name:    "one whole block",
-			context: "<chat>\n0+1|a\n1+1|b\n2+1|c\n3+1|d\n</chat>",
-			want:    []string{"<chat>\n", "0+1|a\n1+1|b\n2+1|c\n3+1|d\n", "</chat>\n"},
-		},
-		{
-			name:    "two whole blocks and a rest",
-			context: "<chat>\n0+2|a\n2+1|b\n3+1|c\n4+1|d\n5+1|e\n6+1|f\n7+1|g\n8+1|h\n9+1|i\n</chat>",
-			want: []string{
-				"<chat>\n",
-				"0+2|a\n2+1|b\n3+1|c\n4+1|d\n",
-				"5+1|e\n6+1|f\n7+1|g\n8+1|h\n",
-				"9+1|i\n</chat>\n",
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			parts := viewParts(tc.context)
-			require.Equal(t, tc.want, parts)
-			require.Equal(t, tc.context+"\n", strings.Join(parts, ""))
-		})
-	}
-}
-
-func TestViewPartsKeepTheBlocksOfAShorterView(t *testing.T) {
-	shorter := viewParts("<chat>\n0+1|a\n1+1|b\n2+1|c\n3+1|d\n4+1|e\n</chat>")
-	longer := viewParts("<chat>\n0+1|a\n1+1|b\n2+1|c\n3+1|d\n4+1|e\n5+1|f\n6+1|g\n7+1|h\n</chat>")
-	require.Equal(t, shorter[:2], longer[:2])
-	require.NotEqual(t, shorter[2], longer[2])
-}
-
 func TestCompactorWritesTheMergeTask(t *testing.T) {
 	text, err := compactionTask(Task{
 		Level: 2,
@@ -137,18 +86,18 @@ func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
 	}
 
 	first := inputParts(t, server.Call(0))
-	require.Len(t, first, 3)
+	require.Len(t, first, 2)
 	for n, want := range []string{long[0], long[1]} {
 		call := server.Call(n + 1)
 		parts := inputParts(t, call)
-		require.Equal(t, first, parts[:3])
-		require.Equal(t, []string{tooLong(want)}, parts[3:])
-		require.Contains(t, parts[3], "was "+strconv.Itoa(len(want))+" bytes,")
-		require.Contains(t, parts[3], "\n"+want[:512]+"| <- LIMIT")
+		require.Equal(t, first, parts[:2])
+		require.Equal(t, []string{tooLong(want)}, parts[2:])
+		require.Contains(t, parts[2], "was "+strconv.Itoa(len(want))+" bytes,")
+		require.Contains(t, parts[2], "\n"+want[:512]+"| <- LIMIT")
 
 		note, err := json.Marshal(map[string]string{
 			"type": "input_text",
-			"text": parts[3],
+			"text": parts[2],
 		})
 		require.NoError(t, err)
 		require.LessOrEqual(t, len(call.raw), len(server.Call(0).raw)+len(",")+len(note))
@@ -249,12 +198,17 @@ func newTestCompactor(t *testing.T, server *fakeResponses) *Compactor {
 
 	client := newClient(server.URL, apiKey(testKey), "agent-key", filepath.Join(t.TempDir(), "usage.jsonl"))
 
-	return newCompactor(client, "Ada", ModelConfig{
+	return newCompactor(client, adaPrompt, ModelConfig{
 		Model:  "gpt-test",
 		Effort: "high",
 	})
 }
 
+// adaPrompt returns the prompt of the agent Ada, without instructions.
+func adaPrompt() (string, error) {
+	return prompt("Ada", ""), nil
+}
+
 func leafTask() Task {
 	return Task{
 		Level:   0,