Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions commands/cc_statusline.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func commandCCStatusline(c *cli.Context) error {
}

// Format and output
output := formatStatuslineOutput(data.Model.DisplayName, data.Cost.TotalCostUSD, result.Cost, result.SessionSeconds, contextPercent, result.GitBranch, result.GitDirty, result.FiveHourUtilization, result.SevenDayUtilization, result.UserLogin, result.WebEndpoint)
output := formatStatuslineOutput(data.Model.DisplayName, data.Cost.TotalCostUSD, result.Cost, result.SessionSeconds, contextPercent, result.GitBranch, result.GitDirty, result.FiveHourUtilization, result.SevenDayUtilization, result.UserLogin, result.WebEndpoint, data.SessionID)
fmt.Println(output)

return nil
Expand Down Expand Up @@ -126,7 +126,7 @@ func calculateContextPercent(cw model.CCStatuslineContextWindow) float64 {
return float64(currentTokens) / float64(cw.ContextWindowSize) * 100
}

func formatStatuslineOutput(modelName string, sessionCost, dailyCost float64, sessionSeconds int, contextPercent float64, gitBranch string, gitDirty bool, fiveHourUtil, sevenDayUtil *float64, userLogin, webEndpoint string) string {
func formatStatuslineOutput(modelName string, sessionCost, dailyCost float64, sessionSeconds int, contextPercent float64, gitBranch string, gitDirty bool, fiveHourUtil, sevenDayUtil *float64, userLogin, webEndpoint, sessionID string) string {
var parts []string

// Git info FIRST (green)
Expand All @@ -144,8 +144,12 @@ func formatStatuslineOutput(modelName string, sessionCost, dailyCost float64, se
modelStr := fmt.Sprintf("🤖 %s", modelName)
parts = append(parts, modelStr)

// Session cost (cyan)
// Session cost (cyan) - clickable link to session page when user login and session ID are available
sessionStr := color.Cyan.Sprintf("💰 $%.2f", sessionCost)
if userLogin != "" && webEndpoint != "" && sessionID != "" {
url := fmt.Sprintf("%s/users/%s/coding-agent/session/%s", webEndpoint, userLogin, sessionID)
sessionStr = wrapOSC8Link(url, sessionStr)
}
Comment on lines +149 to +152
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Constructing URLs with fmt.Sprintf can be brittle. If webEndpoint has a trailing slash, it will result in a double slash in the final URL (e.g., https://example.com//users/...). While many servers handle this, it's more robust to prevent it. Using strings.TrimSuffix is a simple way to ensure the URL is always correctly formed.

Suggested change
if userLogin != "" && webEndpoint != "" && sessionID != "" {
url := fmt.Sprintf("%s/users/%s/coding-agent/session/%s", webEndpoint, userLogin, sessionID)
sessionStr = wrapOSC8Link(url, sessionStr)
}
if userLogin != "" && webEndpoint != "" && sessionID != "" {
url := fmt.Sprintf("%s/users/%s/coding-agent/session/%s", strings.TrimSuffix(webEndpoint, "/"), userLogin, sessionID)
sessionStr = wrapOSC8Link(url, sessionStr)
}

parts = append(parts, sessionStr)

// Daily cost (yellow) - clickable link to coding agent page when user login is available
Expand Down
44 changes: 35 additions & 9 deletions commands/cc_statusline_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (s *CCStatuslineTestSuite) TestGetDaemonInfo_UsesDefaultSocketPath() {
// formatStatuslineOutput Tests

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_AllValues() {
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "", "")
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "", "", "")

// Should contain all components
assert.Contains(s.T(), output, "🌿 main")
Expand All @@ -162,46 +162,46 @@ func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_AllValues() {
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_WithDirtyBranch() {
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "feature/test", true, nil, nil, "", "")
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "feature/test", true, nil, nil, "", "", "")

// Should contain branch with asterisk for dirty
assert.Contains(s.T(), output, "🌿 feature/test*")
assert.Contains(s.T(), output, "🤖 claude-opus-4")
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_NoBranch() {
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "", false, nil, nil, "", "")
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "", false, nil, nil, "", "", "")

// Should show "-" for no branch
assert.Contains(s.T(), output, "🌿 -")
assert.Contains(s.T(), output, "🤖 claude-opus-4")
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_ZeroDailyCost() {
output := formatStatuslineOutput("claude-sonnet", 0.50, 0, 300, 50.0, "main", false, nil, nil, "", "")
output := formatStatuslineOutput("claude-sonnet", 0.50, 0, 300, 50.0, "main", false, nil, nil, "", "", "")

// Should show "-" for zero daily cost
assert.Contains(s.T(), output, "📊 -")
assert.Contains(s.T(), output, "5m0s") // Session time (300 seconds = 5m)
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_ZeroSessionSeconds() {
output := formatStatuslineOutput("claude-sonnet", 0.50, 1.0, 0, 50.0, "main", false, nil, nil, "", "")
output := formatStatuslineOutput("claude-sonnet", 0.50, 1.0, 0, 50.0, "main", false, nil, nil, "", "", "")

// Should show "-" for zero session seconds
assert.Contains(s.T(), output, "⏱️ -")
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_HighContextPercentage() {
output := formatStatuslineOutput("test-model", 1.0, 1.0, 60, 85.0, "main", false, nil, nil, "", "")
output := formatStatuslineOutput("test-model", 1.0, 1.0, 60, 85.0, "main", false, nil, nil, "", "", "")

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

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_LowContextPercentage() {
output := formatStatuslineOutput("test-model", 1.0, 1.0, 45, 25.0, "main", false, nil, nil, "", "")
output := formatStatuslineOutput("test-model", 1.0, 1.0, 45, 25.0, "main", false, nil, nil, "", "", "")

// Should contain the percentage
assert.Contains(s.T(), output, "25%")
Expand Down Expand Up @@ -328,18 +328,44 @@ func (s *CCStatuslineTestSuite) TestFormatQuotaPart_ContainsLink() {
assert.Contains(s.T(), result, "7d:23%")
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_SessionCostWithLink() {
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "testuser", "https://shelltime.xyz", "session-abc123")

// Should contain OSC8 link wrapping session cost
assert.Contains(s.T(), output, "shelltime.xyz/users/testuser/coding-agent/session/session-abc123")
assert.Contains(s.T(), output, "\033]8;;")
assert.Contains(s.T(), output, "$1.23")
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_SessionCostWithoutLink() {
// No userLogin - should not have link
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "", "https://shelltime.xyz", "session-abc123")
assert.Contains(s.T(), output, "$1.23")
assert.NotContains(s.T(), output, "coding-agent/session/")

// No sessionID - should not have link
output = formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "testuser", "https://shelltime.xyz", "")
assert.Contains(s.T(), output, "$1.23")
assert.NotContains(s.T(), output, "coding-agent/session/")

// No webEndpoint - should not have link
output = formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "testuser", "", "session-abc123")
assert.Contains(s.T(), output, "$1.23")
assert.NotContains(s.T(), output, "coding-agent/session/")
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_WithQuota() {
fh := 45.0
sd := 23.0
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, &fh, &sd, "", "")
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, &fh, &sd, "", "", "")

assert.Contains(s.T(), output, "5h:45%")
assert.Contains(s.T(), output, "7d:23%")
assert.Contains(s.T(), output, "🚦")
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_WithoutQuota() {
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "", "")
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "", "", "")

assert.Contains(s.T(), output, "🚦 -")
}
Expand Down
1 change: 1 addition & 0 deletions model/cc_statusline_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package model
// CCStatuslineInput represents the JSON input from Claude Code statusline
type CCStatuslineInput struct {
HookEventName string `json:"hook_event_name"`
SessionID string `json:"session_id"`
Model CCStatuslineModel `json:"model"`
Cost CCStatuslineCost `json:"cost"`
ContextWindow CCStatuslineContextWindow `json:"context_window"`
Expand Down
Loading