Let the agent keep user instructions

[onechat] / memory_test.go

diff --git a/memory_test.go b/memory_test.go
index 4dee8b2951e18d2cb6d47ca60a0414e02054545d..3930435aca7eb400699d43de8cd0c7c3f49f1192 100644 (file)
--- a/memory_test.go
+++ b/memory_test.go
@@ -3,6 +3,7 @@ package main
 import (
        "context"
        "fmt"
 import (
        "context"
        "fmt"

+       "log"

        "maps"
        "os"
        "path/filepath"
        "maps"
        "os"
        "path/filepath"


@@ -17,7 +18,7 @@ import (
 func TestMemoryRestartLoadsTheSameView(t *testing.T) {
        root := t.TempDir()
        clock := newTestClock()
 func TestMemoryRestartLoadsTheSameView(t *testing.T) {
        root := t.TempDir()
        clock := newTestClock()

-       memory, err := openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       memory, err := openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        memory.chat.high = 200
        require.NoError(t, err)
 
        memory.chat.high = 200


@@ -36,7 +37,7 @@ func TestMemoryRestartLoadsTheSameView(t *testing.T) {
        require.Less(t, len(memory.chat.lines), 100)
        require.NoError(t, memory.Close())
 
        require.Less(t, len(memory.chat.lines), 100)
        require.NoError(t, memory.Close())
 

-       memory, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       memory, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -54,7 +55,7 @@ func TestMemoryRestartLoadsTheSameView(t *testing.T) {
 func TestMemoryOpensAfterACrashBeforeTheViewSave(t *testing.T) {
        root := t.TempDir()
        clock := newTestClock()
 func TestMemoryOpensAfterACrashBeforeTheViewSave(t *testing.T) {
        root := t.TempDir()
        clock := newTestClock()

-       memory, err := openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       memory, err := openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        _, err = memory.Append("user", "first")
        require.NoError(t, err)
 
        _, err = memory.Append("user", "first")


@@ -72,14 +73,14 @@ func TestMemoryOpensAfterACrashBeforeTheViewSave(t *testing.T) {
        // The log and the tree hold message 1, but the view does not.
        require.NoError(t, os.WriteFile(filepath.Join(root, "view.json"), saved, 0o600))
 
        // The log and the tree hold message 1, but the view does not.
        require.NoError(t, os.WriteFile(filepath.Join(root, "view.json"), saved, 0o600))
 

-       memory, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       memory, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
        require.Equal(t, view, memory.View())
        require.NoError(t, memory.Close())
 }
 
 func TestMemoryKeepsTheCompactionViewCoarser(t *testing.T) {
        require.NoError(t, err)
        require.Equal(t, view, memory.View())
        require.NoError(t, memory.Close())
 }
 
 func TestMemoryKeepsTheCompactionViewCoarser(t *testing.T) {

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, newFakeSummarizer())
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -110,7 +111,7 @@ func TestMemoryKeepsTheCompactionViewCoarser(t *testing.T) {
 func TestMemoryRunsAtMostEightBuilds(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.gate = make(chan struct{})
 func TestMemoryRunsAtMostEightBuilds(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.gate = make(chan struct{})

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer)
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer, discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -148,7 +149,7 @@ func TestMemoryRunsAtMostEightBuilds(t *testing.T) {
 func TestMemorySettleWaitsForThePendingLines(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.gate = make(chan struct{})
 func TestMemorySettleWaitsForThePendingLines(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.gate = make(chan struct{})

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer)
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer, discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -178,7 +179,8 @@ func TestMemorySettleWaitsForThePendingLines(t *testing.T) {
 func TestMemorySettleFailsWhileABuildFailed(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.SetFailing(true)
 func TestMemorySettleFailsWhileABuildFailed(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.SetFailing(true)

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer)
+       logs := &SyncBuffer{}
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer, log.New(logs, "", 0))

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -188,6 +190,7 @@ func TestMemorySettleFailsWhileABuildFailed(t *testing.T) {
        _, err = memory.Append("echo", memoryLongText(0))
        require.NoError(t, err)
        require.ErrorIs(t, memory.Settle(t.Context()), errMemoryUnsettled)
        _, err = memory.Append("echo", memoryLongText(0))
        require.NoError(t, err)
        require.ErrorIs(t, memory.Settle(t.Context()), errMemoryUnsettled)

+       require.Equal(t, "summary failed, retry at next message: node (0, 0): fake failure\n", logs.String())

 
        summarizer.SetFailing(false)
        _, err = memory.Append("user", "retry")
 
        summarizer.SetFailing(false)
        _, err = memory.Append("user", "retry")


@@ -198,7 +201,7 @@ func TestMemorySettleFailsWhileABuildFailed(t *testing.T) {
 func TestMemorySettleEndsWithItsContext(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.gate = make(chan struct{})
 func TestMemorySettleEndsWithItsContext(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.gate = make(chan struct{})

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer)
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer, discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -217,7 +220,7 @@ func TestMemorySettleEndsWithItsContext(t *testing.T) {
 func TestMemoryStartsALeafAfterFewerThanEightUnbuilt(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.SetFailing(true)
 func TestMemoryStartsALeafAfterFewerThanEightUnbuilt(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.SetFailing(true)

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer)
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer, discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -246,7 +249,7 @@ func TestMemoryStartsALeafAfterFewerThanEightUnbuilt(t *testing.T) {
 
 func TestMemoryMergesAfterBothHalves(t *testing.T) {
        summarizer := newFakeSummarizer()
 
 func TestMemoryMergesAfterBothHalves(t *testing.T) {
        summarizer := newFakeSummarizer()

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer)
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer, discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -275,7 +278,7 @@ func TestMemoryRestartRestoresTheQueue(t *testing.T) {
        clock := newTestClock()
        summarizer := newFakeSummarizer()
        summarizer.SetFailing(true)
        clock := newTestClock()
        summarizer := newFakeSummarizer()
        summarizer.SetFailing(true)

-       memory, err := openMemory(t.Context(), root, clock.Now, summarizer)
+       memory, err := openMemory(t.Context(), root, clock.Now, summarizer, discardLog())

        require.NoError(t, err)
 
        for n := range 4 {
        require.NoError(t, err)
 
        for n := range 4 {


@@ -286,7 +289,7 @@ func TestMemoryRestartRestoresTheQueue(t *testing.T) {
        require.NoError(t, memory.Wait(t.Context()))
        require.NoError(t, memory.Close())
 
        require.NoError(t, memory.Wait(t.Context()))
        require.NoError(t, memory.Close())
 

-       memory, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       memory, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -298,7 +301,7 @@ func TestMemoryRestartRestoresTheQueue(t *testing.T) {
 }
 
 func TestMemoryBuildsFreeParents(t *testing.T) {
 }
 
 func TestMemoryBuildsFreeParents(t *testing.T) {

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, newFakeSummarizer())
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -317,7 +320,7 @@ func TestMemoryBuildsFreeParents(t *testing.T) {
 func TestMemoryKeepsALongMessageOutOfTheView(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.SetFailing(true)
 func TestMemoryKeepsALongMessageOutOfTheView(t *testing.T) {
        summarizer := newFakeSummarizer()
        summarizer.SetFailing(true)

-       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer)
+       memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, summarizer, discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -343,7 +346,7 @@ func TestMemoryKeepsALongMessageOutOfTheView(t *testing.T) {
 func TestMemoryCoversMessagesAfterTheSavedView(t *testing.T) {
        root := t.TempDir()
        clock := newTestClock()
 func TestMemoryCoversMessagesAfterTheSavedView(t *testing.T) {
        root := t.TempDir()
        clock := newTestClock()

-       memory, err := openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       memory, err := openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        _, err = memory.Append("user", "a")
        require.NoError(t, err)
 
        _, err = memory.Append("user", "a")


@@ -353,7 +356,7 @@ func TestMemoryCoversMessagesAfterTheSavedView(t *testing.T) {
        require.NoError(t, err)
        require.NoError(t, memory.Close())
 
        require.NoError(t, err)
        require.NoError(t, memory.Close())
 

-       memory, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       memory, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        defer func() {
        require.NoError(t, err)
 
        defer func() {


@@ -366,7 +369,7 @@ func TestMemoryCoversMessagesAfterTheSavedView(t *testing.T) {
 func TestMemoryRefusesToRebuildAMissingView(t *testing.T) {
        root := t.TempDir()
        clock := newTestClock()
 func TestMemoryRefusesToRebuildAMissingView(t *testing.T) {
        root := t.TempDir()
        clock := newTestClock()

-       memory, err := openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       memory, err := openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.NoError(t, err)
 
        _, err = memory.Append("user", "a")
        require.NoError(t, err)
 
        _, err = memory.Append("user", "a")


@@ -374,7 +377,7 @@ func TestMemoryRefusesToRebuildAMissingView(t *testing.T) {
        require.NoError(t, memory.Close())
        require.NoError(t, os.Remove(filepath.Join(root, "view.json")))
 
        require.NoError(t, memory.Close())
        require.NoError(t, os.Remove(filepath.Join(root, "view.json")))
 

-       _, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer())
+       _, err = openMemory(t.Context(), root, clock.Now, newFakeSummarizer(), discardLog())

        require.ErrorIs(t, err, errMemoryNoView)
 }
 
        require.ErrorIs(t, err, errMemoryNoView)
 }