@os-eco/overstory-cli 0.7.7 → 0.7.9

package/src/metrics/store.test.ts

@@ -535,6 +535,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 100,
 			estimatedCostUsd: 0.15,
 			modelUsed: "claude-sonnet-4-5",
+			runId: null,
 			createdAt: new Date().toISOString(),
 		};
 
@@ -558,6 +559,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: 0.01,
 			modelUsed: "claude-sonnet-4-5",
+			runId: null,
 			createdAt: new Date(now - 60_000).toISOString(), // 1 min ago
 		});
 
@@ -569,6 +571,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: 0.02,
 			modelUsed: "claude-sonnet-4-5",
+			runId: null,
 			createdAt: new Date(now).toISOString(), // now (most recent)
 		});
 
@@ -580,6 +583,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: 0.03,
 			modelUsed: "claude-sonnet-4-5",
+			runId: null,
 			createdAt: new Date(now - 30_000).toISOString(), // 30s ago
 		});
 
@@ -606,6 +610,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: time1,
 		});
 
@@ -617,6 +622,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: time2,
 		});
 
@@ -638,6 +644,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: new Date().toISOString(),
 		});
 
@@ -649,6 +656,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: new Date().toISOString(),
 		});
 
@@ -666,6 +674,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: new Date().toISOString(),
 		});
 
@@ -677,6 +686,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: new Date().toISOString(),
 		});
 
@@ -698,6 +708,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: new Date(now - 120_000).toISOString(), // 2 min ago
 		});
 
@@ -709,6 +720,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: new Date(now - 10_000).toISOString(), // 10s ago (recent)
 		});
 
@@ -729,6 +741,7 @@ describe("token snapshots", () => {
 			cacheCreationTokens: 0,
 			estimatedCostUsd: null,
 			modelUsed: null,
+			runId: null,
 			createdAt: new Date().toISOString(),
 		});
 
@@ -740,6 +753,220 @@ describe("token snapshots", () => {
 		expect(snapshots).toHaveLength(1);
 		expect(snapshots[0]?.agentName).toBe("test-agent");
 	});
+
+	test("runId roundtrips correctly through snapshot record and retrieval", () => {
+		const now = Date.now();
+		store.recordSnapshot({
+			agentName: "agent-a",
+			inputTokens: 100,
+			outputTokens: 50,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-abc",
+			createdAt: new Date(now).toISOString(),
+		});
+
+		store.recordSnapshot({
+			agentName: "agent-b",
+			inputTokens: 200,
+			outputTokens: 100,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: null,
+			createdAt: new Date(now).toISOString(),
+		});
+
+		const snapshots = store.getLatestSnapshots();
+		const agentA = snapshots.find((s) => s.agentName === "agent-a");
+		const agentB = snapshots.find((s) => s.agentName === "agent-b");
+
+		expect(agentA?.runId).toBe("run-abc");
+		expect(agentB?.runId).toBeNull();
+	});
+
+	test("getLatestSnapshots(runId) returns only snapshots matching that run", () => {
+		const now = Date.now();
+		store.recordSnapshot({
+			agentName: "agent-a",
+			inputTokens: 100,
+			outputTokens: 50,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-001",
+			createdAt: new Date(now).toISOString(),
+		});
+
+		store.recordSnapshot({
+			agentName: "agent-b",
+			inputTokens: 200,
+			outputTokens: 100,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-001",
+			createdAt: new Date(now).toISOString(),
+		});
+
+		store.recordSnapshot({
+			agentName: "agent-c",
+			inputTokens: 300,
+			outputTokens: 150,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-002",
+			createdAt: new Date(now).toISOString(),
+		});
+
+		const run001Snapshots = store.getLatestSnapshots("run-001");
+		expect(run001Snapshots).toHaveLength(2);
+		expect(run001Snapshots.every((s) => s.runId === "run-001")).toBe(true);
+
+		const run002Snapshots = store.getLatestSnapshots("run-002");
+		expect(run002Snapshots).toHaveLength(1);
+		expect(run002Snapshots[0]?.agentName).toBe("agent-c");
+	});
+
+	test("getLatestSnapshots(runId) returns empty array for unknown run", () => {
+		store.recordSnapshot({
+			agentName: "agent-a",
+			inputTokens: 100,
+			outputTokens: 50,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-001",
+			createdAt: new Date().toISOString(),
+		});
+
+		const snapshots = store.getLatestSnapshots("run-nonexistent");
+		expect(snapshots).toEqual([]);
+	});
+
+	test("getLatestSnapshots(runId) excludes snapshots with null run_id", () => {
+		const now = Date.now();
+		store.recordSnapshot({
+			agentName: "agent-a",
+			inputTokens: 100,
+			outputTokens: 50,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: null, // no run
+			createdAt: new Date(now).toISOString(),
+		});
+
+		store.recordSnapshot({
+			agentName: "agent-b",
+			inputTokens: 200,
+			outputTokens: 100,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-001",
+			createdAt: new Date(now).toISOString(),
+		});
+
+		const run001Snapshots = store.getLatestSnapshots("run-001");
+		expect(run001Snapshots).toHaveLength(1);
+		expect(run001Snapshots[0]?.agentName).toBe("agent-b");
+	});
+
+	test("getLatestSnapshots(runId) returns latest per agent within the run", () => {
+		const now = Date.now();
+		// Two snapshots for agent-a in run-001: should only get the latest
+		store.recordSnapshot({
+			agentName: "agent-a",
+			inputTokens: 100,
+			outputTokens: 50,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-001",
+			createdAt: new Date(now - 30_000).toISOString(), // older
+		});
+
+		store.recordSnapshot({
+			agentName: "agent-a",
+			inputTokens: 500,
+			outputTokens: 250,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-001",
+			createdAt: new Date(now).toISOString(), // latest
+		});
+
+		const snapshots = store.getLatestSnapshots("run-001");
+		expect(snapshots).toHaveLength(1);
+		expect(snapshots[0]?.inputTokens).toBe(500); // most recent
+	});
+
+	test("migration adds run_id to existing token_snapshots table", () => {
+		store.close();
+
+		// Create a DB with old token_snapshots schema (no run_id column)
+		const { Database } = require("bun:sqlite");
+		const oldDb = new Database(dbPath);
+		oldDb.exec("DROP TABLE IF EXISTS token_snapshots");
+		oldDb.exec(`
+			CREATE TABLE token_snapshots (
+				id INTEGER PRIMARY KEY AUTOINCREMENT,
+				agent_name TEXT NOT NULL,
+				input_tokens INTEGER NOT NULL DEFAULT 0,
+				output_tokens INTEGER NOT NULL DEFAULT 0,
+				cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+				cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
+				estimated_cost_usd REAL,
+				model_used TEXT,
+				created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f','now'))
+			)
+		`);
+		oldDb.exec(`
+			INSERT INTO token_snapshots (agent_name, input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, created_at)
+			VALUES ('old-agent', 100, 50, 0, 0, '2026-01-01T00:00:00.000Z')
+		`);
+		oldDb.close();
+
+		// Re-open with createMetricsStore which should migrate
+		store = createMetricsStore(dbPath);
+
+		// Old row should be readable with null run_id
+		const snapshots = store.getLatestSnapshots();
+		expect(snapshots).toHaveLength(1);
+		expect(snapshots[0]?.agentName).toBe("old-agent");
+		expect(snapshots[0]?.runId).toBeNull();
+
+		// New rows with run_id should work
+		store.recordSnapshot({
+			agentName: "new-agent",
+			inputTokens: 200,
+			outputTokens: 100,
+			cacheReadTokens: 0,
+			cacheCreationTokens: 0,
+			estimatedCostUsd: null,
+			modelUsed: null,
+			runId: "run-xyz",
+			createdAt: new Date().toISOString(),
+		});
+
+		const newSnapshots = store.getLatestSnapshots("run-xyz");
+		expect(newSnapshots).toHaveLength(1);
+		expect(newSnapshots[0]?.runId).toBe("run-xyz");
+	});
 });
 
 // === close ===

package/src/metrics/store.ts

@@ -21,8 +21,9 @@ export interface MetricsStore {
 	purge(options: { all?: boolean; agent?: string }): number;
 	/** Record a token usage snapshot for a running agent. */
 	recordSnapshot(snapshot: TokenSnapshot): void;
-	/** Get the most recent snapshot per active agent (one row per agent). */
-	getLatestSnapshots(): TokenSnapshot[];
+	/** Get the most recent snapshot per active agent (one row per agent).
+	 * When runId is provided, restricts to snapshots recorded for that run. */
+	getLatestSnapshots(runId?: string): TokenSnapshot[];
 	/** Get the timestamp of the most recent snapshot for an agent, or null. */
 	getLatestSnapshotTime(agentName: string): string | null;
 	/** Delete snapshots matching criteria. Returns number of rows deleted. */
@@ -60,6 +61,7 @@ interface SnapshotRow {
 	cache_creation_tokens: number;
 	estimated_cost_usd: number | null;
 	model_used: string | null;
+	run_id: string | null;
 	created_at: string;
 }
 
@@ -94,6 +96,7 @@ CREATE TABLE IF NOT EXISTS token_snapshots (
   cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
   estimated_cost_usd REAL,
   model_used TEXT,
+  run_id TEXT,
   created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f','now'))
 )`;
 
@@ -136,6 +139,18 @@ function migrateRunIdColumn(db: Database): void {
 	}
 }
 
+/**
+ * Migrate an existing token_snapshots table to include the run_id column.
+ * Safe to call multiple times — only adds the column if missing.
+ */
+function migrateSnapshotRunIdColumn(db: Database): void {
+	const rows = db.prepare("PRAGMA table_info(token_snapshots)").all() as Array<{ name: string }>;
+	const existingColumns = new Set(rows.map((r) => r.name));
+	if (!existingColumns.has("run_id")) {
+		db.exec("ALTER TABLE token_snapshots ADD COLUMN run_id TEXT");
+	}
+}
+
 /**
  * Migrate an existing sessions table to include token columns.
  * Safe to call multiple times — only adds columns that are missing.
@@ -183,6 +198,7 @@ function rowToSnapshot(row: SnapshotRow): TokenSnapshot {
 		cacheCreationTokens: row.cache_creation_tokens,
 		estimatedCostUsd: row.estimated_cost_usd,
 		modelUsed: row.model_used,
+		runId: row.run_id,
 		createdAt: row.created_at,
 	};
 }
@@ -210,6 +226,7 @@ export function createMetricsStore(dbPath: string): MetricsStore {
 	migrateBeadIdToTaskId(db);
 	migrateTokenColumns(db);
 	migrateRunIdColumn(db);
+	migrateSnapshotRunIdColumn(db);
 
 	// Prepare statements for all queries
 	const insertStmt = db.prepare<
@@ -282,13 +299,14 @@ export function createMetricsStore(dbPath: string): MetricsStore {
 			$cache_creation_tokens: number;
 			$estimated_cost_usd: number | null;
 			$model_used: string | null;
+			$run_id: string | null;
 			$created_at: string;
 		}
 	>(`
 		INSERT INTO token_snapshots
-			(agent_name, input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, estimated_cost_usd, model_used, created_at)
+			(agent_name, input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, estimated_cost_usd, model_used, run_id, created_at)
 		VALUES
-			($agent_name, $input_tokens, $output_tokens, $cache_read_tokens, $cache_creation_tokens, $estimated_cost_usd, $model_used, $created_at)
+			($agent_name, $input_tokens, $output_tokens, $cache_read_tokens, $cache_creation_tokens, $estimated_cost_usd, $model_used, $run_id, $created_at)
 	`);
 
 	const latestSnapshotsStmt = db.prepare<SnapshotRow, Record<string, never>>(`
@@ -301,6 +319,18 @@ export function createMetricsStore(dbPath: string): MetricsStore {
 		) latest ON s.agent_name = latest.agent_name AND s.created_at = latest.max_created_at
 	`);
 
+	const latestSnapshotsByRunStmt = db.prepare<SnapshotRow, { $run_id: string }>(`
+		SELECT s.*
+		FROM token_snapshots s
+		INNER JOIN (
+			SELECT agent_name, MAX(created_at) as max_created_at
+			FROM token_snapshots
+			WHERE run_id = $run_id
+			GROUP BY agent_name
+		) latest ON s.agent_name = latest.agent_name AND s.created_at = latest.max_created_at
+		WHERE s.run_id = $run_id
+	`);
+
 	const latestSnapshotTimeStmt = db.prepare<
 		{ created_at: string } | null,
 		{ $agent_name: string }
@@ -401,11 +431,16 @@ export function createMetricsStore(dbPath: string): MetricsStore {
 				$cache_creation_tokens: snapshot.cacheCreationTokens,
 				$estimated_cost_usd: snapshot.estimatedCostUsd,
 				$model_used: snapshot.modelUsed,
+				$run_id: snapshot.runId,
 				$created_at: snapshot.createdAt,
 			});
 		},
 
-		getLatestSnapshots(): TokenSnapshot[] {
+		getLatestSnapshots(runId?: string): TokenSnapshot[] {
+			if (runId !== undefined) {
+				const rows = latestSnapshotsByRunStmt.all({ $run_id: runId });
+				return rows.map(rowToSnapshot);
+			}
 			const rows = latestSnapshotsStmt.all({});
 			return rows.map(rowToSnapshot);
 		},