@saadnvd1/agent-os 0.3.470 → 0.3.472

package/lib/usage/turns.ts

@@ -7,6 +7,8 @@
 import { db, type Session } from "../db";
 import type { UsageTotals } from "../chat/events";
 import { totalTokens, turnDelta } from "../chat/context";
+import { readUsage } from "../orchestrator/usage";
+import { ANTHROPIC, sessionRole } from "../models/roles";
 
 // Where a worker's totals start: a resumed conversation continues from the
 // totals its transcript saved, which the last worker stored; a new one
@@ -30,12 +32,22 @@ function savedTotals(sessionId: string): UsageTotals | null {
   }
 }
 
-// Records the turn and returns the totals to measure the next one from.
+// The plan's 5-hour window when a turn on it ended, for its share of the
+// plan (lib/usage/compare): unknown when the statusline isn't sampling.
+export function planWindowPct(): number | null {
+  const u = readUsage();
+  return "window" in u && u.window ? u.window.pct : null;
+}
+
+// Records the turn, with the model, provider and role it ran as, and
+// returns the totals to measure the next one from.
 export function recordTurn(
   session: Pick<Session, "id" | "name" | "workspace_id">,
   prev: UsageTotals | null,
   totals: UsageTotals,
-  at = Date.now()
+  at = Date.now(),
+  durationMs: number | null = null,
+  windowPct: () => number | null = planWindowPct
 ): UsageTotals {
   const turn = turnDelta(prev, totals);
   db.transaction(() => {
@@ -46,25 +58,102 @@ export function recordTurn(
     // A local command (/context, /mcp) spends nothing.
     if (turn.costUsd <= 0 && totalTokens(turn) <= 0) return;
     const current = db
-      .prepare(`SELECT name, workspace_id FROM sessions WHERE id = ?`)
+      .prepare(
+        `SELECT name, workspace_id, model, model_provider, role, task_status,
+           plan_phase FROM sessions WHERE id = ?`
+      )
       .get(session.id) as
-      | { name: string; workspace_id: string | null }
+      | Pick<
+          Session,
+          | "name"
+          | "workspace_id"
+          | "model"
+          | "model_provider"
+          | "role"
+          | "task_status"
+          | "plan_phase"
+        >
       | undefined;
-    db.prepare(
-      `INSERT INTO chat_turns (session_id, session_name, workspace_id, at, cost_usd,
-         input_tokens, output_tokens, cache_read_tokens, cache_write_tokens)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
-    ).run(
-      session.id,
-      current?.name ?? session.name,
-      current?.workspace_id ?? session.workspace_id,
+    const provider = current?.model_provider ?? ANTHROPIC;
+    insertTurn({
+      sessionId: session.id,
+      sessionName: current?.name ?? session.name,
+      workspaceId: current?.workspace_id ?? session.workspace_id,
       at,
-      turn.costUsd,
-      turn.inputTokens,
-      turn.outputTokens,
-      turn.cacheReadTokens,
-      turn.cacheWriteTokens
-    );
+      turn,
+      model: current?.model ?? null,
+      provider,
+      role: current ? sessionRole(current) : null,
+      durationMs,
+      windowPct: provider === ANTHROPIC ? windowPct() : null,
+    });
   })();
   return totals;
 }
+
+// Records one compaction: who ran it ("auto" is the agent's own, at its
+// auto-compact window; "threshold" and "stale" are AgentOS's before a
+// message; "manual" is a /compact someone typed), and the context before
+// and after when the agent said.
+export function recordCompaction(
+  session: Pick<Session, "id" | "name" | "workspace_id">,
+  c: { trigger: string; before?: number; after?: number },
+  at = Date.now()
+): void {
+  const current = db
+    .prepare(`SELECT name, workspace_id FROM sessions WHERE id = ?`)
+    .get(session.id) as
+    | { name: string; workspace_id: string | null }
+    | undefined;
+  db.prepare(
+    `INSERT INTO chat_compactions (session_id, session_name, workspace_id, at, trigger, before_tokens, after_tokens)
+     VALUES (?, ?, ?, ?, ?, ?, ?)`
+  ).run(
+    session.id,
+    current?.name ?? session.name,
+    current?.workspace_id ?? session.workspace_id,
+    at,
+    c.trigger,
+    c.before ?? null,
+    c.after ?? null
+  );
+}
+
+export interface TurnRecord {
+  sessionId: string;
+  sessionName: string;
+  workspaceId: string | null;
+  at: number;
+  turn: UsageTotals;
+  model: string | null;
+  provider: string;
+  role: string | null;
+  durationMs: number | null;
+  windowPct: number | null;
+}
+
+// One row of the usage ledger: a chat turn, or a one-shot check's run.
+export function insertTurn(r: TurnRecord): void {
+  const { turn } = r;
+  db.prepare(
+    `INSERT INTO chat_turns (session_id, session_name, workspace_id, at, cost_usd,
+       input_tokens, output_tokens, cache_read_tokens, cache_write_tokens,
+       model, provider, role, duration_ms, window_pct)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+  ).run(
+    r.sessionId,
+    r.sessionName,
+    r.workspaceId,
+    r.at,
+    turn.costUsd,
+    turn.inputTokens,
+    turn.outputTokens,
+    turn.cacheReadTokens,
+    turn.cacheWriteTokens,
+    r.model,
+    r.provider,
+    r.role,
+    r.durationMs,
+    r.windowPct
+  );
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.470",
+  "version": "0.3.472",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"

package/stores/usageUi.ts

@@ -1,12 +1,21 @@
 import { proxy } from "valtio";
 
-export const usageUi = proxy({ open: false });
+export type UsageTab = "spend" | "models" | "compare";
+
+export const usageUi = proxy<{ open: boolean; tab: UsageTab }>({
+  open: false,
+  tab: "spend",
+});
 
 export const usageUiActions = {
-  open: () => {
+  open: (tab: UsageTab = "spend") => {
+    usageUi.tab = tab;
     usageUi.open = true;
   },
   setOpen: (open: boolean) => {
     usageUi.open = open;
   },
+  setTab: (tab: UsageTab) => {
+    usageUi.tab = tab;
+  },
 };

package/scripts/check-code-review.ts

@@ -1,21 +0,0 @@
-// CI: fail a pull request whose body has no Code review section for its
-// head commit (the same rule the orchestrator's sign_off and stacks' land
-// apply). Reads PR_BODY and HEAD_SHA from the environment.
-import { codeReviewRefusal, parseCodeReview } from "../lib/tasks/code-review";
-
-// A head AgentOS rebased itself is covered by the review of the head it
-// rebased, as its gates allow.
-const section = parseCodeReview(process.env.PR_BODY ?? "");
-const refusal = codeReviewRefusal(
-  section,
-  process.env.HEAD_SHA || undefined,
-  section?.restacked
-);
-if (refusal) {
-  console.error(`✗ ${refusal}.`);
-  console.error(
-    "Run /do-code-review on the branch, then put its section in the PR body:\n\n## Code review\nReviewed: <head sha>\nAgents: ...\nFixed: ...\nDeferred: ..."
-  );
-  process.exit(1);
-}
-console.log(`✓ the Code review section covers ${process.env.HEAD_SHA}`);