@oh-my-pi/omp-stats 14.9.5 → 14.9.7

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/omp-stats",
-	"version": "14.9.5",
+	"version": "14.9.7",
 	"description": "Local observability dashboard for pi AI usage statistics",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -37,8 +37,8 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-ai": "14.9.5",
-		"@oh-my-pi/pi-utils": "14.9.5",
+		"@oh-my-pi/pi-ai": "14.9.7",
+		"@oh-my-pi/pi-utils": "14.9.7",
 		"@tailwindcss/node": "^4.2.4",
 		"chart.js": "^4.5.1",
 		"date-fns": "^4.1.0",

package/src/aggregator.ts

@@ -19,67 +19,177 @@ import {
 	insertMessageStats,
 	insertUserMessageStats,
 	setFileOffset,
+	updateUserMessageLinks,
 } from "./db";
-import { getSessionEntry, listAllSessionFiles, parseSessionFile } from "./parser";
+import { getSessionEntry, listAllSessionFiles, type ParseSessionResult } from "./parser";
+import type { SyncWorkerRequest, SyncWorkerResponse } from "./sync-worker";
+// `with { type: "file" }` resolves to the worker's absolute path at runtime
+// (dev) and survives bundling (the asset is copied alongside the build).
+// tsgo doesn't recognize Bun's file-URL import attribute and would raise
+// TS1192/TS5097 here; Bun honors it. Same suppression pattern lives in
+// `tab-supervisor.ts` and `context-manager.ts`.
+// @ts-expect-error -- Bun file-URL import (see comment above).
+import syncWorkerUrl from "./sync-worker.ts" with { type: "file" };
 import type { BehaviorDashboardStats, DashboardStats, MessageStats, RequestDetails } from "./types";
 
 /**
- * Sync a single session file to the database.
- * Only processes new entries since the last sync.
+ * Apply a freshly parsed result to the database. Runs entirely on the
+ * main thread so the single SQLite handle owns every write.
  */
-async function syncSessionFile(sessionFile: string): Promise<number> {
-	// Get file stats
-	let fileStats: fs.Stats;
-	try {
-		fileStats = await fs.promises.stat(sessionFile);
-	} catch {
-		return 0;
-	}
+function applyParseResult(sessionFile: string, lastModified: number, result: ParseSessionResult): number {
+	if (result.stats.length > 0) insertMessageStats(result.stats);
+	if (result.userStats.length > 0) insertUserMessageStats(result.userStats);
+	if (result.userLinks.length > 0) updateUserMessageLinks(result.userLinks);
+	setFileOffset(sessionFile, result.newOffset, lastModified);
+	return result.stats.length + result.userStats.length;
+}
 
-	const lastModified = fileStats.mtimeMs;
+/**
+ * Progress event emitted after each session file is fully processed.
+ * `current` is the number of files completed (skipped + parsed),
+ * `total` is the size of the work set. `processed` is the running total
+ * of inserted rows.
+ */
+export interface SyncProgress {
+	current: number;
+	total: number;
+	processed: number;
+	sessionFile: string;
+}
 
-	// Check if file has changed since last sync
-	const stored = getFileOffset(sessionFile);
-	if (stored && stored.lastModified >= lastModified) {
-		return 0; // File hasn't changed
-	}
+export interface SyncOptions {
+	/** Called after each file completes. Synchronous; keep it cheap. */
+	onProgress?: (event: SyncProgress) => void;
+	/**
+	 * Worker pool size. Defaults to a sensible value derived from the host
+	 * (capped to avoid drowning a small machine in workers). Set to `1` to
+	 * force serial parsing without spawning workers.
+	 */
+	workers?: number;
+}
 
-	// Parse file from last offset
-	const fromOffset = stored?.offset ?? 0;
-	const { stats, userStats, newOffset } = await parseSessionFile(sessionFile, fromOffset);
+function defaultWorkerCount(): number {
+	// `navigator.hardwareConcurrency` is the portable answer in Bun; fall
+	// back to a small fixed pool if it's somehow unavailable.
+	const hw = typeof navigator !== "undefined" ? (navigator.hardwareConcurrency ?? 0) : 0;
+	const raw = hw > 0 ? hw : 4;
+	// Cap at 8 - parse is JSON-bound, and SQLite writes serialize on main
+	// thread anyway, so more workers stop helping.
+	return Math.min(8, Math.max(2, Math.floor(raw)));
+}
 
-	if (stats.length > 0) {
-		insertMessageStats(stats);
-	}
-	if (userStats.length > 0) {
-		insertUserMessageStats(userStats);
-	}
+interface WorkerHandle {
+	worker: Worker;
+	busy: boolean;
+	resolve: ((res: ParseSessionResult) => void) | null;
+	reject: ((err: Error) => void) | null;
+}
 
-	// Update offset tracker
-	setFileOffset(sessionFile, newOffset, lastModified);
+function spawnWorker(): WorkerHandle {
+	const worker = new Worker(syncWorkerUrl, { type: "module" });
+	const handle: WorkerHandle = { worker, busy: false, resolve: null, reject: null };
+	worker.onmessage = (event: MessageEvent<SyncWorkerResponse>) => {
+		const { resolve, reject } = handle;
+		handle.resolve = null;
+		handle.reject = null;
+		handle.busy = false;
+		if (!resolve || !reject) return;
+		if (event.data.ok) resolve(event.data.result);
+		else reject(new Error(event.data.error));
+	};
+	worker.onerror = (event: ErrorEvent) => {
+		const { reject } = handle;
+		handle.resolve = null;
+		handle.reject = null;
+		handle.busy = false;
+		reject?.(event.error instanceof Error ? event.error : new Error(event.message || "worker error"));
+	};
+	return handle;
+}
 
-	return stats.length + userStats.length;
+function dispatch(handle: WorkerHandle, request: SyncWorkerRequest): Promise<ParseSessionResult> {
+	if (handle.busy) {
+		return Promise.reject(new Error("worker is busy - this is a bug in the dispatcher"));
+	}
+	const { promise, resolve, reject } = Promise.withResolvers<ParseSessionResult>();
+	handle.busy = true;
+	handle.resolve = resolve;
+	handle.reject = reject;
+	handle.worker.postMessage(request);
+	return promise;
 }
 
 /**
  * Sync all session files to the database.
- * Returns the number of new entries processed.
+ *
+ * Parsing fans out across a worker pool (one in-flight job per worker)
+ * while DB writes and offset bookkeeping stay on the calling thread so the
+ * single SQLite handle stays uncontended. `onProgress` fires once per
+ * completed file (skipped files included so the bar walks at a steady
+ * rate).
  */
-export async function syncAllSessions(): Promise<{ processed: number; files: number }> {
+export async function syncAllSessions(opts?: SyncOptions): Promise<{ processed: number; files: number }> {
 	await initDb();
 
 	const files = await listAllSessionFiles();
+	if (files.length === 0) return { processed: 0, files: 0 };
+
 	let totalProcessed = 0;
 	let filesProcessed = 0;
+	let completed = 0;
+	let cursor = 0;
+
+	const poolSize = Math.max(1, Math.min(files.length, opts?.workers ?? defaultWorkerCount()));
+	const handles: WorkerHandle[] = [];
+	for (let i = 0; i < poolSize; i++) handles.push(spawnWorker());
+
+	const report = (sessionFile: string) => {
+		completed++;
+		opts?.onProgress?.({
+			current: completed,
+			total: files.length,
+			processed: totalProcessed,
+			sessionFile,
+		});
+	};
 
-	for (const file of files) {
-		const count = await syncSessionFile(file);
-		if (count > 0) {
-			totalProcessed += count;
-			filesProcessed++;
+	async function drain(handle: WorkerHandle): Promise<void> {
+		while (true) {
+			const idx = cursor++;
+			if (idx >= files.length) return;
+			const sessionFile = files[idx];
+
+			let fileStats: fs.Stats;
+			try {
+				fileStats = await fs.promises.stat(sessionFile);
+			} catch {
+				report(sessionFile);
+				continue;
+			}
+			const lastModified = fileStats.mtimeMs;
+			const stored = getFileOffset(sessionFile);
+			if (stored && stored.lastModified >= lastModified) {
+				report(sessionFile);
+				continue;
+			}
+
+			const fromOffset = stored?.offset ?? 0;
+			const result = await dispatch(handle, { sessionFile, fromOffset });
+			const inserted = applyParseResult(sessionFile, lastModified, result);
+			if (inserted > 0) {
+				totalProcessed += inserted;
+				filesProcessed++;
+			}
+			report(sessionFile);
 		}
 	}
 
+	try {
+		await Promise.all(handles.map(drain));
+	} finally {
+		for (const handle of handles) handle.worker.terminate();
+	}
+
 	return { processed: totalProcessed, files: filesProcessed };
 }
 

package/src/client/components/BehaviorChart.tsx

@@ -51,10 +51,14 @@ const CHART_THEMES = {
 } as const;
 
 const METRIC_OPTIONS = [
-	{ value: "yellingSentences", label: "Yelling" },
+	{ value: "yelling", label: "Yelling" },
 	{ value: "profanity", label: "Profanity" },
-	{ value: "dramaRuns", label: "Drama (!!! / ???)" },
-	{ value: "total", label: "All three combined" },
+	{ value: "anguish", label: "Anguish (!!!, nooo, dude, ..)" },
+	{ value: "negation", label: "Negation (no/nope/wrong)" },
+	{ value: "repetition", label: "Repetition (i meant, still doesnt)" },
+	{ value: "blame", label: "Blame (you didnt, stop X-ing)" },
+	{ value: "frustration", label: "Frustration (neg + rep + blame)" },
+	{ value: "total", label: "All signals combined" },
 ] as const;
 type Metric = (typeof METRIC_OPTIONS)[number]["value"];
 
@@ -70,7 +74,10 @@ interface BehaviorChartProps {
 }
 
 function pointHits(point: BehaviorTimeSeriesPoint, metric: Metric): number {
-	if (metric === "total") return point.yellingSentences + point.profanity + point.dramaRuns;
+	if (metric === "frustration") return point.negation + point.repetition + point.blame;
+	if (metric === "total") {
+		return point.yelling + point.profanity + point.anguish + point.negation + point.repetition + point.blame;
+	}
 	return point[metric];
 }
 

package/src/client/components/BehaviorModelsTable.tsx

@@ -30,7 +30,8 @@ const MODEL_COLORS = [
 const SERIES_COLORS = {
 	yelling: "#fbbf24", // amber
 	profanity: "#f87171", // red
-	drama: "#a78bfa", // violet
+	anguish: "#a78bfa", // violet
+	frustration: "#22d3ee", // cyan - new semantic signals
 } as const;
 
 const CHART_THEMES = {
@@ -65,7 +66,8 @@ interface DailyPoint {
 	timestamp: number;
 	yelling: number;
 	profanity: number;
-	drama: number;
+	anguish: number;
+	frustration: number;
 	total: number;
 }
 
@@ -73,7 +75,7 @@ interface ModelTrendSeries {
 	data: DailyPoint[];
 }
 
-const GRID_TEMPLATE = "2fr 0.9fr 0.9fr 0.9fr 0.9fr 0.9fr 140px 40px";
+const GRID_TEMPLATE = "2fr 0.9fr 0.8fr 0.8fr 0.8fr 0.9fr 0.8fr 140px 40px";
 
 function formatInt(value: number): string {
 	return value.toLocaleString();
@@ -81,7 +83,13 @@ function formatInt(value: number): string {
 
 function totalHitRate(model: BehaviorModelStats): number {
 	if (model.totalMessages === 0) return 0;
-	const hits = model.totalYellingSentences + model.totalProfanity + model.totalDramaRuns;
+	const hits =
+		model.totalYelling +
+		model.totalProfanity +
+		model.totalAnguish +
+		model.totalNegation +
+		model.totalRepetition +
+		model.totalBlame;
 	return hits / model.totalMessages;
 }
 
@@ -128,7 +136,8 @@ export function BehaviorModelsTable({ models, behaviorSeries }: BehaviorModelsTa
 					<div className="text-right">Messages</div>
 					<div className="text-right">CAPS %</div>
 					<div className="text-right">Profanity %</div>
-					<div className="text-right">Drama %</div>
+					<div className="text-right">Anguish %</div>
+					<div className="text-right">Frustration %</div>
 					<div className="text-right">Hits %</div>
 					<div className="text-center">Trend</div>
 					<div />
@@ -140,7 +149,8 @@ export function BehaviorModelsTable({ models, behaviorSeries }: BehaviorModelsTa
 						const trend = trendByKey.get(key)?.data ?? [];
 						const trendColor = MODEL_COLORS[index % MODEL_COLORS.length];
 						const isExpanded = expandedKey === key;
-						const totalHits = model.totalYellingSentences + model.totalProfanity + model.totalDramaRuns;
+						const totalFrustration = model.totalNegation + model.totalRepetition + model.totalBlame;
+						const totalHits = model.totalYelling + model.totalProfanity + model.totalAnguish + totalFrustration;
 
 						return (
 							<div key={key} className="border-t border-[var(--border-subtle)]">
@@ -158,13 +168,16 @@ export function BehaviorModelsTable({ models, behaviorSeries }: BehaviorModelsTa
 											{formatInt(model.totalMessages)}
 										</div>
 										<div className="text-right text-[var(--text-secondary)] font-mono text-sm">
-											{formatRate(model.totalYellingSentences, model.totalMessages)}
+											{formatRate(model.totalYelling, model.totalMessages)}
 										</div>
 										<div className="text-right text-[var(--text-secondary)] font-mono text-sm">
 											{formatRate(model.totalProfanity, model.totalMessages)}
 										</div>
 										<div className="text-right text-[var(--text-secondary)] font-mono text-sm">
-											{formatRate(model.totalDramaRuns, model.totalMessages)}
+											{formatRate(model.totalAnguish, model.totalMessages)}
+										</div>
+										<div className="text-right text-[var(--text-secondary)] font-mono text-sm">
+											{formatRate(totalFrustration, model.totalMessages)}
 										</div>
 										<div className="text-right text-[var(--text-secondary)] font-mono text-sm">
 											{formatRate(totalHits, model.totalMessages)}
@@ -188,7 +201,7 @@ export function BehaviorModelsTable({ models, behaviorSeries }: BehaviorModelsTa
 											<div className="space-y-4 text-sm">
 												<DetailRow
 													label="Yelling (CAPS)"
-													total={model.totalYellingSentences}
+													total={model.totalYelling}
 													messages={model.totalMessages}
 													valueClass="text-[var(--accent-amber,#fbbf24)]"
 												/>
@@ -199,11 +212,29 @@ export function BehaviorModelsTable({ models, behaviorSeries }: BehaviorModelsTa
 													valueClass="text-[var(--accent-red,#f87171)]"
 												/>
 												<DetailRow
-													label="Drama (!!! / ???)"
-													total={model.totalDramaRuns}
+													label="Anguish (!!!, nooo, dude, ..)"
+													total={model.totalAnguish}
 													messages={model.totalMessages}
 													valueClass="text-[var(--accent-violet,#a78bfa)]"
 												/>
+												<DetailRow
+													label="Negation (no/nope/wrong)"
+													total={model.totalNegation}
+													messages={model.totalMessages}
+													valueClass="text-[var(--accent-cyan,#22d3ee)]"
+												/>
+												<DetailRow
+													label="Repetition (i meant, still doesnt)"
+													total={model.totalRepetition}
+													messages={model.totalMessages}
+													valueClass="text-[var(--accent-cyan,#22d3ee)]"
+												/>
+												<DetailRow
+													label="Blame (you didnt, stop X-ing)"
+													total={model.totalBlame}
+													messages={model.totalMessages}
+													valueClass="text-[var(--accent-cyan,#22d3ee)]"
+												/>
 												<DetailRow
 													label="Avg chars / msg"
 													total={model.totalChars}
@@ -322,9 +353,18 @@ function BreakdownChart({ data, chartTheme }: { data: DailyPoint[]; chartTheme:
 				borderWidth: 2,
 			},
 			{
-				label: "Drama",
-				data: data.map(d => d.drama),
-				borderColor: SERIES_COLORS.drama,
+				label: "Anguish",
+				data: data.map(d => d.anguish),
+				borderColor: SERIES_COLORS.anguish,
+				backgroundColor: "transparent",
+				tension: 0.4,
+				pointRadius: 0,
+				borderWidth: 2,
+			},
+			{
+				label: "Frustration",
+				data: data.map(d => d.frustration),
+				borderColor: SERIES_COLORS.frustration,
 				backgroundColor: "transparent",
 				tension: 0.4,
 				pointRadius: 0,
@@ -394,13 +434,15 @@ function buildTrendLookup(points: BehaviorTimeSeriesPoint[]): Map<string, ModelT
 			timestamp: point.timestamp,
 			yelling: 0,
 			profanity: 0,
-			drama: 0,
+			anguish: 0,
+			frustration: 0,
 			total: 0,
 		};
-		existing.yelling += point.yellingSentences;
+		existing.yelling += point.yelling;
 		existing.profanity += point.profanity;
-		existing.drama += point.dramaRuns;
-		existing.total = existing.yelling + existing.profanity + existing.drama;
+		existing.anguish += point.anguish;
+		existing.frustration += point.negation + point.repetition + point.blame;
+		existing.total = existing.yelling + existing.profanity + existing.anguish + existing.frustration;
 		dayMap.set(point.timestamp, existing);
 	}
 
@@ -412,7 +454,8 @@ function buildTrendLookup(points: BehaviorTimeSeriesPoint[]): Map<string, ModelT
 					timestamp: ts,
 					yelling: 0,
 					profanity: 0,
-					drama: 0,
+					anguish: 0,
+					frustration: 0,
 					total: 0,
 				},
 		);

package/src/client/components/BehaviorSummary.tsx

@@ -10,14 +10,26 @@ function formatInt(value: number): string {
 	return value.toLocaleString();
 }
 
+/**
+ * Per-message rate for a signal. Uses 2 decimals so a 0.01-hits-per-msg model
+ * still distinguishes from a true zero, and never shows `NaN` or `Infinity`
+ * when there are no messages.
+ */
+function perMsg(total: number, messages: number): string | undefined {
+	if (messages <= 0) return undefined;
+	return `${(total / messages).toFixed(2)} / msg`;
+}
+
 export function BehaviorSummary({ overall, behaviorSeries }: BehaviorSummaryProps) {
-	// Top "ranted-at" model: model that absorbed the most caps + profanity + drama.
+	// Top "ranted-at" model: model that absorbed the most caps + profanity +
+	// anguish + frustration (negation/repetition/blame).
 	const topModel = useMemo(() => {
 		const totals = new Map<string, { model: string; provider: string; score: number }>();
 		for (const point of behaviorSeries) {
 			const key = `${point.model}::${point.provider}`;
 			const existing = totals.get(key);
-			const score = point.yellingSentences + point.profanity + point.dramaRuns;
+			const score =
+				point.yelling + point.profanity + point.anguish + point.negation + point.repetition + point.blame;
 			if (existing) {
 				existing.score += score;
 			} else {
@@ -31,36 +43,44 @@ export function BehaviorSummary({ overall, behaviorSeries }: BehaviorSummaryProp
 		return best;
 	}, [behaviorSeries]);
 
-	const capsPerMsg = overall.totalMessages > 0 ? overall.totalYellingSentences / overall.totalMessages : 0;
+	const totalFrustration = overall.totalNegation + overall.totalRepetition + overall.totalBlame;
+	const messages = overall.totalMessages;
 
 	const cards: Array<{ label: string; value: string; sub?: string }> = [
 		{
 			label: "Messages",
 			value: formatInt(overall.totalMessages),
+			sub: messages > 0 ? "in selected range" : undefined,
 		},
 		{
 			label: "Yelling",
-			value: formatInt(overall.totalYellingSentences),
-			sub: overall.totalMessages > 0 ? `${capsPerMsg.toFixed(2)} / msg` : undefined,
+			value: formatInt(overall.totalYelling),
+			sub: perMsg(overall.totalYelling, messages),
 		},
 		{
 			label: "Profanity hits",
 			value: formatInt(overall.totalProfanity),
+			sub: perMsg(overall.totalProfanity, messages),
+		},
+		{
+			label: "Anguish",
+			value: formatInt(overall.totalAnguish),
+			sub: perMsg(overall.totalAnguish, messages),
 		},
 		{
-			label: "Drama runs",
-			value: formatInt(overall.totalDramaRuns),
-			sub: "!!! / ???",
+			label: "Frustration",
+			value: formatInt(totalFrustration),
+			sub: perMsg(totalFrustration, messages),
 		},
 		{
 			label: "Most yelled-at",
-			value: topModel?.model ?? "—",
+			value: topModel?.model ?? "\u2014",
 			sub: topModel ? `${formatInt(topModel.score)} hits` : undefined,
 		},
 	];
 
 	return (
-		<div className="grid grid-cols-2 sm:grid-cols-5 gap-4">
+		<div className="grid grid-cols-2 sm:grid-cols-6 gap-4">
 			{cards.map(card => (
 				<div key={card.label} className="surface px-4 py-3">
 					<p className="text-xs text-[var(--text-muted)] mb-1">{card.label}</p>

package/src/client/types.ts

@@ -135,17 +135,23 @@ export interface BehaviorTimeSeriesPoint {
 	model: string;
 	provider: string;
 	messages: number;
-	yellingSentences: number;
+	yelling: number;
 	profanity: number;
-	dramaRuns: number;
+	anguish: number;
+	negation: number;
+	repetition: number;
+	blame: number;
 	chars: number;
 }
 
 export interface BehaviorOverallStats {
 	totalMessages: number;
-	totalYellingSentences: number;
+	totalYelling: number;
 	totalProfanity: number;
-	totalDramaRuns: number;
+	totalAnguish: number;
+	totalNegation: number;
+	totalRepetition: number;
+	totalBlame: number;
 	totalChars: number;
 	firstTimestamp: number;
 	lastTimestamp: number;
@@ -155,9 +161,12 @@ export interface BehaviorModelStats {
 	model: string;
 	provider: string;
 	totalMessages: number;
-	totalYellingSentences: number;
+	totalYelling: number;
 	totalProfanity: number;
-	totalDramaRuns: number;
+	totalAnguish: number;
+	totalNegation: number;
+	totalRepetition: number;
+	totalBlame: number;
 	totalChars: number;
 	lastTimestamp: number;
 }