review: dedupe token sessions across reviewers · Entire
review: dedupe token sessions across reviewers
29c8570→main·
dipree·3w ago·3 files·+78 added/-4 removed
Sessions
d3623ea66317View transcript
[?
Checkout the hand off doc that I just added.Pi·Opus 4.8·1 step](/content/gh/entireio/cli/session/019eca64-8c2c-7b00-90c6-3aa49738c497#timeline-d3623ea66317/index.html)
Changes
3
cmd/entire/cli/review
Mcmd.go+6/-1
Mmanifest.go+20/-3
Mmanifest_test.go+52
16 unmodified lines
17
18
19
20
21
22
23
1459 unmodified lines
1483
1484
1485
1486
1487
1488
1486
1489
1490
1491
1492
1493
1494
16 unmodified lines
"os"
"sort"
"strings"
"sync"
"time"
"charm.land/huh/v2"
1459 unmodified lines
}
func reviewAgentRunTokenEnricher(worktreeRoot, headSHA string) func(context.Context, reviewtypes.AgentRun) reviewtypes.AgentRun {
var mu sync.Mutex
usedSessions := map[string]bool{}
return func(ctx context.Context, run reviewtypes.AgentRun) reviewtypes.AgentRun {
enriched, err := hydrateReviewAgentRunTokensFromCurrentState(ctx, worktreeRoot, headSHA, run, agent.GetByAgentType)
mu.Lock()
defer mu.Unlock()
enriched, err := hydrateReviewAgentRunTokensFromCurrentStateWithUsed(ctx, worktreeRoot, headSHA, run, agent.GetByAgentType, usedSessions)
if err != nil {
logging.Debug(ctx, "review agent token hydration skipped", slog.String("error", err.Error()))
return run
}
Mcmd/entire/cli/review/cmd.go+6/-1
250 unmodified lines
251
252
253
254
254
255
256
257
258
259
260
261
262
263
3 unmodified lines
267
268
269
269
270
271
272
273
4 unmodified lines
278
279
280
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
250 unmodified lines
return hydrateReviewSummaryTokensFromStates(ctx, worktreeRoot, headSHA, summary, states, lookup), nil
}
func hydrateReviewAgentRunTokensFromCurrentState(
func hydrateReviewAgentRunTokensFromCurrentStateWithUsed(
ctx context.Context,
worktreeRoot string,
headSHA string,
run reviewtypes.AgentRun,
lookup agentTypeLookup,
usedSessions map[string]bool,
) (reviewtypes.AgentRun, error) {
store, err := session.NewStateStore(ctx)
if err != nil {
3 unmodified lines
if err != nil {
return run, fmt.Errorf("list session states: %w", err)
}
return hydrateReviewAgentRunTokensFromStates(ctx, worktreeRoot, headSHA, run, states, lookup), nil
return hydrateReviewAgentRunTokensFromStatesWithUsed(ctx, worktreeRoot, headSHA, run, states, lookup, usedSessions), nil
}
func hydrateReviewAgentRunTokensFromStates(
4 unmodified lines
states []*session.State,
lookup agentTypeLookup,
) reviewtypes.AgentRun {
st := matchReviewSessionState(worktreeRoot, headSHA, run.StartedAt, agentNameForRun(run), run.Model, states, map[string]bool{})
return hydrateReviewAgentRunTokensFromStatesWithUsed(ctx, worktreeRoot, headSHA, run, states, lookup, map[string]bool{})
}
func hydrateReviewAgentRunTokensFromStatesWithUsed(
ctx context.Context,
worktreeRoot string,
headSHA string,
run reviewtypes.AgentRun,
states []*session.State,
lookup agentTypeLookup,
usedSessions map[string]bool,
) reviewtypes.AgentRun {
if usedSessions == nil {
usedSessions = map[string]bool{}
}
st := matchReviewSessionState(worktreeRoot, headSHA, run.StartedAt, agentNameForRun(run), run.Model, states, usedSessions)
if st == nil || st.SessionID == "" {
return run
}
usedSessions[st.SessionID] = true
tokens := reviewTokensFromTokenUsage(reviewTokenUsageForSession(ctx, st, lookup))
if tokens.In == 0 && tokens.Out == 0 {
return run
Mcmd/entire/cli/review/manifest.go+20/-3
837 unmodified lines
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
837 unmodified lines
}
}
func TestHydrateReviewAgentRunTokensFromStatesWithUsedDisambiguatesDuplicateSlots(t *testing.T) {
t.Parallel()
started := time.Date(2026, 5, 7, 10, 0, 0, 0, time.UTC)
run := reviewtypes.AgentRun{
Name: "claude-code",
AgentName: "claude-code",
Model: "opus",
StartedAt: started,
}
states := []*session.State{
{
SessionID: "sess-older",
Kind: session.KindAgentReview,
WorktreePath: "/repo",
BaseCommit: "abc123",
StartedAt: started.Add(time.Second),
AgentType: agenttypes.AgentType("Claude Code"),
ModelName: "claude-opus-4-1",
TokenUsage: &agent.TokenUsage{InputTokens: 20, OutputTokens: 2},
},
{
SessionID: "sess-newer",
Kind: session.KindAgentReview,
WorktreePath: "/repo",
BaseCommit: "abc123",
StartedAt: started.Add(2 * time.Second),
AgentType: agenttypes.AgentType("Claude Code"),
ModelName: "claude-opus-4-1",
TokenUsage: &agent.TokenUsage{InputTokens: 10, OutputTokens: 1},
},
}
freshA := hydrateReviewAgentRunTokensFromStates(context.Background(), "/repo", "abc123", run, states, nil)
freshB := hydrateReviewAgentRunTokensFromStates(context.Background(), "/repo", "abc123", run, states, nil)
if freshA.Tokens.In != 10 || freshB.Tokens.In != 10 {
t.Fatalf("fresh-map setup changed: tokens = %d/%d, want both newest session token count 10", freshA.Tokens.In, freshB.Tokens.In)
}
used := map[string]bool{}
first := hydrateReviewAgentRunTokensFromStatesWithUsed(context.Background(), "/repo", "abc123", run, states, nil, used)
second := hydrateReviewAgentRunTokensFromStatesWithUsed(context.Background(), "/repo", "abc123", run, states, nil, used)
if first.Tokens.In != 10 || first.Tokens.Out != 1 {
t.Fatalf("first tokens = %+v, want newer session tokens 10/1", first.Tokens)
}
if second.Tokens.In != 20 || second.Tokens.Out != 2 {
t.Fatalf("second tokens = %+v, want older distinct session tokens 20/2", second.Tokens)
}
if !used["sess-newer"] || !used["sess-older"] || len(used) != 2 {
t.Fatalf("used sessions = %#v, want both sessions claimed", used)
}
}
func TestBuildLocalReviewManifestFromSummary_DisambiguatesSameModelDifferentThinking(t *testing.T) {
started := time.Date(2026, 5, 7, 10, 0, 0, 0, time.UTC)
summary := reviewtypes.RunSummary{