portable-agent-layer 0.27.0 → 0.28.0

package/assets/skills/consulting-report/SKILL.md

@@ -48,7 +48,7 @@ Edit:
 ### Step 3: Render
 
 ```bash
-bun ~/.pal/skills/consulting-report/tools/generate-pdf.ts <report-dir>
+node --experimental-strip-types ~/.pal/skills/consulting-report/tools/generate-pdf.ts <report-dir>
 ```
 
 Output: `<dir>/<client-slug>-<title-slug>-<date>.pdf` and matching `.html`. Override with `--pdf <path>` / `--html <path>`.
@@ -101,7 +101,7 @@ Do NOT combine CSS `@page` margin-box rules with the Playwright `displayHeaderFo
 A runnable demo lives at `~/.pal/skills/consulting-report/demo/`:
 
 ```bash
-bun ~/.pal/skills/consulting-report/tools/generate-pdf.ts ~/.pal/skills/consulting-report/demo
+node --experimental-strip-types ~/.pal/skills/consulting-report/tools/generate-pdf.ts ~/.pal/skills/consulting-report/demo
 ```
 
 Inspect the produced PDF to see the full layout (cover, TOC, sections, findings, recommendations, conclusion, appendix) before writing your own report.

package/assets/skills/consulting-report/template/README.md

@@ -10,7 +10,7 @@
 ## Render
 
 ```
-bun ~/.pal/skills/consulting-report/tools/generate-pdf.ts .
+node --experimental-strip-types ~/.pal/skills/consulting-report/tools/generate-pdf.ts .
 ```
 
 Output goes into this directory as `<client>-<title>-<date>.{pdf,html}` unless you pass `--pdf <path>` or `--html <path>`.

package/assets/skills/consulting-report/tools/generate-pdf.ts

@@ -1,10 +1,14 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 
 // consulting-report skill tool: render a structured report directory to a branded PDF.
 // Pipeline: report-data.ts + section markdown + diagrams -> HTML -> PDF (Playwright).
 //
+// Run with Node (not Bun) — Playwright's chromium.launch hangs under Bun on Windows
+// because it uses --remote-debugging-pipe over stdio and Bun's Windows child-process
+// pipe handling doesn't complete the CDP handshake.
+//
 // Usage:
-//   bun ~/.pal/skills/consulting-report/tools/generate-pdf.ts <report-dir> [--pdf <out>] [--html <out>]
+//   node --experimental-strip-types ~/.pal/skills/consulting-report/tools/generate-pdf.ts <report-dir> [--pdf <out>] [--html <out>]
 //
 // <report-dir> must contain content/report-data.ts (default export or named `report`).
 
@@ -12,6 +16,7 @@ import { spawnSync } from "node:child_process";
 import { constants as fsConstants } from "node:fs";
 import { access, readdir, readFile, stat, writeFile } from "node:fs/promises";
 import { isAbsolute, join, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
 import { marked } from "marked";
 import { chromium } from "playwright";
 
@@ -403,7 +408,7 @@ async function renderPdf(
   const browser = await chromium.launch();
   try {
     const page = await browser.newPage();
-    await page.goto(`file://${htmlPath}`, { waitUntil: "networkidle" });
+    await page.goto(pathToFileURL(htmlPath).href, { waitUntil: "networkidle" });
 
     // Wait for all images
     await page.evaluate(async () => {
@@ -459,7 +464,7 @@ async function loadReport(
     throw new Error(`report-data.ts not found at ${dataPath}`);
   }
   const mod: { default?: ConsultingReport; report?: ConsultingReport } = await import(
-    dataPath
+    pathToFileURL(dataPath).href
   );
   const report = mod.default || mod.report;
   if (!report) {

package/assets/skills/consulting-report/tools/scaffold.ts

@@ -70,5 +70,5 @@ console.log(`  2. Fill ${join(targetDir, "content")} with your section markdown
 console.log(`  3. Drop images into ${join(targetDir, "diagrams")}`);
 console.log(`  4. Render:`);
 console.log(
-  `       bun ~/.pal/skills/consulting-report/tools/generate-pdf.ts ${targetDir}`
+  `       node --experimental-strip-types ~/.pal/skills/consulting-report/tools/generate-pdf.ts ${targetDir}`
 );

package/assets/skills/create-pdf/SKILL.md

@@ -55,13 +55,13 @@ Invoke the skill tool. Flags:
 Single-file example:
 
 ```bash
-bun ~/.pal/skills/create-pdf/tools/md-to-html-pdf.ts /path/to/report.md --pdf /path/to/report.pdf
+node --experimental-strip-types ~/.pal/skills/create-pdf/tools/md-to-html-pdf.ts /path/to/report.md --pdf /path/to/report.pdf
 ```
 
 Multi-file example (after Step 2):
 
 ```bash
-bun ~/.pal/skills/create-pdf/tools/md-to-html-pdf.ts /tmp/combined.md --pdf /path/to/report.pdf --html /path/to/report.html
+node --experimental-strip-types ~/.pal/skills/create-pdf/tools/md-to-html-pdf.ts /tmp/combined.md --pdf /path/to/report.pdf --html /path/to/report.html
 ```
 
 The tool writes the self-contained HTML (inline CSS, UTF-8) and the PDF, and prints both paths + sizes on stdout.

package/assets/skills/create-pdf/tools/md-to-html-pdf.ts

@@ -1,12 +1,17 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 // create-pdf skill tool: Markdown -> HTML (marked, GFM) -> PDF (Playwright).
 // Self-contained HTML: all CSS inlined, no CDN at render time.
 //
+// Run with Node (not Bun) — Playwright's chromium.launch hangs under Bun on Windows
+// because it uses --remote-debugging-pipe over stdio and Bun's Windows child-process
+// pipe handling doesn't complete the CDP handshake.
+//
 // Usage:
-//   bun ~/.pal/skills/create-pdf/tools/md-to-html-pdf.ts <input.md> [--html <out.html>] [--pdf <out.pdf>]
+//   node --experimental-strip-types ~/.pal/skills/create-pdf/tools/md-to-html-pdf.ts <input.md> [--html <out.html>] [--pdf <out.pdf>]
 
 import { readFile, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
 import { marked } from "marked";
 import { chromium } from "playwright";
 
@@ -74,7 +79,7 @@ await writeFile(htmlOut, html, "utf8");
 const browser = await chromium.launch();
 try {
   const page = await browser.newPage();
-  await page.goto(`file://${htmlOut}`, { waitUntil: "networkidle" });
+  await page.goto(pathToFileURL(htmlOut).href, { waitUntil: "networkidle" });
   await page.pdf({
     path: pdfOut,
     format: "A4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portable-agent-layer",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "PAL — Portable Agent Layer: persistent personal context for AI coding assistants",
   "type": "module",
   "bin": {

package/src/cli/index.ts

@@ -356,6 +356,39 @@ function checkPlaywrightChromium(): boolean {
   }
 }
 
+interface NodeCheck {
+  available: boolean;
+  version?: string;
+  meetsMinimum?: boolean;
+}
+
+// Minimum Node version with `--experimental-strip-types` is 22.6.0 — required
+// by the consulting-report skill, which runs under Node on Windows because
+// Playwright's chromium.launch() hangs under Bun.
+function checkNode(): NodeCheck {
+  const minMajor = 22;
+  const minMinor = 6;
+  const result = checkTool("node");
+  if (!result.available) return { available: false };
+  const raw = (result.version || "").replace(/^v/, "");
+  const [majorStr = "", minorStr = ""] = raw.split(".");
+  const major = Number(majorStr);
+  const minor = Number(minorStr);
+  const meetsMinimum =
+    Number.isFinite(major) &&
+    Number.isFinite(minor) &&
+    (major > minMajor || (major === minMajor && minor >= minMinor));
+  return { available: true, version: raw, meetsMinimum };
+}
+
+function nodeInstallHint(): string {
+  if (process.platform === "win32")
+    return "install Node ≥ 22.6 (`winget install OpenJS.NodeJS.LTS` or https://nodejs.org)";
+  if (process.platform === "darwin")
+    return "install Node ≥ 22.6 (`brew install node` or https://nodejs.org)";
+  return "install Node ≥ 22.6 (see https://nodejs.org or your package manager)";
+}
+
 function checkHookHealth(home: string): HookHealth {
   const logPath = resolve(home, "memory", "state", "debug.log");
 
@@ -435,6 +468,18 @@ function doctor(silent = false): DoctorResult {
     console.log("");
     log.info("Doctor");
     ok(`Bun ${bun.version}`);
+    const node = checkNode();
+    if (!node.available) {
+      warn(
+        `Node — not found; consulting-report PDF skill will not work. ${nodeInstallHint()}`
+      );
+    } else if (!node.meetsMinimum) {
+      warn(
+        `Node ${node.version} — too old for consulting-report PDF skill (needs ≥ 22.6 for --experimental-strip-types). ${nodeInstallHint()}`
+      );
+    } else {
+      ok(`Node ${node.version}`);
+    }
     claude.available
       ? ok(`Claude Code ${claude.version || ""}`.trim())
       : fail("Claude Code — not found");
@@ -635,18 +680,35 @@ async function install(targets: Targets) {
   // Fetch the Chromium build Playwright uses for PDF rendering (create-pdf skill).
   // Idempotent — skipped if already cached. Skipped entirely under PAL_SKIP_BROWSER_INSTALL=1
   // (used by tests to avoid a ~150MB download on every run).
+  // Uses `bun x` (not `bunx`) for Windows compatibility — bunx resolves unreliably under cmd.exe.
   if (process.env.PAL_SKIP_BROWSER_INSTALL !== "1") {
     log.info("Installing Playwright Chromium...");
-    const pw = spawnSync("bunx", ["playwright", "install", "chromium"], {
+    const pw = spawnSync("bun", ["x", "playwright", "install", "chromium"], {
       cwd: pkg,
       stdio: "inherit",
       shell: true,
     });
     if (pw.status !== 0) {
-      log.warn("playwright install chromium failed — create-pdf skill will not work");
+      log.warn(
+        `playwright install chromium failed (exit ${pw.status}) — create-pdf and consulting-report skills won't work. Retry manually: bun x playwright install chromium`
+      );
     }
   }
 
+  // Node check — the consulting-report skill runs under `node --experimental-strip-types`
+  // because Playwright's chromium.launch() hangs under Bun on Windows (CDP handshake over
+  // stdio pipes). Node ≥ 22.6 is required for --experimental-strip-types.
+  const node = checkNode();
+  if (!node.available) {
+    log.warn(
+      `Node not found — consulting-report PDF skill will not work. ${nodeInstallHint()}`
+    );
+  } else if (!node.meetsMinimum) {
+    log.warn(
+      `Node ${node.version} is older than 22.6 — consulting-report PDF skill will not work (needs --experimental-strip-types). ${nodeInstallHint()}`
+    );
+  }
+
   // Scaffold TELOS + PAL settings, then prompt for missing identity
   const { scaffoldTelos, scaffoldPalSettings } = await import("../targets/lib");
   const { promptIdentity } = await import("./setup-identity");

package/src/hooks/handlers/desktop-notify.ts

@@ -0,0 +1,22 @@
+/**
+ * Stop handler: desktop notification when Claude finishes responding.
+ * Platform dispatch lives in lib/notify — this just chooses the message.
+ */
+
+import { basename } from "node:path";
+import { notify } from "../lib/notify";
+import { readSessionNames } from "../lib/session-names";
+import { identity } from "../lib/settings";
+
+export async function notifyDesktop(sessionId?: string): Promise<void> {
+  await notify(identity().ai.name, resolveBody(sessionId));
+}
+
+function resolveBody(sessionId?: string): string {
+  if (sessionId) {
+    const name = readSessionNames()[sessionId];
+    if (name && name !== "untitled session") return `New message in task "${name}".`;
+  }
+  const cwd = basename(process.cwd());
+  return cwd && cwd !== "/" ? `New message in task "${cwd}".` : "You have a new message.";
+}

package/src/hooks/lib/models.ts

@@ -8,10 +8,47 @@ export const SONNET_MODEL = "claude-sonnet-4-6";
 /** Pricing per million tokens (USD) — from https://platform.claude.com/docs/en/about-claude/pricing */
 export const MODEL_PRICING: Record<
   string,
-  { input: number; output: number; cacheWrite: number; cacheRead: number }
+  {
+    input: number;
+    output: number;
+    cacheWrite5m: number;
+    cacheWrite1h: number;
+    cacheRead: number;
+  }
 > = {
-  [HAIKU_MODEL]: { input: 1, output: 5, cacheWrite: 1.25, cacheRead: 0.1 },
-  "claude-opus-4-6": { input: 5, output: 25, cacheWrite: 6.25, cacheRead: 0.5 },
-  "claude-sonnet-4-6": { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.3 },
-  "claude-sonnet-4-5": { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.3 },
+  [HAIKU_MODEL]: {
+    input: 1,
+    output: 5,
+    cacheWrite5m: 1.25,
+    cacheWrite1h: 2,
+    cacheRead: 0.1,
+  },
+  "claude-opus-4-7": {
+    input: 5,
+    output: 25,
+    cacheWrite5m: 6.25,
+    cacheWrite1h: 10,
+    cacheRead: 0.5,
+  },
+  "claude-opus-4-6": {
+    input: 5,
+    output: 25,
+    cacheWrite5m: 6.25,
+    cacheWrite1h: 10,
+    cacheRead: 0.5,
+  },
+  "claude-sonnet-4-6": {
+    input: 3,
+    output: 15,
+    cacheWrite5m: 3.75,
+    cacheWrite1h: 6,
+    cacheRead: 0.3,
+  },
+  "claude-sonnet-4-5": {
+    input: 3,
+    output: 15,
+    cacheWrite5m: 3.75,
+    cacheWrite1h: 6,
+    cacheRead: 0.3,
+  },
 };

package/src/hooks/lib/notify.ts

@@ -0,0 +1,55 @@
+/**
+ * Cross-platform desktop notification primitive.
+ *
+ * macOS  : osascript "display notification"
+ * Linux  : notify-send (libnotify)
+ * Windows: PowerShell NotifyIcon (Win10+ surfaces this as a toast)
+ *
+ * All implementations fail silently if the underlying command is missing —
+ * notifications are non-essential, never surface as errors.
+ */
+
+import { spawn } from "node:child_process";
+
+function spawnSilent(cmd: string, args: string[]): Promise<void> {
+  return new Promise((res) => {
+    const p = spawn(cmd, args, { stdio: "ignore", windowsHide: true });
+    p.on("close", () => res());
+    p.on("error", () => res());
+  });
+}
+
+function escapeAppleScript(s: string): string {
+  return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+
+function escapePowerShellSingle(s: string): string {
+  return s.replace(/'/g, "''");
+}
+
+export async function notify(title: string, body: string): Promise<void> {
+  if (process.platform === "darwin") {
+    const script = `display notification "${escapeAppleScript(body)}" with title "${escapeAppleScript(title)}"`;
+    await spawnSilent("osascript", ["-e", script]);
+    return;
+  }
+  if (process.platform === "linux") {
+    await spawnSilent("notify-send", [title, body]);
+    return;
+  }
+  if (process.platform === "win32") {
+    const t = escapePowerShellSingle(title);
+    const b = escapePowerShellSingle(body);
+    const ps = [
+      "Add-Type -AssemblyName System.Windows.Forms;",
+      "$n = New-Object System.Windows.Forms.NotifyIcon;",
+      "$n.Icon = [System.Drawing.SystemIcons]::Information;",
+      "$n.Visible = $true;",
+      `$n.ShowBalloonTip(3000, '${t}', '${b}', 'Info');`,
+      "Start-Sleep -Seconds 3;",
+      "$n.Dispose()",
+    ].join(" ");
+    await spawnSilent("powershell.exe", ["-NoProfile", "-Command", ps]);
+    return;
+  }
+}

package/src/hooks/lib/stop.ts

@@ -6,6 +6,7 @@
 import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { autoBackup } from "../handlers/backup";
+import { notifyDesktop } from "../handlers/desktop-notify";
 import { captureFailure } from "../handlers/failure";
 import { checkReflectTrigger } from "../handlers/reflect-trigger";
 import { checkSelfModelTrigger } from "../handlers/self-model-trigger";
@@ -48,6 +49,7 @@ export async function runStopHandlers(
     checkReflectTrigger(),
     checkSelfModelTrigger(),
     runSynthesis(),
+    notifyDesktop(options.sessionId),
   ]);
 
   const handlerNames = [
@@ -58,7 +60,9 @@ export async function runStopHandlers(
     "update-counts",
     "backup",
     "reflect-trigger",
+    "self-model-trigger",
     "synthesis",
+    "desktop-notify",
   ];
   for (let i = 0; i < results.length; i++) {
     const r = results[i];

package/src/tools/session-summary.ts

@@ -16,7 +16,8 @@ import { MODEL_PRICING } from "../hooks/lib/models";
 interface Usage {
   input: number;
   output: number;
-  cacheWrite: number;
+  cacheWrite5m: number;
+  cacheWrite1h: number;
   cacheRead: number;
   cost: number;
   calls: number;
@@ -82,7 +83,8 @@ export function parseSession(filepath: string, sessionId: string): Usage {
   const usage: Usage = {
     input: 0,
     output: 0,
-    cacheWrite: 0,
+    cacheWrite5m: 0,
+    cacheWrite1h: 0,
     cacheRead: 0,
     cost: 0,
     calls: 0,
@@ -109,6 +111,10 @@ export function parseSession(filepath: string, sessionId: string): Usage {
             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;
+            };
           };
         };
       };
@@ -127,19 +133,30 @@ export function parseSession(filepath: string, sessionId: string): Usage {
 
       const input = u.input_tokens ?? 0;
       const output = u.output_tokens ?? 0;
-      const cw = u.cache_creation_input_tokens ?? 0;
       const cr = u.cache_read_input_tokens ?? 0;
+      const cw5m = u.cache_creation?.ephemeral_5m_input_tokens;
+      const cw1h = u.cache_creation?.ephemeral_1h_input_tokens;
+      const hasBreakdown = cw5m !== undefined || cw1h !== undefined;
+      const cacheWrite5m = hasBreakdown
+        ? (cw5m ?? 0)
+        : (u.cache_creation_input_tokens ?? 0);
+      const cacheWrite1h = cw1h ?? 0;
 
       const p = MODEL_PRICING[model];
       if (p) {
         usage.cost +=
-          (input * p.input + output * p.output + cw * p.cacheWrite + cr * p.cacheRead) /
+          (input * p.input +
+            output * p.output +
+            cacheWrite5m * p.cacheWrite5m +
+            cacheWrite1h * p.cacheWrite1h +
+            cr * p.cacheRead) /
           1_000_000;
       }
 
       usage.input += input;
       usage.output += output;
-      usage.cacheWrite += cw;
+      usage.cacheWrite5m += cacheWrite5m;
+      usage.cacheWrite1h += cacheWrite1h;
       usage.cacheRead += cr;
       usage.calls++;
       usage.models.add(model);
@@ -195,7 +212,12 @@ function run() {
   const usage = parseSession(file.filepath, sessionId);
   if (usage.calls === 0) process.exit(0);
 
-  const totalTokens = usage.input + usage.output + usage.cacheWrite + usage.cacheRead;
+  const totalTokens =
+    usage.input +
+    usage.output +
+    usage.cacheWrite5m +
+    usage.cacheWrite1h +
+    usage.cacheRead;
   const model = [...usage.models].map((m) => m.replace("claude-", "")).join(", ");
 
   const dim = "\x1b[2m";

package/src/tools/token-cost.ts

@@ -20,14 +20,23 @@ import { palHome } from "../hooks/lib/paths";
 export interface Bucket {
   input: number;
   output: number;
-  cacheWrite: number;
+  cacheWrite5m: number;
+  cacheWrite1h: number;
   cacheRead: number;
   cost: number;
   calls: number;
 }
 
 export function emptyBucket(): Bucket {
-  return { input: 0, output: 0, cacheWrite: 0, cacheRead: 0, cost: 0, calls: 0 };
+  return {
+    input: 0,
+    output: 0,
+    cacheWrite5m: 0,
+    cacheWrite1h: 0,
+    cacheRead: 0,
+    cost: 0,
+    calls: 0,
+  };
 }
 
 export interface TimeBuckets {
@@ -60,7 +69,8 @@ function costForUsage(
   model: string,
   input: number,
   output: number,
-  cacheWrite: number,
+  cacheWrite5m: number,
+  cacheWrite1h: number,
   cacheRead: number
 ): number {
   const p = findPricing(model);
@@ -68,7 +78,8 @@ function costForUsage(
   return (
     (input * p.input +
       output * p.output +
-      cacheWrite * p.cacheWrite +
+      cacheWrite5m * p.cacheWrite5m +
+      cacheWrite1h * p.cacheWrite1h +
       cacheRead * p.cacheRead) /
     1_000_000
   );
@@ -79,14 +90,23 @@ export function addToBucket(
   model: string,
   input: number,
   output: number,
-  cacheWrite: number,
+  cacheWrite5m: number,
+  cacheWrite1h: number,
   cacheRead: number
 ): void {
   bucket.input += input;
   bucket.output += output;
-  bucket.cacheWrite += cacheWrite;
+  bucket.cacheWrite5m += cacheWrite5m;
+  bucket.cacheWrite1h += cacheWrite1h;
   bucket.cacheRead += cacheRead;
-  bucket.cost += costForUsage(model, input, output, cacheWrite, cacheRead);
+  bucket.cost += costForUsage(
+    model,
+    input,
+    output,
+    cacheWrite5m,
+    cacheWrite1h,
+    cacheRead
+  );
   bucket.calls++;
 }
 
@@ -104,7 +124,7 @@ function fmtCost(n: number): string {
 }
 
 function printRow(label: string, b: Bucket, labelWidth = 14): void {
-  const tokens = b.input + b.output + b.cacheWrite + b.cacheRead;
+  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)}`
   );
@@ -112,7 +132,7 @@ function printRow(label: string, b: Bucket, labelWidth = 14): void {
 
 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.cacheWrite).padStart(8)} cw  ${fmt(b.cacheRead).padStart(8)} cr  ${fmtCost(b.cost).padStart(8)}`
+    `  ${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)}`
   );
 }
 
@@ -124,17 +144,20 @@ function addToTimeBuckets(
   model: string,
   input: number,
   output: number,
-  cacheWrite: number,
+  cacheWrite5m: number,
+  cacheWrite1h: number,
   cacheRead: number,
   todayPrefix: string,
   weekAgo: string,
   monthAgo: string
 ): void {
-  addToBucket(tb.total, model, input, output, cacheWrite, cacheRead);
-  if (ts >= monthAgo) addToBucket(tb.month, model, input, output, cacheWrite, cacheRead);
-  if (ts >= weekAgo) addToBucket(tb.week, model, input, output, cacheWrite, cacheRead);
+  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, cacheWrite, cacheRead);
+    addToBucket(tb.today, model, input, output, cacheWrite5m, cacheWrite1h, cacheRead);
 }
 
 export function readClaudeCode(projectFilter?: string): {
@@ -205,6 +228,10 @@ export function readClaudeCode(projectFilter?: string): {
                 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;
+                };
               };
             };
           };
@@ -216,8 +243,15 @@ export function readClaudeCode(projectFilter?: string): {
 
           const input = usage.input_tokens ?? 0;
           const output = usage.output_tokens ?? 0;
-          const cw = usage.cache_creation_input_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,
@@ -225,7 +259,8 @@ export function readClaudeCode(projectFilter?: string): {
             model,
             input,
             output,
-            cw,
+            cacheWrite5m,
+            cacheWrite1h,
             cr,
             todayPrefix,
             weekAgo,
@@ -233,7 +268,15 @@ export function readClaudeCode(projectFilter?: string): {
           );
 
           if (!byModel[model]) byModel[model] = emptyBucket();
-          addToBucket(byModel[model], model, input, output, cw, cr);
+          addToBucket(
+            byModel[model],
+            model,
+            input,
+            output,
+            cacheWrite5m,
+            cacheWrite1h,
+            cr
+          );
 
           if (!byProject[projName]) byProject[projName] = emptyTimeBuckets();
           addToTimeBuckets(
@@ -242,7 +285,8 @@ export function readClaudeCode(projectFilter?: string): {
             model,
             input,
             output,
-            cw,
+            cacheWrite5m,
+            cacheWrite1h,
             cr,
             todayPrefix,
             weekAgo,
@@ -297,6 +341,7 @@ export function readPalInference(): {
         e.outputTokens,
         0,
         0,
+        0,
         todayPrefix,
         weekAgo,
         monthAgo
@@ -310,12 +355,13 @@ export function readPalInference(): {
         e.outputTokens,
         0,
         0,
+        0,
         todayPrefix,
         weekAgo,
         monthAgo
       );
       if (!byCaller[e.caller]) byCaller[e.caller] = emptyBucket();
-      addToBucket(byCaller[e.caller], e.model, e.inputTokens, e.outputTokens, 0, 0);
+      addToBucket(byCaller[e.caller], e.model, e.inputTokens, e.outputTokens, 0, 0, 0);
     } catch {
       /* skip */
     }
@@ -385,7 +431,8 @@ function run() {
   for (const b of [cc.buckets.total, pal.buckets.total]) {
     grand.input += b.input;
     grand.output += b.output;
-    grand.cacheWrite += b.cacheWrite;
+    grand.cacheWrite5m += b.cacheWrite5m;
+    grand.cacheWrite1h += b.cacheWrite1h;
     grand.cacheRead += b.cacheRead;
     grand.cost += b.cost;
     grand.calls += b.calls;