auto-model-router 0.4.11 → 0.4.12

package/.omp-plugin/marketplace.json

@@ -7,14 +7,14 @@
   },
   "metadata": {
     "description": "auto-model-router: a local cost/complexity-aware model router for Oh My Pi, backed by OpenRouter",
-    "version": "0.4.11",
+    "version": "0.4.12",
     "pluginRoot": "."
   },
   "plugins": [
     {
       "name": "auto-model-router",
       "description": "Local cost/complexity-aware model router for Oh My Pi, backed by OpenRouter. Runs in-process, routes per turn by price and task complexity, with budget caps, mid-stream escalation, and cache-aware hysteresis.",
-      "version": "0.4.11",
+      "version": "0.4.12",
       "author": {
         "name": "drewappling",
         "email": "drewappling@gmail.com"

package/README.md

@@ -706,7 +706,8 @@ escalation signal, error. Three views aggregate it, all from the same
   transcript. Falls back to reading the ledger directly if the router is
   unreachable.
 - `auto-model-router report --days 7 [--harness <id>] [--json]` on the terminal.
-- `GET /v1/router/report?days=7&harness=<id>` for dashboards.
+- `GET /v1/router/report?days=7&harness=<id>` for dashboards (`harness` may be
+  a comma-separated set of ids, for a group).
 - `GET /v1/router/summary?harness=<id>` — the daily summary as JSON (`auto=1`
   applies the once-a-day gate and returns `due: false` when nothing is due).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-model-router",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "private": false,
   "description": "Local cost/complexity-aware model router for Oh My Pi, backed by OpenRouter",
   "type": "module",

package/src/cost/report.ts

@@ -187,9 +187,20 @@ function toRow(r: RawRow, windowSpend: number): ReportRow {
 	};
 }
 
+/** A harness filter: one id, or several comma-separated (a team's members); empty ⇒ everything. */
+export function harnessFilter(harnessId: string, param = "$harness"): { sql: string[]; bind: Record<string, string> } {
+	const ids = harnessId.split(",").map((s) => s.trim()).filter((s) => s !== "");
+	if (ids.length === 0) return { sql: [], bind: {} };
+	if (ids.length === 1) return { sql: [`harness_id = ${param}`], bind: { [param]: ids[0]! } };
+	const bind: Record<string, string> = {};
+	ids.forEach((id, i) => (bind[`${param}${i}`] = id));
+	return { sql: [`harness_id IN (${ids.map((_, i) => `${param}${i}`).join(", ")})`], bind };
+}
+
 /**
  * Builds the report for the last `windowDays`. `harnessId` narrows to one
- * harness (the `X-Omp-Harness` header); empty means everything.
+ * harness (the `X-Omp-Harness` header) or a comma-separated set of them (a
+ * team edition group); empty means everything.
  */
 export function buildUsageReport(
 	db: Database,
@@ -200,12 +211,9 @@ export function buildUsageReport(
 	const sinceMs = nowMs - windowDays * 86_400_000;
 	const harnessId = opts.harnessId ?? "";
 	const untilMs = opts.untilMs;
-	const where = [
-		"created_at_ms >= $since",
-		...(untilMs === undefined ? [] : ["created_at_ms < $until"]),
-		...(harnessId === "" ? [] : ["harness_id = $harness"]),
-	].join(" AND ");
-	const bind = { $since: sinceMs, ...(untilMs === undefined ? {} : { $until: untilMs }), ...(harnessId === "" ? {} : { $harness: harnessId }) };
+	const hf = harnessFilter(harnessId);
+	const where = ["created_at_ms >= $since", ...(untilMs === undefined ? [] : ["created_at_ms < $until"]), ...hf.sql].join(" AND ");
+	const bind = { $since: sinceMs, ...(untilMs === undefined ? {} : { $until: untilMs }), ...hf.bind };
 
 	const t = db
 		.query(

package/src/cost/summary.ts

@@ -13,7 +13,7 @@
 
 import type { Database } from "bun:sqlite";
 import { TIER_ORDER } from "../router/types.ts";
-import { buildUsageReport, type BaselinePrice, type BaselineRow, type UsageReport } from "./report.ts";
+import { buildUsageReport, harnessFilter, type BaselinePrice, type BaselineRow, type UsageReport } from "./report.ts";
 import type { SoftFailureSpike } from "./types.ts";
 
 /** One 24-hour window's headline numbers. */
@@ -89,8 +89,9 @@ function windowOf(r: UsageReport): SummaryWindow {
 
 /** Counts tier moves up and down between consecutive kept turns of each conversation since `sinceMs`. */
 export function countTierChanges(db: Database, sinceMs: number, harnessId: string): { up: number; down: number } {
-	const where = harnessId === "" ? "created_at_ms >= $since" : "created_at_ms >= $since AND harness_id = $harness";
-	const bind = harnessId === "" ? { $since: sinceMs } : { $since: sinceMs, $harness: harnessId };
+	const hf = harnessFilter(harnessId);
+	const where = ["created_at_ms >= $since", ...hf.sql].join(" AND ");
+	const bind = { $since: sinceMs, ...hf.bind };
 	const seq = db
 		.query(`SELECT conversation_key AS ck, tier FROM ledger WHERE ${where} AND wasted = 0 AND requested_model <> 'digest' ORDER BY conversation_key, created_at_ms`)
 		.all(bind) as { ck: string; tier: string }[];
@@ -155,7 +156,7 @@ function delta(current: number, previous: number): string {
 
 /** Renders the summary as a few plain lines for the transcript. */
 export function renderDailySummary(s: DailySummary): string {
-	const scope = s.harnessId === "" ? "all harnesses" : `harness ${s.harnessId}`;
+	const scope = s.harnessId === "" ? "all harnesses" : s.harnessId.includes(",") ? `${s.harnessId.split(",").length} harnesses` : `harness ${s.harnessId}`;
 	const out: string[] = [`auto-model-router daily summary — last 24h (${scope})`];
 	const c = s.current;
 	if (c.dispatches === 0) {

package/test/report.test.ts

@@ -156,6 +156,20 @@ describe("buildUsageReport", () => {
 		db.close();
 	});
 
+	test("a comma-separated harness list reports the union (a team group)", () => {
+		const { db, ledger } = seeded();
+		try {
+			ledger.record(entry({ harnessId: "u_a", reportedUsd: 1 }));
+			ledger.record(entry({ harnessId: "u_b", reportedUsd: 2 }));
+			ledger.record(entry({ harnessId: "u_c", reportedUsd: 4 }));
+			expect(buildUsageReport(db, { windowDays: 1, nowMs: NOW, harnessId: "u_a,u_b" }).totals.spendUsd).toBeCloseTo(3, 6);
+			expect(buildUsageReport(db, { windowDays: 1, nowMs: NOW, harnessId: " u_c , u_a " }).totals.spendUsd).toBeCloseTo(5, 6);
+			expect(buildUsageReport(db, { windowDays: 1, nowMs: NOW, harnessId: "u_b" }).totals.spendUsd).toBeCloseTo(2, 6);
+		} finally {
+			db.close();
+		}
+	});
+
 	test("prompt anatomy averages the recorded byte shares", () => {
 		const { db, ledger } = seeded();
 		const feat = (tool: number, older: number, stale: number) => ({ toolSchemaBytes: 1000, anatomy: { messages: 30, systemBytes: 1000, userBytes: 500, assistantBytes: 500, toolBytes: tool, olderHalfBytes: older, staleToolBytes: stale } });