Split long replies between Markdown blocks

[onechat] / compactor.go

diff --git a/compactor.go b/compactor.go
index fe8a00ffd8c3df5038117400cf0b8de6f7b9a437..e899c094ee58ad0036cdd7443fac632a9b903df9 100644 (file)
--- a/compactor.go
+++ b/compactor.go
@@ -4,18 +4,12 @@ import (
        "context"
        "errors"
        "fmt"
-       "slices"
        "strings"
        "unicode/utf8"
 )
 
-const (
-       // compactionTries is the most calls for one node.
-       compactionTries = 5
-
-       // viewBlock is the number of view lines in one input part.
-       viewBlock = 4
-)
+// compactionTries is the most calls for one node.
+const compactionTries = 5
 
 // 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.
@@ -24,9 +18,7 @@ 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.
 //
 // 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
@@ -38,33 +30,39 @@ var ruler = strings.Repeat("-", nodeBytes)
 type Compactor struct {
        client       *Client
        model        ModelConfig
-       instructions string
+       instructions func() (string, error)
        tools        []Tool
 }
 
-// newCompactor returns the compactor of the agent name, which sends its calls
-// through client with model.
-func newCompactor(client *Client, name string, model ModelConfig) *Compactor {
+// newCompactor returns the compactor of an agent, which sends its calls through
+// client with model. instructions gives the system prompt of the agent at each
+// build, so a build sends the same prompt as the turns of that time.
+func newCompactor(client *Client, instructions func() (string, error), model ModelConfig) *Compactor {
        return &Compactor{
                client:       client,
                model:        model,
-               instructions: prompt(name),
+               instructions: instructions,
                tools:        agentTools(),
        }
 }
 
 // Summarize returns the line of the node of task.
 func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
-       view := viewParts(task.Context)
+       view := task.Context + "\n"
        text, err := compactionTask(task)
        if err != nil {
                return "", err
        }
 
+       instructions, err := c.instructions()
+       if err != nil {
+               return "", fmt.Errorf("compact node (%d, %d): %w", task.Level, task.Index, err)
+       }
+
        var lines []string
        note := ""
        for len(lines) < compactionTries {
-               parts := slices.Concat(view, []string{text})
+               parts := []string{view, text}
                if note != "" {
                        parts = append(parts, note)
                }
@@ -73,7 +71,7 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
                response, err = c.client.Create(ctx, Request{
                        Model:        c.model.Model,
                        Effort:       c.model.Effort,
-                       Instructions: c.instructions,
+                       Instructions: instructions,
                        Tools:        c.tools,
                        Input:        []any{userMessage(parts...)},
                        Node:         &nodeKey{task.Level, task.Index},
@@ -103,21 +101,6 @@ 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 {