portable-agent-layer 0.71.0 → 0.73.0

package/src/tools/token-cost.ts

@@ -9,389 +9,29 @@
  */
 
 import { spawnSync } from "node:child_process";
-import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { resolve } from "node:path";
 import { parseArgs } from "node:util";
-import { costOfUsage } from "../hooks/lib/models";
 import { palHome } from "../hooks/lib/paths";
 import { findBinaryOnPath } from "../hooks/lib/which";
+import { parseRtkSummary, type RtkGain, usageLines } from "./lib/token-report";
+import { readClaudeCode, readPalInference } from "./lib/usage-buckets";
 
-// ── Types ──
-
-interface Bucket {
-  input: number;
-  output: number;
-  cacheWrite5m: number;
-  cacheWrite1h: number;
-  cacheRead: number;
-  cost: number;
-  calls: number;
-}
-
-function emptyBucket(): Bucket {
-  return {
-    input: 0,
-    output: 0,
-    cacheWrite5m: 0,
-    cacheWrite1h: 0,
-    cacheRead: 0,
-    cost: 0,
-    calls: 0,
-  };
-}
-
-interface TimeBuckets {
-  today: Bucket;
-  week: Bucket;
-  month: Bucket;
-  total: Bucket;
-}
-
-function emptyTimeBuckets(): TimeBuckets {
-  return {
-    today: emptyBucket(),
-    week: emptyBucket(),
-    month: emptyBucket(),
-    total: emptyBucket(),
-  };
-}
-
-// ── Helpers ──
-
-function addToBucket(
-  bucket: Bucket,
-  model: string,
-  input: number,
-  output: number,
-  cacheWrite5m: number,
-  cacheWrite1h: number,
-  cacheRead: number
-): void {
-  bucket.input += input;
-  bucket.output += output;
-  bucket.cacheWrite5m += cacheWrite5m;
-  bucket.cacheWrite1h += cacheWrite1h;
-  bucket.cacheRead += cacheRead;
-  bucket.cost += costOfUsage(model, {
-    input,
-    output,
-    cacheWrite5m,
-    cacheWrite1h,
-    cacheRead,
-  });
-  bucket.calls++;
-}
-
-// ── Formatting ──
-
-function fmt(n: number): string {
-  if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
-  if (n >= 1_000) return `${(n / 1_000).toFixed(1)}k`;
-  return n.toLocaleString("en-US");
-}
-
-function fmtCost(n: number): string {
-  if (n >= 1) return `$${n.toFixed(2)}`;
-  return `$${n.toFixed(4)}`;
-}
-
-function printRow(label: string, b: Bucket, labelWidth = 14): void {
-  const tokens = b.input + b.output + b.cacheWrite5m + b.cacheWrite1h + b.cacheRead;
-  console.log(
-    `  ${label.padEnd(labelWidth)} ${fmt(tokens).padStart(8)} tok  ${fmt(b.calls).padStart(5)} calls  ${fmtCost(b.cost).padStart(8)}`
-  );
-}
-
-function printDetailed(label: string, b: Bucket, labelWidth = 14): void {
-  console.log(
-    `  ${label.padEnd(labelWidth)} ${fmt(b.input).padStart(8)} in  ${fmt(b.output).padStart(8)} out  ${fmt(b.cacheWrite5m).padStart(7)} cw5m  ${fmt(b.cacheWrite1h).padStart(7)} cw1h  ${fmt(b.cacheRead).padStart(8)} cr  ${fmtCost(b.cost).padStart(8)}`
-  );
-}
-
-// ── Claude Code transcripts ──
-
-function addToTimeBuckets(
-  tb: TimeBuckets,
-  ts: string,
-  model: string,
-  input: number,
-  output: number,
-  cacheWrite5m: number,
-  cacheWrite1h: number,
-  cacheRead: number,
-  todayPrefix: string,
-  weekAgo: string,
-  monthAgo: string
-): void {
-  addToBucket(tb.total, model, input, output, cacheWrite5m, cacheWrite1h, cacheRead);
-  if (ts >= monthAgo)
-    addToBucket(tb.month, model, input, output, cacheWrite5m, cacheWrite1h, cacheRead);
-  if (ts >= weekAgo)
-    addToBucket(tb.week, model, input, output, cacheWrite5m, cacheWrite1h, cacheRead);
-  if (ts.startsWith(todayPrefix))
-    addToBucket(tb.today, model, input, output, cacheWrite5m, cacheWrite1h, cacheRead);
-}
-
-function readClaudeCode(projectFilter?: string): {
-  buckets: TimeBuckets;
-  byModel: Record<string, Bucket>;
-  byProject: Record<string, TimeBuckets>;
-} {
-  const now = new Date();
-  const todayPrefix = now.toISOString().slice(0, 10);
-  const weekAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000).toISOString();
-  const monthAgo = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000).toISOString();
-
-  const buckets = emptyTimeBuckets();
-  const byModel: Record<string, Bucket> = {};
-  const byProject: Record<string, TimeBuckets> = {};
-
-  const claudeDir = resolve(homedir(), ".claude", "projects");
-  if (!existsSync(claudeDir)) return { buckets, byModel, byProject };
-
-  const projectDirs = readdirSync(claudeDir, { withFileTypes: true })
-    .filter((d) => d.isDirectory())
-    .map((d) => d.name);
-
-  for (const projDir of projectDirs) {
-    const projPath = resolve(claudeDir, projDir);
-    const segments = projDir.replace(/^-/, "").split("-");
-    const projName = segments.length > 1 ? segments.slice(-1)[0] : projDir;
-
-    if (typeof projectFilter === "string" && !projName.includes(projectFilter)) continue;
-
-    const jsonlFiles: string[] = [];
-
-    for (const entry of readdirSync(projPath, { withFileTypes: true })) {
-      if (entry.isFile() && entry.name.endsWith(".jsonl")) {
-        jsonlFiles.push(resolve(projPath, entry.name));
-      } else if (entry.isDirectory()) {
-        const subagentsDir = resolve(projPath, entry.name, "subagents");
-        try {
-          for (const sub of readdirSync(subagentsDir)) {
-            if (sub.endsWith(".jsonl")) {
-              jsonlFiles.push(resolve(subagentsDir, sub));
-            }
-          }
-        } catch {
-          /* no subagents dir */
-        }
-      }
-    }
-
-    for (const filepath of jsonlFiles) {
-      let content: string;
-      try {
-        content = readFileSync(filepath, "utf-8");
-      } catch {
-        continue;
-      }
-
-      for (const line of content.split("\n")) {
-        if (!line.includes('"usage"')) continue;
-        try {
-          const d = JSON.parse(line) as {
-            type?: string;
-            timestamp?: string;
-            message?: {
-              model?: string;
-              usage?: {
-                input_tokens?: number;
-                output_tokens?: number;
-                cache_creation_input_tokens?: number;
-                cache_read_input_tokens?: number;
-                cache_creation?: {
-                  ephemeral_5m_input_tokens?: number;
-                  ephemeral_1h_input_tokens?: number;
-                };
-              };
-            };
-          };
-          if (d.type !== "assistant") continue;
-          const usage = d.message?.usage;
-          const model = d.message?.model;
-          const ts = d.timestamp;
-          if (!usage || !model || !ts) continue;
-
-          const input = usage.input_tokens ?? 0;
-          const output = usage.output_tokens ?? 0;
-          const cr = usage.cache_read_input_tokens ?? 0;
-          const cw5m = usage.cache_creation?.ephemeral_5m_input_tokens;
-          const cw1h = usage.cache_creation?.ephemeral_1h_input_tokens;
-          // Older transcripts only have the summed cache_creation_input_tokens — bill as 5m.
-          const hasBreakdown = cw5m !== undefined || cw1h !== undefined;
-          const cacheWrite5m = hasBreakdown
-            ? (cw5m ?? 0)
-            : (usage.cache_creation_input_tokens ?? 0);
-          const cacheWrite1h = cw1h ?? 0;
-
-          addToTimeBuckets(
-            buckets,
-            ts,
-            model,
-            input,
-            output,
-            cacheWrite5m,
-            cacheWrite1h,
-            cr,
-            todayPrefix,
-            weekAgo,
-            monthAgo
-          );
-
-          byModel[model] ??= emptyBucket();
-          addToBucket(
-            byModel[model],
-            model,
-            input,
-            output,
-            cacheWrite5m,
-            cacheWrite1h,
-            cr
-          );
-
-          byProject[projName] ??= emptyTimeBuckets();
-          addToTimeBuckets(
-            byProject[projName],
-            ts,
-            model,
-            input,
-            output,
-            cacheWrite5m,
-            cacheWrite1h,
-            cr,
-            todayPrefix,
-            weekAgo,
-            monthAgo
-          );
-        } catch {
-          /* skip */
-        }
-      }
-    }
-  }
-
-  return { buckets, byModel, byProject };
-}
-
-// ── PAL inference ──
-
-function readPalInference(): {
-  buckets: TimeBuckets;
-  byModel: Record<string, TimeBuckets>;
-  byCaller: Record<string, Bucket>;
-} {
-  const now = new Date();
-  const todayPrefix = now.toISOString().slice(0, 10);
-  const weekAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000).toISOString();
-  const monthAgo = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000).toISOString();
-
-  const buckets = emptyTimeBuckets();
-  const byModel: Record<string, TimeBuckets> = {};
-  const byCaller: Record<string, Bucket> = {};
-
-  const filepath = resolve(palHome(), "memory", "signals", "token-usage.jsonl");
-  if (!existsSync(filepath)) return { buckets, byModel, byCaller };
-
-  const content = readFileSync(filepath, "utf-8").trim();
-  if (!content) return { buckets, byModel, byCaller };
-
-  for (const line of content.split("\n")) {
-    try {
-      const e = JSON.parse(line) as {
-        ts: string;
-        caller: string;
-        model: string;
-        inputTokens: number;
-        outputTokens: number;
-      };
-      addToTimeBuckets(
-        buckets,
-        e.ts,
-        e.model,
-        e.inputTokens,
-        e.outputTokens,
-        0,
-        0,
-        0,
-        todayPrefix,
-        weekAgo,
-        monthAgo
-      );
-      byModel[e.model] ??= emptyTimeBuckets();
-      addToTimeBuckets(
-        byModel[e.model],
-        e.ts,
-        e.model,
-        e.inputTokens,
-        e.outputTokens,
-        0,
-        0,
-        0,
-        todayPrefix,
-        weekAgo,
-        monthAgo
-      );
-      byCaller[e.caller] ??= emptyBucket();
-      addToBucket(byCaller[e.caller], e.model, e.inputTokens, e.outputTokens, 0, 0, 0);
-    } catch {
-      /* skip */
-    }
-  }
-
-  return { buckets, byModel, byCaller };
-}
-
-// ── rtk compression savings ──
-
-interface RtkSummary {
-  total_commands: number;
-  total_saved: number;
-  avg_savings_pct: number;
-}
-
-/**
- * Query rtk's own savings ledger. `installed: false` means rtk isn't on PATH;
- * `summary: null` with `installed: true` means rtk is present but has no data
- * (or errored) — the two cases print differently in the usage report.
- */
-function readRtkGain(): { installed: boolean; summary: RtkSummary | null } {
+function rtkGain(): RtkGain {
   const rtk = findBinaryOnPath("rtk");
   if (!rtk) return { installed: false, summary: null };
-  try {
-    const r = spawnSync(rtk, ["gain", "--format", "json"], {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"],
-    });
-    if (r.status !== 0 || !r.stdout) return { installed: true, summary: null };
-    const parsed = JSON.parse(r.stdout) as { summary?: RtkSummary };
-    return { installed: true, summary: parsed.summary ?? null };
-  } catch {
-    return { installed: true, summary: null };
-  }
-}
-
-function printRtkGain(): void {
-  const { installed, summary } = readRtkGain();
-  console.log("\n  rtk Compression\n");
-  if (!installed) {
-    console.log("  rtk not installed");
-    return;
-  }
-  if (!summary || summary.total_commands === 0) {
-    console.log("  rtk installed — no savings recorded yet");
-    return;
-  }
-  console.log(
-    `  Tokens saved   ${fmt(summary.total_saved).padStart(8)} tok  ${summary.avg_savings_pct.toFixed(1)}% avg  across ${fmt(summary.total_commands)} commands`
-  );
+  const result = spawnSync(rtk, ["gain", "--format", "json"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"],
+  });
+  return {
+    installed: true,
+    summary: parseRtkSummary(result.status, result.stdout ?? ""),
+  };
 }
 
-// ── CLI ──
-
 export function usage() {
-  parseArgs({
+  const { values } = parseArgs({
     options: {
       today: { type: "boolean", default: false },
       week: { type: "boolean", default: false },
@@ -402,62 +42,12 @@ export function usage() {
     strict: false,
   });
 
-  const cc = readClaudeCode();
-  const pal = readPalInference();
-
-  console.log("\n  Claude Code Usage\n");
-  printRow("Today", cc.buckets.today);
-  printRow("7d", cc.buckets.week);
-  printRow("30d", cc.buckets.month);
-  printRow("Total", cc.buckets.total);
-
-  if (Object.keys(cc.byModel).length > 0) {
-    console.log("\n  By Model (all time)\n");
-    const sorted = Object.entries(cc.byModel).sort((a, b) => b[1].cost - a[1].cost);
-    const modelNames = sorted.map(([m]) => m.replace("claude-", ""));
-    const modelWidth = Math.max(14, ...modelNames.map((n) => n.length + 2));
-    for (let i = 0; i < sorted.length; i++) {
-      printDetailed(modelNames[i], sorted[i][1], modelWidth);
-    }
-  }
-
-  if (Object.keys(cc.byProject).length > 1) {
-    console.log("\n  By Project (all time)\n");
-    const sorted = Object.entries(cc.byProject).sort(
-      (a, b) => b[1].total.cost - a[1].total.cost
-    );
-    for (const [proj, tb] of sorted) {
-      printRow(proj, tb.total);
-    }
-  }
-
-  for (const [model, tb] of Object.entries(pal.byModel)) {
-    if (tb.total.calls === 0) continue;
-    let label: string;
-    if (model.includes("haiku")) label = "Haiku";
-    else if (model.includes("sonnet")) label = "Sonnet";
-    else label = model.replace("claude-", "");
-    console.log(`\n  PAL Inference (${label})\n`);
-    printRow("Today", tb.today);
-    printRow("7d", tb.week);
-    printRow("30d", tb.month);
-    printRow("Total", tb.total);
-  }
-
-  printRtkGain();
-
-  const grand = emptyBucket();
-  for (const b of [cc.buckets.total, pal.buckets.total]) {
-    grand.input += b.input;
-    grand.output += b.output;
-    grand.cacheWrite5m += b.cacheWrite5m;
-    grand.cacheWrite1h += b.cacheWrite1h;
-    grand.cacheRead += b.cacheRead;
-    grand.cost += b.cost;
-    grand.calls += b.calls;
-  }
-
-  console.log(`\n  Grand Total: ${fmtCost(grand.cost)}\n`);
+  const lines = usageLines(
+    readClaudeCode(resolve(homedir(), ".claude", "projects"), values.project as string),
+    readPalInference(resolve(palHome(), "memory", "signals", "token-usage.jsonl")),
+    rtkGain()
+  );
+  for (const line of lines) console.log(line);
 }
 
 if (import.meta.main) usage();

package/src/tools/control-room/ui/agenda.tsx

@@ -1,43 +0,0 @@
-import type { AgendaView } from "../data";
-import { Pending, useLoaded } from "./panel";
-
-function Age({ view }: { view: AgendaView }) {
-  if (!view.generatedAt) return <span className="agenda-age">never written</span>;
-  const hours = view.ageHours ?? 0;
-  const text = hours < 1 ? "written just now" : `written ${hours}h ago`;
-  return (
-    <span className={view.stale ? "agenda-age stale" : "agenda-age"}>
-      {view.stale ? `${text} — out of date` : text}
-    </span>
-  );
-}
-
-export function Agenda() {
-  const loaded = useLoaded<AgendaView>("/api/agenda");
-
-  return (
-    <section className="agenda">
-      <header>
-        <h2>Today</h2>
-        {loaded.state === "ready" && <Age view={loaded.data} />}
-      </header>
-      <Pending value={loaded} />
-      {loaded.state === "ready" &&
-        (loaded.data.moves.length === 0 ? (
-          <p className="agenda-empty">
-            No moves yet. They are written when a session ends — finish one and come back.
-          </p>
-        ) : (
-          <ol className="moves">
-            {loaded.data.moves.map((move, i) => (
-              <li key={move.move}>
-                <span className="rank">{i + 1}</span>
-                <span className="move">{move.move}</span>
-                <span className="because">{move.because}</span>
-              </li>
-            ))}
-          </ol>
-        ))}
-    </section>
-  );
-}

package/src/tools/control-room/ui/agents.tsx

@@ -1,67 +0,0 @@
-import type { AgentsRow, AgentsView } from "../data";
-import { Panel, Pending, useLoaded } from "./panel";
-
-function Row({ r, max }: { r: AgentsRow; max: number }) {
-  return (
-    <tr>
-      <td>
-        {r.slug}
-        <span className="bar">
-          <i style={{ width: `${(r.actions / max) * 100}%` }} />
-        </span>
-      </td>
-      <td className="num">{r.actions}</td>
-      <td>
-        <span className="runtimes">
-          {Object.entries(r.runtimes).map(([runtime, n]) => (
-            <span key={runtime} className="tag">
-              {runtime} {n}
-            </span>
-          ))}
-        </span>
-      </td>
-      <td className="num">{r.machines}</td>
-      <td className="num">{r.actors}</td>
-      <td className="num">{r.sessions}</td>
-    </tr>
-  );
-}
-
-export function Agents() {
-  const view = useLoaded<AgentsView>("/api/agents");
-  const max =
-    view.state === "ready" ? Math.max(1, ...view.data.projects.map((p) => p.actions)) : 1;
-  return (
-    <Panel
-      index="04 · activity"
-      title="Agents at work"
-      span={7}
-      order={3}
-      aside={view.state === "ready" ? `since ${view.data.since.slice(0, 10)}` : ""}
-    >
-      <Pending value={view} />
-      {view.state === "ready" && view.data.projects.length === 0 && (
-        <div className="empty">No recorded actions in the window.</div>
-      )}
-      {view.state === "ready" && view.data.projects.length > 0 && (
-        <table>
-          <thead>
-            <tr>
-              <th>project</th>
-              <th className="num">actions</th>
-              <th>runtimes</th>
-              <th className="num">machines</th>
-              <th className="num">actors</th>
-              <th className="num">sessions</th>
-            </tr>
-          </thead>
-          <tbody>
-            {view.data.projects.map((r) => (
-              <Row key={r.slug} r={r} max={max} />
-            ))}
-          </tbody>
-        </table>
-      )}
-    </Panel>
-  );
-}