X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/6755f2645bf6bcf8c7cd5b1f3a682a11bf2392f5..56129a5:/compactor.go

diff --git a/compactor.go b/compactor.go
index ac5fd1d..fe8a00f 100644
--- a/compactor.go
+++ b/compactor.go
@@ -4,12 +4,18 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"strings"
 	"unicode/utf8"
 )
 
-// compactionTries is the most calls for one node.
-const compactionTries = 5
+const (
+	// compactionTries is the most calls for one node.
+	compactionTries = 5
+
+	// viewBlock is the number of view lines in one input part.
+	viewBlock = 4
+)
 
 // ruler shows the model the size limit of a line. Models cannot count bytes,
 // and a sample line as the ruler gets its content copied.
@@ -18,7 +24,9 @@ var ruler = strings.Repeat("-", nodeBytes)
 // Compactor builds the nodes of one agent with a model. A compaction is a call
 // like a turn, with the same system prompt and tools, so it reads them from the
 // prompt cache of the turns. The tools are never called. After them comes one
-// user message with the compaction view up to the node and the task.
+// user message with the compaction view up to the node and the task. The view
+// goes in parts of viewBlock lines, as viewParts gives them, so compactions
+// whose views end at different lines still send the same first parts.
 //
 // When the line is over nodeBytes, the next try sends the same view and task,
 // plus a note with the size of the newest line and its cut at the limit. A try
@@ -47,7 +55,7 @@ func newCompactor(client *Client, name string, model ModelConfig) *Compactor {
 
 // Summarize returns the line of the node of task.
 func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
-	view := task.Context + "\n"
+	view := viewParts(task.Context)
 	text, err := compactionTask(task)
 	if err != nil {
 		return "", err
@@ -56,7 +64,7 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
 	var lines []string
 	note := ""
 	for len(lines) < compactionTries {
-		parts := []string{view, text}
+		parts := slices.Concat(view, []string{text})
 		if note != "" {
 			parts = append(parts, note)
 		}
@@ -68,6 +76,7 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
 			Instructions: c.instructions,
 			Tools:        c.tools,
 			Input:        []any{userMessage(parts...)},
+			Node:         &nodeKey{task.Level, task.Index},
 		})
 		if err != nil {
 			break
@@ -94,6 +103,21 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
 	return shortest(lines), nil
 }
 
+// viewParts returns the parts of the compaction view context: the opening tag,
+// one part for each whole block of viewBlock lines, and the rest of the lines
+// with the closing tag and a newline. Joined, the parts are context and a
+// newline.
+func viewParts(context string) []string {
+	lines := strings.SplitAfter(strings.TrimPrefix(context, "<chat>\n"), "\n")
+	whole := len(lines) - 1 - (len(lines)-1)%viewBlock
+	parts := []string{"<chat>\n"}
+	for n := 0; n < whole; n += viewBlock {
+		parts = append(parts, strings.Join(lines[n:n+viewBlock], ""))
+	}
+
+	return append(parts, strings.Join(lines[whole:], "")+"\n")
+}
+
 // compactionTask returns the task of a build, with its input.
 func compactionTask(task Task) (string, error) {
 	if task.Level == 0 && len(task.Input) == 1 {