@@ -459,7 +459,7 @@ func TestZoeaListMysesCompaction(t *testing.T) {
459459 }
460460
461461 // Get context memories
462- memories, err := mysis.getContextMemories()
462+ memories, _, err := mysis.getContextMemories()
463463 if err != nil {
464464 t.Fatalf("getContextMemories() error: %v", err)
465465 }
@@ -581,7 +581,7 @@ func TestGetContextMemories_CurrentTurnBoundary(t *testing.T) {
581581 tt.setupMemories()
582582
583583 // Get context memories
584- memories, err := mysis.getContextMemories()
584+ memories, _, err := mysis.getContextMemories()
585585 if err != nil {
586586 t.Fatalf("getContextMemories() error: %v", err)
587587 }
@@ -1190,8 +1190,8 @@ func TestStopAtVariousTimings(t *testing.T) {
11901190 // Encouragement counter now increments in getContextMemories() when no user message exists.
11911191 // See TestEncouragementLimit and TestEncouragementReset for new behavior.
11921192
1193-// TestEncouragementLimit tests that encouragementCount reaches 3 after 3 getContextMemories() calls
1194-// with no user messages, and that a warning is logged.
1193+// TestEncouragementLimit tests that getContextMemories() returns the correct addedSynthetic flag
1194+// when no user messages exist. The counter increment happens in SendMessageFrom(), not here.
11951195 func TestEncouragementLimit(t *testing.T) {
11961196 s, bus, cleanup := setupMysisTest(t)
11971197 defer cleanup()
@@ -1210,34 +1210,27 @@ func TestEncouragementLimit(t *testing.T) {
12101210 t.Fatalf("AddMemory error: %v", err)
12111211 }
12121212
1213- // Call getContextMemories() 3 times with no user messages
1214- for i := 1; i <= 3; i++ {
1215- _, err := mysis.getContextMemories()
1216- if err != nil {
1217- t.Fatalf("getContextMemories() error on call %d: %v", i, err)
1218- }
1219-
1220- // Check counter value
1221- mysis.mu.RLock()
1222- count := mysis.encouragementCount
1223- mysis.mu.RUnlock()
1213+ // Call getContextMemories() with no user messages - should return addedSynthetic=true
1214+ _, addedSynthetic, err := mysis.getContextMemories()
1215+ if err != nil {
1216+ t.Fatalf("getContextMemories() error: %v", err)
1217+ }
12241218
1225- if count != i {
1226- t.Errorf("after call %d: expected encouragementCount=%d, got %d", i, i, count)
1227- }
1219+ if !addedSynthetic {
1220+ t.Errorf("expected addedSynthetic=true when no user message exists, got false")
12281221 }
12291222
1230- // Verify counter reached 3
1223+ // Verify counter is still 0 (increment happens in SendMessageFrom, not here)
12311224 mysis.mu.RLock()
1232- finalCount := mysis.encouragementCount
1225+ count := mysis.encouragementCount
12331226 mysis.mu.RUnlock()
12341227
1235- if finalCount != 3 {
1236- t.Errorf("expected final encouragementCount=3, got %d", finalCount)
1228+ if count != 0 {
1229+ t.Errorf("expected encouragementCount=0 (not incremented by getContextMemories), got %d", count)
12371230 }
12381231
1239- // Note: Testing the warning log would require capturing log output,
1240- // which is not done here. The warning is verified in integration tests.
1232+ // Note: Full autonomous turn behavior (counter increment after turn completes)
1233+ // is tested in TestMysisCounterBehavior_* tests.
12411234 }
12421235
12431236 // TestEncouragementReset tests that encouragementCount resets to 0 when a real user message
@@ -1339,7 +1332,7 @@ func TestEncouragementReset(t *testing.T) {
13391332 mysis.mu.Unlock()
13401333
13411334 // Call getContextMemories() - should NOT reset counter because real user message exists
1342- _, err = mysis.getContextMemories()
1335+ _, _, err = mysis.getContextMemories()
13431336 if err != nil {
13441337 t.Fatalf("getContextMemories() error: %v", err)
13451338 }
@@ -1966,7 +1959,7 @@ func TestGetContextMemories_CurrentTurnPreserved(t *testing.T) {
19661959 t.Fatalf("AddMemory error: %v", err)
19671960 }
19681961
1969- memories, err := mysis.getContextMemories()
1962+ memories, _, err := mysis.getContextMemories()
19701963 if err != nil {
19711964 t.Fatalf("getContextMemories error: %v", err)
19721965 }
@@ -2031,7 +2024,7 @@ func TestGetContextMemories_NoUserPrompt(t *testing.T) {
20312024 t.Fatalf("AddMemory error: %v", err)
20322025 }
20332026
2034- memories, err := mysis.getContextMemories()
2027+ memories, _, err := mysis.getContextMemories()
20352028 if err != nil {
20362029 t.Fatalf("getContextMemories error: %v", err)
20372030 }
@@ -2074,7 +2067,7 @@ func TestGetContextMemories_OnlyHistoricalTurns(t *testing.T) {
20742067 t.Fatalf("AddMemory error: %v", err)
20752068 }
20762069
2077- memories, err := mysis.getContextMemories()
2070+ memories, _, err := mysis.getContextMemories()
20782071 if err != nil {
20792072 t.Fatalf("getContextMemories error: %v", err)
20802073 }
@@ -2452,7 +2445,7 @@ func TestBroadcastSlidingWindowBug(t *testing.T) {
24522445
24532446 // Call getContextMemories - this should find the broadcast even though
24542447 // it's outside the 20-message sliding window
2455- memories, err := mysis.getContextMemories()
2448+ memories, _, err := mysis.getContextMemories()
24562449 if err != nil {
24572450 t.Fatalf("getContextMemories() error: %v", err)
24582451 }
@@ -2555,7 +2548,7 @@ func TestNewMysisInheritsGlobalBroadcast(t *testing.T) {
25552548 mock := provider.NewMock("mock", "Continuing mission...")
25562549 mysisInstance := NewMysis(mysis2.ID, mysis2.Name, mysis2.CreatedAt, mock, s, bus)
25572550
2558- memories, err := mysisInstance.getContextMemories()
2551+ memories, _, err := mysisInstance.getContextMemories()
25592552 if err != nil {
25602553 t.Fatalf("getContextMemories() error: %v", err)
25612554 }