Send the end of the view in one part with the task

[onechat] / compactor.go

diff --git a/compactor.go b/compactor.go
index ac5fd1d56541e416e981c013cbe20f289afb281a..11497b8ddd6aeb919a75cf37c7ae08e8f2c25c59 100644 (file)
--- 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,10 @@ 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, in the
+// parts that compactionParts gives. Only the last part holds the end of the
+// view, so compactions whose views end at different lines begin with the same
+// parts up to their last shared block.
 //
 // 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,18 +56,18 @@ 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"
        text, err := compactionTask(task)
        if err != nil {
                return "", err
        }
 
+       first := compactionParts(task.Context, text)
        var lines []string
        note := ""
        for len(lines) < compactionTries {
-               parts := []string{view, text}
+               parts := first
                if note != "" {
-                       parts = append(parts, note)
+                       parts = append(slices.Clip(first), note)
                }
 
                var response Response
@@ -68,6 +77,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 +104,22 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
        return shortest(lines), nil
 }
 
+// compactionParts returns the input parts of a first try for the compaction
+// view context and the task text: the opening tag, one part for each whole
+// block of viewBlock lines, and then one part with the rest of the lines, the
+// closing tag, a newline, and the task. Joined, the parts are the view, a
+// newline, and the task.
+func compactionParts(context, task 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"+task)
+}
+
 // compactionTask returns the task of a build, with its input.
 func compactionTask(task Task) (string, error) {
        if task.Level == 0 && len(task.Input) == 1 {