Skip to content

refactor(commands): replace positional params with statuslineParams struct #234

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

Merged
AnnatarHe merged 1 commit into from
Feb 15, 2026
Merged

refactor(commands): replace positional params with statuslineParams struct #234

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
74 changes: 51 additions & 23 deletions commands/cc_statusline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,20 @@ 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, data.SessionID)
output := formatStatuslineOutput(statuslineParams{
ModelName: data.Model.DisplayName,
SessionCost: data.Cost.TotalCostUSD,
DailyCost: result.Cost,
SessionSeconds: result.SessionSeconds,
ContextPercent: contextPercent,
GitBranch: result.GitBranch,
GitDirty: result.GitDirty,
FiveHourUtil: result.FiveHourUtilization,
SevenDayUtil: result.SevenDayUtilization,
UserLogin: result.UserLogin,
WebEndpoint: result.WebEndpoint,
SessionID: data.SessionID,
})
fmt.Println(output)

return nil
Expand Down Expand Up @@ -145,13 +158,28 @@ 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, sessionID string) string {
type statuslineParams struct {
ModelName string
SessionCost float64
DailyCost float64
SessionSeconds int
ContextPercent float64
GitBranch string
GitDirty bool
FiveHourUtil *float64
SevenDayUtil *float64
UserLogin string
WebEndpoint string
SessionID string
}

func formatStatuslineOutput(p statuslineParams) string {
var parts []string

// Git info FIRST (green)
if gitBranch != "" {
gitStr := gitBranch
if gitDirty {
if p.GitBranch != "" {
gitStr := p.GitBranch
if p.GitDirty {
gitStr += "*"
}
parts = append(parts, color.Green.Sprintf("🌿 %s", gitStr))
Expand All @@ -160,22 +188,22 @@ func formatStatuslineOutput(modelName string, sessionCost, dailyCost float64, se
}

// Model name
modelStr := fmt.Sprintf("🤖 %s", modelName)
modelStr := fmt.Sprintf("🤖 %s", p.ModelName)
parts = append(parts, modelStr)

// 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 := color.Cyan.Sprintf("💰 $%.2f", p.SessionCost)
if p.UserLogin != "" && p.WebEndpoint != "" && p.SessionID != "" {
url := fmt.Sprintf("%s/users/%s/coding-agent/session/%s", p.WebEndpoint, p.UserLogin, p.SessionID)
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 15, 2026

Choose a reason for hiding this comment

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

medium

Using fmt.Sprintf for URL concatenation can be brittle. If p.WebEndpoint has a trailing slash, this will result in a double slash in the URL (e.g., https://example.com//users/...). For more robust URL construction, it's better to handle this case.

A simple way to fix this is to use strings.TrimRight to remove any trailing slash from the base URL.

This same issue exists on lines 206 and 223.

Suggested change
url := fmt.Sprintf("%s/users/%s/coding-agent/session/%s", p.WebEndpoint, p.UserLogin, p.SessionID)
url := fmt.Sprintf("%s/users/%s/coding-agent/session/%s", strings.TrimRight(p.WebEndpoint, "/"), p.UserLogin, p.SessionID)

sessionStr = wrapOSC8Link(url, sessionStr)
}
parts = append(parts, sessionStr)

// Daily cost (yellow) - clickable link to coding agent page when user login is available
if dailyCost > 0 {
dailyStr := color.Yellow.Sprintf("📊 $%.2f", dailyCost)
if userLogin != "" && webEndpoint != "" {
url := fmt.Sprintf("%s/users/%s/coding-agent/claude-code", webEndpoint, userLogin)
if p.DailyCost > 0 {
dailyStr := color.Yellow.Sprintf("📊 $%.2f", p.DailyCost)
if p.UserLogin != "" && p.WebEndpoint != "" {
url := fmt.Sprintf("%s/users/%s/coding-agent/claude-code", p.WebEndpoint, p.UserLogin)
dailyStr = wrapOSC8Link(url, dailyStr)
}
parts = append(parts, dailyStr)
Expand All @@ -185,14 +213,14 @@ func formatStatuslineOutput(modelName string, sessionCost, dailyCost float64, se

// Quota utilization (macOS only - requires Keychain for OAuth token)
if runtime.GOOS == "darwin" {
parts = append(parts, formatQuotaPart(fiveHourUtil, sevenDayUtil))
parts = append(parts, formatQuotaPart(p.FiveHourUtil, p.SevenDayUtil))
}

// AI agent time (magenta) - clickable link to user profile
if sessionSeconds > 0 {
timeStr := color.Magenta.Sprintf("⏱️ %s", formatSessionDuration(sessionSeconds))
if userLogin != "" && webEndpoint != "" {
url := fmt.Sprintf("%s/users/%s", webEndpoint, userLogin)
if p.SessionSeconds > 0 {
timeStr := color.Magenta.Sprintf("⏱️ %s", formatSessionDuration(p.SessionSeconds))
if p.UserLogin != "" && p.WebEndpoint != "" {
url := fmt.Sprintf("%s/users/%s", p.WebEndpoint, p.UserLogin)
timeStr = wrapOSC8Link(url, timeStr)
}
parts = append(parts, timeStr)
Expand All @@ -203,12 +231,12 @@ func formatStatuslineOutput(modelName string, sessionCost, dailyCost float64, se
// Context percentage with color coding
var contextStr string
switch {
case contextPercent >= 80:
contextStr = color.Red.Sprintf("📈 %.0f%%", contextPercent)
case contextPercent >= 50:
contextStr = color.Yellow.Sprintf("📈 %.0f%%", contextPercent)
case p.ContextPercent >= 80:
contextStr = color.Red.Sprintf("📈 %.0f%%", p.ContextPercent)
case p.ContextPercent >= 50:
contextStr = color.Yellow.Sprintf("📈 %.0f%%", p.ContextPercent)
default:
contextStr = color.Green.Sprintf("📈 %.0f%%", contextPercent)
contextStr = color.Green.Sprintf("📈 %.0f%%", p.ContextPercent)
}
parts = append(parts, contextStr)

Expand Down
160 changes: 144 additions & 16 deletions commands/cc_statusline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,14 @@ 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(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
})

// Should contain all components
assert.Contains(s.T(), output, "🌿 main")
Expand All @@ -163,46 +170,86 @@ 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(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "feature/test",
GitDirty: true,
})

// 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(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
})

// 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(statuslineParams{
ModelName: "claude-sonnet",
SessionCost: 0.50,
SessionSeconds: 300,
ContextPercent: 50.0,
GitBranch: "main",
})

// 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(statuslineParams{
ModelName: "claude-sonnet",
SessionCost: 0.50,
DailyCost: 1.0,
ContextPercent: 50.0,
GitBranch: "main",
})

// 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(statuslineParams{
ModelName: "test-model",
SessionCost: 1.0,
DailyCost: 1.0,
SessionSeconds: 60,
ContextPercent: 85.0,
GitBranch: "main",
})

// 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(statuslineParams{
ModelName: "test-model",
SessionCost: 1.0,
DailyCost: 1.0,
SessionSeconds: 45,
ContextPercent: 25.0,
GitBranch: "main",
})

// Should contain the percentage
assert.Contains(s.T(), output, "25%")
Expand Down Expand Up @@ -330,7 +377,17 @@ func (s *CCStatuslineTestSuite) TestFormatQuotaPart_ContainsLink() {
}

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")
output := formatStatuslineOutput(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
UserLogin: "testuser",
WebEndpoint: "https://shelltime.xyz",
SessionID: "session-abc123",
})

// Should contain OSC8 link wrapping session cost
assert.Contains(s.T(), output, "shelltime.xyz/users/testuser/coding-agent/session/session-abc123")
Expand All @@ -340,23 +397,60 @@ func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_SessionCostWithLink()

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")
output := formatStatuslineOutput(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
WebEndpoint: "https://shelltime.xyz",
SessionID: "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", "")
output = formatStatuslineOutput(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
UserLogin: "testuser",
WebEndpoint: "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")
output = formatStatuslineOutput(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
UserLogin: "testuser",
SessionID: "session-abc123",
})
assert.Contains(s.T(), output, "$1.23")
assert.NotContains(s.T(), output, "coding-agent/session/")
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_TimeWithProfileLink() {
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "testuser", "https://shelltime.xyz", "session-abc123")
output := formatStatuslineOutput(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
UserLogin: "testuser",
WebEndpoint: "https://shelltime.xyz",
SessionID: "session-abc123",
})

// Should contain OSC8 link wrapping time section to user profile
assert.Contains(s.T(), output, "shelltime.xyz/users/testuser")
Expand All @@ -365,21 +459,48 @@ func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_TimeWithProfileLink()

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_TimeWithoutProfileLink() {
// No userLogin - should not have profile link on time
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "", "https://shelltime.xyz", "session-abc123")
output := formatStatuslineOutput(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
WebEndpoint: "https://shelltime.xyz",
SessionID: "session-abc123",
})
assert.Contains(s.T(), output, "1h1m")
// The time section should not contain a link to users/ profile
// Count occurrences of "shelltime.xyz/users/" - should only be in session cost and daily cost links
assert.NotContains(s.T(), output, "shelltime.xyz/users//")

// No webEndpoint - should not have profile link on time
output = formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "testuser", "", "session-abc123")
output = formatStatuslineOutput(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
UserLogin: "testuser",
SessionID: "session-abc123",
})
assert.Contains(s.T(), output, "1h1m")
}

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(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
FiveHourUtil: &fh,
SevenDayUtil: &sd,
})

if runtime.GOOS == "darwin" {
assert.Contains(s.T(), output, "5h:45%")
Expand All @@ -391,7 +512,14 @@ func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_WithQuota() {
}

func (s *CCStatuslineTestSuite) TestFormatStatuslineOutput_WithoutQuota() {
output := formatStatuslineOutput("claude-opus-4", 1.23, 4.56, 3661, 75.0, "main", false, nil, nil, "", "", "")
output := formatStatuslineOutput(statuslineParams{
ModelName: "claude-opus-4",
SessionCost: 1.23,
DailyCost: 4.56,
SessionSeconds: 3661,
ContextPercent: 75.0,
GitBranch: "main",
})

if runtime.GOOS == "darwin" {
assert.Contains(s.T(), output, "🚦 -")
Expand Down
Loading