diff --git a/internal/gateway/methods/sessions.go b/internal/gateway/methods/sessions.go index 9c00b504..ec929841 100644 --- a/internal/gateway/methods/sessions.go +++ b/internal/gateway/methods/sessions.go @@ -42,7 +42,7 @@ func (m *SessionsMethods) handleList(_ context.Context, client *gateway.Client, params.Limit = 20 } - result := m.sessions.ListPaged(store.SessionListOpts{ + result := m.sessions.ListPagedRich(store.SessionListOpts{ AgentID: params.AgentID, Limit: params.Limit, Offset: params.Offset, diff --git a/internal/store/pg/sessions_list.go b/internal/store/pg/sessions_list.go index fef6a06e..8dc63cdd 100644 --- a/internal/store/pg/sessions_list.go +++ b/internal/store/pg/sessions_list.go @@ -134,6 +134,101 @@ func (s *PGSessionStore) ListPaged(opts store.SessionListOpts) store.SessionList return store.SessionListResult{Sessions: result, Total: total} } +// ListPagedRich returns enriched session info for API responses (includes model, tokens, agent name). +func (s *PGSessionStore) ListPagedRich(opts store.SessionListOpts) store.SessionListRichResult { + limit := opts.Limit + if limit <= 0 { + limit = 20 + } + offset := opts.Offset + if offset < 0 { + offset = 0 + } + + var where string + var whereArgs []interface{} + + if opts.AgentID != "" { + where = " WHERE s.session_key LIKE $1" + whereArgs = append(whereArgs, "agent:"+opts.AgentID+":%") + } + + // Count total + var total int + countQ := "SELECT COUNT(*) FROM sessions s" + where + if err := s.db.QueryRow(countQ, whereArgs...).Scan(&total); err != nil { + return store.SessionListRichResult{Sessions: []store.SessionInfoRich{}, Total: 0} + } + + // Fetch page with agent name via LEFT JOIN + var selectQ string + var selectArgs []interface{} + + const richCols = `s.session_key, jsonb_array_length(s.messages), s.created_at, s.updated_at, + s.label, s.channel, s.user_id, COALESCE(s.metadata, '{}'), + s.model, s.provider, s.input_tokens, s.output_tokens, + COALESCE(a.display_name, '')` + + if opts.AgentID != "" { + selectQ = `SELECT ` + richCols + ` + FROM sessions s LEFT JOIN agents a ON s.agent_id = a.id + WHERE s.session_key LIKE $1 ORDER BY s.updated_at DESC LIMIT $2 OFFSET $3` + selectArgs = []interface{}{whereArgs[0], limit, offset} + } else { + selectQ = `SELECT ` + richCols + ` + FROM sessions s LEFT JOIN agents a ON s.agent_id = a.id + ORDER BY s.updated_at DESC LIMIT $1 OFFSET $2` + selectArgs = []interface{}{limit, offset} + } + + rows, err := s.db.Query(selectQ, selectArgs...) + if err != nil { + return store.SessionListRichResult{Sessions: []store.SessionInfoRich{}, Total: total} + } + defer rows.Close() + + var result []store.SessionInfoRich + for rows.Next() { + var key string + var msgCount int + var createdAt, updatedAt time.Time + var label, channel, userID *string + var metaJSON []byte + var model, provider *string + var inputTokens, outputTokens int64 + var agentName string + if err := rows.Scan(&key, &msgCount, &createdAt, &updatedAt, &label, &channel, &userID, &metaJSON, + &model, &provider, &inputTokens, &outputTokens, &agentName); err != nil { + continue + } + var meta map[string]string + if len(metaJSON) > 0 { + json.Unmarshal(metaJSON, &meta) + } + result = append(result, store.SessionInfoRich{ + SessionInfo: store.SessionInfo{ + Key: key, + MessageCount: msgCount, + Created: createdAt, + Updated: updatedAt, + Label: derefStr(label), + Channel: derefStr(channel), + UserID: derefStr(userID), + Metadata: meta, + }, + Model: derefStr(model), + Provider: derefStr(provider), + InputTokens: inputTokens, + OutputTokens: outputTokens, + AgentName: agentName, + }) + } + if result == nil { + result = []store.SessionInfoRich{} + } + return store.SessionListRichResult{Sessions: result, Total: total} +} + func (s *PGSessionStore) Save(key string) error { s.mu.RLock() data, ok := s.cache[key] diff --git a/internal/store/session_store.go b/internal/store/session_store.go index 1018378b..460e2ee8 100644 --- a/internal/store/session_store.go +++ b/internal/store/session_store.go @@ -62,6 +62,22 @@ type SessionListResult struct { Total int `json:"total"` } +// SessionInfoRich is an enriched session info for API responses (includes model, tokens, agent name). +type SessionInfoRich struct { + SessionInfo + Model string `json:"model,omitempty"` + Provider string `json:"provider,omitempty"` + InputTokens int64 `json:"inputTokens,omitempty"` + OutputTokens int64 `json:"outputTokens,omitempty"` + AgentName string `json:"agentName,omitempty"` +} + +// SessionListRichResult is the paginated result of ListPagedRich. +type SessionListRichResult struct { + Sessions []SessionInfoRich `json:"sessions"` + Total int `json:"total"` +} + // SessionStore manages conversation sessions. type SessionStore interface { GetOrCreate(key string) *SessionData @@ -88,6 +104,7 @@ type SessionStore interface { Delete(key string) error List(agentID string) []SessionInfo ListPaged(opts SessionListOpts) SessionListResult + ListPagedRich(opts SessionListOpts) SessionListRichResult Save(key string) error LastUsedChannel(agentID string) (channel, chatID string) } diff --git a/ui/web/src/components/chat/session-switcher.tsx b/ui/web/src/components/chat/session-switcher.tsx index e0cadd83..09a59f6a 100644 --- a/ui/web/src/components/chat/session-switcher.tsx +++ b/ui/web/src/components/chat/session-switcher.tsx @@ -39,7 +39,7 @@ export function SessionSwitcher({ {sessions.map((session) => { const parsed = parseSessionKey(session.key); const isActive = session.key === activeKey; - const label = session.label || parsed.scope || session.key; + const label = session.metadata?.chat_title || session.metadata?.display_name || session.label || parsed.scope || session.key; return (
-

- {session.metadata?.chat_title || session.metadata?.display_name || session.label || parsed.scope} -

-
- {parsed.agentId} + {editingTitle ? ( +
+ setTitleDraft(e.target.value)} + onKeyDown={(e) => { + if (e.key === "Enter") { + onPatch?.(session.key, { label: titleDraft }); + setEditingTitle(false); + } else if (e.key === "Escape") { + setEditingTitle(false); + } + }} + /> + + +
+ ) : ( +

{ + setTitleDraft(session.label || session.metadata?.chat_title || session.metadata?.display_name || ""); + setEditingTitle(true); + }} + > + {session.metadata?.chat_title || session.metadata?.display_name || session.label || parsed.scope} + +

+ )} +
+ {session.agentName || parsed.agentId} {session.channel && session.channel !== "ws" && ( diff --git a/ui/web/src/pages/sessions/sessions-page.tsx b/ui/web/src/pages/sessions/sessions-page.tsx index 69377ab8..7e633dad 100644 --- a/ui/web/src/pages/sessions/sessions-page.tsx +++ b/ui/web/src/pages/sessions/sessions-page.tsx @@ -21,7 +21,7 @@ export function SessionsPage() { const [page, setPage] = useState(1); const [pageSize, setPageSize] = useState(20); - const { sessions, total, loading, preview, deleteSession, resetSession } = useSessions({ + const { sessions, total, loading, preview, deleteSession, resetSession, patchSession } = useSessions({ limit: pageSize, offset: (page - 1) * pageSize, }); @@ -44,6 +44,7 @@ export function SessionsPage() { navigate("/sessions"); }} onReset={resetSession} + onPatch={patchSession} /> ); } @@ -146,7 +147,7 @@ function SessionRow({
- {parsed.agentId} + {session.agentName || parsed.agentId} {session.channel || "ws"} diff --git a/ui/web/src/types/session.ts b/ui/web/src/types/session.ts index 288dd3d1..f777df38 100644 --- a/ui/web/src/types/session.ts +++ b/ui/web/src/types/session.ts @@ -13,6 +13,7 @@ export interface SessionInfo { outputTokens?: number; userID?: string; metadata?: Record; + agentName?: string; } export interface SessionPreview {