X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/30fbeb13a74942c6d515cc2a51eab7407a78c325..4b9b22619008f0829b7f5a8685e7b1d2a9aeb6bb:/compactor_test.go?ds=inline

diff --git a/compactor_test.go b/compactor_test.go
index 7813c77..20862c7 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|user: earlier\n</chat>",
+		Context: "<chat>\n0+4|a\n4+1|b\n5+1|c\n6+1|d\n7+1|e\n</chat>",
 		Input:   []string{"user: " + strings.Repeat("x", 600)},
 	})
 	require.NoError(t, err)
@@ -42,14 +42,66 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
 
 	parts := inputParts(t, server.Call(0))
 	require.Equal(t, []string{
-		"<chat>\n0+4|user: earlier\n</chat>\n",
-		"Compaction: compress message 7 into one line of at most 512 bytes\n" +
+		"<chat>\n",
+		"0+4|a\n4+1|b\n5+1|c\n6+1|d\n",
+		"7+1|e\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" +
 			"<input>\nuser: " + strings.Repeat("x", 600) + "\n</input>",
 	}, parts)
 }
 
+func TestCompactionPartsEndWithTheRestAndTheTask(t *testing.T) {
+	testCases := []struct {
+		name    string
+		context string
+		want    []string
+	}{
+		{
+			name:    "empty view has the opening tag and the last part",
+			context: "<chat>\n</chat>",
+			want:    []string{"<chat>\n", "</chat>\nTASK"},
+		},
+		{
+			name:    "lines short of a block go into the last part",
+			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>\nTASK"},
+		},
+		{
+			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>\nTASK"},
+		},
+		{
+			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>\nTASK",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			parts := compactionParts(tc.context, "TASK")
+			require.Equal(t, tc.want, parts)
+			require.Equal(t, tc.context+"\nTASK", strings.Join(parts, ""))
+		})
+	}
+}
+
+func TestCompactionPartsOfALongerViewBeginWithTheBlocksOfAShorterOne(t *testing.T) {
+	shorter := compactionParts("<chat>\n0+1|a\n1+1|b\n2+1|c\n3+1|d\n4+1|e\n</chat>", "task 5")
+	longer := compactionParts("<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>", "task 8")
+	require.Len(t, shorter, 3)
+	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,
@@ -72,11 +124,19 @@ func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
 		writeEvents(w, completedEvent([]any{messageItem(long[call.number])}, 100, 0, 5))
 	}
 
-	line, err := newTestCompactor(t, server).Summarize(t.Context(), leafTask())
+	compactor := newTestCompactor(t, server)
+	line, err := compactor.Summarize(t.Context(), leafTask())
 	require.NoError(t, err)
 	require.Equal(t, long[2], line)
 	require.Equal(t, 3, server.Calls())
 
+	records := readUsage(t, compactor.client.usage.path)
+	require.Len(t, records, 3)
+	for n, record := range records {
+		require.Equal(t, &[2]int{0, 0}, record.Node)
+		require.Equal(t, len(long[n]), record.TextBytes)
+	}
+
 	first := inputParts(t, server.Call(0))
 	require.Len(t, first, 2)
 	for n, want := range []string{long[0], long[1]} {
@@ -85,7 +145,7 @@ func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
 		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")
+		require.Contains(t, parts[2], "\n"+want[:512]+"| <- LIMIT")
 
 		note, err := json.Marshal(map[string]string{
 			"type": "input_text",