4 commits

Author	SHA1	Message	Date
Resham Joshi	8e1caae33a	sessions: fold subagent runs into PR attribution (#791) ... * sessions: fold subagent runs into PR attribution Sidechain (subagent) session cost never reached the by-PR view, so a session orchestrated on one model with subagent lanes on another showed only the parent model on every PR row. Fold each sidechain's cost, calls, models, and categories into the parent turn that spawned it, so it inherits that turn's PR set under the existing turn-level state machine. Linkage, in priority order: the spawn result's toolUseResult.agentId pairs the child's agent id with the Agent/Task tool_use id that launched it (recorded per turn), which is the true launch point and wins even when the child's first activity landed during a later turn; else the child's first-activity timestamp is bucketed into the containing turn span; else the child folds into the parent's unattributed spend. Children of parents that referenced no PR, and orphans whose parent is absent from the scan, contribute nothing, unchanged. Cache v6 to v7 (neither shipped, so one combined bump from v5): per-turn spawnToolUseIds, per-file parentSessionId and agentSpawnLinks; the validator and the append/compact paths thread them like prRefs. By-PR footers now count parents plus folded subagent runs and the payload gains an additive subagentSessions field. distinctCost now includes folded subagent spend, documented in the payload comment. * sessions: address adversarial review of subagent PR attribution Rework child attribution to resolve each subagent to the PR its launching turn was working on, using the parent's UNFILTERED turn data, and enforce that every dollar is counted exactly once. - Mutual exclusion: a child that referenced its own PR attributes standalone and is never folded; a child with no links is folded only. Fixes a double-charge where a self-linking child was both folded and self-attributed. - Recursion: a fold aggregates a child plus its non-self-linking descendants (depth-first, cycle-guarded), so grandchildren spawned by subagents reach the PR report. - Global linkage: the subagent index keys by parentSessionId alone (UUIDs are globally unique), so a child whose worktree resolves to a different project still links. - Date-range correctness: spawn-to-PR sets are built at assembly from the full turn list, so a spawn in a pre-range turn attributes to the right PR; a PR-linked parent whose own turns fall out of range is kept as a 0-cost fold anchor so its in-range child is not lost. - Timestamp fallback compares epoch ms (mixed UTC offsets order right) and is end-bounded: a child active after the parent's last turn is unlinked (contributes nothing), matching orphan semantics. - Cache adoption tries the newest prior versioned file (v6 then v5) so the preceding build's expired-PR history survives the v7 bump; an invariant note requires the list to cover every version that can exist on disk. - Spawn-result pairing matches the tool_result block that carries the agentId, not the first block, when a record batches several results. - resolveSubagentAttribution is computed once and shared by aggregateByPr and prLinkedTotals. subagentSessions now counts folded subtrees (children plus descendants). Verified on real data: attributed + unattributed reconciles to cost, and parent-only cost plus folded-children cost equals the folded total to the cent (no double-count). * sessions: round-2 hardening of subagent PR attribution Address a second adversarial review of the new machinery. - ID collision: parents and a child's parent reference are keyed by provider + sessionId, not bare sessionId. When two distinct parents still share a key (true duplicate/imported data), the child folds into NEITHER (deterministic skip, stays standalone): correctness over coverage. - Recursion dedup is global: one claimed-set spans all of a parent's direct children, so a descendant reachable through two paths (a diamond or duplicate id) folds exactly once and a parent-link cycle terminates. - Cache adoption migrates every prior version oldest-to-newest and MERGES per source path (newer wins per entry), so a sparse or partial newer file no longer masks older-only expired-PR orphans. - Fold anchors (0-cost PR-linked parents kept only for attribution) live in a new ProjectSummary.subagentAnchors, never in `sessions`, so they no longer contaminate session counts, averages, or any per-session report. Folded PR rows take their date span from the contributing child activity rather than the anchor's empty timestamps. - One-pass buildPrAttribution computes rows and totals together; the payload builder and CLI call it once. Drops the identity-keyed memoization, which could return stale folds if the array was mutated. - Ambiguous multi-block spawn-result pairing leaves the spawn link unset on purpose; the child then folds via the timestamp fallback rather than pairing with the wrong id or disappearing. Every fix is mutation-verified. A fresh real-data drive re-proves the no-double-count identity to the cent (parent-only cost plus folded cost equals the folded total) and that the PR rows sum to attributedCost. * sessions: round-3 hardening of subagent PR attribution Third adversarial review pass. - Ambiguity counts ALL candidate parents (and anchors) sharing a provider+sessionId key, not just PR-bearing ones, and uses a per-record fingerprint: a key carried by more than one DISTINCT record folds its child/subtree into NEITHER (identical duplicates still fold once). This unifies the parent-collision and duplicate-descendant rules and is deterministic across input order. - Project-rebuilding filters (by day, by date range, by config source) now carry subagentAnchors through, and a date filter CONVERTS a spawn parent whose in-range turns are all filtered out into an anchor so a surviving in-range child still folds. Rebuilt sessions also keep their PR + subagent-linkage metadata (prLinks, parentSessionId, spawnPrSets, ...), which buildSessionSummary otherwise drops, so by-PR and folding work on a filtered slice (menubar/dashboard flow). - Fold anchors leave ProjectSummary.sessions entirely and folded PR rows take their span from the child, so 0-cost anchors never touch session counts or averages. - Ambiguous spawn pairing (parent named the agent but its exact launching tool_use could not be paired) is recorded per parent; a late child of such a pairing folds to the parent's last turn within a 30 minute grace window, else stays unlinked. A truly-absent pairing gets no grace. - Row session key is NUL-delimited and provider-prefixed, so a project name or session id containing a space no longer collides and undercounts distinct sessions. Every fix mutation-verified. A fresh real-data drive re-proves the no-double-count identity to the cent, and a day-filtered drive proves the filter fix end to end (anchors created, subagents fold, identity holds). * sessions: round-4 hardening of subagent PR attribution Fourth adversarial review pass. - sessionFingerprint now covers the COMPLETE linkage-relevant payload, not just headline stats: a canonical (sorted-key) serialization of agentSpawnLinks, spawnPrSets, prRefsAtRangeStart, ambiguousSpawnAgentIds, parent/agent identity, and the per-turn prRefs timeline. Two records that share an id and headline stats but map the child to different spawns/PRs now fingerprint DISTINCT, so the ambiguity rule fires and they fold into neither, deterministically rather than order-dependent first-wins. - A date/day filter recomputes prRefsAtRangeStart at the new slice boundary by replaying the original full turn sequence, instead of copying the wide range's value. A PR switch between the wide start and the slice start (July 1 A, July 10 B, slice July 20) now carries B, not a stale A; a turn exactly on the boundary stays in-slice and applies its own refs. The recompute selects by timestamp, so it is order-independent. Non-contiguous day selections are documented as treated contiguous from the earliest selected day (a single session-level seed cannot represent multiple segments; the menubar selection is a single day or a run). - The anchor-carry path drops an anchor that duplicates a surviving session id, so malformed merged input cannot double-count. Also: rebuilt filtered sessions were losing their PR/subagent-linkage metadata (a child its parentSessionId, a parent its prLinks), which carryLinkageFields now restores, so by-PR and folding work on any filtered slice. Every fix mutation-verified. A fresh real-data drive re-proves the no-double-count identity and reconciliation to the cent for both a lifetime scan and a day-filtered slice (anchors created, subagents fold through the filter). * sessions: round-5 hardening of subagent PR attribution Fifth adversarial review pass; closed-form fixes. - sessionFingerprint serializes the COMPLETE fold-determining state via a real recursive canonical encoder: session-level linkage AND, per turn in sequence, timestamp, prRefs, cost, calls, savings, and per-model cost. Object keys are sorted recursively and set-semantic arrays (PR-ref lists, ambiguous ids, spawnPrSets values) are sorted, while the turn list keeps order; the structure is emitted through JSON.stringify (no delimiter concatenation). Two same-id parents that differ only in a turn timestamp now fingerprint DISTINCT (fold neither), and records differing only in set-array order fingerprint EQUAL (no false ambiguity). - recomputeRangeStartPrRefs breaks an exact-same-millisecond tie deterministically by the lexicographically-last sorted-ref key, so the recomputed seed is stable regardless of turn order. - A day filter seeds EACH selected day's first ref-less turn by replaying the original full turn sequence up to that day's start (per-day seeding), so a PR switch on an UNSELECTED day between two selected days carries to the later day. Contiguous and non-contiguous selections are both correct. - The anchor dedupe drops an anchor only when a surviving session shares the full provider-aware, fingerprint-qualified identity (a proven duplicate): a different-provider or different-record same-id session no longer wrongly drops the anchor. Also fixed a double-count the fingerprint test exposed: two duplicate parent sessions share a key and the SAME resolved children, so folding is now done once per parent key. Every fix mutation-verified. Fresh real-data drives (lifetime, single-day, and a NON-CONTIGUOUS day selection) re-prove no-double-count and reconciliation to the cent. --------- Co-authored-by: reviewer <review@local>	2026-07-20 20:47:23 -07:00
Resham Joshi	45e93129f2	sessions: attribute PR spend per turn instead of per session (#790) ... * sessions: attribute PR spend per turn instead of per session The by-PR surfaces attributed a session's full cost to every PR it referenced, so one orchestration session that touched many PRs rendered identical full-session rows. Capture per-turn PR references during transcript parsing and attribute each turn's cost to the PR set active at that turn (split evenly across a multi-PR merge-sweep turn), carrying the most recent PR set forward across turns that reference nothing. Turns before the first reference form an unattributed bucket. A session whose transcript expired before per-turn capture keeps its session-level prLinks but has no per-turn refs; it falls back to an even whole-session split, and any row carrying such a portion is flagged approximate. Rows are now summable: the CLI and app footers report the attributed sum plus the unattributed remainder instead of a distinct-session total. Bumps the session cache version so surviving transcripts re-parse and populate the new per-turn field. Daily-cache versioning is untouched. * sessions: harden PR attribution and add models + category breakdown Addresses the review findings on the per-turn PR attribution and adds the model and task-category surfaces. Correctness: - Cache migration: the 5 -> 6 session-cache bump now adopts the prior v5 file's expired-source PR entries instead of abandoning them, and the claude scan preserves and surfaces PR-bearing orphans, so a session whose transcript was deleted still appears as a legacy even-split instead of vanishing. The daily cache is untouched. - Date-range carry: the parser captures the PR set active at the start of the in-range turn slice and seeds the state machine with it, so a PR referenced before the window still owns its later, in-range, ref-less turns instead of the session falling back to a whole-session approx split. - Calls are split across a multi-PR turn by largest-remainder, keeping per-PR counts whole (a 1-call, 2-PR turn no longer renders as 2 calls). - The CLI and app footers reconcile to the rounded row values actually shown. - Distinct sessions are keyed by project + sessionId, not sessionId alone. - The app tolerates an older by-reference payload (no attributedCost): it keeps the old non-summable footer and never renders NaN. Features: - Each PR contribution records the models of its calls and the turn's task category (split by the same share on a multi-PR turn); legacy even-split rows carry the model union but no category breakdown. - Payload rows gain models (short names, cost-desc) and categories (label + cost, cost-desc, omitted when empty); the payload gains otherPrCount/otherPrCost for the PRs beyond the sent top 20. - CLI --by-pr gains a Models column. The desktop table is now full-width with a Models column and click-to-expand rows showing a per-category cost breakdown with proportional bars, keyboard accessible, with an "Other (N more PRs)" row when capped. Tests: state-machine seed/models/categories/largest-remainder/dedup, the prRefs round-trip through the real incremental-append path (continuation + straddle), v5 adoption of an expired PR session, payload round-trip, and the desktop expansion/models/old-payload cases. * sessions: reconcile mixed PR rows, harden v5 adoption, bound models Round-2 review follow-ups. - Mixed legacy/live category breakdown: a PR row that combines an expired legacy contribution (even-split, no turn data) with a live per-turn contribution now emits an explicit "Legacy estimate (no per-turn detail)" category carrying the legacy share, so the expansion reconciles to the row cost instead of silently dropping it. A legacy-only row still shows no breakdown. - v5 adoption is now per cached file: one malformed entry is skipped instead of rejecting the whole v5 cache and dropping every valid expired PR session. - The desktop "Other (N more PRs)" line moved to the table footer as a muted, separated summary rather than a sorted row. - Row expansion resets when the PR set changes (period/provider/data), so a stale expansion cannot linger on a row that is gone. - Payload models per row are capped to the top 4 by attributed cost, with a name-ascending tie-break; categories get the same stable tie-break. Tests: mixed live+legacy reconciliation, legacy-only omission, model cap and tie-break, corrupt-plus-valid v5 adoption, and the desktop expansion-reset. * session-cache: validate optional agentType and failed during v5 adoption; app: reset PR expansion on period switch A v5 entry that was valid except for a malformed optional field (agentType, failed) passed per-file validation and flowed downstream as a non-string. The expansion reset keyed only on the row URL set, so a period switch that returned the same PRs kept a stale expansion open over changed numbers. --------- Co-authored-by: reviewer <review@local>	2026-07-20 20:44:29 -07:00
Resham Joshi	be748c81aa	parser: full re-parse when an appended region restates a cached message id (#772) ... The incremental-append path groups the appended region before the file's own cached keys join the dedup set, so a streamed assistant id restated across the append boundary counted twice, and the boundary merge could splice it into the wrong turn (reproduced on real image-heavy sessions: one id streamed across several records over seconds, 111 calls vs the 110 a full re-parse yields). Suppressing the restatement instead would freeze the stale first emission, so neither shortcut matches a full re-parse. On any id overlap between the appended entries and the cached turns the shortcut is abandoned and the file re-parses from byte 0. Rare (about 0.3 percent of real files) and bounded to one file per refresh. Regression test uses the cold-reparse oracle; mutation-verified against the unguarded code. Co-authored-by: reviewer <review@local>	2026-07-20 09:22:52 -07:00
iamtoruk	8326aee4a6	perf(parser): parse appended session files from the cached offset instead of byte 0	2026-07-18 16:26:12 -07:00