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

diff --git a/compactor.go b/compactor.go
index fe8a00f..11497b8 100644
--- a/compactor.go
+++ b/compactor.go
@@ -24,9 +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. 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.
+// 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
@@ -55,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 := viewParts(task.Context)
 	text, err := compactionTask(task)
 	if err != nil {
 		return "", err
 	}
 
+	first := compactionParts(task.Context, text)
 	var lines []string
 	note := ""
 	for len(lines) < compactionTries {
-		parts := slices.Concat(view, []string{text})
+		parts := first
 		if note != "" {
-			parts = append(parts, note)
+			parts = append(slices.Clip(first), note)
 		}
 
 		var response Response
@@ -103,11 +104,12 @@ 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 {
+// 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"}
@@ -115,7 +117,7 @@ func viewParts(context string) []string {
 		parts = append(parts, strings.Join(lines[n:n+viewBlock], ""))
 	}
 
-	return append(parts, strings.Join(lines[whole:], "")+"\n")
+	return append(parts, strings.Join(lines[whole:], "")+"\n"+task)
 }
 
 // compactionTask returns the task of a build, with its input.