tweak(timeline): add a dot to the session timeline modal for better visual cue of session's revert point (#1978)

This commit is contained in:
spoons-and-mirrors
2025-08-18 12:50:43 +02:00
committed by GitHub
parent 75ed131abf
commit cd3d91209a
4 changed files with 109 additions and 71 deletions

View File

@@ -229,6 +229,7 @@ export namespace Config {
session_export: z.string().optional().default("<leader>x").describe("Export session to editor"), session_export: z.string().optional().default("<leader>x").describe("Export session to editor"),
session_new: z.string().optional().default("<leader>n").describe("Create a new session"), session_new: z.string().optional().default("<leader>n").describe("Create a new session"),
session_list: z.string().optional().default("<leader>l").describe("List all sessions"), session_list: z.string().optional().default("<leader>l").describe("List all sessions"),
session_timeline: z.string().optional().default("<leader>g").describe("Show session timeline"),
session_share: z.string().optional().default("<leader>s").describe("Share current session"), session_share: z.string().optional().default("<leader>s").describe("Share current session"),
session_unshare: z.string().optional().default("none").describe("Unshare current session"), session_unshare: z.string().optional().default("none").describe("Unshare current session"),
session_interrupt: z.string().optional().default("esc").describe("Interrupt current session"), session_interrupt: z.string().optional().default("esc").describe("Interrupt current session"),

View File

@@ -107,7 +107,6 @@ func (r CommandRegistry) Matches(msg tea.KeyPressMsg, leader bool) []Command {
} }
const ( const (
SessionChildCycleCommand CommandName = "session_child_cycle" SessionChildCycleCommand CommandName = "session_child_cycle"
SessionChildCycleReverseCommand CommandName = "session_child_cycle_reverse" SessionChildCycleReverseCommand CommandName = "session_child_cycle_reverse"
ModelCycleRecentReverseCommand CommandName = "model_cycle_recent_reverse" ModelCycleRecentReverseCommand CommandName = "model_cycle_recent_reverse"
@@ -119,7 +118,7 @@ const (
EditorOpenCommand CommandName = "editor_open" EditorOpenCommand CommandName = "editor_open"
SessionNewCommand CommandName = "session_new" SessionNewCommand CommandName = "session_new"
SessionListCommand CommandName = "session_list" SessionListCommand CommandName = "session_list"
SessionNavigationCommand CommandName = "session_navigation" SessionTimelineCommand CommandName = "session_timeline"
SessionShareCommand CommandName = "session_share" SessionShareCommand CommandName = "session_share"
SessionUnshareCommand CommandName = "session_unshare" SessionUnshareCommand CommandName = "session_unshare"
SessionInterruptCommand CommandName = "session_interrupt" SessionInterruptCommand CommandName = "session_interrupt"
@@ -216,10 +215,10 @@ func LoadFromConfig(config *opencode.Config) CommandRegistry {
Trigger: []string{"sessions", "resume", "continue"}, Trigger: []string{"sessions", "resume", "continue"},
}, },
{ {
Name: SessionNavigationCommand, Name: SessionTimelineCommand,
Description: "jump to message", Description: "show session timeline",
Keybindings: parseBindings("<leader>g"), Keybindings: parseBindings("<leader>g"),
Trigger: []string{"jump", "goto", "navigate"}, Trigger: []string{"timeline", "history", "goto"},
}, },
{ {
Name: SessionShareCommand, Name: SessionShareCommand,

View File

@@ -18,8 +18,8 @@ import (
"github.com/sst/opencode/internal/util" "github.com/sst/opencode/internal/util"
) )
// NavigationDialog interface for the session navigation dialog // TimelineDialog interface for the session timeline dialog
type NavigationDialog interface { type TimelineDialog interface {
layout.Modal layout.Modal
} }
@@ -34,8 +34,8 @@ type RestoreToMessageMsg struct {
Index int Index int
} }
// navigationItem represents a user message in the navigation list // timelineItem represents a user message in the timeline list
type navigationItem struct { type timelineItem struct {
messageID string messageID string
content string content string
timestamp time.Time timestamp time.Time
@@ -43,25 +43,38 @@ type navigationItem struct {
toolCount int // Number of tools used in this message toolCount int // Number of tools used in this message
} }
func (n navigationItem) Render( func (n timelineItem) Render(
selected bool, selected bool,
width int, width int,
isFirstInViewport bool, isFirstInViewport bool,
baseStyle styles.Style, baseStyle styles.Style,
isCurrent bool,
) string { ) string {
t := theme.CurrentTheme() t := theme.CurrentTheme()
infoStyle := baseStyle.Background(t.BackgroundPanel()).Foreground(t.Info()).Render infoStyle := baseStyle.Background(t.BackgroundPanel()).Foreground(t.Info()).Render
textStyle := baseStyle.Background(t.BackgroundPanel()).Foreground(t.Text()).Render textStyle := baseStyle.Background(t.BackgroundPanel()).Foreground(t.Text()).Render
// Add dot after timestamp if this is the current message - only apply color when not selected
var dot string
var dotVisualLen int
if isCurrent {
if selected {
dot = "● "
} else {
dot = lipgloss.NewStyle().Foreground(t.Success()).Render("● ")
}
dotVisualLen = 2 // "● " is 2 characters wide
}
// Format timestamp - only apply color when not selected // Format timestamp - only apply color when not selected
var timeStr string var timeStr string
var timeVisualLen int var timeVisualLen int
if selected { if selected {
timeStr = n.timestamp.Format("15:04") + " " timeStr = n.timestamp.Format("15:04") + " " + dot
timeVisualLen = lipgloss.Width(timeStr) timeVisualLen = lipgloss.Width(n.timestamp.Format("15:04")+" ") + dotVisualLen
} else { } else {
timeStr = infoStyle(n.timestamp.Format("15:04") + " ") timeStr = infoStyle(n.timestamp.Format("15:04")+" ") + dot
timeVisualLen = lipgloss.Width(timeStr) timeVisualLen = lipgloss.Width(n.timestamp.Format("15:04")+" ") + dotVisualLen
} }
// Tool count display (fixed width for alignment) - only apply color when not selected // Tool count display (fixed width for alignment) - only apply color when not selected
@@ -78,7 +91,7 @@ func (n navigationItem) Render(
} }
// Calculate available space for content // Calculate available space for content
// Reserve space for: timestamp + space + toolInfo + padding + some buffer // Reserve space for: timestamp + dot + space + toolInfo + padding + some buffer
reservedSpace := timeVisualLen + 1 + toolInfoVisualLen + 4 reservedSpace := timeVisualLen + 1 + toolInfoVisualLen + 4
contentWidth := max(width-reservedSpace, 8) contentWidth := max(width-reservedSpace, 8)
@@ -135,23 +148,23 @@ func (n navigationItem) Render(
return itemStyle.Render(text) return itemStyle.Render(text)
} }
func (n navigationItem) Selectable() bool { func (n timelineItem) Selectable() bool {
return true return true
} }
type navigationDialog struct { type timelineDialog struct {
width int width int
height int height int
modal *modal.Modal modal *modal.Modal
list list.List[navigationItem] list list.List[timelineItem]
app *app.App app *app.App
} }
func (n *navigationDialog) Init() tea.Cmd { func (n *timelineDialog) Init() tea.Cmd {
return nil return nil
} }
func (n *navigationDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) { func (n *timelineDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) { switch msg := msg.(type) {
case tea.WindowSizeMsg: case tea.WindowSizeMsg:
n.width = msg.Width n.width = msg.Width
@@ -163,7 +176,7 @@ func (n *navigationDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
// Handle navigation and immediately scroll to selected message // Handle navigation and immediately scroll to selected message
var cmd tea.Cmd var cmd tea.Cmd
listModel, cmd := n.list.Update(msg) listModel, cmd := n.list.Update(msg)
n.list = listModel.(list.List[navigationItem]) n.list = listModel.(list.List[timelineItem])
// Get the newly selected item and scroll to it immediately // Get the newly selected item and scroll to it immediately
if item, idx := n.list.GetSelectedItem(); idx >= 0 { if item, idx := n.list.GetSelectedItem(); idx >= 0 {
@@ -191,11 +204,11 @@ func (n *navigationDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var cmd tea.Cmd var cmd tea.Cmd
listModel, cmd := n.list.Update(msg) listModel, cmd := n.list.Update(msg)
n.list = listModel.(list.List[navigationItem]) n.list = listModel.(list.List[timelineItem])
return n, cmd return n, cmd
} }
func (n *navigationDialog) Render(background string) string { func (n *timelineDialog) Render(background string) string {
listView := n.list.View() listView := n.list.View()
t := theme.CurrentTheme() t := theme.CurrentTheme()
@@ -229,7 +242,7 @@ func (n *navigationDialog) Render(background string) string {
return n.modal.Render(content, background) return n.modal.Render(content, background)
} }
func (n *navigationDialog) Close() tea.Cmd { func (n *timelineDialog) Close() tea.Cmd {
return nil return nil
} }
@@ -268,9 +281,9 @@ func countToolsInResponse(messages []app.Message, userMessageIndex int) int {
return count return count
} }
// NewNavigationDialog creates a new session navigation dialog // NewTimelineDialog creates a new session timeline dialog
func NewNavigationDialog(app *app.App) NavigationDialog { func NewTimelineDialog(app *app.App) TimelineDialog { // renamed from NewNavigationDialog
var items []navigationItem var items []timelineItem
// Filter to only user messages and extract relevant info // Filter to only user messages and extract relevant info
for i, message := range app.Messages { for i, message := range app.Messages {
@@ -278,7 +291,7 @@ func NewNavigationDialog(app *app.App) NavigationDialog {
preview := extractMessagePreview(message.Parts) preview := extractMessagePreview(message.Parts)
toolCount := countToolsInResponse(app.Messages, i) toolCount := countToolsInResponse(app.Messages, i)
items = append(items, navigationItem{ items = append(items, timelineItem{
messageID: userMsg.ID, messageID: userMsg.ID,
content: preview, content: preview,
timestamp: time.UnixMilli(int64(userMsg.Time.Created)), timestamp: time.UnixMilli(int64(userMsg.Time.Created)),
@@ -290,25 +303,50 @@ func NewNavigationDialog(app *app.App) NavigationDialog {
listComponent := list.NewListComponent( listComponent := list.NewListComponent(
list.WithItems(items), list.WithItems(items),
list.WithMaxVisibleHeight[navigationItem](12), list.WithMaxVisibleHeight[timelineItem](12),
list.WithFallbackMessage[navigationItem]("No user messages in this session"), list.WithFallbackMessage[timelineItem]("No user messages in this session"),
list.WithAlphaNumericKeys[navigationItem](true), list.WithAlphaNumericKeys[timelineItem](true),
list.WithRenderFunc( list.WithRenderFunc(
func(item navigationItem, selected bool, width int, baseStyle styles.Style) string { func(item timelineItem, selected bool, width int, baseStyle styles.Style) string {
return item.Render(selected, width, false, baseStyle) // Determine if this item is the current message for the session
isCurrent := false
if app.Session.Revert.MessageID != "" {
// When reverted, Session.Revert.MessageID contains the NEXT user message ID
// So we need to find the previous user message to highlight the correct one
for i, navItem := range items {
if navItem.messageID == app.Session.Revert.MessageID && i > 0 {
// Found the next message, so the previous one is current
isCurrent = item.messageID == items[i-1].messageID
break
}
}
} else if len(app.Messages) > 0 {
// If not reverted, highlight the last user message
lastUserMsgID := ""
for i := len(app.Messages) - 1; i >= 0; i-- {
if userMsg, ok := app.Messages[i].Info.(opencode.UserMessage); ok {
lastUserMsgID = userMsg.ID
break
}
}
isCurrent = item.messageID == lastUserMsgID
}
// Only show the dot if undo/redo/restore is available
showDot := app.Session.Revert.MessageID != ""
return item.Render(selected, width, false, baseStyle, isCurrent && showDot)
}, },
), ),
list.WithSelectableFunc(func(item navigationItem) bool { list.WithSelectableFunc(func(item timelineItem) bool {
return true return true
}), }),
) )
listComponent.SetMaxWidth(layout.Current.Container.Width - 12) listComponent.SetMaxWidth(layout.Current.Container.Width - 12)
return &navigationDialog{ return &timelineDialog{
list: listComponent, list: listComponent,
app: app, app: app,
modal: modal.New( modal: modal.New(
modal.WithTitle("Jump to Message"), modal.WithTitle("Session Timeline"),
modal.WithMaxWidth(layout.Current.Container.Width-8), modal.WithMaxWidth(layout.Current.Container.Width-8),
), ),
} }

View File

@@ -728,8 +728,8 @@ func (a Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case "/tui/open-sessions": case "/tui/open-sessions":
sessionDialog := dialog.NewSessionDialog(a.app) sessionDialog := dialog.NewSessionDialog(a.app)
a.modal = sessionDialog a.modal = sessionDialog
case "/tui/open-navigation": case "/tui/open-timeline":
navigationDialog := dialog.NewNavigationDialog(a.app) navigationDialog := dialog.NewTimelineDialog(a.app)
a.modal = navigationDialog a.modal = navigationDialog
case "/tui/open-themes": case "/tui/open-themes":
themeDialog := dialog.NewThemeDialog() themeDialog := dialog.NewThemeDialog()
@@ -1146,11 +1146,11 @@ func (a Model) executeCommand(command commands.Command) (tea.Model, tea.Cmd) {
case commands.SessionListCommand: case commands.SessionListCommand:
sessionDialog := dialog.NewSessionDialog(a.app) sessionDialog := dialog.NewSessionDialog(a.app)
a.modal = sessionDialog a.modal = sessionDialog
case commands.SessionNavigationCommand: case commands.SessionTimelineCommand:
if a.app.Session.ID == "" { if a.app.Session.ID == "" {
return a, toast.NewErrorToast("No active session") return a, toast.NewErrorToast("No active session")
} }
navigationDialog := dialog.NewNavigationDialog(a.app) navigationDialog := dialog.NewTimelineDialog(a.app)
a.modal = navigationDialog a.modal = navigationDialog
case commands.SessionShareCommand: case commands.SessionShareCommand:
if a.app.Session.ID == "" { if a.app.Session.ID == "" {