feat(usage): introduce executor type tracking in usage reporting

luispater · luispater · commit 959067edfbf8 · 2026-06-02T00:43:16.000+08:00
- Replaced `NewUsageReporter` with `NewExecutorUsageReporter` to include executor type in usage records.
- Updated all executors to use the new reporter implementation.
- Extended `UsageReporter` to track and publish executor type.
- Added tests to validate proper executor type recording and handling.
- Enhanced RedisQueue plugin and payload schema with executor type support.
diff --git a/internal/redisqueue/plugin.go b/internal/redisqueue/plugin.go
@@ -42,6 +42,10 @@ func (p *usageQueuePlugin) HandleUsage(ctx context.Context, record coreusage.Rec
 	if provider == "" {
 		provider = "unknown"
 	}
+	executorType := strings.TrimSpace(record.ExecutorType)
+	if executorType == "" {
+		executorType = "unknown"
+	}
 	authType := strings.TrimSpace(record.AuthType)
 	if authType == "" {
 		authType = "unknown"
@@ -94,6 +98,7 @@ func (p *usageQueuePlugin) HandleUsage(ctx context.Context, record coreusage.Rec
 	payload, err := json.Marshal(queuedUsageDetail{
 		requestDetail:   detail,
 		Provider:        provider,
+		ExecutorType:    executorType,
 		Model:           modelName,
 		Alias:           aliasName,
 		Endpoint:        resolveEndpoint(ctx),
@@ -112,6 +117,7 @@ func (p *usageQueuePlugin) HandleUsage(ctx context.Context, record coreusage.Rec
 type queuedUsageDetail struct {
 	requestDetail
 	Provider        string `json:"provider"`
+	ExecutorType    string `json:"executor_type"`
 	Model           string `json:"model"`
 	Alias           string `json:"alias"`
 	Endpoint        string `json:"endpoint"`
diff --git a/internal/redisqueue/plugin_test.go b/internal/redisqueue/plugin_test.go
@@ -26,6 +26,7 @@ func TestUsageQueuePluginPayloadIncludesStableFieldsAndSuccess(t *testing.T) {
 		plugin := &usageQueuePlugin{}
 		plugin.HandleUsage(ctx, coreusage.Record{
 			Provider:        "openai",
+			ExecutorType:    "KimiExecutor",
 			Model:           "gpt-5.4",
 			Alias:           "client-gpt",
 			APIKey:          "test-key",
@@ -47,6 +48,7 @@ func TestUsageQueuePluginPayloadIncludesStableFieldsAndSuccess(t *testing.T) {
 
 		payload := popSinglePayload(t)
 		requireStringField(t, payload, "provider", "openai")
+		requireStringField(t, payload, "executor_type", "KimiExecutor")
 		requireStringField(t, payload, "model", "gpt-5.4")
 		requireStringField(t, payload, "alias", "client-gpt")
 		requireStringField(t, payload, "endpoint", "POST /v1/chat/completions")
diff --git a/internal/runtime/executor/aistudio_executor.go b/internal/runtime/executor/aistudio_executor.go
@@ -128,7 +128,7 @@ func (e *AIStudioExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth,
 		return resp, statusErr{code: http.StatusNotImplemented, msg: "/responses/compact not supported"}
 	}
 	baseModel := thinking.ParseSuffix(req.Model).ModelName
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	translatedReq, body, err := e.translateRequest(req, opts, false)
@@ -196,7 +196,7 @@ func (e *AIStudioExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth
 		return nil, statusErr{code: http.StatusNotImplemented, msg: "/responses/compact not supported"}
 	}
 	baseModel := thinking.ParseSuffix(req.Model).ModelName
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	translatedReq, body, err := e.translateRequest(req, opts, true)
diff --git a/internal/runtime/executor/antigravity_executor.go b/internal/runtime/executor/antigravity_executor.go
@@ -530,7 +530,7 @@ func (e *AntigravityExecutor) Execute(ctx context.Context, auth *cliproxyauth.Au
 		return e.executeClaudeNonStream(ctx, auth, req, opts)
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
@@ -730,7 +730,7 @@ func (e *AntigravityExecutor) executeClaudeNonStream(ctx context.Context, auth *
 		return resp, statusErr{code: http.StatusTooManyRequests, msg: fmt.Sprintf("auth in short cooldown, %s remaining", remaining), retryAfter: &d}
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
@@ -1192,7 +1192,7 @@ func (e *AntigravityExecutor) ExecuteStream(ctx context.Context, auth *cliproxya
 		return nil, statusErr{code: http.StatusTooManyRequests, msg: fmt.Sprintf("auth in short cooldown, %s remaining", remaining), retryAfter: &d}
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
diff --git a/internal/runtime/executor/claude_executor.go b/internal/runtime/executor/claude_executor.go
@@ -171,7 +171,7 @@ func (e *ClaudeExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, r
 		baseURL = "https://api.anthropic.com"
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 	from := opts.SourceFormat
 	to := sdktranslator.FromString("claude")
@@ -354,7 +354,7 @@ func (e *ClaudeExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.A
 		baseURL = "https://api.anthropic.com"
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 	from := opts.SourceFormat
 	to := sdktranslator.FromString("claude")
diff --git a/internal/runtime/executor/codex_executor.go b/internal/runtime/executor/codex_executor.go
@@ -264,7 +264,7 @@ func (e *CodexExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, re
 		baseURL = "https://chatgpt.com/backend-api/codex"
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
@@ -431,7 +431,7 @@ func (e *CodexExecutor) executeCompact(ctx context.Context, auth *cliproxyauth.A
 		baseURL = "https://chatgpt.com/backend-api/codex"
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
@@ -536,7 +536,7 @@ func (e *CodexExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.Au
 		baseURL = "https://chatgpt.com/backend-api/codex"
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
diff --git a/internal/runtime/executor/codex_openai_images.go b/internal/runtime/executor/codex_openai_images.go
@@ -89,7 +89,7 @@ func (e *CodexExecutor) executeOpenAIImage(ctx context.Context, auth *cliproxyau
 	}
 
 	mainModel := e.resolveGPTImage2BaseModel()
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), mainModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, mainModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	body, errBuild := e.prepareCodexOpenAIImageBody(prepared.Body, req, opts, mainModel)
@@ -182,7 +182,7 @@ func (e *CodexExecutor) executeOpenAIImageStream(ctx context.Context, auth *clip
 	}
 
 	mainModel := e.resolveGPTImage2BaseModel()
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), mainModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, mainModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	body, errBuild := e.prepareCodexOpenAIImageBody(prepared.Body, req, opts, mainModel)
diff --git a/internal/runtime/executor/codex_websockets_executor.go b/internal/runtime/executor/codex_websockets_executor.go
@@ -184,7 +184,7 @@ func (e *CodexWebsocketsExecutor) Execute(ctx context.Context, auth *cliproxyaut
 		baseURL = "https://chatgpt.com/backend-api/codex"
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
@@ -404,7 +404,7 @@ func (e *CodexWebsocketsExecutor) ExecuteStream(ctx context.Context, auth *clipr
 		baseURL = "https://chatgpt.com/backend-api/codex"
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
diff --git a/internal/runtime/executor/gemini_cli_executor.go b/internal/runtime/executor/gemini_cli_executor.go
@@ -118,7 +118,7 @@ func (e *GeminiCLIExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth
 		return resp, err
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
@@ -277,7 +277,7 @@ func (e *GeminiCLIExecutor) ExecuteStream(ctx context.Context, auth *cliproxyaut
 		return nil, err
 	}
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
diff --git a/internal/runtime/executor/gemini_executor.go b/internal/runtime/executor/gemini_executor.go
@@ -112,7 +112,7 @@ func (e *GeminiExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, r
 
 	apiKey, bearer := geminiCreds(auth)
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	// Official Gemini API via API key or OAuth bearer
@@ -224,7 +224,7 @@ func (e *GeminiExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.A
 
 	apiKey, bearer := geminiCreds(auth)
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
diff --git a/internal/runtime/executor/gemini_vertex_executor.go b/internal/runtime/executor/gemini_vertex_executor.go
@@ -306,7 +306,7 @@ func (e *GeminiVertexExecutor) Refresh(ctx context.Context, auth *cliproxyauth.A
 func (e *GeminiVertexExecutor) executeWithServiceAccount(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options, projectID, location string, saJSON []byte) (resp cliproxyexecutor.Response, err error) {
 	baseModel := thinking.ParseSuffix(req.Model).ModelName
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	var body []byte
@@ -441,7 +441,7 @@ func (e *GeminiVertexExecutor) executeWithServiceAccount(ctx context.Context, au
 func (e *GeminiVertexExecutor) executeWithAPIKey(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options, apiKey, baseURL string) (resp cliproxyexecutor.Response, err error) {
 	baseModel := thinking.ParseSuffix(req.Model).ModelName
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
@@ -555,7 +555,7 @@ func (e *GeminiVertexExecutor) executeWithAPIKey(ctx context.Context, auth *clip
 func (e *GeminiVertexExecutor) executeStreamWithServiceAccount(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options, projectID, location string, saJSON []byte) (_ *cliproxyexecutor.StreamResult, err error) {
 	baseModel := thinking.ParseSuffix(req.Model).ModelName
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
@@ -699,7 +699,7 @@ func (e *GeminiVertexExecutor) executeStreamWithServiceAccount(ctx context.Conte
 func (e *GeminiVertexExecutor) executeStreamWithAPIKey(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options, apiKey, baseURL string) (_ *cliproxyexecutor.StreamResult, err error) {
 	baseModel := thinking.ParseSuffix(req.Model).ModelName
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	from := opts.SourceFormat
diff --git a/internal/runtime/executor/helps/usage_helpers.go b/internal/runtime/executor/helps/usage_helpers.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"reflect"
 	"strings"
 	"sync"
 	"time"
@@ -21,22 +22,37 @@ import (
 )
 
 type UsageReporter struct {
-	provider    string
-	model       string
-	alias       string
-	authID      string
-	authIndex   string
-	authType    string
-	apiKey      string
-	source      string
-	reasoning   string
-	serviceTier string
-	requestedAt time.Time
-	ttftMu      sync.RWMutex
-	ttft        time.Duration
-	ttftStart   time.Time
-	ttftSet     bool
-	once        sync.Once
+	provider     string
+	executorType string
+	model        string
+	alias        string
+	authID       string
+	authIndex    string
+	authType     string
+	apiKey       string
+	source       string
+	reasoning    string
+	serviceTier  string
+	requestedAt  time.Time
+	ttftMu       sync.RWMutex
+	ttft         time.Duration
+	ttftStart    time.Time
+	ttftSet      bool
+	once         sync.Once
+}
+
+type usageExecutor interface {
+	Identifier() string
+}
+
+func NewExecutorUsageReporter(ctx context.Context, executor usageExecutor, model string, auth *cliproxyauth.Auth) *UsageReporter {
+	provider := ""
+	if executor != nil {
+		provider = executor.Identifier()
+	}
+	reporter := NewUsageReporter(ctx, provider, model, auth)
+	reporter.executorType = ExecutorTypeName(executor)
+	return reporter
 }
 
 func NewUsageReporter(ctx context.Context, provider, model string, auth *cliproxyauth.Auth) *UsageReporter {
@@ -63,6 +79,17 @@ func NewUsageReporter(ctx context.Context, provider, model string, auth *cliprox
 	return reporter
 }
 
+func ExecutorTypeName(executor any) string {
+	if executor == nil {
+		return ""
+	}
+	executorType := reflect.TypeOf(executor)
+	for executorType.Kind() == reflect.Pointer {
+		executorType = executorType.Elem()
+	}
+	return strings.TrimSpace(executorType.Name())
+}
+
 func (r *UsageReporter) Publish(ctx context.Context, detail usage.Detail) {
 	r.publishWithOutcome(ctx, detail, false, usage.Failure{})
 }
@@ -234,6 +261,7 @@ func (r *UsageReporter) buildRecordForModel(model string, detail usage.Detail, f
 	}
 	return usage.Record{
 		Provider:        r.provider,
+		ExecutorType:    r.executorType,
 		Model:           model,
 		Alias:           r.alias,
 		Source:          r.source,
diff --git a/internal/runtime/executor/helps/usage_helpers_test.go b/internal/runtime/executor/helps/usage_helpers_test.go
@@ -231,6 +231,18 @@ func TestUsageReporterBuildRecordIncludesRequestedModelAlias(t *testing.T) {
 	}
 }
 
+func TestNewExecutorUsageReporterIncludesExecutorType(t *testing.T) {
+	reporter := NewExecutorUsageReporter(context.Background(), &TestUsageExecutor{}, "gpt-5.4", nil)
+
+	record := reporter.buildRecord(usage.Detail{TotalTokens: 3}, false)
+	if record.Provider != "test-provider" {
+		t.Fatalf("provider = %q, want %q", record.Provider, "test-provider")
+	}
+	if record.ExecutorType != "TestUsageExecutor" {
+		t.Fatalf("executor type = %q, want %q", record.ExecutorType, "TestUsageExecutor")
+	}
+}
+
 func TestUsageReporterBuildRecordIncludesReasoningEffort(t *testing.T) {
 	ctx := usage.WithReasoningEffort(context.Background(), "medium")
 	reporter := NewUsageReporter(ctx, "openai", "gpt-5.4", nil)
@@ -297,3 +309,9 @@ type roundTripFunc func(*http.Request) (*http.Response, error)
 func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
 	return f(req)
 }
+
+type TestUsageExecutor struct{}
+
+func (TestUsageExecutor) Identifier() string {
+	return "test-provider"
+}
diff --git a/internal/runtime/executor/kimi_executor.go b/internal/runtime/executor/kimi_executor.go
@@ -83,7 +83,7 @@ func (e *KimiExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, req
 
 	token := kimiCreds(auth)
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	to := sdktranslator.FromString("openai")
@@ -191,7 +191,7 @@ func (e *KimiExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.Aut
 	baseModel := thinking.ParseSuffix(req.Model).ModelName
 	token := kimiCreds(auth)
 
-	reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)
+	reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)
 	defer reporter.TrackFailure(ctx, &err)
 
 	to := sdktranslator.FromString("openai")
diff --git a/internal/runtime/executor/openai_compat_executor.go b/internal/runtime/executor/openai_compat_executor.go
diff --git a/internal/runtime/executor/xai_executor.go b/internal/runtime/executor/xai_executor.go
diff --git a/sdk/cliproxy/usage/manager.go b/sdk/cliproxy/usage/manager.go

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ func (e AntigravityExecutor) Execute(ctx context.Context, auth cliproxyauth.Au`
`530`	`530`	`return e.executeClaudeNonStream(ctx, auth, req, opts)`
`531`	`531`	`}`
`532`	`532`
`533`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`533`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`534`	`534`	`defer reporter.TrackFailure(ctx, &err)`
`535`	`535`
`536`	`536`	`from := opts.SourceFormat`
`@@ -730,7 +730,7 @@ func (e AntigravityExecutor) executeClaudeNonStream(ctx context.Context, auth `
`730`	`730`	`return resp, statusErr{code: http.StatusTooManyRequests, msg: fmt.Sprintf("auth in short cooldown, %s remaining", remaining), retryAfter: &d}`
`731`	`731`	`}`
`732`	`732`
`733`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`733`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`734`	`734`	`defer reporter.TrackFailure(ctx, &err)`
`735`	`735`
`736`	`736`	`from := opts.SourceFormat`
`@@ -1192,7 +1192,7 @@ func (e AntigravityExecutor) ExecuteStream(ctx context.Context, auth cliproxya`
`1192`	`1192`	`return nil, statusErr{code: http.StatusTooManyRequests, msg: fmt.Sprintf("auth in short cooldown, %s remaining", remaining), retryAfter: &d}`
`1193`	`1193`	`}`
`1194`	`1194`
`1195`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`1195`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`1196`	`1196`	`defer reporter.TrackFailure(ctx, &err)`
`1197`	`1197`
`1198`	`1198`	`from := opts.SourceFormat`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ func (e CodexExecutor) Execute(ctx context.Context, auth cliproxyauth.Auth, re`
`264`	`264`	`baseURL = "https://chatgpt.com/backend-api/codex"`
`265`	`265`	`}`
`266`	`266`
`267`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`267`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`268`	`268`	`defer reporter.TrackFailure(ctx, &err)`
`269`	`269`
`270`	`270`	`from := opts.SourceFormat`
`@@ -431,7 +431,7 @@ func (e CodexExecutor) executeCompact(ctx context.Context, auth cliproxyauth.A`
`431`	`431`	`baseURL = "https://chatgpt.com/backend-api/codex"`
`432`	`432`	`}`
`433`	`433`
`434`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`434`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`435`	`435`	`defer reporter.TrackFailure(ctx, &err)`
`436`	`436`
`437`	`437`	`from := opts.SourceFormat`
`@@ -536,7 +536,7 @@ func (e CodexExecutor) ExecuteStream(ctx context.Context, auth cliproxyauth.Au`
`536`	`536`	`baseURL = "https://chatgpt.com/backend-api/codex"`
`537`	`537`	`}`
`538`	`538`
`539`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`539`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`540`	`540`	`defer reporter.TrackFailure(ctx, &err)`
`541`	`541`
`542`	`542`	`from := opts.SourceFormat`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (e CodexExecutor) executeOpenAIImage(ctx context.Context, auth cliproxyau`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`mainModel := e.resolveGPTImage2BaseModel()`
`92`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), mainModel, auth)`
	`92`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, mainModel, auth)`
`93`	`93`	`defer reporter.TrackFailure(ctx, &err)`
`94`	`94`
`95`	`95`	`body, errBuild := e.prepareCodexOpenAIImageBody(prepared.Body, req, opts, mainModel)`
`@@ -182,7 +182,7 @@ func (e CodexExecutor) executeOpenAIImageStream(ctx context.Context, auth clip`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`mainModel := e.resolveGPTImage2BaseModel()`
`185`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), mainModel, auth)`
	`185`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, mainModel, auth)`
`186`	`186`	`defer reporter.TrackFailure(ctx, &err)`
`187`	`187`
`188`	`188`	`body, errBuild := e.prepareCodexOpenAIImageBody(prepared.Body, req, opts, mainModel)`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (e CodexWebsocketsExecutor) Execute(ctx context.Context, auth cliproxyaut`
`184`	`184`	`baseURL = "https://chatgpt.com/backend-api/codex"`
`185`	`185`	`}`
`186`	`186`
`187`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`187`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`188`	`188`	`defer reporter.TrackFailure(ctx, &err)`
`189`	`189`
`190`	`190`	`from := opts.SourceFormat`
`@@ -404,7 +404,7 @@ func (e CodexWebsocketsExecutor) ExecuteStream(ctx context.Context, auth clipr`
`404`	`404`	`baseURL = "https://chatgpt.com/backend-api/codex"`
`405`	`405`	`}`
`406`	`406`
`407`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`407`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`408`	`408`	`defer reporter.TrackFailure(ctx, &err)`
`409`	`409`
`410`	`410`	`from := opts.SourceFormat`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (e GeminiCLIExecutor) Execute(ctx context.Context, auth cliproxyauth.Auth`
`118`	`118`	`return resp, err`
`119`	`119`	`}`
`120`	`120`
`121`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`121`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`122`	`122`	`defer reporter.TrackFailure(ctx, &err)`
`123`	`123`
`124`	`124`	`from := opts.SourceFormat`
`@@ -277,7 +277,7 @@ func (e GeminiCLIExecutor) ExecuteStream(ctx context.Context, auth cliproxyaut`
`277`	`277`	`return nil, err`
`278`	`278`	`}`
`279`	`279`
`280`		`- reporter := helps.NewUsageReporter(ctx, e.Identifier(), baseModel, auth)`
	`280`	`+ reporter := helps.NewExecutorUsageReporter(ctx, e, baseModel, auth)`
`281`	`281`	`defer reporter.TrackFailure(ctx, &err)`
`282`	`282`
`283`	`283`	`from := opts.SourceFormat`