Store shared private images by content hash

[onechat] / rebuild_test.go

diff --git a/rebuild_test.go b/rebuild_test.go
index e3757ea0748a954a98abfe25f228f895c1bc1411..fc4ff7e8b09dc3cfd23d46c221cc7e36fbce8fcd 100644 (file)
--- a/rebuild_test.go
+++ b/rebuild_test.go
@@ -47,7 +47,9 @@ func TestRebuildMergesDatesAndKeepsAgentFiles(t *testing.T) {
        before := rebuildTestSnapshot(t, agent.dir)
        server := newModelFake(t)
        client := newModelClient(server.URL, ModelAPIKey(modelTestKey), agent.CacheKey(), filepath.Join(t.TempDir(), "usage.jsonl"))
        before := rebuildTestSnapshot(t, agent.dir)
        server := newModelFake(t)
        client := newModelClient(server.URL, ModelAPIKey(modelTestKey), agent.CacheKey(), filepath.Join(t.TempDir(), "usage.jsonl"))

+

        var report strings.Builder
        var report strings.Builder

+

        added := []DatedMessage{
                {
                        Kind: "work",
        added := []DatedMessage{
                {
                        Kind: "work",


@@ -61,7 +63,7 @@ func TestRebuildMergesDatesAndKeepsAgentFiles(t *testing.T) {
                },
        }
 
                },
        }
 

-       backup, err := rebuild(t.Context(), agent, added, client, newCompactor(client, agent.Prompt, defaultConfig().Compactor), &report)
+       backup, err := rebuild(t.Context(), agent, added, client, newCompactor(client, agent.Prompt, defaultConfig().Compactor, agent.Tools()), &report)

        require.NoError(t, err)
        require.Equal(t, before, rebuildTestSnapshot(t, backup))
 
        require.NoError(t, err)
        require.Equal(t, before, rebuildTestSnapshot(t, backup))
 


@@ -141,7 +143,7 @@ func TestRebuildFailureAndCancellationKeepOriginal(t *testing.T) {
                                Kind: "work",
                                Text: strings.Repeat("long ", 200),
                                Date: "2025-01-01T00:00:00Z",
                                Kind: "work",
                                Text: strings.Repeat("long ", 200),
                                Date: "2025-01-01T00:00:00Z",

-                       }}, client, newCompactor(client, agent.Prompt, defaultConfig().Compactor), &strings.Builder{})
+                       }}, client, newCompactor(client, agent.Prompt, defaultConfig().Compactor, agent.Tools()), &strings.Builder{})

                        require.Error(t, err)
                        require.Empty(t, backup)
                        require.Equal(t, before, rebuildTestSnapshot(t, agent.dir))
                        require.Error(t, err)
                        require.Empty(t, backup)
                        require.Equal(t, before, rebuildTestSnapshot(t, agent.dir))


@@ -169,6 +171,7 @@ func TestRebuildKeepsOriginalWhenAnInvisibleMergeFails(t *testing.T) {
        }
 
        rebuildTestLog(t, agent.dir, old)
        }
 
        rebuildTestLog(t, agent.dir, old)

+

        before := rebuildTestSnapshot(t, agent.dir)
        server := newModelFake(t)
        server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {
        before := rebuildTestSnapshot(t, agent.dir)
        server := newModelFake(t)
        server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {


@@ -176,7 +179,7 @@ func TestRebuildKeepsOriginalWhenAnInvisibleMergeFails(t *testing.T) {
        }
 
        client := newModelClient(server.URL, ModelAPIKey(modelTestKey), agent.CacheKey(), filepath.Join(t.TempDir(), "usage.jsonl"))
        }
 
        client := newModelClient(server.URL, ModelAPIKey(modelTestKey), agent.CacheKey(), filepath.Join(t.TempDir(), "usage.jsonl"))

-       _, err := rebuild(t.Context(), agent, nil, client, newCompactor(client, agent.Prompt, defaultConfig().Compactor), &strings.Builder{})
+       _, err := rebuild(t.Context(), agent, nil, client, newCompactor(client, agent.Prompt, defaultConfig().Compactor, agent.Tools()), &strings.Builder{})

        require.ErrorContains(t, err, "summary tree has unfinished nodes")
        require.Equal(t, before, rebuildTestSnapshot(t, agent.dir))
 }
        require.ErrorContains(t, err, "summary tree has unfinished nodes")
        require.Equal(t, before, rebuildTestSnapshot(t, agent.dir))
 }