Skip to content

Sort multiple resume session by created_at asc #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Soph wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −0
Open

Sort multiple resume session by created_at asc #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions cmd/entire/cli/resume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"log/slog"
"os"
"path/filepath"
"sort"

"github.com/entireio/cli/cmd/entire/cli/agent"
"github.com/entireio/cli/cmd/entire/cli/checkpoint"
Expand Down Expand Up @@ -420,6 +421,12 @@ func resumeSession(sessionID string, checkpointID id.CheckpointID, force bool) e
return resumeSingleSession(ctx, ag, sessionID, checkpointID, repoRoot, force)
}

// Sort sessions by CreatedAt so the most recent is last (for display).
// This fixes ordering when subdirectory index doesn't reflect activity order.
sort.Slice(sessions, func(i, j int) bool {
return sessions[i].CreatedAt.Before(sessions[j].CreatedAt)
})

logging.Debug(ctx, "resume session completed",
slog.String("checkpoint_id", checkpointID.String()),
slog.Int("session_count", len(sessions)),
Expand Down
1 change: 1 addition & 0 deletions cmd/entire/cli/strategy/manual_commit_rewind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,7 @@ func (s *ManualCommitStrategy) RestoreLogsOnly(point RewindPoint, force bool) ([
SessionID: sessionID,
Agent: sessionAgent.Type(),
Prompt: promptPreview,
CreatedAt: content.Metadata.CreatedAt,
})
}

Expand Down
1 change: 1 addition & 0 deletions cmd/entire/cli/strategy/strategy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ type RestoredSession struct {
SessionID string
Agent agent.AgentType
Prompt string
CreatedAt time.Time // From session metadata; used by resume to determine most recent
}

// LogsOnlyRestorer is an optional interface for strategies that support
Expand Down