@oh-my-pi/omp-stats 16.1.13 → 16.1.15

package/dist/client/styles.css

@@ -208,6 +208,12 @@
   .h-1 {
     height: var(--spacing);
   }
+  .h-2\.5 {
+    height: calc(var(--spacing) * 2.5);
+  }
+  .h-3 {
+    height: calc(var(--spacing) * 3);
+  }
   .h-10 {
     height: calc(var(--spacing) * 10);
   }
@@ -229,6 +235,9 @@
   .max-h-\[calc\(100vh-300px\)\] {
     max-height: calc(100vh - 300px);
   }
+  .w-2\.5 {
+    width: calc(var(--spacing) * 2.5);
+  }
   .w-24 {
     width: calc(var(--spacing) * 24);
   }
@@ -244,6 +253,9 @@
   .flex-1 {
     flex: 1;
   }
+  .flex-shrink-0 {
+    flex-shrink: 0;
+  }
   .cursor-pointer {
     cursor: pointer;
   }
@@ -297,6 +309,13 @@
       margin-block-end: calc(var(--spacing) * calc(1 - var(--tw-space-y-reverse)));
     }
   }
+  .space-y-2 {
+    :where(& > :not(:last-child)) {
+      --tw-space-y-reverse: 0;
+      margin-block-start: calc(calc(var(--spacing) * 2) * var(--tw-space-y-reverse));
+      margin-block-end: calc(calc(var(--spacing) * 2) * calc(1 - var(--tw-space-y-reverse)));
+    }
+  }
   .space-y-4 {
     :where(& > :not(:last-child)) {
       --tw-space-y-reverse: 0;
@@ -328,6 +347,9 @@
   .rounded {
     border-radius: 0.25rem;
   }
+  .rounded-full {
+    border-radius: calc(infinity * 1px);
+  }
   .border-t {
     border-top-style: var(--tw-border-style);
     border-top-width: 1px;
@@ -432,6 +454,10 @@
   .uppercase {
     text-transform: uppercase;
   }
+  .tabular-nums {
+    --tw-numeric-spacing: tabular-nums;
+    font-variant-numeric: var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,);
+  }
   .transition-colors {
     transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
     transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -1585,6 +1611,26 @@
   syntax: "*";
   inherits: false;
 }
+@property --tw-ordinal {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-slashed-zero {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-numeric-figure {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-numeric-spacing {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-numeric-fraction {
+  syntax: "*";
+  inherits: false;
+}
 @keyframes spin {
   to {
     transform: rotate(360deg);
@@ -1597,6 +1643,11 @@
       --tw-border-style: solid;
       --tw-font-weight: initial;
       --tw-tracking: initial;
+      --tw-ordinal: initial;
+      --tw-slashed-zero: initial;
+      --tw-numeric-figure: initial;
+      --tw-numeric-spacing: initial;
+      --tw-numeric-fraction: initial;
     }
   }
 }

package/dist/types/aggregator.d.ts

@@ -52,7 +52,7 @@ export declare function syncAllSessions(opts?: SyncOptions): Promise<{
  * Get all dashboard stats.
  */
 export declare function getDashboardStats(range?: string | null): Promise<DashboardStats>;
-export declare function getOverviewStats(range?: string | null): Promise<Pick<DashboardStats, "overall" | "timeSeries">>;
+export declare function getOverviewStats(range?: string | null): Promise<Pick<DashboardStats, "overall" | "byAgentType" | "timeSeries">>;
 export declare function getModelDashboardStats(range?: string | null): Promise<Pick<DashboardStats, "byModel" | "modelSeries" | "modelPerformanceSeries">>;
 export declare function getCostDashboardStats(range?: string | null): Promise<Pick<DashboardStats, "costSeries">>;
 export declare function getRecentRequests(limit?: number): Promise<MessageStats[]>;

package/dist/types/client/components/AgentTokenShare.d.ts

@@ -0,0 +1,5 @@
+import type { AgentTypeStats } from "../types";
+export interface AgentTokenShareProps {
+    stats: AgentTypeStats[];
+}
+export declare function AgentTokenShare({ stats }: AgentTokenShareProps): import("react").JSX.Element;

package/dist/types/client/data/view-models.d.ts

@@ -1,4 +1,26 @@
-import type { BehaviorOverallStats, BehaviorTimeSeriesPoint, CostTimeSeriesPoint, FolderStats, ModelPerformancePoint, TimeRange } from "../types";
+import type { AgentType, AgentTypeStats, BehaviorOverallStats, BehaviorTimeSeriesPoint, CostTimeSeriesPoint, FolderStats, ModelPerformancePoint, TimeRange } from "../types";
+export interface AgentTokenSegment {
+    agentType: AgentType;
+    /** input + output + cache read + cache write — the displayed denominator. */
+    tokens: number;
+    requests: number;
+    cost: number;
+    /** Fraction (0-1) of total tokens across all present agent types. */
+    share: number;
+}
+export interface AgentTokenShareView {
+    totalTokens: number;
+    totalCost: number;
+    segments: AgentTokenSegment[];
+}
+/**
+ * Build the "token usage by agent" breakdown: one segment per agent type that
+ * appears in the data, ordered main -> subagents -> advisor, each carrying its
+ * token total and share of the grand total. Token counts sum the same four
+ * columns the overview renders (input + output + cache read + cache write) so a
+ * segment's share never disagrees with the count beside it.
+ */
+export declare function buildAgentTokenShare(stats: AgentTypeStats[]): AgentTokenShareView;
 export interface CostSummaryView {
     totalCost: number;
     avgDailyCost: number;

package/dist/types/client/types.d.ts

@@ -11,7 +11,7 @@
  *   - `TimeRange`, `OverviewStats`, `ModelDashboardStats`,
  *     `CostDashboardStats` are UI-only view shapes the server never produces.
  */
-import type { AggregatedStats, CostTimeSeriesPoint, ModelPerformancePoint, ModelStats, ModelTimeSeriesPoint, TimeSeriesPoint } from "../shared-types";
+import type { AgentTypeStats, AggregatedStats, CostTimeSeriesPoint, ModelPerformancePoint, ModelStats, ModelTimeSeriesPoint, TimeSeriesPoint } from "../shared-types";
 export * from "../shared-types";
 export interface Usage {
     input: number;
@@ -50,6 +50,7 @@ export interface RequestDetails extends MessageStats {
 export type TimeRange = "1h" | "24h" | "7d" | "30d" | "90d" | "all";
 export interface OverviewStats {
     overall: AggregatedStats;
+    byAgentType: AgentTypeStats[];
     timeSeries: TimeSeriesPoint[];
 }
 export interface ModelDashboardStats {

package/dist/types/db.d.ts

@@ -1,5 +1,5 @@
 import { Database } from "bun:sqlite";
-import type { AggregatedStats, BehaviorModelStats, BehaviorOverallStats, BehaviorTimeSeriesPoint, CostTimeSeriesPoint, FolderStats, MessageStats, ModelPerformancePoint, ModelStats, ModelTimeSeriesPoint, TimeSeriesPoint, UserMessageLink, UserMessageStats } from "./types";
+import type { AgentTypeStats, AggregatedStats, BehaviorModelStats, BehaviorOverallStats, BehaviorTimeSeriesPoint, CostTimeSeriesPoint, FolderStats, MessageStats, ModelPerformancePoint, ModelStats, ModelTimeSeriesPoint, TimeSeriesPoint, UserMessageLink, UserMessageStats } from "./types";
 /**
  * Initialize the database and create tables.
  */
@@ -31,6 +31,12 @@ export declare function getStatsByModel(cutoff?: number): ModelStats[];
  * Get stats grouped by folder.
  */
 export declare function getStatsByFolder(cutoff?: number): FolderStats[];
+/**
+ * Get token usage grouped by agent type (main agent, task subagents, advisor).
+ * Token columns are explicit so the dashboard's share denominator matches the
+ * counts it renders. Rows missing `agent_type` (defensive) fall back to "main".
+ */
+export declare function getStatsByAgentType(cutoff?: number): AgentTypeStats[];
 /**
  * Get time series data.
  */

package/dist/types/parser.d.ts

@@ -1,4 +1,14 @@
-import type { MessageStats, SessionEntry, UserMessageLink, UserMessageStats } from "./types";
+import type { AgentType, MessageStats, SessionEntry, UserMessageLink, UserMessageStats } from "./types";
+/**
+ * Classify which agent produced a transcript from its path within the sessions
+ * directory. Layout: `<sessionsDir>/<project>/<file>.jsonl` is the `main`
+ * agent; subagent and advisor transcripts live nested one level deeper inside
+ * the session's artifacts dir (`<project>/<session>/<id>.jsonl`,
+ * `<project>/<session>/__advisor.jsonl`). Any `__advisor.jsonl` — at any depth,
+ * including a subagent's own advisor — counts as `advisor`; every other nested
+ * transcript is a task `subagent`.
+ */
+export declare function classifyAgentType(sessionPath: string): AgentType;
 /**
  * Parse a session file and extract all assistant message stats.
  * Uses incremental reading with offset tracking.

package/dist/types/shared-types.d.ts

@@ -125,11 +125,39 @@ export interface DashboardStats {
     overall: AggregatedStats;
     byModel: ModelStats[];
     byFolder: FolderStats[];
+    byAgentType: AgentTypeStats[];
     timeSeries: TimeSeriesPoint[];
     modelSeries: ModelTimeSeriesPoint[];
     modelPerformanceSeries: ModelPerformancePoint[];
     costSeries: CostTimeSeriesPoint[];
 }
+/**
+ * Which agent produced a message, derived from its transcript file location
+ * inside the session directory: the top-level `<project>/<file>.jsonl` is the
+ * `main` agent, an `__advisor.jsonl` is the passive `advisor`, and any other
+ * nested transcript is a task `subagent`.
+ */
+export type AgentType = "main" | "subagent" | "advisor";
+/**
+ * Token usage aggregated by {@link AgentType} over the active range. Token
+ * columns are explicit so the dashboard's share denominator matches the
+ * counts it renders (input + output + cache read + cache write).
+ */
+export interface AgentTypeStats {
+    agentType: AgentType;
+    /** Total number of requests */
+    totalRequests: number;
+    /** Total input tokens */
+    totalInputTokens: number;
+    /** Total output tokens */
+    totalOutputTokens: number;
+    /** Total cache read tokens */
+    totalCacheReadTokens: number;
+    /** Total cache write tokens */
+    totalCacheWriteTokens: number;
+    /** Total cost */
+    totalCost: number;
+}
 /**
  * Behavior time-series point (daily bucket, per responding model).
  */

package/dist/types/types.d.ts

@@ -1,4 +1,5 @@
 import type { AssistantMessage, ServiceTier, StopReason, Usage } from "@oh-my-pi/pi-ai";
+import type { AgentType } from "./shared-types";
 export * from "./shared-types";
 /**
  * Extracted stats from an assistant message.
@@ -30,6 +31,8 @@ export interface MessageStats {
     errorMessage: string | null;
     /** Token usage */
     usage: Usage;
+    /** Which agent produced this message (main agent, task subagent, advisor) */
+    agentType: AgentType;
 }
 /**
  * Full details of a request, including content.

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/omp-stats",
-	"version": "16.1.13",
+	"version": "16.1.15",
 	"description": "Local observability dashboard for pi AI usage statistics",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -37,9 +37,9 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-ai": "16.1.13",
-		"@oh-my-pi/pi-catalog": "16.1.13",
-		"@oh-my-pi/pi-utils": "16.1.13",
+		"@oh-my-pi/pi-ai": "16.1.15",
+		"@oh-my-pi/pi-catalog": "16.1.15",
+		"@oh-my-pi/pi-utils": "16.1.15",
 		"@tailwindcss/node": "^4.3.0",
 		"chart.js": "^4.5.1",
 		"date-fns": "^4.4.0",

package/src/aggregator.ts

@@ -13,6 +13,7 @@ import {
 	getModelPerformanceSeries,
 	getModelTimeSeries,
 	getOverallStats,
+	getStatsByAgentType,
 	getStatsByFolder,
 	getStatsByModel,
 	getTimeSeries,
@@ -364,6 +365,7 @@ export async function getDashboardStats(range?: string | null): Promise<Dashboar
 		overall: getOverallStats(cutoff ?? undefined),
 		byModel: getStatsByModel(cutoff ?? undefined),
 		byFolder: getStatsByFolder(cutoff ?? undefined),
+		byAgentType: getStatsByAgentType(cutoff ?? undefined),
 		timeSeries: getTimeSeries(timeSeriesHours, cutoff, timeSeriesBucketMs),
 		modelSeries: getModelTimeSeries(modelSeriesDays, cutoff, modelSeriesBucketMs),
 		modelPerformanceSeries: getModelPerformanceSeries(modelPerformanceDays, cutoff, modelPerformanceBucketMs),
@@ -371,12 +373,15 @@ export async function getDashboardStats(range?: string | null): Promise<Dashboar
 	};
 }
 
-export async function getOverviewStats(range?: string | null): Promise<Pick<DashboardStats, "overall" | "timeSeries">> {
+export async function getOverviewStats(
+	range?: string | null,
+): Promise<Pick<DashboardStats, "overall" | "byAgentType" | "timeSeries">> {
 	await initDb();
 	const { timeSeriesHours, timeSeriesBucketMs, cutoff } = getTimeRangeConfig(range);
 
 	return {
 		overall: getOverallStats(cutoff ?? undefined),
+		byAgentType: getStatsByAgentType(cutoff ?? undefined),
 		timeSeries: getTimeSeries(timeSeriesHours, cutoff, timeSeriesBucketMs),
 	};
 }

package/src/client/components/AgentTokenShare.tsx

@@ -0,0 +1,68 @@
+import { useMemo } from "react";
+import { formatCompact, formatInteger, formatPercent } from "../data/formatters";
+import { buildAgentTokenShare } from "../data/view-models";
+import type { AgentType, AgentTypeStats } from "../types";
+
+/**
+ * Per-agent-type display chrome. Colors follow the OMP brand palette
+ * (pink -> violet -> cyan) used by the dashboard charts so the bar reads on
+ * both themes without per-theme overrides.
+ */
+const AGENT_META: Record<AgentType, { label: string; color: string }> = {
+	main: { label: "Main agent", color: "#ed4abf" },
+	subagent: { label: "Subagents", color: "#9b4dff" },
+	advisor: { label: "Advisor", color: "#5ad8e6" },
+};
+
+export interface AgentTokenShareProps {
+	stats: AgentTypeStats[];
+}
+
+export function AgentTokenShare({ stats }: AgentTokenShareProps) {
+	const view = useMemo(() => buildAgentTokenShare(stats), [stats]);
+
+	if (view.totalTokens === 0) {
+		return <div className="py-8 text-center stats-text-muted text-sm">No token usage in this range</div>;
+	}
+
+	return (
+		<div className="space-y-4">
+			<div className="flex h-3 w-full overflow-hidden rounded-full" style={{ background: "var(--surface-2)" }}>
+				{view.segments.map(
+					seg =>
+						seg.share > 0 && (
+							<div
+								key={seg.agentType}
+								className="h-full"
+								style={{ width: `${seg.share * 100}%`, background: AGENT_META[seg.agentType].color }}
+								title={`${AGENT_META[seg.agentType].label}: ${formatPercent(seg.share)}`}
+							/>
+						),
+				)}
+			</div>
+
+			<div className="space-y-2">
+				{view.segments.map(seg => (
+					<div key={seg.agentType} className="flex items-center justify-between gap-3 text-sm">
+						<div className="flex items-center gap-2 min-w-0">
+							<span
+								className="w-2.5 h-2.5 rounded-full flex-shrink-0"
+								style={{ background: AGENT_META[seg.agentType].color }}
+							/>
+							<span className="stats-text-primary truncate">{AGENT_META[seg.agentType].label}</span>
+							<span className="stats-text-muted stats-text-xs whitespace-nowrap">
+								{formatInteger(seg.requests)} req
+							</span>
+						</div>
+						<div className="flex items-center gap-3 whitespace-nowrap">
+							<span className="stats-text-secondary">{formatCompact(seg.tokens)} tok</span>
+							<span className="stats-font-semibold stats-text-primary tabular-nums">
+								{formatPercent(seg.share)}
+							</span>
+						</div>
+					</div>
+				))}
+			</div>
+		</div>
+	);
+}

package/src/client/data/view-models.ts

@@ -1,5 +1,7 @@
 import { rangeMeta } from "../components/range-meta";
 import type {
+	AgentType,
+	AgentTypeStats,
 	BehaviorOverallStats,
 	BehaviorTimeSeriesPoint,
 	CostTimeSeriesPoint,
@@ -8,6 +10,59 @@ import type {
 	TimeRange,
 } from "../types";
 
+/** Fixed display order for the agent-token-share breakdown. */
+const AGENT_TYPE_ORDER: AgentType[] = ["main", "subagent", "advisor"];
+
+export interface AgentTokenSegment {
+	agentType: AgentType;
+	/** input + output + cache read + cache write — the displayed denominator. */
+	tokens: number;
+	requests: number;
+	cost: number;
+	/** Fraction (0-1) of total tokens across all present agent types. */
+	share: number;
+}
+
+export interface AgentTokenShareView {
+	totalTokens: number;
+	totalCost: number;
+	segments: AgentTokenSegment[];
+}
+
+/**
+ * Build the "token usage by agent" breakdown: one segment per agent type that
+ * appears in the data, ordered main -> subagents -> advisor, each carrying its
+ * token total and share of the grand total. Token counts sum the same four
+ * columns the overview renders (input + output + cache read + cache write) so a
+ * segment's share never disagrees with the count beside it.
+ */
+export function buildAgentTokenShare(stats: AgentTypeStats[]): AgentTokenShareView {
+	const byType = new Map<AgentType, AgentTypeStats>();
+	for (const stat of stats) byType.set(stat.agentType, stat);
+
+	const tokensOf = (stat: AgentTypeStats) =>
+		stat.totalInputTokens + stat.totalOutputTokens + stat.totalCacheReadTokens + stat.totalCacheWriteTokens;
+
+	const present = AGENT_TYPE_ORDER.map(type => byType.get(type)).filter(
+		(stat): stat is AgentTypeStats => stat !== undefined,
+	);
+	const totalTokens = present.reduce((sum, stat) => sum + tokensOf(stat), 0);
+	const totalCost = present.reduce((sum, stat) => sum + stat.totalCost, 0);
+
+	const segments = present.map(stat => {
+		const tokens = tokensOf(stat);
+		return {
+			agentType: stat.agentType,
+			tokens,
+			requests: stat.totalRequests,
+			cost: stat.totalCost,
+			share: totalTokens > 0 ? tokens / totalTokens : 0,
+		};
+	});
+
+	return { totalTokens, totalCost, segments };
+}
+
 export interface CostSummaryView {
 	totalCost: number;
 	avgDailyCost: number;

package/src/client/routes/OverviewRoute.tsx

@@ -2,6 +2,7 @@ import { format } from "date-fns";
 import { useMemo } from "react";
 import { Line } from "react-chartjs-2";
 import { getOverviewStats, getRecentRequests } from "../api";
+import { AgentTokenShare } from "../components/AgentTokenShare";
 import { CHART_THEMES } from "../components/chart-shared";
 import { formatCost, formatDurationMs, formatInteger, formatRelativeTime } from "../data/formatters";
 import { useResource } from "../data/useResource";
@@ -224,6 +225,15 @@ export function OverviewRoute({ active, range, refreshTrigger, onRequestClick }:
 				{overview && <MetricCluster stats={overview.overall} />}
 			</AsyncBoundary>
 
+			<Panel
+				title="Token Usage by Agent"
+				subtitle="Share of tokens across the main agent, task subagents, and the advisor"
+			>
+				<AsyncBoundary loading={overviewLoading} error={overviewError} data={overview}>
+					{overview && <AgentTokenShare stats={overview.byAgentType} />}
+				</AsyncBoundary>
+			</Panel>
+
 			<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
 				<div className="lg:col-span-2">
 					<Panel title="System Throughput" subtitle="Request volume and errors over time">

package/src/client/types.ts

@@ -13,6 +13,7 @@
  */
 
 import type {
+	AgentTypeStats,
 	AggregatedStats,
 	CostTimeSeriesPoint,
 	ModelPerformancePoint,
@@ -64,6 +65,7 @@ export type TimeRange = "1h" | "24h" | "7d" | "30d" | "90d" | "all";
 
 export interface OverviewStats {
 	overall: AggregatedStats;
+	byAgentType: AgentTypeStats[];
 	timeSeries: TimeSeriesPoint[];
 }
 

package/src/db.ts

@@ -4,7 +4,10 @@ import type { Usage } from "@oh-my-pi/pi-ai";
 import type { GeneratedProvider } from "@oh-my-pi/pi-catalog/models";
 import { getBundledModel } from "@oh-my-pi/pi-catalog/models";
 import { getConfigRootDir, getStatsDbPath } from "@oh-my-pi/pi-utils";
+import { classifyAgentType } from "./parser";
 import type {
+	AgentType,
+	AgentTypeStats,
 	AggregatedStats,
 	BehaviorModelStats,
 	BehaviorOverallStats,
@@ -41,6 +44,7 @@ const BACKFILL_PENDING = "pending";
 const USER_MESSAGES_BACKFILL_KEY = "user_messages_v6";
 const USER_MESSAGE_LINKS_REPAIR_KEY = "user_message_links_v1";
 const PRIORITY_PREMIUM_REQUESTS_BACKFILL_KEY = "premium_requests_priority_v1";
+const AGENT_TYPE_BACKFILL_KEY = "agent_type_v1";
 function shouldResetBackfill(value: string | undefined): boolean {
 	return value !== BACKFILL_COMPLETE && value !== BACKFILL_PENDING;
 }
@@ -59,6 +63,11 @@ export async function initDb(): Promise<Database> {
 	db.run("PRAGMA busy_timeout = 5000");
 	db.run("PRAGMA journal_mode = WAL");
 
+	// Whether `messages` predates this init — drives the one-time agent_type
+	// backfill below, so it must be sampled before CREATE TABLE adds the table.
+	const messagesTableExisted =
+		db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'messages'").get() !== undefined;
+
 	// Create tables
 	db.run(`
 		CREATE TABLE IF NOT EXISTS messages (
@@ -85,6 +94,7 @@ export async function initDb(): Promise<Database> {
 			cost_cache_read REAL NOT NULL,
 			cost_cache_write REAL NOT NULL,
 			cost_total REAL NOT NULL,
+			agent_type TEXT NOT NULL DEFAULT 'main',
 			UNIQUE(session_file, entry_id)
 		);
 
@@ -135,6 +145,26 @@ export async function initDb(): Promise<Database> {
 		db.run("ALTER TABLE messages ADD COLUMN premium_requests REAL NOT NULL DEFAULT 0");
 	}
 	db.run("UPDATE messages SET premium_requests = 0 WHERE premium_requests IS NULL");
+	// Token-usage-by-agent: each message is classified main / subagent / advisor
+	// from its transcript path. A brand-new table gets the column from CREATE
+	// TABLE and the parser labels rows at insert time; a pre-existing table gets
+	// the column here (defaulting every prior row to 'main') and enrolls the
+	// one-time path-based reclassification, gated by a meta sentinel.
+	const hasAgentTypeColumn = messageColumns.some(column => column.name === "agent_type");
+	if (!hasAgentTypeColumn) {
+		db.run("ALTER TABLE messages ADD COLUMN agent_type TEXT NOT NULL DEFAULT 'main'");
+	}
+	// For any pre-existing table, enroll the backfill PENDING unless a prior run
+	// already settled the sentinel — `OR IGNORE` leaves an existing
+	// COMPLETE/PENDING value intact, so an ALTER that committed before its
+	// sentinel write (process killed in between) still reclassifies on the next
+	// init instead of silently leaving every row as the 'main' default. A
+	// brand-new empty table has nothing to reclassify, so it settles COMPLETE.
+	db.prepare("INSERT OR IGNORE INTO meta (key, value) VALUES (?, ?)").run(
+		AGENT_TYPE_BACKFILL_KEY,
+		messagesTableExisted ? BACKFILL_PENDING : BACKFILL_COMPLETE,
+	);
+	db.run("CREATE INDEX IF NOT EXISTS idx_messages_timestamp_agent_type ON messages(timestamp, agent_type)");
 	// Each behavior-metric bump invalidates previously-ingested rows. We detect
 	// the stale schema by column name and drop the table; `IF NOT EXISTS` above
 	// already produced the new schema, but we want a clean wipe + re-ingest.
@@ -186,6 +216,7 @@ export async function initDb(): Promise<Database> {
 	backfillUserMessages(db);
 	repairUserMessageLinks(db);
 	backfillPriorityPremiumRequests(db);
+	backfillAgentType(db);
 	backfillMissingCatalogCosts(db);
 	return db;
 }
@@ -317,8 +348,8 @@ export function insertMessageStats(stats: MessageStats[]): number {
 			session_file, entry_id, folder, model, provider, api, timestamp,
 			duration, ttft, stop_reason, error_message,
 			input_tokens, output_tokens, cache_read_tokens, cache_write_tokens, total_tokens, premium_requests,
-			cost_input, cost_output, cost_cache_read, cost_cache_write, cost_total
-		) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+			cost_input, cost_output, cost_cache_read, cost_cache_write, cost_total, agent_type
+		) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 		ON CONFLICT(session_file, entry_id) DO UPDATE SET
 			premium_requests = excluded.premium_requests
 		WHERE messages.premium_requests < excluded.premium_requests
@@ -351,6 +382,7 @@ export function insertMessageStats(stats: MessageStats[]): number {
 				cost.cacheRead,
 				cost.cacheWrite,
 				cost.total,
+				s.agentType,
 			);
 			if (result.changes > 0) inserted++;
 		}
@@ -519,6 +551,41 @@ export function getStatsByFolder(cutoff?: number): FolderStats[] {
 	}));
 }
 
+/**
+ * Get token usage grouped by agent type (main agent, task subagents, advisor).
+ * Token columns are explicit so the dashboard's share denominator matches the
+ * counts it renders. Rows missing `agent_type` (defensive) fall back to "main".
+ */
+export function getStatsByAgentType(cutoff?: number): AgentTypeStats[] {
+	if (!db) return [];
+
+	const hasCutoff = cutoff !== undefined && cutoff > 0;
+	const stmt = db.prepare(`
+		SELECT
+			agent_type,
+			COUNT(*) as total_requests,
+			SUM(input_tokens) as total_input_tokens,
+			SUM(output_tokens) as total_output_tokens,
+			SUM(cache_read_tokens) as total_cache_read_tokens,
+			SUM(cache_write_tokens) as total_cache_write_tokens,
+			SUM(cost_total) as total_cost
+		FROM messages
+		${hasCutoff ? "WHERE timestamp >= ?" : ""}
+		GROUP BY agent_type
+	`);
+
+	const rows = (hasCutoff ? stmt.all(cutoff) : stmt.all()) as any[];
+	return rows.map(row => ({
+		agentType: (row.agent_type as AgentType) ?? "main",
+		totalRequests: row.total_requests || 0,
+		totalInputTokens: row.total_input_tokens || 0,
+		totalOutputTokens: row.total_output_tokens || 0,
+		totalCacheReadTokens: row.total_cache_read_tokens || 0,
+		totalCacheWriteTokens: row.total_cache_write_tokens || 0,
+		totalCost: row.total_cost || 0,
+	}));
+}
+
 /**
  * Get time series data.
  */
@@ -686,6 +753,7 @@ function rowToMessageStats(row: any): MessageStats {
 				total: row.cost_total,
 			},
 		},
+		agentType: (row.agent_type as AgentType) ?? "main",
 	};
 }
 
@@ -794,6 +862,37 @@ function backfillUserMessages(database: Database): void {
 		.run(USER_MESSAGES_BACKFILL_KEY, BACKFILL_PENDING);
 }
 
+/**
+ * Reclassify pre-existing `messages` rows by agent type once, after the
+ * `agent_type` column is added to an older database (every prior row defaulted
+ * to 'main' on the ALTER). Classification is purely path-based — derived from
+ * the stored `session_file` — so no session re-parse is needed. Idempotent and
+ * crash-safe: enrolled (PENDING) only at migration time in {@link initDb} and
+ * marked COMPLETE inside the same transaction that applies the updates, so an
+ * interrupted run rolls back and retries on the next init.
+ */
+function backfillAgentType(database: Database): void {
+	const row = database.prepare("SELECT value FROM meta WHERE key = ?").get(AGENT_TYPE_BACKFILL_KEY) as
+		| { value: string }
+		| undefined;
+	if (row?.value !== BACKFILL_PENDING) return;
+
+	const sessionFiles = database.prepare("SELECT DISTINCT session_file FROM messages").all() as {
+		session_file: string;
+	}[];
+	const update = database.prepare("UPDATE messages SET agent_type = ? WHERE session_file = ?");
+	const markComplete = database.prepare("INSERT OR REPLACE INTO meta (key, value) VALUES (?, ?)");
+	const apply = database.transaction(() => {
+		for (const { session_file } of sessionFiles) {
+			const agentType = classifyAgentType(session_file);
+			// Rows already default to 'main'; only the nested transcripts move.
+			if (agentType !== "main") update.run(agentType, session_file);
+		}
+		markComplete.run(AGENT_TYPE_BACKFILL_KEY, BACKFILL_COMPLETE);
+	});
+	apply();
+}
+
 /**
  * One-shot wipe of `file_offsets` to force `parseSessionFile` to re-parse
  * every session from byte zero. We don't touch `user_messages`; the parser