portable-agent-layer 0.95.0 → 0.95.1

package/package.json

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

package/src/tools/lib/session-usage.ts

@@ -10,7 +10,7 @@ import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { resolve } from "node:path";
 import { costOfUsage } from "../../hooks/lib/models";
-import { cacheWritesOf, type TranscriptUsage } from "./transcript-usage";
+import { cacheWritesOf, finalPerMessage, type TranscriptUsage } from "./transcript-usage";
 
 export interface SessionUsage {
   input: number;
@@ -94,7 +94,7 @@ interface TranscriptLine {
   type?: string;
   timestamp?: string;
   sessionId?: string;
-  message?: { model?: string; usage?: TranscriptUsage };
+  message?: { id?: string; model?: string; usage?: TranscriptUsage };
 }
 
 function emptyUsage(): SessionUsage {
@@ -113,6 +113,7 @@ function emptyUsage(): SessionUsage {
 
 export function accumulateUsage(transcript: string, sessionId: string): SessionUsage {
   const total = emptyUsage();
+  const assistantTurns: TranscriptLine[] = [];
   let firstTs = "";
   let lastTs = "";
 
@@ -133,7 +134,10 @@ export function accumulateUsage(transcript: string, sessionId: string): SessionU
       lastTs = entry.timestamp;
     }
 
-    if (entry.type !== "assistant") continue;
+    if (entry.type === "assistant") assistantTurns.push(entry);
+  }
+
+  for (const entry of finalPerMessage(assistantTurns, (e) => e.message?.id)) {
     const usage = entry.message?.usage;
     const model = entry.message?.model;
     if (!usage || !model) continue;

package/src/tools/lib/transcript-usage.ts

@@ -18,6 +18,20 @@ export interface TranscriptUsage {
   };
 }
 
+/**
+ * Claude Code writes one transcript line per content block of a message, each
+ * repeating the message's usage — and an early line can carry the usage while
+ * the message was still streaming. A message is billed once, at its last line.
+ */
+export function finalPerMessage<T>(
+  calls: Iterable<T>,
+  messageIdOf: (call: T) => string | undefined
+): T[] {
+  const byMessage = new Map<unknown, T>();
+  for (const call of calls) byMessage.set(messageIdOf(call) ?? call, call);
+  return [...byMessage.values()];
+}
+
 export interface CacheWrites {
   cacheWrite5m: number;
   cacheWrite1h: number;

package/src/tools/lib/usage-buckets.ts

@@ -7,7 +7,7 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { costOfUsage } from "../../hooks/lib/models";
-import { cacheWritesOf, type TranscriptUsage } from "./transcript-usage";
+import { cacheWritesOf, finalPerMessage, type TranscriptUsage } from "./transcript-usage";
 
 export interface Bucket {
   input: number;
@@ -180,7 +180,7 @@ export function usageTally(projectFilter?: string, now: Date = new Date()): Usag
 interface TranscriptLine {
   type?: string;
   timestamp?: string;
-  message?: { model?: string; usage?: TranscriptUsage };
+  message?: { id?: string; model?: string; usage?: TranscriptUsage };
 }
 
 /**
@@ -209,6 +209,7 @@ function transcriptsIn(projPath: string): string[] {
 }
 
 interface PricedCall {
+  messageId?: string;
   ts: string;
   model: string;
   tokens: Tokens;
@@ -230,6 +231,7 @@ function pricedCallOf(line: string): PricedCall | null {
   if (!usage || !model || !ts) return null;
 
   return {
+    messageId: entry.message?.id,
     ts,
     model,
     tokens: {
@@ -248,6 +250,7 @@ export function readClaudeCode(
 ): AgentUsage {
   const tally = usageTally(projectFilter, now);
   if (!existsSync(claudeDir)) return tally.usage;
+  const calls: (PricedCall & { project: string })[] = [];
 
   const projectDirs = readdirSync(claudeDir, { withFileTypes: true })
     .filter((entry) => entry.isDirectory())
@@ -269,16 +272,20 @@ export function readClaudeCode(
         // Cheap reject before the parse: most lines are not model turns.
         if (!line.includes('"usage"')) continue;
         const call = pricedCallOf(line);
-        if (!call) continue;
-        tally.record({
-          ...call,
-          project: projName,
-          cost: costOfUsage(call.model, call.tokens),
-        });
+        if (call) calls.push({ ...call, project: projName });
       }
     }
   }
 
+  for (const call of finalPerMessage(calls, (c) => c.messageId)) {
+    tally.record({
+      ts: call.ts,
+      model: call.model,
+      tokens: call.tokens,
+      project: call.project,
+      cost: costOfUsage(call.model, call.tokens),
+    });
+  }
   return tally.usage;
 }