X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/016d46008fc9726d2617e4e3ea098113f34c7636..b2fc2d6a737dd5bab25e57ba822dd07258de93e6:/rebuild.go

diff --git a/rebuild.go b/rebuild.go
index 91b5ae5..598371c 100644
--- a/rebuild.go
+++ b/rebuild.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"log"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"slices"
@@ -26,7 +26,9 @@ const rebuildCallLimit = 1500
 // removes the new directory and leaves the original directory unchanged.
 // Success copies the other agent files, adds this run's usage, and swaps the
 // directories, with the original kept as a timestamped backup. Message IDs are
-// new positions in the merged log, but kind, text, and date stay exact.
+// new positions in the merged log, but kind, text, and date stay exact. A child
+// keeps its staging directory and backup outside children so that neither is
+// read as a configured child.
 func rebuild(ctx context.Context, agent *Agent, added []DatedMessage, client *ModelClient, summarizer Summarizer, out io.Writer) (backup string, err error) {
 	err = rebuildIdle(agent.dir)
 	if err != nil {
@@ -43,7 +45,14 @@ func rebuild(ctx context.Context, agent *Agent, added []DatedMessage, client *Mo
 		return "", fmt.Errorf("merge rebuild messages: %w", err)
 	}
 
-	root, err := os.MkdirTemp(filepath.Dir(agent.dir), ".agent-rebuild-")
+	parent := filepath.Dir(agent.dir)
+	backupDir := agent.dir
+	if agent.config.Parent != "" {
+		parent = filepath.Dir(parent)
+		backupDir = filepath.Join(parent, agent.config.Name)
+	}
+
+	root, err := os.MkdirTemp(parent, ".agent-rebuild-")
 	if err != nil {
 		return "", fmt.Errorf("create rebuild directory: %w", err)
 	}
@@ -55,7 +64,7 @@ func rebuild(ctx context.Context, agent *Agent, added []DatedMessage, client *Mo
 		}
 	}()
 
-	memory, err := openMemory(ctx, root, time.Now, summarizer, log.New(io.Discard, "", 0))
+	memory, err := openMemory(ctx, root, time.Now, summarizer, slog.New(slog.DiscardHandler))
 	if err != nil {
 		return "", fmt.Errorf("open rebuilt memory: %w", err)
 	}
@@ -110,7 +119,7 @@ func rebuild(ctx context.Context, agent *Agent, added []DatedMessage, client *Mo
 		return "", ctx.Err()
 	}
 
-	backup = agent.dir + "-backup-" + time.Now().Format("20060102-150405.000000000")
+	backup = backupDir + "-backup-" + time.Now().Format("20060102-150405.000000000")
 	err = os.Rename(agent.dir, backup)
 	if err != nil {
 		return "", fmt.Errorf("back up agent: %w", err)