@newrelic/preflight 1.51.3 → 1.52.0

package/dist/metrics/usage-insights.js

@@ -0,0 +1,251 @@
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+const DAY_MS = 24 * 60 * 60 * 1000;
+const LONG_SESSION_MS = 8 * 60 * 60 * 1000;
+/** A session counts as "subagent-heavy" once subagent cost reaches this share of its total. */
+const SUBAGENT_HEAVY_SHARE = 0.25;
+/** Every share table (skills/subagents/plugins/loops) is capped to its top N rows by cost. */
+const TABLE_CAP = 10;
+/**
+ * Headline/advice copy for each insight, keyed by id so the per-session pass
+ * below only ever computes numbers — no insight-specific string-building is
+ * scattered through it. `plugins`' headline is the only one that depends on
+ * more than its own percentage (it names the contributing plugin, or falls
+ * back to the plural when more than one contributed).
+ */
+const INSIGHT_COPY = {
+    high_context: {
+        headline: (pct) => `${pct}% of your spend was at >150k context`,
+        advice: 'Longer sessions are more expensive even when cached. /compact mid-task, /clear when switching to new tasks.',
+    },
+    subagent_heavy: {
+        headline: (pct) => `${pct}% of your spend came from subagent-heavy sessions`,
+        advice: 'Each subagent runs its own requests. Be deliberate about spawning them, and consider a cheaper model for simpler subagents.',
+    },
+    long_sessions: {
+        headline: (pct) => `${pct}% of your spend came from sessions active for 8+ hours`,
+        advice: 'These are often background or loop sessions. Continuous usage adds up quickly, so make sure it is intentional.',
+    },
+    loops: {
+        headline: (pct) => `${pct}% of your spend came from /loop sessions`,
+        advice: 'Heavy loops can be scoped down or run with a cheaper model via skill frontmatter.',
+    },
+    plugins: {
+        headline: (pct, topPlugin) => topPlugin !== null
+            ? `${pct}% of your spend came from the plugin "${topPlugin}"`
+            : `${pct}% of your spend came from plugins`,
+        advice: 'Review what this plugin contributes; its agents, skills, and MCP tools all count toward your spend.',
+    },
+};
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function sharePct(costUsd, totalCostUsd) {
+    return totalCostUsd > 0 ? Math.round((costUsd / totalCostUsd) * 100) : 0;
+}
+function sessionTotalTokens(s) {
+    return s.tokensInput + s.tokensOutput + s.tokensCacheRead + s.tokensCacheCreation;
+}
+/** Prefix before the first `:` in a plugin-namespaced skill/agent-type key (`pstack:unslop` -> `pstack`); null when the key carries no plugin prefix. */
+function pluginPrefixOf(key) {
+    const idx = key.indexOf(':');
+    return idx > 0 ? key.slice(0, idx) : null;
+}
+function addToAccum(map, key, bucket) {
+    const existing = map.get(key);
+    if (existing) {
+        existing.costUsd += bucket.costUsd;
+        existing.tokens += bucket.tokens;
+        existing.count += bucket.count;
+    }
+    else {
+        map.set(key, { costUsd: bucket.costUsd, tokens: bucket.tokens, count: bucket.count });
+    }
+}
+/** Builds one share table (skills/subagents/plugins) from an accumulated per-key map: sorted by cost descending, capped to {@link TABLE_CAP}. */
+function shareTable(rows, totalCostUsd) {
+    return [...rows.entries()]
+        .map(([key, acc]) => ({
+        key,
+        costUsd: acc.costUsd,
+        tokens: acc.tokens,
+        count: acc.count,
+        sharePct: sharePct(acc.costUsd, totalCostUsd),
+    }))
+        .sort((a, b) => b.costUsd - a.costUsd)
+        .slice(0, TABLE_CAP);
+}
+/** Latest timeline timestamp among `ScheduleWakeup` entries, or null when the session has no timeline or no such entry. */
+function lastScheduleWakeupMs(s) {
+    let max = null;
+    for (const entry of s.timeline ?? []) {
+        if (entry.toolName === 'ScheduleWakeup' && (max === null || entry.timestamp > max)) {
+            max = entry.timestamp;
+        }
+    }
+    return max;
+}
+function isLoopSession(s, scheduleWakeupCount) {
+    return scheduleWakeupCount > 0 || 'loop' in (s.attribution?.buckets.skill ?? {});
+}
+function makeInsight(id, costUsd, tokens, sessionCount, totalCostUsd, topPlugin) {
+    const pct = sharePct(costUsd, totalCostUsd);
+    if (pct === 0)
+        return null;
+    const copy = INSIGHT_COPY[id];
+    return {
+        id,
+        key: id,
+        costUsd,
+        tokens,
+        count: sessionCount,
+        sharePct: pct,
+        sessionCount,
+        headline: copy.headline(pct, topPlugin),
+        advice: copy.advice,
+    };
+}
+// ---------------------------------------------------------------------------
+// computeUsageInsights
+// ---------------------------------------------------------------------------
+export function computeUsageInsights(sessions, opts) {
+    const cutoffMs = opts.nowMs - opts.windowDays * DAY_MS;
+    const windowSessions = sessions.filter((s) => s.startTime >= cutoffMs);
+    let totalCostUsd = 0;
+    let totalTokens = 0;
+    const skillsAccum = new Map();
+    const subagentsAccum = new Map();
+    const pluginsAccum = new Map();
+    const pluginSessionIds = new Set();
+    const loopRows = [];
+    let highContextCostUsd = 0;
+    let highContextTokens = 0;
+    let highContextSessions = 0;
+    let subagentHeavyCostUsd = 0;
+    let subagentHeavyTokens = 0;
+    let subagentHeavySessions = 0;
+    let longSessionsCostUsd = 0;
+    let longSessionsTokens = 0;
+    let longSessionsSessions = 0;
+    let loopsCostUsd = 0;
+    let loopsTokens = 0;
+    let loopsSessions = 0;
+    let attributedCostUsd = 0;
+    let anyAttribution = false;
+    // One per-session pass: every table and insight below is built from the
+    // accumulators this loop fills, rather than re-scanning `windowSessions`
+    // once per characteristic.
+    for (const s of windowSessions) {
+        const cost = s.estimatedCostUsd ?? 0;
+        totalCostUsd += cost;
+        const tokens = sessionTotalTokens(s);
+        totalTokens += tokens;
+        const buckets = s.attribution?.buckets;
+        if (s.attribution) {
+            anyAttribution = true;
+            let toolCostSum = 0;
+            for (const bucket of Object.values(buckets?.tool ?? {}))
+                toolCostSum += bucket.costUsd;
+            attributedCostUsd += toolCostSum;
+        }
+        for (const [key, bucket] of Object.entries(buckets?.skill ?? {})) {
+            addToAccum(skillsAccum, key, bucket);
+            const prefix = pluginPrefixOf(key);
+            if (prefix) {
+                addToAccum(pluginsAccum, prefix, bucket);
+                pluginSessionIds.add(s.sessionId);
+            }
+        }
+        for (const [key, bucket] of Object.entries(buckets?.subagent ?? {})) {
+            addToAccum(subagentsAccum, key, bucket);
+            const prefix = pluginPrefixOf(key);
+            if (prefix) {
+                addToAccum(pluginsAccum, prefix, bucket);
+                pluginSessionIds.add(s.sessionId);
+            }
+        }
+        const highContext = s.attribution?.highContextCostUsd ?? 0;
+        if (highContext > 0) {
+            highContextCostUsd += highContext;
+            highContextTokens += tokens;
+            highContextSessions += 1;
+        }
+        if (cost > 0 && s.subagentCostUsd >= SUBAGENT_HEAVY_SHARE * cost) {
+            subagentHeavyCostUsd += cost;
+            subagentHeavyTokens += tokens;
+            subagentHeavySessions += 1;
+        }
+        if (s.durationMs >= LONG_SESSION_MS) {
+            longSessionsCostUsd += cost;
+            longSessionsTokens += tokens;
+            longSessionsSessions += 1;
+        }
+        const scheduleWakeupCount = s.toolBreakdown.ScheduleWakeup ?? 0;
+        if (isLoopSession(s, scheduleWakeupCount)) {
+            loopsCostUsd += cost;
+            loopsTokens += tokens;
+            loopsSessions += 1;
+            const runs = scheduleWakeupCount + 1;
+            loopRows.push({
+                sessionId: s.sessionId,
+                sessionName: s.sessionName,
+                runs,
+                tokens,
+                tokensPerRun: Math.round(tokens / runs),
+                costUsd: cost,
+                lastRunMs: lastScheduleWakeupMs(s) ?? s.endTime ?? s.startTime,
+            });
+        }
+    }
+    const pluginsCostUsd = [...pluginsAccum.values()].reduce((sum, a) => sum + a.costUsd, 0);
+    const pluginsTokens = [...pluginsAccum.values()].reduce((sum, a) => sum + a.tokens, 0);
+    const topPlugin = pluginsAccum.size === 1 ? [...pluginsAccum.keys()][0] : null;
+    const insights = [
+        {
+            id: 'high_context',
+            costUsd: highContextCostUsd,
+            tokens: highContextTokens,
+            sessionCount: highContextSessions,
+        },
+        {
+            id: 'subagent_heavy',
+            costUsd: subagentHeavyCostUsd,
+            tokens: subagentHeavyTokens,
+            sessionCount: subagentHeavySessions,
+        },
+        {
+            id: 'long_sessions',
+            costUsd: longSessionsCostUsd,
+            tokens: longSessionsTokens,
+            sessionCount: longSessionsSessions,
+        },
+        { id: 'loops', costUsd: loopsCostUsd, tokens: loopsTokens, sessionCount: loopsSessions },
+        {
+            id: 'plugins',
+            costUsd: pluginsCostUsd,
+            tokens: pluginsTokens,
+            sessionCount: pluginSessionIds.size,
+        },
+    ]
+        .map((input) => makeInsight(input.id, input.costUsd, input.tokens, input.sessionCount, totalCostUsd, topPlugin))
+        .filter((insight) => insight !== null)
+        .sort((a, b) => b.sharePct - a.sharePct);
+    return {
+        windowDays: opts.windowDays,
+        sessionCount: windowSessions.length,
+        totalCostUsd,
+        totalTokens,
+        insights,
+        skills: shareTable(skillsAccum, totalCostUsd),
+        skillsTotalCount: skillsAccum.size,
+        subagents: shareTable(subagentsAccum, totalCostUsd),
+        subagentsTotalCount: subagentsAccum.size,
+        plugins: shareTable(pluginsAccum, totalCostUsd),
+        pluginsTotalCount: pluginsAccum.size,
+        loops: loopRows.sort((a, b) => b.costUsd - a.costUsd).slice(0, TABLE_CAP),
+        loopsTotalCount: loopRows.length,
+        attributionRatePct: anyAttribution ? sharePct(attributedCostUsd, totalCostUsd) : null,
+    };
+}
+//# sourceMappingURL=usage-insights.js.map

package/dist/metrics/usage-insights.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"usage-insights.js","sourceRoot":"","sources":["../../src/metrics/usage-insights.ts"],"names":[],"mappings":"AAsEA,8EAA8E;AAC9E,YAAY;AACZ,8EAA8E;AAE9E,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACnC,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC3C,+FAA+F;AAC/F,MAAM,oBAAoB,GAAG,IAAI,CAAC;AAClC,8FAA8F;AAC9F,MAAM,SAAS,GAAG,EAAE,CAAC;AAErB;;;;;;GAMG;AACH,MAAM,YAAY,GAGd;IACF,YAAY,EAAE;QACZ,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,sCAAsC;QAC/D,MAAM,EACJ,6GAA6G;KAChH;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,mDAAmD;QAC5E,MAAM,EACJ,6HAA6H;KAChI;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,wDAAwD;QACjF,MAAM,EACJ,gHAAgH;KACnH;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,0CAA0C;QACnE,MAAM,EAAE,mFAAmF;KAC5F;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAC3B,SAAS,KAAK,IAAI;YAChB,CAAC,CAAC,GAAG,GAAG,yCAAyC,SAAS,GAAG;YAC7D,CAAC,CAAC,GAAG,GAAG,mCAAmC;QAC/C,MAAM,EACJ,qGAAqG;KACxG;CACF,CAAC;AAEF,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,SAAS,QAAQ,CAAC,OAAe,EAAE,YAAoB;IACrD,OAAO,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,kBAAkB,CAAC,CAAqB;IAC/C,OAAO,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,mBAAmB,CAAC;AACpF,CAAC;AAED,yJAAyJ;AACzJ,SAAS,cAAc,CAAC,GAAW;IACjC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5C,CAAC;AAQD,SAAS,UAAU,CAAC,GAA0B,EAAE,GAAW,EAAE,MAAyB;IACpF,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC;QACnC,QAAQ,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC;QACjC,QAAQ,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IACjC,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACxF,CAAC;AACH,CAAC;AAED,iJAAiJ;AACjJ,SAAS,UAAU,CAAC,IAA2B,EAAE,YAAoB;IACnE,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;SACvB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACpB,GAAG;QACH,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC;KAC9C,CAAC,CAAC;SACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;SACrC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AACzB,CAAC;AAED,2HAA2H;AAC3H,SAAS,oBAAoB,CAAC,CAAqB;IACjD,IAAI,GAAG,GAAkB,IAAI,CAAC;IAC9B,KAAK,MAAM,KAAK,IAAI,CAAC,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,QAAQ,KAAK,gBAAgB,IAAI,CAAC,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,EAAE,CAAC;YACnF,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,aAAa,CAAC,CAAqB,EAAE,mBAA2B;IACvE,OAAO,mBAAmB,GAAG,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,WAAW,CAClB,EAAkB,EAClB,OAAe,EACf,MAAc,EACd,YAAoB,EACpB,YAAoB,EACpB,SAAwB;IAExB,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC5C,IAAI,GAAG,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3B,MAAM,IAAI,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;IAC9B,OAAO;QACL,EAAE;QACF,GAAG,EAAE,EAAE;QACP,OAAO;QACP,MAAM;QACN,KAAK,EAAE,YAAY;QACnB,QAAQ,EAAE,GAAG;QACb,YAAY;QACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;KACpB,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,uBAAuB;AACvB,8EAA8E;AAE9E,MAAM,UAAU,oBAAoB,CAClC,QAAuC,EACvC,IAA0B;IAE1B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IACvD,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,QAAQ,CAAC,CAAC;IAEvE,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAoB,CAAC;IACnD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAoB,CAAC;IACjD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,MAAM,QAAQ,GAAc,EAAE,CAAC;IAE/B,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAE5B,IAAI,oBAAoB,GAAG,CAAC,CAAC;IAC7B,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAE9B,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,oBAAoB,GAAG,CAAC,CAAC;IAE7B,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,aAAa,GAAG,CAAC,CAAC;IAEtB,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,cAAc,GAAG,KAAK,CAAC;IAE3B,wEAAwE;IACxE,yEAAyE;IACzE,2BAA2B;IAC3B,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,CAAC,CAAC,gBAAgB,IAAI,CAAC,CAAC;QACrC,YAAY,IAAI,IAAI,CAAC;QACrB,MAAM,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACrC,WAAW,IAAI,MAAM,CAAC;QAEtB,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC;QACvC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YAClB,cAAc,GAAG,IAAI,CAAC;YACtB,IAAI,WAAW,GAAG,CAAC,CAAC;YACpB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC;gBAAE,WAAW,IAAI,MAAM,CAAC,OAAO,CAAC;YACvF,iBAAiB,IAAI,WAAW,CAAC;QACnC,CAAC;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;YACjE,UAAU,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,MAAM,EAAE,CAAC;gBACX,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;gBACzC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;YACpE,UAAU,CAAC,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YACxC,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,MAAM,EAAE,CAAC;gBACX,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;gBACzC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAED,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,kBAAkB,IAAI,CAAC,CAAC;QAC3D,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACpB,kBAAkB,IAAI,WAAW,CAAC;YAClC,iBAAiB,IAAI,MAAM,CAAC;YAC5B,mBAAmB,IAAI,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,IAAI,oBAAoB,GAAG,IAAI,EAAE,CAAC;YACjE,oBAAoB,IAAI,IAAI,CAAC;YAC7B,mBAAmB,IAAI,MAAM,CAAC;YAC9B,qBAAqB,IAAI,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,CAAC,UAAU,IAAI,eAAe,EAAE,CAAC;YACpC,mBAAmB,IAAI,IAAI,CAAC;YAC5B,kBAAkB,IAAI,MAAM,CAAC;YAC7B,oBAAoB,IAAI,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,mBAAmB,GAAG,CAAC,CAAC,aAAa,CAAC,cAAc,IAAI,CAAC,CAAC;QAChE,IAAI,aAAa,CAAC,CAAC,EAAE,mBAAmB,CAAC,EAAE,CAAC;YAC1C,YAAY,IAAI,IAAI,CAAC;YACrB,WAAW,IAAI,MAAM,CAAC;YACtB,aAAa,IAAI,CAAC,CAAC;YACnB,MAAM,IAAI,GAAG,mBAAmB,GAAG,CAAC,CAAC;YACrC,QAAQ,CAAC,IAAI,CAAC;gBACZ,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,WAAW,EAAE,CAAC,CAAC,WAAW;gBAC1B,IAAI;gBACJ,MAAM;gBACN,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;gBACvC,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,SAAS;aAC/D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACzF,MAAM,aAAa,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACvF,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhF,MAAM,QAAQ,GACZ;QACE;YACE,EAAE,EAAE,cAAc;YAClB,OAAO,EAAE,kBAAkB;YAC3B,MAAM,EAAE,iBAAiB;YACzB,YAAY,EAAE,mBAAmB;SAClC;QACD;YACE,EAAE,EAAE,gBAAgB;YACpB,OAAO,EAAE,oBAAoB;YAC7B,MAAM,EAAE,mBAAmB;YAC3B,YAAY,EAAE,qBAAqB;SACpC;QACD;YACE,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,mBAAmB;YAC5B,MAAM,EAAE,kBAAkB;YAC1B,YAAY,EAAE,oBAAoB;SACnC;QACD,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE;QACxF;YACE,EAAE,EAAE,SAAS;YACb,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE,aAAa;YACrB,YAAY,EAAE,gBAAgB,CAAC,IAAI;SACpC;KAEJ;SACE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,WAAW,CACT,KAAK,CAAC,EAAE,EACR,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,YAAY,EAClB,YAAY,EACZ,SAAS,CACV,CACF;SACA,MAAM,CAAC,CAAC,OAAO,EAA2B,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC;SAC9D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IAE3C,OAAO;QACL,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,YAAY,EAAE,cAAc,CAAC,MAAM;QACnC,YAAY;QACZ,WAAW;QACX,QAAQ;QACR,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC;QAC7C,gBAAgB,EAAE,WAAW,CAAC,IAAI;QAClC,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC;QACnD,mBAAmB,EAAE,cAAc,CAAC,IAAI;QACxC,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,YAAY,CAAC;QAC/C,iBAAiB,EAAE,YAAY,CAAC,IAAI;QACpC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC;QACzE,eAAe,EAAE,QAAQ,CAAC,MAAM;QAChC,kBAAkB,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;KACtF,CAAC;AACJ,CAAC"}

package/dist/storage/session-store.d.ts

@@ -12,9 +12,10 @@
  * task-level data into a single FullSessionSummary.
  */
 import { type SessionNameSource } from '../hooks/session-resolver.js';
-import type { SessionSummary, ReplayTimelineEntry } from './types.js';
+import type { SessionSummary, ReplayTimelineEntry, SessionAttribution } from './types.js';
 import type { SessionTracker } from '../metrics/session-tracker.js';
 import type { CostTracker } from '../metrics/cost-tracker.js';
+import type { TurnCostAttributor } from '../metrics/turn-cost-attributor.js';
 import type { TaskDetector } from '../metrics/task-detector.js';
 import type { AntiPatternDetector } from '../metrics/anti-patterns.js';
 import type { EfficiencyScorer, EfficiencyScoreComponents } from '../metrics/efficiency-score.js';
@@ -25,7 +26,6 @@ import { ToolSelectionScorer, type ToolSelectionSummary } from '../metrics/tool-
 import type { ModelUsageTracker, ModelBreakdownEntry } from '../metrics/model-usage-tracker.js';
 import type { QualityProxyTracker } from '../metrics/quality-proxy-tracker.js';
 import { type QualityProxyRawCounts } from '../metrics/quality-proxy-tracker.js';
-import type { TurnCostAttributor } from '../metrics/turn-cost-attributor.js';
 /**
  * One detected anti-pattern occurrence, persisted per incident rather than
  * grouped by type — the target (`file`/`command`) and the detector's own
@@ -156,6 +156,8 @@ export interface FullSessionSummary extends SessionSummary {
      * and for sessions with no token events.
      */
     readonly modelBreakdown: Readonly<Record<string, ModelBreakdownEntry>>;
+    /** Spend sliced by tool, skill, and subagent type, plus high-context spend and API wait time. Absent on legacy files. */
+    readonly attribution?: SessionAttribution;
     /**
      * Per-workflow-run cost, split by local-day, keyed by workflow_run_id then
      * day key — the exact shape `CostMetrics.costByWorkflowRunId` already
@@ -219,12 +221,6 @@ export interface ListSessionsOptions {
     since?: Date;
     developer?: string;
 }
-/**
- * Combine two views of the same session so neither writer can lose the other's
- * data. Counters take the max rather than the sum: the two processes observe
- * overlapping (not disjoint) slices of one session, so summing would inflate
- * and taking the incoming value alone would regress.
- */
 export declare function mergeSummaries(existing: FullSessionSummary, incoming: FullSessionSummary): FullSessionSummary;
 export declare class SessionStore {
     private readonly sessionsDir;
@@ -254,6 +250,7 @@ export declare class SessionStore {
 export interface BuildSessionSummarySources {
     sessionTracker: SessionTracker;
     costTracker?: CostTracker;
+    turnCostAttributor?: TurnCostAttributor;
     taskDetector?: TaskDetector;
     antiPatternDetector?: AntiPatternDetector;
     efficiencyScorer?: EfficiencyScorer;
@@ -261,7 +258,6 @@ export interface BuildSessionSummarySources {
     toolSelectionScorer?: ToolSelectionScorer;
     modelUsageTracker?: ModelUsageTracker;
     qualityProxyTracker?: QualityProxyTracker;
-    turnCostAttributor?: TurnCostAttributor;
     developer: string;
     repoName?: string | null;
     /**
@@ -346,6 +342,7 @@ interface SerializedFullSessionSummary {
     readonly modelBreakdown?: Record<string, unknown>;
     readonly costByWorkflowRunId?: Record<string, unknown>;
     readonly qualityProxy?: Record<string, unknown>;
+    readonly attribution?: Record<string, unknown>;
 }
 /**
  * Explicitly extract known fields from a raw session object (already parsed

package/dist/storage/session-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/storage/session-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/storage/session-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAaH,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAE5F,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAGnB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAClG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EACL,mBAAmB,EAEnB,KAAK,oBAAoB,EAC1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAChG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EACL,KAAK,qBAAqB,EAE3B,MAAM,qCAAqC,CAAC;AAQ7C;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,GAAG,oBAAoB,EAAE,CAWhG;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,4EAA4E;IAC5E,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACrD;;;;OAIG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,iFAAiF;IACjF,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC;;;;;OAKG;IACH,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC;;;;;;;;;OASG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C;;yBAEqB;IACrB,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IAC7C;;;;;;;;OAQG;IACH,QAAQ,CAAC,yBAAyB,CAAC,EAAE,yBAAyB,GAAG,IAAI,CAAC;IACtE,QAAQ,CAAC,YAAY,EAAE,oBAAoB,EAAE,CAAC;IAC9C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,QAAQ,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC1C;;;;;;;OAOG;IACH,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC3D;;;;;;;OAOG;IACH,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;IACvE,yHAAyH;IACzH,QAAQ,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IAC1C;;;;;;;OAOG;IACH,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACrE;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC;CAC9C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC5C;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAMxE;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA+DD,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EAAE,kBAAkB,GAC3B,kBAAkB,CA0MpB;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,OAAO,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE;IAI5C,cAAc,IAAI,MAAM;IAIxB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAkG9C,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI;IAIzD,mMAAmM;IACnM,OAAO,CAAC,mBAAmB;IA0B3B,YAAY,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,eAAe,EAAE;IAgC9D,eAAe,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,kBAAkB,EAAE;IAwCpE,iBAAiB,IAAI,kBAAkB,EAAE;IAMzC;;;;;;;;;OASG;IACH,4BAA4B,IAAI,kBAAkB,EAAE;CAYrD;AAMD,MAAM,WAAW,0BAA0B;IACzC,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AA4DD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,kBAAkB,CAgL3F;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,kBAAkB,GAC1B,oBAAoB,GAAG,IAAI,CAe7B;AAUD;;;;;;;GAOG;AACH,UAAU,4BAA4B;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC;IAC/B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IACnC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAC9C,QAAQ,CAAC,yBAAyB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7D,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACvD,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACnD,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvD,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChD;AAkFD;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,4BAA4B,GAChC,kBAAkB,CAiQpB"}

package/dist/storage/session-store.js

@@ -69,6 +69,50 @@ export function hasAttributableActivity(s) {
  * overlapping (not disjoint) slices of one session, so summing would inflate
  * and taking the incoming value alone would regress.
  */
+/**
+ * Merge two `SessionAttribution` snapshots facet-by-facet, key-by-key,
+ * taking a field-wise max on each bucket's four numbers — the same
+ * no-single-writer-loses-data rule as `modelBreakdown` above. `undefined`
+ * on either side is treated as an empty attribution rather than short-
+ * circuiting, so a session that only recently gained a `turnCostAttributor`
+ * still merges cleanly against an earlier write that had none.
+ */
+function mergeAttribution(existing, incoming) {
+    if (!existing && !incoming)
+        return undefined;
+    const maxNum = (a, b) => Math.max(a ?? 0, b ?? 0);
+    const maxNullable = (a, b) => (a == null && b == null ? null : Math.max(a ?? 0, b ?? 0));
+    const a = existing ?? { buckets: {}, highContextCostUsd: 0, apiDurationMs: null };
+    const b = incoming ?? { buckets: {}, highContextCostUsd: 0, apiDurationMs: null };
+    const facets = new Set([
+        ...Object.keys(a.buckets),
+        ...Object.keys(b.buckets),
+    ]);
+    const buckets = {};
+    for (const facet of facets) {
+        const facetA = a.buckets[facet] ?? {};
+        const facetB = b.buckets[facet] ?? {};
+        const keys = new Set([...Object.keys(facetA), ...Object.keys(facetB)]);
+        const merged = {};
+        for (const key of keys) {
+            const ba = facetA[key];
+            const bb = facetB[key];
+            merged[key] = {
+                costUsd: maxNum(ba?.costUsd, bb?.costUsd),
+                tokens: maxNum(ba?.tokens, bb?.tokens),
+                count: maxNum(ba?.count, bb?.count),
+                durationMs: maxNum(ba?.durationMs, bb?.durationMs),
+            };
+        }
+        if (Object.keys(merged).length > 0)
+            buckets[facet] = merged;
+    }
+    return {
+        buckets,
+        highContextCostUsd: maxNum(a.highContextCostUsd, b.highContextCostUsd),
+        apiDurationMs: maxNullable(a.apiDurationMs, b.apiDurationMs),
+    };
+}
 export function mergeSummaries(existing, incoming) {
     const maxNum = (a, b) => Math.max(typeof a === 'number' ? a : 0, typeof b === 'number' ? b : 0);
     const maxNullable = (a, b) => a === null && b === null ? null : Math.max(a ?? 0, b ?? 0);
@@ -227,6 +271,7 @@ export function mergeSummaries(existing, incoming) {
         toolSelectionMetrics,
         modelBreakdown,
         qualityProxy,
+        attribution: mergeAttribution(existing.attribution, incoming.attribution),
     };
 }
 export class SessionStore {
@@ -462,10 +507,55 @@ function skillInvocationCounts(metrics) {
     }
     return result;
 }
+/**
+ * Assemble `SessionAttribution` from the turn attributor's tool/skill
+ * buckets and the cost tracker's subagent/high-context/API-duration fields.
+ * Facets with no entries are omitted entirely rather than persisted as `{}`.
+ */
+function buildAttribution(turnMetrics, costMetrics) {
+    const buckets = {};
+    if (turnMetrics) {
+        const toolBuckets = {};
+        for (const [tool, entry] of Object.entries(turnMetrics.costByToolType)) {
+            toolBuckets[tool] = {
+                costUsd: entry.totalCost,
+                tokens: 0,
+                count: entry.callCount,
+                durationMs: 0,
+            };
+        }
+        if (Object.keys(toolBuckets).length > 0)
+            buckets.tool = toolBuckets;
+        const skillBuckets = {};
+        for (const [skill, entry] of Object.entries(turnMetrics.costBySkill)) {
+            skillBuckets[skill] = {
+                costUsd: entry.totalCost,
+                tokens: entry.inputTokens + entry.outputTokens + entry.cacheReadTokens,
+                count: entry.callCount,
+                durationMs: entry.totalDurationMs,
+            };
+        }
+        if (Object.keys(skillBuckets).length > 0)
+            buckets.skill = skillBuckets;
+    }
+    const subagentBuckets = costMetrics?.subagentByAgentType;
+    if (subagentBuckets && Object.keys(subagentBuckets).length > 0) {
+        buckets.subagent = { ...subagentBuckets };
+    }
+    return {
+        buckets,
+        highContextCostUsd: costMetrics?.highContextCostUsd ?? 0,
+        apiDurationMs: costMetrics?.apiDurationMs ?? null,
+    };
+}
 export function buildSessionSummary(sources) {
     const { sessionTracker, costTracker, taskDetector, antiPatternDetector, efficiencyScorer, developer, } = sources;
     const sessionMetrics = sessionTracker.getMetrics();
     const costMetrics = costTracker?.getMetrics() ?? null;
+    const turnAttributionMetrics = sources.turnCostAttributor?.getMetrics() ?? null;
+    const attribution = sources.costTracker || sources.turnCostAttributor
+        ? buildAttribution(turnAttributionMetrics, costMetrics)
+        : undefined;
     const taskMetrics = taskDetector?.getMetrics() ?? null;
     const transcriptMessageMetrics = sources.transcriptMessageTracker?.getMetrics();
     // Aggregate task-level data
@@ -546,6 +636,8 @@ export function buildSessionSummary(sources) {
         isBuildCommand: tc.isBuildCommand || undefined,
         isLintCommand: tc.isLintCommand || undefined,
         errorType: tc.errorType || undefined,
+        skillName: tc.toolName === 'Skill' && tc.skillName ? tc.skillName : undefined,
+        agentType: tc.toolName === 'Agent' && tc.agentType ? tc.agentType : undefined,
     }));
     const now = Date.now();
     return {
@@ -609,6 +701,7 @@ export function buildSessionSummary(sources) {
         modelBreakdown: sources.modelUsageTracker?.getRawBreakdown() ?? {},
         costByWorkflowRunId: costMetrics?.costByWorkflowRunId ?? {},
         qualityProxy: sources.qualityProxyTracker?.getRawCounts() ?? ZERO_QUALITY_PROXY_COUNTS,
+        attribution,
     };
 }
 /**
@@ -640,6 +733,65 @@ export function sessionSummaryToDriftRecord(summary) {
 function formatDate(date) {
     return date.toISOString().slice(0, 10);
 }
+/**
+ * Accept a bucket only when all four fields are finite numbers; any other
+ * shape is dropped rather than partially hydrated. Used to parse each key of
+ * every facet in an on-disk `SessionAttribution.buckets`.
+ */
+function parseAttributionBucket(raw) {
+    if (typeof raw !== 'object' || raw === null)
+        return undefined;
+    const r = raw;
+    const { costUsd, tokens, count, durationMs } = r;
+    if (typeof costUsd === 'number' &&
+        Number.isFinite(costUsd) &&
+        typeof tokens === 'number' &&
+        Number.isFinite(tokens) &&
+        typeof count === 'number' &&
+        Number.isFinite(count) &&
+        typeof durationMs === 'number' &&
+        Number.isFinite(durationMs)) {
+        return { costUsd, tokens, count, durationMs };
+    }
+    return undefined;
+}
+/**
+ * Parse an on-disk `attribution` field. Returns undefined when the field is
+ * absent or not an object (a legacy session summary written before this
+ * field existed), so it loads unchanged. Invalid facet keys/buckets are
+ * dropped individually rather than invalidating the whole field.
+ */
+function parseAttribution(raw) {
+    if (typeof raw !== 'object' || raw === null)
+        return undefined;
+    const r = raw;
+    const rawBuckets = r.buckets;
+    const buckets = {};
+    if (typeof rawBuckets === 'object' && rawBuckets !== null) {
+        for (const facet of ['tool', 'skill', 'subagent']) {
+            const facetRaw = rawBuckets[facet];
+            if (typeof facetRaw !== 'object' || facetRaw === null)
+                continue;
+            const facetBuckets = {};
+            for (const [key, bucketRaw] of Object.entries(facetRaw)) {
+                const bucket = parseAttributionBucket(bucketRaw);
+                if (bucket)
+                    facetBuckets[key] = bucket;
+            }
+            if (Object.keys(facetBuckets).length > 0)
+                buckets[facet] = facetBuckets;
+        }
+    }
+    return {
+        buckets,
+        highContextCostUsd: typeof r.highContextCostUsd === 'number' && Number.isFinite(r.highContextCostUsd)
+            ? r.highContextCostUsd
+            : 0,
+        apiDurationMs: typeof r.apiDurationMs === 'number' && Number.isFinite(r.apiDurationMs)
+            ? r.apiDurationMs
+            : null,
+    };
+}
 /**
  * Parse an untrusted value into a `Record<string, number>`, dropping any
  * non-finite or non-numeric entries. Used to hydrate the per-day cost maps
@@ -895,12 +1047,15 @@ export function deserializeFullSessionSummary(obj) {
                 isBuildCommand: typeof e.isBuildCommand === 'boolean' ? e.isBuildCommand : undefined,
                 isLintCommand: typeof e.isLintCommand === 'boolean' ? e.isLintCommand : undefined,
                 errorType: typeof e.errorType === 'string' ? e.errorType : undefined,
+                skillName: typeof e.skillName === 'string' ? e.skillName : undefined,
+                agentType: typeof e.agentType === 'string' ? e.agentType : undefined,
             }))
             : undefined,
         toolSelectionMetrics,
         modelBreakdown,
         costByWorkflowRunId,
         qualityProxy,
+        attribution: parseAttribution(obj.attribution),
     };
 }
 /**