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

package/src/parser.ts

@@ -3,6 +3,7 @@ import * as path from "node:path";
 import { type AssistantMessage, getPriorityPremiumRequests, type ServiceTier } from "@oh-my-pi/pi-ai";
 import { getSessionsDir, isEnoent } from "@oh-my-pi/pi-utils";
 import type {
+	AgentType,
 	MessageStats,
 	SessionEntry,
 	SessionMessageEntry,
@@ -12,6 +13,25 @@ import type {
 } from "./types";
 import { computeUserMessageMetrics } from "./user-metrics";
 
+/** Basename of an advisor agent's transcript inside a session artifacts dir. */
+const ADVISOR_TRANSCRIPT_BASENAME = "__advisor.jsonl";
+
+/**
+ * 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 function classifyAgentType(sessionPath: string): AgentType {
+	if (path.basename(sessionPath) === ADVISOR_TRANSCRIPT_BASENAME) return "advisor";
+	const rel = path.relative(getSessionsDir(), sessionPath);
+	// `<project>/<file>.jsonl` -> 2 segments. Deeper nesting is a subagent.
+	return rel.split(path.sep).length <= 2 ? "main" : "subagent";
+}
+
 /**
  * Extract folder name from session filename.
  * Session files are named like: --work--pi--/timestamp_uuid.jsonl
@@ -107,6 +127,7 @@ function extractStats(
 	folder: string,
 	entry: SessionMessageEntry,
 	currentServiceTier: ServiceTier | undefined,
+	agentType: AgentType,
 ): MessageStats | null {
 	const msg = entry.message as AssistantMessage;
 	if (msg?.role !== "assistant") return null;
@@ -134,6 +155,7 @@ function extractStats(
 		stopReason: msg.stopReason,
 		errorMessage: msg.errorMessage ?? null,
 		usage,
+		agentType,
 	};
 }
 
@@ -220,6 +242,7 @@ export async function parseSessionFile(sessionPath: string, fromOffset = 0): Pro
 	}
 
 	const folder = extractFolderFromPath(sessionPath);
+	const agentType = classifyAgentType(sessionPath);
 	const stats: MessageStats[] = [];
 	const userStats: UserMessageStats[] = [];
 	const userLinks: UserMessageLink[] = [];
@@ -245,7 +268,7 @@ export async function parseSessionFile(sessionPath: string, fromOffset = 0): Pro
 			continue;
 		}
 		if (isAssistantMessage(entry)) {
-			const msgStats = extractStats(sessionPath, folder, entry, currentServiceTier);
+			const msgStats = extractStats(sessionPath, folder, entry, currentServiceTier, agentType);
 			if (msgStats) stats.push(msgStats);
 			// Link assistant's responding model back to the user message it answered.
 			const parentId = (entry as SessionMessageEntry).parentId;

package/src/shared-types.ts

@@ -133,12 +133,42 @@ 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/src/types.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";
 
@@ -32,6 +33,8 @@ export interface MessageStats {
 	errorMessage: string | null;
 	/** Token usage */
 	usage: Usage;
+	/** Which agent produced this message (main agent, task subagent, advisor) */
+	agentType: AgentType;
 }
 
 /**