Skip to content

Commit 2e0901f

Browse files
AnnatarHeAnnatarHe
authored
Merge pull request #198 from shelltime/feat/cc-statusline-agent-time
feat(statusline): add total AI agent time to CC statusline display
2 parents 3da5b2b + bed4581 commit 2e0901f

9 files changed

Lines changed: 248 additions & 118 deletions

‎commands/cc_statusline.go‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ func commandCCStatusline(c *cli.Context) error {
4444
// Calculate context percentage
4545
contextPercent := calculateContextPercent(data.ContextWindow)
4646

47-
// Get daily cost - try daemon first, fallback to direct API
48-
var dailyCost float64
47+
// Get daily stats - try daemon first, fallback to direct API
48+
var dailyStats model.CCStatuslineDailyStats
4949
config, err := configService.ReadConfigFile(ctx)
5050
if err == nil {
51-
dailyCost = getDailyCostWithDaemonFallback(ctx, config)
51+
dailyStats = getDailyStatsWithDaemonFallback(ctx, config)
5252
}
5353

5454
// Format and output
55-
output := formatStatuslineOutput(data.Model.DisplayName, data.Cost.TotalCostUSD, dailyCost, contextPercent)
55+
output := formatStatuslineOutput(data.Model.DisplayName, data.Cost.TotalCostUSD, dailyStats.Cost, dailyStats.SessionSeconds, contextPercent)
5656
fmt.Println(output)
5757

5858
return nil
@@ -108,7 +108,7 @@ func calculateContextPercent(cw model.CCStatuslineContextWindow) float64 {
108108
return float64(currentTokens) / float64(cw.ContextWindowSize) * 100
109109
}
110110

111-
func formatStatuslineOutput(modelName string, sessionCost, dailyCost, contextPercent float64) string {
111+
func formatStatuslineOutput(modelName string, sessionCost, dailyCost float64, sessionSeconds int, contextPercent float64) string {
112112
var parts []string
113113

114114
// Model name
@@ -127,6 +127,14 @@ func formatStatuslineOutput(modelName string, sessionCost, dailyCost, contextPer
127127
parts = append(parts, color.Gray.Sprint("📊 -"))
128128
}
129129

130+
// AI agent time (magenta)
131+
if sessionSeconds > 0 {
132+
timeStr := color.Magenta.Sprintf("⏱️ %s", formatSessionDuration(sessionSeconds))
133+
parts = append(parts, timeStr)
134+
} else {
135+
parts = append(parts, color.Gray.Sprint("⏱️ -"))
136+
}
137+
130138
// Context percentage with color coding
131139
var contextStr string
132140
switch {
@@ -143,12 +151,27 @@ func formatStatuslineOutput(modelName string, sessionCost, dailyCost, contextPer
143151
}
144152

145153
func outputFallback() {
146-
fmt.Println(color.Gray.Sprint("🤖 - | 💰 - | 📊 - | 📈 -%"))
154+
fmt.Println(color.Gray.Sprint("🤖 - | 💰 - | 📊 - | ⏱️ - | 📈 -%"))
147155
}
148156

149-
// getDailyCostWithDaemonFallback tries to get daily cost from daemon first,
157+
// formatSessionDuration formats seconds into a human-readable duration
158+
func formatSessionDuration(totalSeconds int) string {
159+
hours := totalSeconds / 3600
160+
minutes := (totalSeconds % 3600) / 60
161+
seconds := totalSeconds % 60
162+
163+
if hours > 0 {
164+
return fmt.Sprintf("%dh%dm", hours, minutes)
165+
}
166+
if minutes > 0 {
167+
return fmt.Sprintf("%dm%ds", minutes, seconds)
168+
}
169+
return fmt.Sprintf("%ds", seconds)
170+
}
171+
172+
// getDailyStatsWithDaemonFallback tries to get daily stats from daemon first,
150173
// falls back to direct API if daemon is unavailable
151-
func getDailyCostWithDaemonFallback(ctx context.Context, config model.ShellTimeConfig) float64 {
174+
func getDailyStatsWithDaemonFallback(ctx context.Context, config model.ShellTimeConfig) model.CCStatuslineDailyStats {
152175
socketPath := config.SocketPath
153176
if socketPath == "" {
154177
socketPath = model.DefaultSocketPath
@@ -158,10 +181,13 @@ func getDailyCostWithDaemonFallback(ctx context.Context, config model.ShellTimeC
158181
if daemon.IsSocketReady(ctx, socketPath) {
159182
resp, err := daemon.RequestCCInfo(socketPath, daemon.CCInfoTimeRangeToday, 50*time.Millisecond)
160183
if err == nil && resp != nil {
161-
return resp.TotalCostUSD
184+
return model.CCStatuslineDailyStats{
185+
Cost: resp.TotalCostUSD,
186+
SessionSeconds: resp.TotalSessionSeconds,
187+
}
162188
}
163189
}
164190

165191
// Fallback to direct API (existing behavior)
166-
return model.FetchDailyCostCached(ctx, config)
192+
return model.FetchDailyStatsCached(ctx, config)
167193
}

‎commands/cc_statusline_test.go‎

Lines changed: 69 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ func (s *CCStatuslineTestSuite) TearDownTest() {
4242

4343
// getDailyCostWithDaemonFallback Tests
4444

45-
func (s *CCStatuslineTestSuite) TestGetDailyCost_UsesDaemonWhenAvailable() {
45+
func (s *CCStatuslineTestSuite) TestGetDailyStats_UsesDaemonWhenAvailable() {
4646
// Start mock daemon socket
4747
listener, err := net.Listen("unix", s.socketPath)
4848
assert.NoError(s.T(), err)
4949
s.listener = listener
5050

5151
expectedCost := 15.67
52+
expectedSessionSeconds := 3600
5253
go func() {
5354
conn, _ := listener.Accept()
5455
defer conn.Close()
@@ -57,9 +58,10 @@ func (s *CCStatuslineTestSuite) TestGetDailyCost_UsesDaemonWhenAvailable() {
5758
json.NewDecoder(conn).Decode(&msg)
5859

5960
response := daemon.CCInfoResponse{
60-
TotalCostUSD: expectedCost,
61-
TimeRange: "today",
62-
CachedAt: time.Now(),
61+
TotalCostUSD: expectedCost,
62+
TotalSessionSeconds: expectedSessionSeconds,
63+
TimeRange: "today",
64+
CachedAt: time.Now(),
6365
}
6466
json.NewEncoder(conn).Encode(response)
6567
}()
@@ -70,25 +72,27 @@ func (s *CCStatuslineTestSuite) TestGetDailyCost_UsesDaemonWhenAvailable() {
7072
SocketPath: s.socketPath,
7173
}
7274

73-
cost := getDailyCostWithDaemonFallback(context.Background(), config)
75+
stats := getDailyStatsWithDaemonFallback(context.Background(), config)
7476

75-
assert.Equal(s.T(), expectedCost, cost)
77+
assert.Equal(s.T(), expectedCost, stats.Cost)
78+
assert.Equal(s.T(), expectedSessionSeconds, stats.SessionSeconds)
7679
}
7780

78-
func (s *CCStatuslineTestSuite) TestGetDailyCost_FallbackWhenDaemonUnavailable() {
81+
func (s *CCStatuslineTestSuite) TestGetDailyStats_FallbackWhenDaemonUnavailable() {
7982
// No socket exists, should fall back to cached API
8083
config := model.ShellTimeConfig{
8184
SocketPath: "/nonexistent/socket.sock",
82-
Token: "", // No token means FetchDailyCostCached returns 0
85+
Token: "", // No token means FetchDailyStatsCached returns zero values
8386
}
8487

85-
cost := getDailyCostWithDaemonFallback(context.Background(), config)
88+
stats := getDailyStatsWithDaemonFallback(context.Background(), config)
8689

87-
// Should return 0 (from cache fallback with no token)
88-
assert.Equal(s.T(), float64(0), cost)
90+
// Should return zero values (from cache fallback with no token)
91+
assert.Equal(s.T(), float64(0), stats.Cost)
92+
assert.Equal(s.T(), 0, stats.SessionSeconds)
8993
}
9094

91-
func (s *CCStatuslineTestSuite) TestGetDailyCost_FallbackOnDaemonError() {
95+
func (s *CCStatuslineTestSuite) TestGetDailyStats_FallbackOnDaemonError() {
9296
// Start mock daemon that returns error
9397
listener, err := net.Listen("unix", s.socketPath)
9498
assert.NoError(s.T(), err)
@@ -107,57 +111,96 @@ func (s *CCStatuslineTestSuite) TestGetDailyCost_FallbackOnDaemonError() {
107111
Token: "", // No token
108112
}
109113

110-
cost := getDailyCostWithDaemonFallback(context.Background(), config)
114+
stats := getDailyStatsWithDaemonFallback(context.Background(), config)
111115

112-
// Should fall back and return 0
113-
assert.Equal(s.T(), float64(0), cost)
116+
// Should fall back and return zero values
117+
assert.Equal(s.T(), float64(0), stats.Cost)
118+
assert.Equal(s.T(), 0, stats.SessionSeconds)
114119
}
115120

116-
func (s *CCStatuslineTestSuite) TestGetDailyCost_UsesDefaultSocketPath() {
121+
func (s *CCStatuslineTestSuite) TestGetDailyStats_UsesDefaultSocketPath() {
117122
// Test that default socket path is used when config is empty
118123
config := model.ShellTimeConfig{
119-
SocketPath: "", // Empty path
124+
SocketPath: "", // Empty path - should use model.DefaultSocketPath
120125
Token: "",
121126
}
122127

123128
// This should use model.DefaultSocketPath internally
124-
// Since no daemon is running, it will fall back
125-
cost := getDailyCostWithDaemonFallback(context.Background(), config)
126-
127-
assert.Equal(s.T(), float64(0), cost)
129+
// Since no daemon is running at the default path, it will fall back to cached API
130+
// The function should not panic and should return a valid stats struct
131+
stats := getDailyStatsWithDaemonFallback(context.Background(), config)
132+
133+
// We can't assert on exact values since the global cache might have data
134+
// from previous tests. Just verify the function returns without error
135+
// and returns non-negative values
136+
assert.GreaterOrEqual(s.T(), stats.Cost, float64(0))
137+
assert.GreaterOrEqual(s.T(), stats.SessionSeconds, 0)
128138
}
129139

130140
// formatStatuslineOutput Tests
131141

132142
func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_AllValues() {
133-
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 75.0)
143+
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0)
134144

135145
// Should contain all components
136146
assert.Contains(s.T(), output, "🤖 claude-opus-4")
137147
assert.Contains(s.T(), output, "$1.23")
138148
assert.Contains(s.T(), output, "$4.56")
139-
assert.Contains(s.T(), output, "75%") // Context percentage
149+
assert.Contains(s.T(), output, "1h1m") // Session time (3661 seconds = 1h 1m 1s)
150+
assert.Contains(s.T(), output, "75%") // Context percentage
140151
}
141152

142153
func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_ZeroDailyCost() {
143-
output := formatStatuslineOutput("claude-sonnet", 0.50, 0, 50.0)
154+
output := formatStatuslineOutput("claude-sonnet", 0.50, 0, 300, 50.0)
144155

145156
// Should show "-" for zero daily cost
146157
assert.Contains(s.T(), output, "📊 -")
158+
assert.Contains(s.T(), output, "5m0s") // Session time (300 seconds = 5m)
159+
}
160+
161+
func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_ZeroSessionSeconds() {
162+
output := formatStatuslineOutput("claude-sonnet", 0.50, 1.0, 0, 50.0)
163+
164+
// Should show "-" for zero session seconds
165+
assert.Contains(s.T(), output, "⏱️ -")
147166
}
148167

149168
func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_HighContextPercentage() {
150-
output := formatStatuslineOutput("test-model", 1.0, 1.0, 85.0)
169+
output := formatStatuslineOutput("test-model", 1.0, 1.0, 60, 85.0)
151170

152171
// Should contain the percentage (color codes may vary)
153172
assert.Contains(s.T(), output, "85%")
173+
assert.Contains(s.T(), output, "1m0s")
154174
}
155175

156176
func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_LowContextPercentage() {
157-
output := formatStatuslineOutput("test-model", 1.0, 1.0, 25.0)
177+
output := formatStatuslineOutput("test-model", 1.0, 1.0, 45, 25.0)
158178

159179
// Should contain the percentage
160180
assert.Contains(s.T(), output, "25%")
181+
assert.Contains(s.T(), output, "45s")
182+
}
183+
184+
// formatSessionDuration Tests
185+
186+
func (s *CCStatuslineTestSuite) TestFormatSessionDuration_Seconds() {
187+
result := formatSessionDuration(45)
188+
assert.Equal(s.T(), "45s", result)
189+
}
190+
191+
func (s *CCStatuslineTestSuite) TestFormatSessionDuration_Minutes() {
192+
result := formatSessionDuration(125) // 2m 5s
193+
assert.Equal(s.T(), "2m5s", result)
194+
}
195+
196+
func (s *CCStatuslineTestSuite) TestFormatSessionDuration_Hours() {
197+
result := formatSessionDuration(3665) // 1h 1m 5s
198+
assert.Equal(s.T(), "1h1m", result)
199+
}
200+
201+
func (s *CCStatuslineTestSuite) TestFormatSessionDuration_Zero() {
202+
result := formatSessionDuration(0)
203+
assert.Equal(s.T(), "0s", result)
161204
}
162205

163206
// calculateContextPercent Tests

‎daemon/cc_info_timer.go‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ var (
1616

1717
// CCInfoCache holds the cached cost data for a time range
1818
type CCInfoCache struct {
19-
TotalCostUSD float64
20-
FetchedAt time.Time
19+
TotalCostUSD float64
20+
TotalSessionSeconds int
21+
FetchedAt time.Time
2122
}
2223

2324
// CCInfoTimerService manages lazy-fetching of CC info data
@@ -174,29 +175,37 @@ func (s *CCInfoTimerService) fetchActiveRanges(ctx context.Context) {
174175

175176
// Fetch each active range
176177
for _, timeRange := range ranges {
177-
cost, err := s.fetchCost(ctx, timeRange)
178+
info, err := s.fetchCCInfo(ctx, timeRange)
178179
if err != nil {
179-
slog.Warn("Failed to fetch CC info cost",
180+
slog.Warn("Failed to fetch CC info",
180181
slog.String("timeRange", string(timeRange)),
181182
slog.Any("err", err))
182183
continue
183184
}
184185

185186
s.mu.Lock()
186187
s.cache[timeRange] = CCInfoCache{
187-
TotalCostUSD: cost,
188-
FetchedAt: time.Now(),
188+
TotalCostUSD: info.TotalCostUSD,
189+
TotalSessionSeconds: info.TotalSessionSeconds,
190+
FetchedAt: time.Now(),
189191
}
190192
s.mu.Unlock()
191193

192-
slog.Debug("CC info cost updated",
194+
slog.Debug("CC info updated",
193195
slog.String("timeRange", string(timeRange)),
194-
slog.Float64("cost", cost))
196+
slog.Float64("cost", info.TotalCostUSD),
197+
slog.Int("sessionSeconds", info.TotalSessionSeconds))
195198
}
196199
}
197200

198-
// fetchCost fetches the cost for a specific time range
199-
func (s *CCInfoTimerService) fetchCost(ctx context.Context, timeRange CCInfoTimeRange) (float64, error) {
201+
// ccInfoFetchResult holds the fetched CC info data
202+
type ccInfoFetchResult struct {
203+
TotalCostUSD float64
204+
TotalSessionSeconds int
205+
}
206+
207+
// fetchCCInfo fetches the CC info for a specific time range
208+
func (s *CCInfoTimerService) fetchCCInfo(ctx context.Context, timeRange CCInfoTimeRange) (ccInfoFetchResult, error) {
200209
now := time.Now()
201210
var since time.Time
202211

@@ -244,8 +253,12 @@ func (s *CCInfoTimerService) fetchCost(ctx context.Context, timeRange CCInfoTime
244253
})
245254

246255
if err != nil {
247-
return 0, err
256+
return ccInfoFetchResult{}, err
248257
}
249258

250-
return result.Data.FetchUser.AICodeOtel.Analytics.TotalCostUsd, nil
259+
analytics := result.Data.FetchUser.AICodeOtel.Analytics
260+
return ccInfoFetchResult{
261+
TotalCostUSD: analytics.TotalCostUsd,
262+
TotalSessionSeconds: analytics.TotalSessionSeconds,
263+
}, nil
251264
}

0 commit comments

Comments
 (0)