mirror of
https://github.com/chenhg5/cc-connect.git
synced 2026-07-03 12:28:10 +08:00
PR #603 (S1011 fix for #600) removed 9 unit tests targeting SwitchToAgentSession, recordPastAgentSessionID, and KnownAgentSessionIDs — production functions that the PR kept. The production code never lost those behaviors, but the test coverage dropped by 9. QA review (msg-20260607-4iaibz/2ocb88) flagged this as a P1 blocker on the merge. Restore the 9 tests verbatim from commit4e61c8f5(which sat on the pre-rebase base of #603) so the merge of #603 into main does not lose the regression coverage for the legacy-session-preservation invariant that #603 was built on top of. - TestSwitchToAgentSession_PreservesOldSession - TestSwitchToAgentSession_ReusesExisting - TestPastAgentSessionIDs_ClearPreservesHistory - TestPastAgentSessionIDs_ReplacePreservesHistory - TestPastAgentSessionIDs_NoDuplicates - TestPastAgentSessionIDs_ContinueSentinelNotRecorded - TestKnownAgentSessionIDs_IncludesPast - TestKnownAgentSessionIDs_ReproducesNewCommandBug - TestKnownAgentSessionIDs_ResetAllSessionsBug Cherry-picked from3392323b(PR #603 branch) which itself restores the tests byte-for-byte from 4e61c8f5:core/session_test.go. This PR re-applies the same 9-test diff onto current main (5e2f3b9e) so coverage restoration can land via a separate review path while the original PR #603 stays merged atcafc802a. Refs #600, #603 Co-existence verified: the 9 new tests live alongside the existing TestPruneDuplicateSessions_* tests in core/session_test.go and exercise the same package-level helpers (NewSessionManager, Session, SetAgentSessionID, SwitchToAgentSession, KnownAgentSessionIDs, filterOwnedSessions, AgentSessionInfo). No production code touched. No changes to the S1011 fix at core/session.go:878, sort.SliceStable at :879, /prune subcommand, PruneDuplicateSessions, --empty/--merge flags, or TestPruneDuplicateSessions_NoMergeKeepsBothWithHistory. go test -count=1 -tags no_web ./core/ → ok (39 existing + 9 restored = 48 tests in core/session_test.go) go vet -tags no_web ./core/... → clean Co-authored-by: Claude <noreply@anthropic.com>
1084 lines
31 KiB
Go
1084 lines
31 KiB
Go
package core
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestSessionManager_GetOrCreateActive(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
s1 := sm.GetOrCreateActive("user1")
|
|
if s1 == nil {
|
|
t.Fatal("expected non-nil session")
|
|
}
|
|
s2 := sm.GetOrCreateActive("user1")
|
|
if s1.ID != s2.ID {
|
|
t.Error("same user should get same active session")
|
|
}
|
|
|
|
s3 := sm.GetOrCreateActive("user2")
|
|
if s3.ID == s1.ID {
|
|
t.Error("different user should get different session")
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_NewSession(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
s1 := sm.NewSession("user1", "chat-a")
|
|
s2 := sm.NewSession("user1", "chat-b")
|
|
|
|
if s1.ID == s2.ID {
|
|
t.Error("new sessions should have different IDs")
|
|
}
|
|
if s1.Name != "chat-a" || s2.Name != "chat-b" {
|
|
t.Error("session names should match")
|
|
}
|
|
|
|
active := sm.GetOrCreateActive("user1")
|
|
if active.ID != s2.ID {
|
|
t.Error("latest session should be active")
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_NewSideSession(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
main := sm.GetOrCreateActive("user1")
|
|
side := sm.NewSideSession("user1", "cron-job")
|
|
|
|
if side.ID == main.ID {
|
|
t.Fatal("side session should be a new record")
|
|
}
|
|
if sm.ActiveSessionID("user1") != main.ID {
|
|
t.Errorf("active session should stay main %q, got %q", main.ID, sm.ActiveSessionID("user1"))
|
|
}
|
|
list := sm.ListSessions("user1")
|
|
if len(list) != 2 {
|
|
t.Fatalf("want 2 sessions for user1, got %d", len(list))
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_SwitchSession(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
s1 := sm.NewSession("user1", "first")
|
|
s2 := sm.NewSession("user1", "second")
|
|
|
|
if sm.ActiveSessionID("user1") != s2.ID {
|
|
t.Error("active should be s2")
|
|
}
|
|
|
|
switched, err := sm.SwitchSession("user1", s1.ID)
|
|
if err != nil {
|
|
t.Fatalf("SwitchSession: %v", err)
|
|
}
|
|
if switched.ID != s1.ID {
|
|
t.Error("should have switched to s1")
|
|
}
|
|
if sm.ActiveSessionID("user1") != s1.ID {
|
|
t.Error("active should now be s1")
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_SwitchByName(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
sm.NewSession("user1", "alpha")
|
|
sm.NewSession("user1", "beta")
|
|
|
|
switched, err := sm.SwitchSession("user1", "alpha")
|
|
if err != nil {
|
|
t.Fatalf("SwitchSession by name: %v", err)
|
|
}
|
|
if switched.Name != "alpha" {
|
|
t.Error("should have switched to alpha")
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_SwitchNotFound(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
sm.NewSession("user1", "only")
|
|
|
|
_, err := sm.SwitchSession("user1", "nonexistent")
|
|
if err == nil {
|
|
t.Error("expected error for nonexistent session")
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_ListSessions(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
sm.NewSession("user1", "a")
|
|
sm.NewSession("user1", "b")
|
|
sm.NewSession("user2", "c")
|
|
|
|
list := sm.ListSessions("user1")
|
|
if len(list) != 2 {
|
|
t.Errorf("user1 should have 2 sessions, got %d", len(list))
|
|
}
|
|
|
|
list2 := sm.ListSessions("user2")
|
|
if len(list2) != 1 {
|
|
t.Errorf("user2 should have 1 session, got %d", len(list2))
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_SessionNames(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
sm.SetSessionName("agent-123", "my-chat")
|
|
|
|
if got := sm.GetSessionName("agent-123"); got != "my-chat" {
|
|
t.Errorf("got %q, want my-chat", got)
|
|
}
|
|
|
|
sm.SetSessionName("agent-123", "")
|
|
if got := sm.GetSessionName("agent-123"); got != "" {
|
|
t.Errorf("got %q, want empty after clear", got)
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_Persistence(t *testing.T) {
|
|
dir := t.TempDir()
|
|
path := filepath.Join(dir, "sessions.json")
|
|
|
|
sm1 := NewSessionManager(path)
|
|
sm1.NewSession("user1", "persisted")
|
|
sm1.SetSessionName("agent-x", "custom-name")
|
|
|
|
sm2 := NewSessionManager(path)
|
|
list := sm2.ListSessions("user1")
|
|
if len(list) != 1 {
|
|
t.Fatalf("expected 1 session after reload, got %d", len(list))
|
|
}
|
|
if list[0].Name != "persisted" {
|
|
t.Errorf("session name = %q, want persisted", list[0].Name)
|
|
}
|
|
if got := sm2.GetSessionName("agent-x"); got != "custom-name" {
|
|
t.Errorf("session name after reload = %q, want custom-name", got)
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_GetOrCreateActive_Persists(t *testing.T) {
|
|
dir := t.TempDir()
|
|
path := filepath.Join(dir, "sessions.json")
|
|
|
|
sm1 := NewSessionManager(path)
|
|
s := sm1.GetOrCreateActive("user1")
|
|
if s == nil {
|
|
t.Fatal("expected non-nil session")
|
|
}
|
|
|
|
// Reload from disk — session should survive
|
|
sm2 := NewSessionManager(path)
|
|
list := sm2.ListSessions("user1")
|
|
if len(list) != 1 {
|
|
t.Fatalf("expected 1 session after reload, got %d", len(list))
|
|
}
|
|
if list[0].ID != s.ID {
|
|
t.Errorf("reloaded session ID = %q, want %q", list[0].ID, s.ID)
|
|
}
|
|
}
|
|
|
|
func TestSession_TryLockUnlock(t *testing.T) {
|
|
s := &Session{}
|
|
if !s.TryLock() {
|
|
t.Error("first TryLock should succeed")
|
|
}
|
|
if s.TryLock() {
|
|
t.Error("second TryLock should fail")
|
|
}
|
|
s.Unlock()
|
|
if !s.TryLock() {
|
|
t.Error("TryLock after Unlock should succeed")
|
|
}
|
|
}
|
|
|
|
func TestSession_Busy(t *testing.T) {
|
|
s := &Session{}
|
|
if s.Busy() {
|
|
t.Error("fresh session should not be busy")
|
|
}
|
|
if !s.TryLock() {
|
|
t.Fatal("TryLock should succeed")
|
|
}
|
|
if !s.Busy() {
|
|
t.Error("session should be busy after TryLock")
|
|
}
|
|
s.Unlock()
|
|
if s.Busy() {
|
|
t.Error("session should not be busy after Unlock")
|
|
}
|
|
}
|
|
|
|
func TestSession_History(t *testing.T) {
|
|
s := &Session{}
|
|
s.AddHistory("user", "hello")
|
|
s.AddHistory("assistant", "hi there")
|
|
s.AddHistory("user", "bye")
|
|
|
|
all := s.GetHistory(0)
|
|
if len(all) != 3 {
|
|
t.Errorf("expected 3 entries, got %d", len(all))
|
|
}
|
|
|
|
last2 := s.GetHistory(2)
|
|
if len(last2) != 2 {
|
|
t.Errorf("expected 2 entries, got %d", len(last2))
|
|
}
|
|
if last2[0].Content != "hi there" {
|
|
t.Errorf("expected 'hi there', got %q", last2[0].Content)
|
|
}
|
|
|
|
s.ClearHistory()
|
|
if h := s.GetHistory(0); len(h) != 0 {
|
|
t.Errorf("expected empty history after clear, got %d", len(h))
|
|
}
|
|
}
|
|
|
|
func TestSession_ConcurrentHistory(t *testing.T) {
|
|
s := &Session{}
|
|
var wg sync.WaitGroup
|
|
for i := 0; i < 50; i++ {
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
s.AddHistory("user", "msg")
|
|
}()
|
|
}
|
|
wg.Wait()
|
|
if h := s.GetHistory(0); len(h) != 50 {
|
|
t.Errorf("expected 50 entries, got %d", len(h))
|
|
}
|
|
}
|
|
|
|
func TestSession_GetAgentSessionID(t *testing.T) {
|
|
s := &Session{}
|
|
if got := s.GetAgentSessionID(); got != "" {
|
|
t.Errorf("initial GetAgentSessionID = %q, want empty", got)
|
|
}
|
|
s.SetAgentSessionID("sess-1", "test")
|
|
if got := s.GetAgentSessionID(); got != "sess-1" {
|
|
t.Errorf("GetAgentSessionID = %q, want %q", got, "sess-1")
|
|
}
|
|
}
|
|
|
|
func TestSession_SetAgentSessionID_RejectsContinueSentinel(t *testing.T) {
|
|
s := &Session{}
|
|
s.SetAgentSessionID("real", "ag")
|
|
s.SetAgentSessionID(ContinueSession, "ag")
|
|
if got := s.GetAgentSessionID(); got != "real" {
|
|
t.Fatalf("ContinueSession must not clobber stored id, got %q", got)
|
|
}
|
|
s.SetAgentSessionID("", "")
|
|
if got := s.GetAgentSessionID(); got != "" {
|
|
t.Fatalf("expected clear, got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestSession_CompareAndSet_ReplacesContinueSentinel(t *testing.T) {
|
|
s := &Session{}
|
|
s.mu.Lock()
|
|
s.AgentSessionID = ContinueSession
|
|
s.mu.Unlock()
|
|
if !s.CompareAndSetAgentSessionID("uuid-1", "pi") {
|
|
t.Fatal("expected CompareAndSet to replace erroneous ContinueSession slot")
|
|
}
|
|
if s.GetAgentSessionID() != "uuid-1" {
|
|
t.Fatalf("GetAgentSessionID = %q, want uuid-1", s.GetAgentSessionID())
|
|
}
|
|
if s.CompareAndSetAgentSessionID("uuid-2", "pi") {
|
|
t.Fatal("expected second CompareAndSet to fail when real id already set")
|
|
}
|
|
}
|
|
|
|
func TestSession_SetAgentInfo_NormalizesContinueSentinel(t *testing.T) {
|
|
s := &Session{}
|
|
s.SetAgentInfo(ContinueSession, "pi", "n")
|
|
if s.GetAgentSessionID() != "" {
|
|
t.Fatalf("SetAgentInfo(ContinueSession) should store empty id, got %q", s.GetAgentSessionID())
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_Load_SanitizesContinueSentinel(t *testing.T) {
|
|
dir := t.TempDir()
|
|
path := filepath.Join(dir, "sessions.json")
|
|
raw := `{
|
|
"sessions": {
|
|
"s1": {
|
|
"id": "s1",
|
|
"name": "default",
|
|
"agent_session_id": "__continue__",
|
|
"agent_type": "pi",
|
|
"history": [],
|
|
"created_at": "2020-01-01T00:00:00Z",
|
|
"updated_at": "2020-01-01T00:00:00Z"
|
|
}
|
|
},
|
|
"active_session": {"user1": "s1"},
|
|
"user_sessions": {"user1": ["s1"]},
|
|
"counter": 1
|
|
}`
|
|
if err := os.WriteFile(path, []byte(raw), 0o644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
sm := NewSessionManager(path)
|
|
s := sm.GetOrCreateActive("user1")
|
|
if got := s.GetAgentSessionID(); got != "" {
|
|
t.Fatalf("loaded session should clear ContinueSession, got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_Save_StripsContinueSentinel(t *testing.T) {
|
|
dir := t.TempDir()
|
|
path := filepath.Join(dir, "sessions.json")
|
|
sm := NewSessionManager(path)
|
|
sm.NewSession("u1", "x")
|
|
s := sm.GetOrCreateActive("u1")
|
|
s.mu.Lock()
|
|
s.AgentSessionID = ContinueSession
|
|
s.AgentType = "pi"
|
|
s.mu.Unlock()
|
|
sm.Save()
|
|
sm2 := NewSessionManager(path)
|
|
// Same user key should reload the same logical session without sentinel.
|
|
s2 := sm2.GetOrCreateActive("u1")
|
|
if got := s2.GetAgentSessionID(); got != "" {
|
|
t.Fatalf("after save+reload want empty agent_session_id, got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestSession_GetName(t *testing.T) {
|
|
s := &Session{Name: "test-session"}
|
|
if got := s.GetName(); got != "test-session" {
|
|
t.Errorf("GetName = %q, want %q", got, "test-session")
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_InvalidateForAgent(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
|
|
// Create sessions with different agent types
|
|
s1 := sm.NewSession("user1", "sess1")
|
|
s1.SetAgentSessionID("old-id-1", "opencode")
|
|
|
|
s2 := sm.NewSession("user2", "sess2")
|
|
s2.SetAgentSessionID("old-id-2", "claudecode")
|
|
|
|
s3 := sm.NewSession("user3", "sess3")
|
|
s3.SetAgentSessionID("old-id-3", "") // pre-migration, no agent type
|
|
|
|
s4 := sm.NewSession("user4", "sess4") // no agent session ID at all
|
|
|
|
sm.InvalidateForAgent("claudecode")
|
|
|
|
// s1: opencode → should be invalidated
|
|
if got := s1.GetAgentSessionID(); got != "" {
|
|
t.Errorf("s1 (opencode) AgentSessionID = %q, want empty (should be invalidated)", got)
|
|
}
|
|
if s1.AgentType != "claudecode" {
|
|
t.Errorf("s1 AgentType = %q, want %q after invalidation", s1.AgentType, "claudecode")
|
|
}
|
|
|
|
// s2: claudecode → should be untouched
|
|
if got := s2.GetAgentSessionID(); got != "old-id-2" {
|
|
t.Errorf("s2 (claudecode) AgentSessionID = %q, want %q (should be preserved)", got, "old-id-2")
|
|
}
|
|
if s2.AgentType != "claudecode" {
|
|
t.Errorf("s2 AgentType = %q, want %q", s2.AgentType, "claudecode")
|
|
}
|
|
|
|
// s3: empty agent type → should be untouched (backward compat)
|
|
if got := s3.GetAgentSessionID(); got != "old-id-3" {
|
|
t.Errorf("s3 (empty type) AgentSessionID = %q, want %q (migration-safe)", got, "old-id-3")
|
|
}
|
|
if s3.AgentType != "" {
|
|
t.Errorf("s3 AgentType = %q, want empty (pre-migration should be untouched)", s3.AgentType)
|
|
}
|
|
|
|
// s4: no agent session ID → should be untouched
|
|
if got := s4.GetAgentSessionID(); got != "" {
|
|
t.Errorf("s4 (no session ID) AgentSessionID = %q, want empty", got)
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_UserMeta(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
sm.GetOrCreateActive("feishu:oc_abc:ou_xyz")
|
|
|
|
// Set UserName
|
|
sm.UpdateUserMeta("feishu:oc_abc:ou_xyz", "Zhang San", "")
|
|
meta := sm.GetUserMeta("feishu:oc_abc:ou_xyz")
|
|
if meta == nil || meta.UserName != "Zhang San" {
|
|
t.Errorf("expected UserName='Zhang San', got %+v", meta)
|
|
}
|
|
if meta.ChatName != "" {
|
|
t.Errorf("expected empty ChatName, got %q", meta.ChatName)
|
|
}
|
|
|
|
// Merge: add ChatName without losing UserName
|
|
sm.UpdateUserMeta("feishu:oc_abc:ou_xyz", "", "Test Group")
|
|
meta = sm.GetUserMeta("feishu:oc_abc:ou_xyz")
|
|
if meta.UserName != "Zhang San" || meta.ChatName != "Test Group" {
|
|
t.Errorf("expected merge, got %+v", meta)
|
|
}
|
|
|
|
// No-op for empty values
|
|
sm.UpdateUserMeta("feishu:oc_abc:ou_xyz", "", "")
|
|
meta = sm.GetUserMeta("feishu:oc_abc:ou_xyz")
|
|
if meta.UserName != "Zhang San" || meta.ChatName != "Test Group" {
|
|
t.Errorf("expected no change, got %+v", meta)
|
|
}
|
|
|
|
// Unknown key returns nil
|
|
if m := sm.GetUserMeta("nonexistent"); m != nil {
|
|
t.Errorf("expected nil for unknown key, got %+v", m)
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_UserMetaPersistence(t *testing.T) {
|
|
dir := t.TempDir()
|
|
path := filepath.Join(dir, "sessions.json")
|
|
|
|
sm1 := NewSessionManager(path)
|
|
sm1.NewSession("feishu:oc_abc:ou_xyz", "test")
|
|
sm1.UpdateUserMeta("feishu:oc_abc:ou_xyz", "Zhang San", "Group Name")
|
|
sm1.Save()
|
|
|
|
sm2 := NewSessionManager(path)
|
|
meta := sm2.GetUserMeta("feishu:oc_abc:ou_xyz")
|
|
if meta == nil || meta.UserName != "Zhang San" || meta.ChatName != "Group Name" {
|
|
t.Errorf("expected persisted meta, got %+v", meta)
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_DeleteByAgentSessionID(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
|
|
s1 := sm.NewSession("user1", "one")
|
|
s1.SetAgentSessionID("agent-1", "codex")
|
|
|
|
s2 := sm.NewSession("user2", "two")
|
|
s2.SetAgentSessionID("agent-2", "codex")
|
|
|
|
s3 := sm.NewSession("user3", "three")
|
|
s3.SetAgentSessionID("agent-1", "codex")
|
|
|
|
if removed := sm.DeleteByAgentSessionID("agent-1"); removed != 2 {
|
|
t.Fatalf("removed = %d, want 2", removed)
|
|
}
|
|
if got := sm.FindByID(s1.ID); got != nil {
|
|
t.Fatalf("expected s1 removed, got %+v", got)
|
|
}
|
|
if got := sm.FindByID(s3.ID); got != nil {
|
|
t.Fatalf("expected s3 removed, got %+v", got)
|
|
}
|
|
if got := sm.FindByID(s2.ID); got == nil {
|
|
t.Fatal("expected s2 preserved")
|
|
}
|
|
if got := sm.ActiveSessionID("user1"); got != "" {
|
|
t.Fatalf("user1 active session = %q, want empty", got)
|
|
}
|
|
if got := sm.ActiveSessionID("user3"); got != "" {
|
|
t.Fatalf("user3 active session = %q, want empty", got)
|
|
}
|
|
if list := sm.ListSessions("user2"); len(list) != 1 || list[0].ID != s2.ID {
|
|
t.Fatalf("user2 sessions = %+v, want only s2", list)
|
|
}
|
|
|
|
if removed := sm.DeleteByAgentSessionID("missing"); removed != 0 {
|
|
t.Fatalf("removed missing = %d, want 0", removed)
|
|
}
|
|
}
|
|
|
|
func TestSession_ConcurrentGetSet(t *testing.T) {
|
|
s := &Session{}
|
|
var wg sync.WaitGroup
|
|
for i := 0; i < 100; i++ {
|
|
wg.Add(2)
|
|
go func() {
|
|
defer wg.Done()
|
|
s.SetAgentSessionID("id", "test")
|
|
}()
|
|
go func() {
|
|
defer wg.Done()
|
|
_ = s.GetAgentSessionID()
|
|
}()
|
|
}
|
|
wg.Wait()
|
|
if got := s.GetAgentSessionID(); got != "id" {
|
|
t.Errorf("final GetAgentSessionID = %q, want %q", got, "id")
|
|
}
|
|
}
|
|
|
|
func TestSessionManager_StorePath(t *testing.T) {
|
|
sm := NewSessionManager("/var/data/sessions")
|
|
if got := sm.StorePath(); got != "/var/data/sessions" {
|
|
t.Errorf("StorePath() = %q, want %q", got, "/var/data/sessions")
|
|
}
|
|
|
|
sm2 := NewSessionManager("")
|
|
if got := sm2.StorePath(); got != "" {
|
|
t.Errorf("StorePath() empty = %q, want empty string", got)
|
|
}
|
|
}
|
|
|
|
func TestKnownAgentSessionIDs(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
s1 := sm.NewSession("user1", "a")
|
|
s1.SetAgentSessionID("uuid-aaa", "claude")
|
|
s2 := sm.NewSession("user1", "b")
|
|
s2.SetAgentSessionID("uuid-bbb", "claude")
|
|
sm.NewSession("user1", "c") // no agent session id
|
|
|
|
known := sm.KnownAgentSessionIDs()
|
|
if len(known) != 2 {
|
|
t.Fatalf("KnownAgentSessionIDs len = %d, want 2", len(known))
|
|
}
|
|
if _, ok := known["uuid-aaa"]; !ok {
|
|
t.Fatal("expected uuid-aaa in known set")
|
|
}
|
|
if _, ok := known["uuid-bbb"]; !ok {
|
|
t.Fatal("expected uuid-bbb in known set")
|
|
}
|
|
}
|
|
|
|
func TestFilterOwnedSessions_FiltersUnknown(t *testing.T) {
|
|
all := []AgentSessionInfo{
|
|
{ID: "owned-1"},
|
|
{ID: "external-1"},
|
|
{ID: "owned-2"},
|
|
{ID: "external-2"},
|
|
}
|
|
known := map[string]struct{}{
|
|
"owned-1": {},
|
|
"owned-2": {},
|
|
}
|
|
filtered := filterOwnedSessions(all, known)
|
|
if len(filtered) != 2 {
|
|
t.Fatalf("filterOwnedSessions len = %d, want 2", len(filtered))
|
|
}
|
|
if filtered[0].ID != "owned-1" || filtered[1].ID != "owned-2" {
|
|
t.Fatalf("filtered = %v, want owned-1 and owned-2", filtered)
|
|
}
|
|
}
|
|
|
|
func TestFilterOwnedSessions_EmptyKnownReturnsAll(t *testing.T) {
|
|
all := []AgentSessionInfo{
|
|
{ID: "session-1"},
|
|
{ID: "session-2"},
|
|
}
|
|
filtered := filterOwnedSessions(all, map[string]struct{}{})
|
|
if len(filtered) != 2 {
|
|
t.Fatalf("filterOwnedSessions with empty known = %d, want 2", len(filtered))
|
|
}
|
|
}
|
|
|
|
func TestParseSessionKey(t *testing.T) {
|
|
tests := []struct {
|
|
key string
|
|
wantPlatform string
|
|
wantBaseChat string
|
|
wantUser string
|
|
}{
|
|
{
|
|
key: "feishu:oc_abc123:ou_xyz789",
|
|
wantPlatform: "feishu",
|
|
wantBaseChat: "feishu:oc_abc123",
|
|
wantUser: "ou_xyz789",
|
|
},
|
|
{
|
|
key: "feishu:oc_abc123",
|
|
wantPlatform: "feishu",
|
|
wantBaseChat: "feishu:oc_abc123",
|
|
wantUser: "",
|
|
},
|
|
{
|
|
key: "telegram:-100123:root:msg456",
|
|
wantPlatform: "telegram",
|
|
wantBaseChat: "telegram:-100123",
|
|
wantUser: "root:msg456",
|
|
},
|
|
{
|
|
key: "invalid",
|
|
wantPlatform: "invalid",
|
|
wantBaseChat: "",
|
|
wantUser: "",
|
|
},
|
|
{
|
|
key: "",
|
|
wantPlatform: "",
|
|
wantBaseChat: "",
|
|
wantUser: "",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.key, func(t *testing.T) {
|
|
platform, baseChat, userOrThread := ParseSessionKey(tt.key)
|
|
if platform != tt.wantPlatform {
|
|
t.Errorf("platform = %q, want %q", platform, tt.wantPlatform)
|
|
}
|
|
if baseChat != tt.wantBaseChat {
|
|
t.Errorf("baseChat = %q, want %q", baseChat, tt.wantBaseChat)
|
|
}
|
|
if userOrThread != tt.wantUser {
|
|
t.Errorf("userOrThread = %q, want %q", userOrThread, tt.wantUser)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestPruneDuplicateSessions_NoDuplicates(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
sm.GetOrCreateActive("feishu:oc_chat1:ou_user1")
|
|
sm.GetOrCreateActive("feishu:oc_chat2:ou_user1") // Different chat, no duplicate
|
|
|
|
result := sm.PruneDuplicateSessions(false)
|
|
if len(result.RemovedSessions) != 0 {
|
|
t.Errorf("removed %d sessions, want 0 (no duplicates)", len(result.RemovedSessions))
|
|
}
|
|
}
|
|
|
|
func TestPruneDuplicateSessions_DifferentChats(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
|
|
// Create sessions for different chats with different users - should not be considered duplicates
|
|
s1 := sm.GetOrCreateActive("feishu:oc_chatA:ou_user1")
|
|
s2 := sm.GetOrCreateActive("feishu:oc_chatB:ou_user1") // Different chat
|
|
|
|
// Add history to both
|
|
s1.AddHistory("user", "msg to chatA")
|
|
s2.AddHistory("user", "msg to chatB")
|
|
|
|
result := sm.PruneDuplicateSessions(false)
|
|
if len(result.RemovedSessions) != 0 {
|
|
t.Errorf("removed %d sessions, want 0 (different chats)", len(result.RemovedSessions))
|
|
}
|
|
|
|
// Both sessions should still exist
|
|
if sm.FindByID(s1.ID) == nil {
|
|
t.Error("s1 should still exist")
|
|
}
|
|
if sm.FindByID(s2.ID) == nil {
|
|
t.Error("s2 should still exist")
|
|
}
|
|
}
|
|
|
|
func TestPruneDuplicateSessions_SameChatDifferentUsers(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
|
|
// Same chat, different users - these are "duplicates" from chat perspective
|
|
s1 := sm.GetOrCreateActive("feishu:oc_chat1:ou_user1")
|
|
s2 := sm.NewSession("feishu:oc_chat1:ou_user2", "user2-session")
|
|
|
|
// Add history
|
|
s1.AddHistory("user", "msg from user1")
|
|
s1.AddHistory("user", "another msg")
|
|
s2.AddHistory("user", "msg from user2")
|
|
|
|
// Make s1 newer (more recent update)
|
|
s1.mu.Lock()
|
|
s1.UpdatedAt = time.Now().Add(1 * time.Hour)
|
|
s1.mu.Unlock()
|
|
|
|
result := sm.PruneDuplicateSessions(true) // merge history
|
|
|
|
// Should remove one session (the older one)
|
|
if len(result.RemovedSessions) != 1 {
|
|
t.Errorf("removed %d sessions, want 1", len(result.RemovedSessions))
|
|
}
|
|
|
|
// s1 should be kept (more recent)
|
|
if sm.FindByID(s1.ID) == nil {
|
|
t.Error("s1 (more recent) should be kept")
|
|
}
|
|
|
|
// s2 should be removed
|
|
if sm.FindByID(s2.ID) != nil {
|
|
t.Error("s2 (older) should be removed")
|
|
}
|
|
|
|
// History should be merged into s1
|
|
keep := sm.FindByID(s1.ID)
|
|
history := keep.GetHistory(0)
|
|
if len(history) != 3 {
|
|
t.Errorf("merged history = %d entries, want 3", len(history))
|
|
}
|
|
}
|
|
|
|
func TestPruneDuplicateSessions_NoMergeKeepsHistory(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
|
|
// Same chat, different users
|
|
s1 := sm.GetOrCreateActive("feishu:oc_chat1:ou_user1")
|
|
s2 := sm.NewSession("feishu:oc_chat1:ou_user2", "user2-session")
|
|
|
|
// s1 has history, s2 is empty
|
|
s1.AddHistory("user", "msg from user1")
|
|
|
|
// Make s2 newer but empty
|
|
s2.mu.Lock()
|
|
s2.UpdatedAt = time.Now().Add(1 * time.Hour)
|
|
s2.mu.Unlock()
|
|
|
|
result := sm.PruneDuplicateSessions(false) // NO merge
|
|
|
|
// s2 (empty, newer) should be removed, s1 (has history, older) should be kept
|
|
if len(result.RemovedSessions) != 1 {
|
|
t.Errorf("removed %d sessions, want 1 (empty session)", len(result.RemovedSessions))
|
|
}
|
|
|
|
// s1 should still exist (has history)
|
|
if sm.FindByID(s1.ID) == nil {
|
|
t.Error("s1 (has history) should be kept")
|
|
}
|
|
|
|
// s2 should be removed (empty)
|
|
if sm.FindByID(s2.ID) != nil {
|
|
t.Error("s2 (empty) should be removed")
|
|
}
|
|
}
|
|
|
|
// TestPruneDuplicateSessions_NoMergeKeepsBothWithHistory locks down the
|
|
// no-merge path when BOTH duplicate sessions have history. With
|
|
// mergeHistory=false, neither session is considered "removable" (the
|
|
// branch at session.go:700-702 skips entries where hasHistory is true
|
|
// for the kept candidate), so both must survive the prune untouched.
|
|
//
|
|
// Without this test the existing TestPruneDuplicateSessions_NoMergeKeepsHistory
|
|
// only covers the "one empty + one has history" case and would not catch
|
|
// a regression that incorrectly drops a non-empty duplicate.
|
|
func TestPruneDuplicateSessions_NoMergeKeepsBothWithHistory(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
|
|
// Same chat, different users, both with history
|
|
s1 := sm.GetOrCreateActive("feishu:oc_chat1:ou_user1")
|
|
s2 := sm.NewSession("feishu:oc_chat1:ou_user2", "user2-session")
|
|
|
|
s1.AddHistory("user", "msg from user1")
|
|
s2.AddHistory("user", "msg from user2")
|
|
|
|
// Make sure both are recognized as duplicates of the same chat.
|
|
// baseChat is derived from the user key via ParseSessionKey, not
|
|
// stored on the Session struct.
|
|
_, s1Base, _ := ParseSessionKey("feishu:oc_chat1:ou_user1")
|
|
_, s2Base, _ := ParseSessionKey("feishu:oc_chat1:ou_user2")
|
|
if s1Base != "feishu:oc_chat1" || s2Base != "feishu:oc_chat1" {
|
|
t.Fatalf("test setup: both sessions must share baseChat, got %q and %q",
|
|
s1Base, s2Base)
|
|
}
|
|
|
|
result := sm.PruneDuplicateSessions(false) // NO merge
|
|
|
|
if len(result.RemovedSessions) != 0 {
|
|
t.Errorf("removed %d sessions, want 0 (both have history, no merge)",
|
|
len(result.RemovedSessions))
|
|
}
|
|
if sm.FindByID(s1.ID) == nil {
|
|
t.Error("s1 (has history) should be kept when mergeHistory=false")
|
|
}
|
|
if sm.FindByID(s2.ID) == nil {
|
|
t.Error("s2 (has history) should be kept when mergeHistory=false")
|
|
}
|
|
|
|
// And the kept candidates' history must NOT be merged away
|
|
s1After := sm.FindByID(s1.ID)
|
|
s2After := sm.FindByID(s2.ID)
|
|
if len(s1After.History) != 1 || s1After.History[0].Content != "msg from user1" {
|
|
t.Errorf("s1 history was mutated: %+v", s1After.History)
|
|
}
|
|
if len(s2After.History) != 1 || s2After.History[0].Content != "msg from user2" {
|
|
t.Errorf("s2 history was mutated: %+v", s2After.History)
|
|
}
|
|
}
|
|
|
|
func TestPruneDuplicateSessions_ThreadIsolation(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
|
|
// Same chat, different threads
|
|
s1 := sm.GetOrCreateActive("feishu:oc_chat1:root:thread1")
|
|
s2 := sm.NewSession("feishu:oc_chat1:root:thread2", "thread2-session")
|
|
s3 := sm.NewSession("feishu:oc_chat1:ou_user1", "user-session")
|
|
|
|
// All have history
|
|
s1.AddHistory("user", "msg in thread1")
|
|
s2.AddHistory("user", "msg in thread2")
|
|
s3.AddHistory("user", "msg from user")
|
|
|
|
// Make s1 most recent
|
|
s1.mu.Lock()
|
|
s1.UpdatedAt = time.Now().Add(2 * time.Hour)
|
|
s1.mu.Unlock()
|
|
|
|
result := sm.PruneDuplicateSessions(true)
|
|
|
|
// Should remove 2 sessions (s2 and s3)
|
|
if len(result.RemovedSessions) != 2 {
|
|
t.Errorf("removed %d sessions, want 2", len(result.RemovedSessions))
|
|
}
|
|
|
|
// s1 should be kept
|
|
if sm.FindByID(s1.ID) == nil {
|
|
t.Error("s1 (most recent) should be kept")
|
|
}
|
|
|
|
// History should be merged
|
|
keep := sm.FindByID(s1.ID)
|
|
history := keep.GetHistory(0)
|
|
if len(history) != 3 {
|
|
t.Errorf("merged history = %d entries, want 3", len(history))
|
|
}
|
|
}
|
|
|
|
func TestPruneEmptySessions(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
|
|
// Create sessions
|
|
s1 := sm.GetOrCreateActive("feishu:oc_chat1:ou_user1")
|
|
s2 := sm.NewSession("feishu:oc_chat2:ou_user1", "empty-session")
|
|
s3 := sm.NewSession("feishu:oc_chat3:ou_user1", "another-empty")
|
|
|
|
// Only s1 has history
|
|
s1.AddHistory("user", "msg1")
|
|
s1.AddHistory("user", "msg2")
|
|
|
|
removed := sm.PruneEmptySessions()
|
|
if removed != 2 {
|
|
t.Errorf("removed %d empty sessions, want 2", removed)
|
|
}
|
|
|
|
// s1 should still exist
|
|
if sm.FindByID(s1.ID) == nil {
|
|
t.Error("s1 (has history) should exist")
|
|
}
|
|
|
|
// s2, s3 should be removed
|
|
if sm.FindByID(s2.ID) != nil {
|
|
t.Error("s2 (empty) should be removed")
|
|
}
|
|
if sm.FindByID(s3.ID) != nil {
|
|
t.Error("s3 (empty) should be removed")
|
|
}
|
|
}
|
|
|
|
func TestPruneDuplicateSessions_Persistence(t *testing.T) {
|
|
dir := t.TempDir()
|
|
path := filepath.Join(dir, "sessions.json")
|
|
|
|
sm1 := NewSessionManager(path)
|
|
s1 := sm1.GetOrCreateActive("feishu:oc_chat1:ou_user1")
|
|
s2 := sm1.NewSession("feishu:oc_chat1:ou_user2", "duplicate")
|
|
|
|
s1.AddHistory("user", "msg1")
|
|
s2.AddHistory("user", "msg2")
|
|
|
|
// Make s1 newer
|
|
s1.mu.Lock()
|
|
s1.UpdatedAt = time.Now().Add(1 * time.Hour)
|
|
s1.mu.Unlock()
|
|
|
|
result := sm1.PruneDuplicateSessions(true)
|
|
if len(result.RemovedSessions) != 1 {
|
|
t.Fatalf("removed %d, want 1", len(result.RemovedSessions))
|
|
}
|
|
|
|
// Reload and verify persisted state
|
|
sm2 := NewSessionManager(path)
|
|
// After prune, there should be only one session for the base chat
|
|
// Note: ListSessions returns sessions for a specific userKey, not base chat
|
|
// So we need to check AllSessions
|
|
all := sm2.AllSessions()
|
|
if len(all) != 1 {
|
|
t.Errorf("after reload: %d sessions, want 1", len(all))
|
|
}
|
|
|
|
// History should be persisted
|
|
history := all[0].GetHistory(0)
|
|
if len(history) != 2 {
|
|
t.Errorf("merged history after reload = %d, want 2", len(history))
|
|
}
|
|
}
|
|
|
|
// TestSwitchToAgentSession_PreservesOldSession locks down that switching the
|
|
// active session to a different agent_session_id keeps the previous ID in
|
|
// KnownAgentSessionIDs so it stays visible to /list, /switch, and
|
|
// filterOwnedSessions. Regression test for #603 / issue #600.
|
|
func TestSwitchToAgentSession_PreservesOldSession(t *testing.T) {
|
|
dir := t.TempDir()
|
|
sm := NewSessionManager(dir + "/sessions.json")
|
|
userKey := "user:alice"
|
|
|
|
s1 := sm.GetOrCreateActive(userKey)
|
|
s1.SetAgentInfo("agent-A", "claude", "session A")
|
|
|
|
known := sm.KnownAgentSessionIDs()
|
|
if _, ok := known["agent-A"]; !ok {
|
|
t.Fatal("agent-A should be in KnownAgentSessionIDs before switch")
|
|
}
|
|
|
|
s2 := sm.SwitchToAgentSession(userKey, "agent-B", "claude", "session B")
|
|
if s2.GetAgentSessionID() != "agent-B" {
|
|
t.Fatalf("switched session AgentSessionID = %q, want agent-B", s2.GetAgentSessionID())
|
|
}
|
|
|
|
known = sm.KnownAgentSessionIDs()
|
|
if _, ok := known["agent-A"]; !ok {
|
|
t.Fatal("agent-A should still be in KnownAgentSessionIDs after switch")
|
|
}
|
|
if _, ok := known["agent-B"]; !ok {
|
|
t.Fatal("agent-B should be in KnownAgentSessionIDs after switch")
|
|
}
|
|
}
|
|
|
|
func TestSwitchToAgentSession_ReusesExisting(t *testing.T) {
|
|
dir := t.TempDir()
|
|
sm := NewSessionManager(dir + "/sessions.json")
|
|
userKey := "user:bob"
|
|
|
|
s1 := sm.GetOrCreateActive(userKey)
|
|
s1.SetAgentInfo("agent-A", "claude", "session A")
|
|
|
|
sm.SwitchToAgentSession(userKey, "agent-B", "claude", "session B")
|
|
|
|
s3 := sm.SwitchToAgentSession(userKey, "agent-A", "claude", "session A")
|
|
if s3.ID != s1.ID {
|
|
t.Fatalf("switching back to agent-A should reuse session %s, got %s", s1.ID, s3.ID)
|
|
}
|
|
}
|
|
|
|
func TestPastAgentSessionIDs_ClearPreservesHistory(t *testing.T) {
|
|
s := &Session{}
|
|
s.SetAgentSessionID("thread-1", "codex")
|
|
s.SetAgentSessionID("", "")
|
|
|
|
if len(s.PastAgentSessionIDs) != 1 || s.PastAgentSessionIDs[0] != "thread-1" {
|
|
t.Fatalf("PastAgentSessionIDs = %v, want [thread-1]", s.PastAgentSessionIDs)
|
|
}
|
|
}
|
|
|
|
func TestPastAgentSessionIDs_ReplacePreservesHistory(t *testing.T) {
|
|
s := &Session{}
|
|
s.SetAgentSessionID("thread-1", "codex")
|
|
s.SetAgentSessionID("thread-2", "codex")
|
|
|
|
if len(s.PastAgentSessionIDs) != 1 || s.PastAgentSessionIDs[0] != "thread-1" {
|
|
t.Fatalf("PastAgentSessionIDs = %v, want [thread-1]", s.PastAgentSessionIDs)
|
|
}
|
|
if s.AgentSessionID != "thread-2" {
|
|
t.Fatalf("AgentSessionID = %q, want thread-2", s.AgentSessionID)
|
|
}
|
|
}
|
|
|
|
func TestPastAgentSessionIDs_NoDuplicates(t *testing.T) {
|
|
s := &Session{}
|
|
s.SetAgentSessionID("thread-1", "codex")
|
|
s.SetAgentSessionID("", "")
|
|
s.SetAgentSessionID("thread-1", "codex")
|
|
s.SetAgentSessionID("", "")
|
|
|
|
if len(s.PastAgentSessionIDs) != 1 {
|
|
t.Fatalf("PastAgentSessionIDs has duplicates: %v", s.PastAgentSessionIDs)
|
|
}
|
|
}
|
|
|
|
func TestPastAgentSessionIDs_ContinueSentinelNotRecorded(t *testing.T) {
|
|
s := &Session{}
|
|
s.SetAgentSessionID(ContinueSession, "codex")
|
|
s.SetAgentSessionID("real-id", "codex")
|
|
s.SetAgentSessionID("", "")
|
|
|
|
for _, past := range s.PastAgentSessionIDs {
|
|
if past == ContinueSession {
|
|
t.Fatal("ContinueSession sentinel should not be in PastAgentSessionIDs")
|
|
}
|
|
}
|
|
if len(s.PastAgentSessionIDs) != 1 || s.PastAgentSessionIDs[0] != "real-id" {
|
|
t.Fatalf("PastAgentSessionIDs = %v, want [real-id]", s.PastAgentSessionIDs)
|
|
}
|
|
}
|
|
|
|
func TestKnownAgentSessionIDs_IncludesPast(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
s1 := sm.NewSession("user1", "a")
|
|
s1.SetAgentSessionID("thread-aaa", "codex")
|
|
s1.SetAgentSessionID("", "")
|
|
|
|
s2 := sm.NewSession("user1", "b")
|
|
s2.SetAgentSessionID("thread-bbb", "codex")
|
|
|
|
known := sm.KnownAgentSessionIDs()
|
|
if _, ok := known["thread-aaa"]; !ok {
|
|
t.Fatal("expected thread-aaa (past ID) in known set")
|
|
}
|
|
if _, ok := known["thread-bbb"]; !ok {
|
|
t.Fatal("expected thread-bbb (current ID) in known set")
|
|
}
|
|
}
|
|
|
|
// TestKnownAgentSessionIDs_ReproducesNewCommandBug simulates the exact user
|
|
// reproduction steps: repeated /new commands progressively clear AgentSessionIDs.
|
|
// Before the PastAgentSessionIDs fix, only the latest session would remain visible.
|
|
func TestKnownAgentSessionIDs_ReproducesNewCommandBug(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
userKey := "user:test"
|
|
|
|
agentSessions := []AgentSessionInfo{
|
|
{ID: "codex-thread-1"},
|
|
{ID: "codex-thread-2"},
|
|
{ID: "codex-thread-3"},
|
|
}
|
|
|
|
s1 := sm.GetOrCreateActive(userKey)
|
|
s1.SetAgentSessionID("codex-thread-1", "codex")
|
|
|
|
s1.SetAgentSessionID("", "")
|
|
s2 := sm.NewSession(userKey, "session 2")
|
|
s2.SetAgentSessionID("codex-thread-2", "codex")
|
|
|
|
s2.SetAgentSessionID("", "")
|
|
s3 := sm.NewSession(userKey, "session 3")
|
|
s3.SetAgentSessionID("codex-thread-3", "codex")
|
|
|
|
known := sm.KnownAgentSessionIDs()
|
|
filtered := filterOwnedSessions(agentSessions, known)
|
|
|
|
if len(filtered) != 3 {
|
|
t.Fatalf("filterOwnedSessions returned %d sessions, want 3 (all should be visible)\nknown IDs: %v",
|
|
len(filtered), known)
|
|
}
|
|
}
|
|
|
|
// TestKnownAgentSessionIDs_ResetAllSessionsBug simulates resetAllSessions
|
|
// clearing all IDs (management API provider switch). Past IDs should keep
|
|
// all sessions visible.
|
|
func TestKnownAgentSessionIDs_ResetAllSessionsBug(t *testing.T) {
|
|
sm := NewSessionManager("")
|
|
userKey := "user:test"
|
|
|
|
s1 := sm.NewSession(userKey, "a")
|
|
s1.SetAgentSessionID("thread-1", "codex")
|
|
s2 := sm.NewSession(userKey, "b")
|
|
s2.SetAgentSessionID("thread-2", "codex")
|
|
s3 := sm.NewSession(userKey, "c")
|
|
s3.SetAgentSessionID("thread-3", "codex")
|
|
|
|
for _, s := range sm.AllSessions() {
|
|
s.SetAgentSessionID("", "")
|
|
}
|
|
|
|
known := sm.KnownAgentSessionIDs()
|
|
for _, id := range []string{"thread-1", "thread-2", "thread-3"} {
|
|
if _, ok := known[id]; !ok {
|
|
t.Fatalf("expected %s in known set after resetAllSessions, known = %v", id, known)
|
|
}
|
|
}
|
|
|
|
agentSessions := []AgentSessionInfo{
|
|
{ID: "thread-1"}, {ID: "thread-2"}, {ID: "thread-3"},
|
|
}
|
|
filtered := filterOwnedSessions(agentSessions, known)
|
|
if len(filtered) != 3 {
|
|
t.Fatalf("filterOwnedSessions returned %d, want 3", len(filtered))
|
|
}
|
|
}
|
|
|