Skip to content

The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu

Harden Codex usage reconciliation

shukieshahf886cb52c241
diff --git a/cli/beacon-hooks/cmd/codex_usage_sync.go b/cli/beacon-hooks/cmd/codex_usage_sync.go
index bb6e251f..2d36abf3 100644
--- a/cli/beacon-hooks/cmd/codex_usage_sync.go
+++ b/cli/beacon-hooks/cmd/codex_usage_sync.go
@@ -53,9 +53,9 @@ func reconcileCodexUsage(logger *logging.Logger) error {
if err := logger.EndpointEvent("token.usage", "metric", "info", "Codex token usage observed", fields); err != nil {
return err
}
- }
- if err := codexusage.MarkEventsSeen(result.Events, ""); err != nil {
- return err
+ if err := codexusage.MarkEventSeen(event, ""); err != nil {
+ return err
+ }
}
logger.Debug("Codex usage reconciliation completed", "events", len(result.Events), "scanned", result.Scanned)
return nil
diff --git a/cli/beacon/cmd/endpoint_codex_usage.go b/cli/beacon/cmd/endpoint_codex_usage.go
index 6ee5f5bf..a5f139d4 100644
--- a/cli/beacon/cmd/endpoint_codex_usage.go
+++ b/cli/beacon/cmd/endpoint_codex_usage.go
@@ -59,9 +59,9 @@ func syncCodexUsageToLog(logPath string, userMode bool) (codexusage.ReconcileRes
if _, err := writer.AppendEvent(event, writer.Options{Path: logPath, UserMode: userMode}); err != nil {
return codexusage.ReconcileResult{}, err
}
- }
- if err := codexusage.MarkEventsSeen(result.Events, ""); err != nil {
- return codexusage.ReconcileResult{}, err
+ if err := codexusage.MarkEventSeen(usage, ""); err != nil {
+ return codexusage.ReconcileResult{}, err
+ }
}
return result, nil
}
diff --git a/cli/beacon/internal/tokens/tokens.go b/cli/beacon/internal/tokens/tokens.go
index 61ebb509..2c11d57c 100644
--- a/cli/beacon/internal/tokens/tokens.go
+++ b/cli/beacon/internal/tokens/tokens.go
@@ -151,6 +151,7 @@ type usageEvent struct {
seriesField string
seriesValue float64
rawSource string
+ rawDedupKey string
}
// Aggregate builds a token usage report from endpoint events. Events from
@@ -170,6 +171,7 @@ func Aggregate(events []schema.Event, opts Options) Report {
}
report := Report{TotalEvents: len(events)}
usageEvents := collectUsageEvents(events)
+ usageEvents = dedupeCodexSessionUsage(usageEvents)
usageEvents, report.Source = selectCodexUsageSource(usageEvents, opts.CodexSource)
usageEvents = dedupeOverlappingChannels(usageEvents)
resolveCumulativeSeries(usageEvents)
@@ -297,12 +299,28 @@ func collectUsageEvents(events []schema.Event) []*usageEvent {
}
ue.metricName, _ = event.Raw["metric_name"].(string)
ue.rawSource, _ = event.Raw["source"].(string)
+ ue.rawDedupKey, _ = event.Raw["dedup_key"].(string)
}
out = append(out, ue)
}
return out
}
+func dedupeCodexSessionUsage(events []*usageEvent) []*usageEvent {
+ seen := map[string]bool{}
+ out := events[:0]
+ for _, event := range events {
+ if isCodexSessionUsage(event) && event.rawDedupKey != "" {
+ if seen[event.rawDedupKey] {
+ continue
+ }
+ seen[event.rawDedupKey] = true
+ }
+ out = append(out, event)
+ }
+ return out
+}
+
func selectCodexUsageSource(events []*usageEvent, source string) ([]*usageEvent, *SourceSummary) {
source = strings.ToLower(strings.TrimSpace(source))
if source == "" {
diff --git a/cli/beacon/internal/tokens/tokens_test.go b/cli/beacon/internal/tokens/tokens_test.go
index b49655b0..dc8fa00e 100644
--- a/cli/beacon/internal/tokens/tokens_test.go
+++ b/cli/beacon/internal/tokens/tokens_test.go
@@ -168,6 +168,23 @@ func TestAggregatePrefersCodexSessionUsageOverOTLP(t *testing.T) {
}
}
+func TestAggregateDedupesCodexSessionUsageByRawDedupKey(t *testing.T) {
+ event := usageEventFixture("2026-06-11T10:00:00Z", "codex_cli", "codex:s1", "gpt-5", func(e *schema.Event) {
+ e.GenAI.Usage.InputTokens = int64Ptr(40)
+ e.GenAI.Usage.OutputTokens = int64Ptr(10)
+ e.Raw = map[string]interface{}{"source": "codex_session_jsonl", "dedup_key": "same-turn"}
+ })
+ duplicate := event
+
+ report := Aggregate([]schema.Event{event, duplicate}, Options{})
+ if report.Totals.InputTokens != 40 || report.Totals.OutputTokens != 10 || report.Totals.Events != 1 {
+ t.Fatalf("duplicate session totals = %#v, want one contribution", report.Totals)
+ }
+ if report.TotalEvents != 2 || report.EventsWithUsage != 1 {
+ t.Fatalf("event counts = %d/%d, want 1 usage event from 2 log events", report.EventsWithUsage, report.TotalEvents)
+ }
+}
+
func TestAggregateDedupesCumulativeSeries(t *testing.T) {
cumulative := func(ts string, value int64) schema.Event {
return usageEventFixture(ts, "claude_code", "s1", "claude-sonnet-4-5", func(e *schema.Event) {
diff --git a/pkg/asymptoteobserve/codexusage/codexusage.go b/pkg/asymptoteobserve/codexusage/codexusage.go
index badb2a43..154d35cb 100644
--- a/pkg/asymptoteobserve/codexusage/codexusage.go
+++ b/pkg/asymptoteobserve/codexusage/codexusage.go
@@ -285,6 +285,13 @@ func MarkEventsSeen(events []UsageEvent, statePath string) error {
return SaveState(statePath, seen)
}
+func MarkEventSeen(event UsageEvent, statePath string) error {
+ if event.DedupKey == "" {
+ return nil
+ }
+ return MarkEventsSeen([]UsageEvent{event}, statePath)
+}
+
func DiscoverFiles(roots []string) ([]string, error) {
if len(roots) == 0 {
defaults, err := DefaultRoots()
@@ -358,7 +365,7 @@ func LoadState(path string) (map[string]bool, error) {
}
var seen map[string]bool
if err := json.Unmarshal(data, &seen); err != nil {
- return map[string]bool{}, nil
+ return nil, err
}
if seen == nil {
seen = map[string]bool{}
diff --git a/pkg/asymptoteobserve/codexusage/codexusage_test.go b/pkg/asymptoteobserve/codexusage/codexusage_test.go
index b940dc7c..b4e92a3e 100644
--- a/pkg/asymptoteobserve/codexusage/codexusage_test.go
+++ b/pkg/asymptoteobserve/codexusage/codexusage_test.go
@@ -68,3 +68,13 @@ func TestReconcileUsesStateForIdempotence(t *testing.T) {
t.Fatalf("second events = %#v, want idempotent empty", second.Events)
}
}
+
+func TestLoadStateRejectsCorruptJSON(t *testing.T) {
+ statePath := filepath.Join(t.TempDir(), "state.json")
+ if err := os.WriteFile(statePath, []byte("{not json"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ if _, err := LoadState(statePath); err == nil {
+ t.Fatal("LoadState returned nil error for corrupt JSON")
+ }
+}