Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(team): preserve every memory evidence turn within review budget
  • Loading branch information
SivanCola committed Nov 3, 2026
commit 56e967bdaf11d004f688502b96e2e40ead2afb1a
26 changes: 22 additions & 4 deletions desktop/team_memory_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"context"
"fmt"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -76,7 +77,7 @@ func TestTeamGroupMemoryEvidenceConsumesEarliestBatchAndExcludesSchedules(t *tes
if i == 3 {
source = "scheduler"
}
_, err := desktopTeamStore().AppendLine(t.Context(), group, teamroster.GroupLine{From: teamroster.ByUser, Kind: teamroster.LinePost, Text: fmt.Sprintf("fact-%02d", i), Source: source, At: time.Now()})
_, err := desktopTeamStore().AppendLine(t.Context(), group, teamroster.GroupLine{From: teamroster.ByUser, Kind: teamroster.LinePost, Text: fmt.Sprintf("fact-%02d %s", i, strings.Repeat("long evidence ", 500)), Source: source, At: time.Now()})
if err != nil {
t.Fatal(err)
}
Expand All @@ -86,15 +87,32 @@ func TestTeamGroupMemoryEvidenceConsumesEarliestBatchAndExcludesSchedules(t *tes
t.Fatal(err)
}
reviews := teamMemoryReviews{app: a}
lines, _, advance, more, err := reviews.evidence(context.Background(), r, team.SeatRef{Agent: id, Group: group}, &state)
if err != nil || !more || len(lines) != 16 || lines[0].Text != "fact-00" || lines[15].Text != "fact-16" {
lines, store, advance, more, err := reviews.evidence(context.Background(), r, team.SeatRef{Agent: id, Group: group}, &state)
if err != nil || !more || len(lines) != 16 || !strings.HasPrefix(lines[0].Text, "fact-00 ") || !strings.HasPrefix(lines[15].Text, "fact-16 ") {
t.Fatalf("lost early evidence: %+v more=%v err=%v", lines, more, err)
}
if _, err := team.ReviewMemory(t.Context(), store, lines, func(_ context.Context, _, prompt string) (string, error) {
for i := range 17 {
if i != 3 && !strings.Contains(prompt, fmt.Sprintf("fact-%02d", i)) {
t.Fatalf("checkpoint would consume omitted human evidence %d", i)
}
}
if strings.Contains(prompt, "fact-03") {
t.Fatal("scheduler content entered human evidence")
}
return `{"changes":[]}`, nil
}); err != nil {
t.Fatal(err)
}
if err := advance(); err != nil {
t.Fatal(err)
}
state, err = loadTeamReviewState(r.Prefs.MemoryReviewStartedAt)
if err != nil {
t.Fatal(err)
}
lines, _, _, more, err = reviews.evidence(context.Background(), r, team.SeatRef{Agent: id, Group: group}, &state)
if err != nil || more || len(lines) != 3 || lines[0].Text != "fact-17" {
if err != nil || more || len(lines) != 3 || !strings.HasPrefix(lines[0].Text, "fact-17 ") {
t.Fatalf("batch cursor lost remaining evidence: %+v %v %v", lines, more, err)
}
}
45 changes: 33 additions & 12 deletions internal/team/review.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,38 +110,59 @@ func firstNonEmpty(a, b string) string {
return b
}

// reviewPrompt numbers the memory held and lists the new lines, each cut to
// its budget; when the whole runs over, the oldest lines go first.
// reviewPrompt includes every human line in the evidence page. The caller
// advances its checkpoint over that whole page, so budget pressure may shorten
// a line but must never silently discard an entire earlier turn.
func reviewPrompt(facts []memory.Memory, lines []ReviewLine) string {
var held strings.Builder
held.WriteString("Memory held now:\n")
if len(facts) == 0 {
held.WriteString("(none)\n")
}
for i, m := range facts {
fmt.Fprintf(&held, "%d. %s: %s\n %s\n", i+1, secrets.RedactCredentials(m.Name), secrets.RedactCredentials(m.Description), clip(oneLine(secrets.RedactCredentials(m.Body)), reviewBodyChars))
if held.Len() > reviewBudget/2 {
fmt.Fprintf(&held, "… %d more not shown\n", len(facts)-i-1)
line := fmt.Sprintf("%d. %s: %s\n %s\n", i+1, clip(secrets.RedactCredentials(m.Name), reviewBodyChars), clip(secrets.RedactCredentials(m.Description), reviewBodyChars), clip(oneLine(secrets.RedactCredentials(m.Body)), reviewBodyChars))
if held.Len()+len(line) > reviewBudget/2-80 {
fmt.Fprintf(&held, "… %d more not shown\n", len(facts)-i)
break
}
held.WriteString(line)
}
var said []string
room := reviewBudget - held.Len()
for i := len(lines) - 1; i >= 0 && room > 0; i-- {
const heading = "\nNew lines of the conversation:\n"
room := reviewBudget - held.Len() - len(heading)
remaining := 0
for _, line := range lines {
if line.User {
remaining++
}
}
for i := range lines {
if !lines[i].User {
continue
}
encoded, _ := json.Marshal(struct {
entry := struct {
Source string `json:"source"`
Name string `json:"name"`
Text string `json:"text"`
}{"user", lines[i].From, clip(secrets.RedactCredentials(lines[i].Text), reviewUserChars)})
}{"user", clip(lines[i].From, 40), ""}
body := secrets.RedactCredentials(lines[i].Text)
limit := reviewUserChars
entry.Text = clip(body, limit)
encoded, _ := json.Marshal(entry)
// Measure serialized bytes, not runes: Unicode and JSON escapes also
// consume the request budget. Each remaining turn gets an equal share.
allowance := room/remaining - 1
for len(encoded) > allowance && limit > 3 {
limit = max(3, limit*3/4)
entry.Text = clip(body, limit)
encoded, _ = json.Marshal(entry)
}
line := string(encoded)
room -= len(line)
room -= len(line) + 1
remaining--
said = append(said, line)
}
slices.Reverse(said)
return held.String() + "\nNew lines of the conversation:\n" + strings.Join(said, "\n")
return held.String() + heading + strings.Join(said, "\n")
}

func validateReviewChanges(changes []reviewChange, facts []memory.Memory) error {
Expand Down
27 changes: 27 additions & 0 deletions internal/team/review_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,30 @@ func TestALongLineKeepsItsHeadAndTail(t *testing.T) {
t.Fatalf("a long line reached the prompt as %d chars", len(a.prompt))
}
}

func TestReviewEvidencePageNeverDropsWholeTurns(t *testing.T) {
for _, fill := range []string{"word ", "用户偏好", "\"\\\n<>&"} {
t.Run(fmt.Sprintf("fill-%x", fill), func(t *testing.T) {
var facts []memory.Memory
for i := range 100 {
facts = append(facts, memory.Memory{Name: fmt.Sprintf("fact-%d", i), Body: strings.Repeat(fill, 200)})
}
var lines []ReviewLine
for i := range 16 {
lines = append(lines, ReviewLine{User: true, From: "user", Text: fmt.Sprintf("START-%02d %s END-%02d", i, strings.Repeat(fill, 3000), i)})
}
prompt := reviewPrompt(facts, lines)
if len(prompt) > reviewBudget {
t.Fatalf("prompt uses %d bytes, budget %d", len(prompt), reviewBudget)
}
previous := -1
for i := range 16 {
start := strings.Index(prompt, fmt.Sprintf("START-%02d", i))
if start <= previous || !strings.Contains(prompt, fmt.Sprintf("END-%02d", i)) {
t.Fatalf("turn %d lost or reordered before the page checkpoint advances", i)
}
previous = start
}
})
}
}