@alook/daemon 0.1.26 → 0.1.28

package/dist/cli/index.js

@@ -16646,6 +16646,7 @@ var communityMachine = sqliteTable("community_machine", {
   arch: text("arch").notNull().default(""),
   osRelease: text("os_release").notNull().default(""),
   daemonVersion: text("daemon_version").notNull().default(""),
+  timeZone: text("time_zone"),
   metadata: text("metadata"),
   availableRuntimes: text("available_runtimes", { mode: "json" }).$type().notNull().default([]),
   status: text("status").notNull().default("offline"),
@@ -17639,6 +17640,7 @@ var HostReadyMessageSchema = exports_external.object({
   arch: exports_external.string().optional(),
   osRelease: exports_external.string().optional(),
   daemonVersion: exports_external.string().optional(),
+  timeZone: exports_external.string().min(1).max(128).optional(),
   providerQuotas: exports_external.array(ProviderQuotaSnapshotSchema).max(2).optional().default([])
 });
 var CommunityDaemonReadySchema = exports_external.object({
@@ -17661,6 +17663,8 @@ var AgentActivityMessageSchema = exports_external.object({
   type: exports_external.literal("agent_activity"),
   agentId: exports_external.string(),
   state: exports_external.enum(["idle", "starting", "running", "stopping"]),
+  usageTimeZone: exports_external.string().min(1).max(128).optional(),
+  usageDay: exports_external.string().regex(/^\d{4}-\d{2}-\d{2}$/).optional(),
   dailyUsage: exports_external.array(DailyUsageSnapshotSchema).max(7).optional(),
   quota: ProviderQuotaSnapshotSchema.optional()
 });
@@ -17926,6 +17930,42 @@ var BotAuditEventAckFrameSchema = exports_external.strictObject({
   type: exports_external.literal("bot_audit_event_ack"),
   eventId: exports_external.string().min(1).max(128)
 });
+// ../shared/src/utils/day-key.ts
+function utcDayKey(now) {
+  const d = now instanceof Date ? now : new Date(now);
+  return d.toISOString().slice(0, 10);
+}
+function calendarDayKeyDaysAgo(day, days) {
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(day);
+  if (!match)
+    throw new RangeError("invalid calendar day key");
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const date5 = Number(match[3]);
+  const parsed = new Date(Date.UTC(year, month - 1, date5));
+  if (parsed.getUTCFullYear() !== year || parsed.getUTCMonth() !== month - 1 || parsed.getUTCDate() !== date5) {
+    throw new RangeError("invalid calendar day key");
+  }
+  parsed.setUTCDate(parsed.getUTCDate() - days);
+  return utcDayKey(parsed);
+}
+function dayKeyInTimeZone(now, timeZone) {
+  const date5 = now instanceof Date ? now : new Date(now);
+  const parts = new Intl.DateTimeFormat("en-US", {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  }).formatToParts(date5);
+  const values = new Map(parts.map((part) => [part.type, part.value]));
+  const year = values.get("year");
+  const month = values.get("month");
+  const day = values.get("day");
+  if (!year || !month || !day)
+    throw new RangeError("unable to format calendar day key");
+  return `${year}-${month}-${day}`;
+}
+
 // ../shared/src/db/community-schema.ts
 var exports_community_schema = {};
 __export(exports_community_schema, {
@@ -20522,6 +20562,66 @@ function buildClaudeArgs(config2) {
   return args;
 }
 
+// agent-driver/dist/internal/token-usage.js
+function validIdentityPart(value) {
+  return value.trim().length > 0 && Buffer.byteLength(value, "utf8") <= 512;
+}
+function identityKey(identity) {
+  if (!validIdentityPart(identity.runtime) || !validIdentityPart(identity.backendSessionId) || !validIdentityPart(identity.providerRecordId))
+    return null;
+  return JSON.stringify([identity.runtime, identity.backendSessionId, identity.providerRecordId]);
+}
+function metric(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
+}
+function cacheMetric(read, write) {
+  const present = [read, write].filter((value) => value !== undefined);
+  if (present.length === 0)
+    return null;
+  const metrics = present.map(metric);
+  if (metrics.some((value) => value === null))
+    return null;
+  const total = metrics.reduce((sum, value) => sum + value, 0);
+  return Number.isSafeInteger(total) ? total : null;
+}
+
+class SettledUsageProjector {
+  active = new Set;
+  project(record2) {
+    const key = identityKey(record2);
+    if (!key || this.active.has(key))
+      return null;
+    this.active.add(key);
+    const cache = cacheMetric(record2.cacheRead, record2.cacheWrite);
+    const rawInput = metric(record2.input);
+    const input = record2.inputIncludesCache ? rawInput !== null && cache !== null && cache <= rawInput ? rawInput - cache : null : rawInput;
+    const rawOutput = metric(record2.output);
+    const reasoning = metric(record2.reasoning);
+    const output = record2.outputIncludesReasoning ? rawOutput : rawOutput !== null && reasoning !== null && Number.isSafeInteger(rawOutput + reasoning) ? rawOutput + reasoning : null;
+    if (input === null && output === null && cache === null) {
+      this.active.delete(key);
+      return null;
+    }
+    return {
+      kind: "telemetry",
+      name: "token_usage",
+      source: record2.source,
+      usage: { input, output, cache }
+    };
+  }
+  release(identity) {
+    const key = identityKey(identity);
+    if (key)
+      this.active.delete(key);
+  }
+  reset() {
+    this.active.clear();
+  }
+  get activeCount() {
+    return this.active.size;
+  }
+}
+
 // agent-driver/dist/internal/utils.js
 import { randomUUID as randomUUID3 } from "crypto";
 function jsonRpcRequest(method, params, id) {
@@ -20541,9 +20641,13 @@ var API_ERROR_RE = /API Error:.*(?:Connection error|\b[45]\d{2}\b)/i;
 class ClaudeEventNormalizer {
   turnProtocol;
   currentSession = null;
+  usageProjector = new SettledUsageProjector;
   constructor(turnProtocol) {
     this.turnProtocol = turnProtocol;
   }
+  beginTurn() {
+    this.usageProjector.reset();
+  }
   get currentSessionId() {
     return this.currentSession;
   }
@@ -20635,7 +20739,7 @@ class ClaudeEventNormalizer {
     const turnOwner = rawOwner ? this.turnProtocol?.claimResult(rawOwner) ?? (this.turnProtocol ? null : `claude:${rawOwner}`) : null;
     if (this.turnProtocol && !turnOwner)
       return;
-    const usage = this.buildUsageTelemetry(event);
+    const usage = this.buildUsageTelemetry(event, rawOwner);
     if (usage)
       out.push(usage);
     if (event.is_error || event.subtype === "error_during_execution") {
@@ -20650,23 +20754,26 @@ class ClaudeEventNormalizer {
   acceptsTurnWork() {
     return this.turnProtocol?.acceptsTurnWork() ?? true;
   }
-  buildUsageTelemetry(event) {
+  buildUsageTelemetry(event, rootRequestId) {
     const u = event?.usage;
     if (!u)
       return null;
-    const metric = (value) => typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
-    const cacheParts = [u.cache_read_input_tokens, u.cache_creation_input_tokens].filter((value) => typeof value === "number" && Number.isSafeInteger(value) && value >= 0);
-    const cache = cacheParts.length > 0 && Number.isSafeInteger(cacheParts.reduce((sum, value) => sum + value, 0)) ? cacheParts.reduce((sum, value) => sum + value, 0) : null;
-    return {
-      kind: "telemetry",
-      name: "token_usage",
+    const backendSessionId = event.session_id ?? this.currentSession;
+    if (typeof backendSessionId !== "string" || !backendSessionId)
+      return null;
+    const providerRecordId = rootRequestId ?? (typeof event.request_id === "string" ? event.request_id : "invocation-result");
+    return this.usageProjector.project({
+      runtime: "claude",
+      backendSessionId,
+      providerRecordId,
       source: "claude_result_usage",
-      usage: {
-        input: metric(u.input_tokens),
-        output: metric(u.output_tokens),
-        cache
-      }
-    };
+      input: u.input_tokens,
+      output: u.output_tokens,
+      cacheRead: u.cache_read_input_tokens,
+      cacheWrite: u.cache_creation_input_tokens,
+      inputIncludesCache: false,
+      outputIncludesReasoning: true
+    });
   }
 }
 
@@ -20869,7 +20976,9 @@ class ClaudeDriver {
   turnProtocol = new ClaudeTurnProtocol;
   eventNormalizer = new ClaudeEventNormalizer(this.turnProtocol);
   beginTurn() {
-    return this.turnProtocol.beginTurn();
+    const receipt = this.turnProtocol.beginTurn();
+    this.eventNormalizer.beginTurn();
+    return receipt;
   }
   probe(command) {
     const explicit = command?.trim();
@@ -20923,14 +21032,6 @@ class ClaudeDriver {
 }
 
 // agent-driver/dist/adapters/codex/telemetry.js
-function metric(value) {
-  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
-}
-function nonCachedInput(input, cached2) {
-  if (typeof input !== "number" || !Number.isSafeInteger(input) || input < 0 || typeof cached2 !== "number" || !Number.isSafeInteger(cached2) || cached2 < 0 || cached2 > input)
-    return null;
-  return input - cached2;
-}
 function canonicalId(value, fallback) {
   return typeof value === "string" && value.length > 0 && new TextEncoder().encode(value).length <= 64 ? value : fallback;
 }
@@ -21024,28 +21125,24 @@ function mapCodexQuotaSnapshots(snapshots, sourceEpoch) {
     }
   };
 }
-function mapCodexTelemetry(method, params, sourceEpoch) {
-  if (method === "thread/tokenUsage/updated") {
-    const u = params?.tokenUsage?.last ?? params?.token_usage?.last;
-    if (!u)
-      return [];
-    const input = u.inputTokens ?? u.input_tokens;
-    const cached2 = u.cachedInputTokens ?? u.cached_input_tokens;
-    return [{
-      kind: "telemetry",
-      name: "token_usage",
-      source: "codex_thread_token_usage_updated",
-      usage: {
-        input: nonCachedInput(input, cached2),
-        output: metric(u.outputTokens ?? u.output_tokens),
-        cache: metric(cached2)
-      }
-    }];
-  }
-  if (method === "account/rateLimits/updated") {
-    return [mapCodexQuotaSnapshots([params?.rateLimits ?? params ?? {}], sourceEpoch)];
-  }
-  return [];
+function mapCodexSettledUsage(params, projector) {
+  const backendSessionId = params?.threadId ?? params?.thread_id;
+  const providerRecordId = params?.responseId ?? params?.response_id;
+  const usage = params?.usage;
+  if (typeof backendSessionId !== "string" || typeof providerRecordId !== "string" || !usage)
+    return null;
+  return projector.project({
+    runtime: "codex",
+    backendSessionId,
+    providerRecordId,
+    source: "codex_raw_response_completed",
+    input: usage.inputTokens ?? usage.input_tokens,
+    output: usage.outputTokens ?? usage.output_tokens,
+    cacheRead: usage.cachedInputTokens ?? usage.cached_input_tokens,
+    cacheWrite: usage.cacheWriteInputTokens ?? usage.cache_write_input_tokens,
+    inputIncludesCache: true,
+    outputIncludesReasoning: true
+  });
 }
 
 // agent-driver/dist/adapters/codex/normalizer.js
@@ -21097,7 +21194,8 @@ class CodexEventNormalizer {
   rateLimitSnapshots = new Map;
   quotaSnapshotInitialized = false;
   quotaSourceGeneration = codexQuotaSourceGeneration;
-  pendingTurnUsage = null;
+  usageProjector = new SettledUsageProjector;
+  usageRecordsBySessionAndTurn = new Map;
   threadId = null;
   turnId = null;
   terminalTurn = null;
@@ -21170,7 +21268,8 @@ class CodexEventNormalizer {
     if (threadId !== this.threadId) {
       this.turnId = null;
       this.terminalTurn = null;
-      this.pendingTurnUsage = null;
+      this.usageProjector.reset();
+      this.usageRecordsBySessionAndTurn.clear();
     }
     this.threadId = threadId;
   }
@@ -21219,6 +21318,22 @@ class CodexEventNormalizer {
   }
   handleNotification(method, params) {
     const notificationThreadId = typeof params?.threadId === "string" ? params.threadId : null;
+    if (method === "rawResponse/completed")
+      return this.handleSettledUsage(params);
+    if (method === "turn/completed" && notificationThreadId !== null && notificationThreadId !== this.threadId) {
+      const turnId = this.notificationTurnId(params);
+      if (turnId)
+        this.releaseUsageForTurn(notificationThreadId, turnId);
+      return [];
+    }
+    if (method === "item/completed" && notificationThreadId !== null && notificationThreadId !== this.threadId) {
+      const turnId = this.notificationTurnId(params);
+      const itemType = params?.item?.type ?? params?.type;
+      if (turnId && itemType === "contextCompaction") {
+        this.releaseUsageForTurn(notificationThreadId, turnId);
+      }
+      return [];
+    }
     if (this.threadId !== null && notificationThreadId !== null && notificationThreadId !== this.threadId)
       return [];
     if (this.isRootWorkNotification(method) && !this.acceptRootWork(params))
@@ -21231,7 +21346,6 @@ class CodexEventNormalizer {
           return [];
         this.turnId = params.turn.id;
         this.terminalTurn = null;
-        this.pendingTurnUsage = null;
         return [
           {
             kind: "turn_owner",
@@ -21247,7 +21361,7 @@ class CodexEventNormalizer {
       case "item/started":
         return this.handleItemStarted(params);
       case "item/completed":
-        return this.handleItemCompleted(params);
+        return this.handleItemCompletedAndReleaseUsage(params);
       case "rawResponseItem/completed":
         return [{ kind: "internal_progress", source: "codex_raw_item", itemType: "rawResponseItem" }];
       case "configWarning":
@@ -21260,30 +21374,24 @@ class CodexEventNormalizer {
       case "turn/completed":
         if (!this.acceptRootTerminal(params))
           return [];
-        const usage = this.pendingTurnUsage;
-        this.pendingTurnUsage = null;
+        this.releaseUsageForTurn(params.threadId, params.turn.id);
         if (params.turn.status === "failed") {
           return [
-            ...usage ? [usage] : [],
             { kind: "error", message: "Codex turn failed" },
             { kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }
           ];
         }
         if (params.turn.status === "interrupted") {
-          return [...usage ? [usage] : [], { kind: "error", message: "Codex turn interrupted" }, { kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }];
+          return [{ kind: "error", message: "Codex turn interrupted" }, { kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }];
         }
-        return [...usage ? [usage] : [], { kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }];
+        return [{ kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }];
       case "error":
         if (params?.willRetry === true) {
           return [{ kind: "runtime_recovery", stage: "retrying", source: "codex_stream" }];
         }
         return [{ kind: "error", message: params?.error?.message ?? params?.message ?? "Codex error" }];
-      case "thread/tokenUsage/updated": {
-        const usage2 = mapCodexTelemetry(method, params, codexQuotaSourceEpoch)[0];
-        if (usage2)
-          this.pendingTurnUsage = usage2;
+      case "thread/tokenUsage/updated":
         return [];
-      }
       case "account/rateLimits/updated":
         return this.mergeQuotaSnapshots(params);
       case "account/updated":
@@ -21294,6 +21402,42 @@ class CodexEventNormalizer {
         return [];
     }
   }
+  handleSettledUsage(params) {
+    const notificationTurnId = this.notificationTurnId(params);
+    if (this.turnId === null && this.terminalTurn?.state === "closed" && notificationTurnId === this.terminalTurn.turnId && params?.threadId === this.terminalTurn.threadId)
+      return [];
+    const backendSessionId = params?.threadId ?? params?.thread_id;
+    const providerRecordId = params?.responseId ?? params?.response_id;
+    if (!notificationTurnId || typeof backendSessionId !== "string" || typeof providerRecordId !== "string")
+      return [];
+    const usage = mapCodexSettledUsage(params, this.usageProjector);
+    if (!usage)
+      return [];
+    const recordsByTurn = this.usageRecordsBySessionAndTurn.get(backendSessionId) ?? new Map;
+    const recordIds = recordsByTurn.get(notificationTurnId) ?? new Set;
+    recordIds.add(providerRecordId);
+    recordsByTurn.set(notificationTurnId, recordIds);
+    this.usageRecordsBySessionAndTurn.set(backendSessionId, recordsByTurn);
+    return [usage];
+  }
+  releaseUsageForTurn(backendSessionId, turnId) {
+    const recordsByTurn = this.usageRecordsBySessionAndTurn.get(backendSessionId);
+    for (const providerRecordId of recordsByTurn?.get(turnId) ?? []) {
+      this.usageProjector.release({ runtime: "codex", backendSessionId, providerRecordId });
+    }
+    recordsByTurn?.delete(turnId);
+    if (recordsByTurn?.size === 0)
+      this.usageRecordsBySessionAndTurn.delete(backendSessionId);
+  }
+  handleItemCompletedAndReleaseUsage(params) {
+    const events = this.handleItemCompleted(params);
+    const turnId = this.notificationTurnId(params);
+    const itemType = params?.item?.type ?? params?.type;
+    if (turnId && itemType === "contextCompaction" && turnId !== this.turnId && typeof params?.threadId === "string") {
+      this.releaseUsageForTurn(params.threadId, turnId);
+    }
+    return events;
+  }
   isRootWorkNotification(method) {
     return method === "item/reasoning/textDelta" || method === "item/reasoning/summaryTextDelta" || method === "item/agentMessage/delta" || method === "item/started" || method === "item/completed" || method === "rawResponseItem/completed";
   }
@@ -22838,6 +22982,7 @@ class OpenCodeServiceLane {
   lastDurableSeq = 0;
   durableSeqById = new Map;
   durableIdBySeq = new Map;
+  usageProjector = new SettledUsageProjector;
   toolNames = new Map;
   handledPermissions = new Set;
   permissionFlights = new Map;
@@ -23378,7 +23523,8 @@ class OpenCodeServiceLane {
     const event = record4(value);
     const durable = record4(event?.durable);
     const data = record4(event?.data);
-    if (!event || typeof event.id !== "string" || typeof event.type !== "string" || !durable || durable.aggregateID !== this.sessionId || !Number.isInteger(durable.seq) || Number(durable.seq) < 0 || data?.sessionID !== this.sessionId) {
+    const backendSessionId = this.sessionId;
+    if (!event || !backendSessionId || typeof event.id !== "string" || typeof event.type !== "string" || !durable || durable.aggregateID !== this.sessionId || !Number.isInteger(durable.seq) || Number(durable.seq) < 0 || data?.sessionID !== this.sessionId) {
       throw new OpenCodeProtocolError("OpenCode session stream emitted an invalid durable event");
     }
     const seq = Number(durable.seq);
@@ -23468,21 +23614,27 @@ class OpenCodeServiceLane {
           });
         }
         const tokens = record4(data.tokens);
-        if (tokens && data.finish !== "tool-calls") {
+        if (tokens) {
           const cache = record4(tokens.cache);
-          const metric2 = (value2) => typeof value2 === "number" && Number.isSafeInteger(value2) && value2 >= 0 ? value2 : null;
-          const cacheParts = [cache?.read, cache?.write].filter((value2) => typeof value2 === "number" && Number.isSafeInteger(value2) && value2 >= 0);
-          const cacheTotal = cacheParts.reduce((sum, value2) => sum + value2, 0);
-          this.events.emit("runtime_event", {
-            kind: "telemetry",
-            name: "token_usage",
+          const identity = {
+            runtime: "opencode",
+            backendSessionId,
+            providerRecordId: event.id
+          };
+          const usage = this.usageProjector.project({
+            ...identity,
             source: "opencode.v2",
-            usage: {
-              input: metric2(tokens.input),
-              output: metric2(tokens.output),
-              cache: cacheParts.length > 0 && Number.isSafeInteger(cacheTotal) ? cacheTotal : null
-            }
+            input: tokens.input,
+            output: tokens.output,
+            reasoning: tokens.reasoning,
+            cacheRead: cache?.read,
+            cacheWrite: cache?.write,
+            inputIncludesCache: false,
+            outputIncludesReasoning: false
           });
+          if (usage)
+            this.events.emit("runtime_event", usage);
+          this.usageProjector.release(identity);
         }
         break;
       }
@@ -24201,6 +24353,11 @@ function readPiSdkVersion() {
   } catch {}
   return resolvePiSdkVersionFromPath();
 }
+function piUsageState(state) {
+  state.usageProjector ??= new SettledUsageProjector;
+  state.pendingUsageRecordIds ??= new Set;
+  return { projector: state.usageProjector, pending: state.pendingUsageRecordIds };
+}
 function mapPiSdkEvent(event, sessionId, state) {
   if (event?.type === "message_update") {
     const d = event.assistantMessageEvent ?? {};
@@ -24221,6 +24378,35 @@ function mapPiSdkEvent(event, sessionId, state) {
     }
   }
   switch (event?.type) {
+    case "message_end": {
+      const message2 = event.message;
+      if (message2?.role !== "assistant" || !message2.usage)
+        return [];
+      state.usageRecordSequence = (state.usageRecordSequence ?? 0) + 1;
+      const providerRecordId = typeof message2.responseId === "string" && message2.responseId ? message2.responseId : `live:${message2.timestamp ?? "unknown"}:${state.usageRecordSequence}`;
+      const { projector, pending } = piUsageState(state);
+      const identity = { runtime: "pi", backendSessionId: sessionId, providerRecordId };
+      const usage = projector.project({
+        ...identity,
+        source: "pi_message_end",
+        input: message2.usage.input,
+        output: message2.usage.output,
+        cacheRead: message2.usage.cacheRead,
+        cacheWrite: message2.usage.cacheWrite,
+        inputIncludesCache: false,
+        outputIncludesReasoning: true
+      });
+      pending.add(providerRecordId);
+      return usage ? [usage] : [];
+    }
+    case "turn_end": {
+      const { projector, pending } = piUsageState(state);
+      for (const providerRecordId of pending) {
+        projector.release({ runtime: "pi", backendSessionId: sessionId, providerRecordId });
+      }
+      pending.clear();
+      return [];
+    }
     case "auto_retry_start":
       return [{ kind: "runtime_recovery", stage: "retrying", source: "pi_auto_retry" }];
     case "auto_retry_end":
@@ -30499,6 +30685,7 @@ class AgentRouter {
     await this.opts.channel.reportReady(this.buildReady());
   }
   buildReady() {
+    const timeZone = typeof this.opts.timeZone === "function" ? this.opts.timeZone() : this.opts.timeZone;
     return {
       runtimeReport: [...this.runtimes.values()],
       capabilities: [CONTROL_HEARTBEAT_CAPABILITY],
@@ -30508,6 +30695,7 @@ class AgentRouter {
       arch: this.opts.arch,
       osRelease: this.opts.osRelease,
       daemonVersion: this.opts.daemonVersion,
+      timeZone,
       ...this.opts.providerQuotas ? { providerQuotas: this.opts.providerQuotas() } : {}
     };
   }
@@ -32428,15 +32616,12 @@ class DaemonSelfSleepScheduler {
 import { chmod, mkdir, open, readFile as readFile2, rename, rm } from "node:fs/promises";
 import { dirname as dirname6, join as join14 } from "node:path";
 import { randomUUID as randomUUID7 } from "node:crypto";
-function dayKey(at) {
-  return at.toISOString().slice(0, 10);
+function oldestRetainedDay(at, timeZone) {
+  const today = dayKeyInTimeZone(at, timeZone);
+  return calendarDayKeyDaysAgo(today, 8);
 }
-function retainedDays(at) {
-  const days = new Set;
-  for (let offset = 0;offset < 7; offset += 1) {
-    days.add(dayKey(new Date(at.getTime() - offset * 86400000)));
-  }
-  return days;
+function oldestVisibleDay(today) {
+  return calendarDayKeyDaysAgo(today, 6);
 }
 function isMetric(value) {
   return value === null || typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
@@ -32481,16 +32666,25 @@ class DailyTokenUsageStore {
   loaded = false;
   data = { version: 1, bots: {} };
   filePath;
-  constructor(workingDirectoryBase, now = () => new Date) {
+  resolveTimeZone;
+  constructor(workingDirectoryBase, now = () => new Date, timeZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone) {
     this.now = now;
+    this.resolveTimeZone = typeof timeZone === "string" ? () => timeZone : timeZone;
+    this.timeZone;
     this.filePath = join14(workingDirectoryBase, ".telemetry", "daily-token-usage.json");
   }
+  get timeZone() {
+    const timeZone = this.resolveTimeZone();
+    dayKeyInTimeZone(0, timeZone);
+    return timeZone;
+  }
   record(botId, delta) {
     return this.enqueue(async () => {
       await this.load();
       const at = this.now();
-      this.prune(at);
-      const day = dayKey(at);
+      const timeZone = this.timeZone;
+      this.prune(at, timeZone);
+      const day = dayKeyInTimeZone(at, timeZone);
       const snapshots = this.data.bots[botId] ?? [];
       const existing = snapshots.find((snapshot) => snapshot.day === day);
       const next = existing ?? emptySnapshot(botId, day);
@@ -32507,13 +32701,27 @@ class DailyTokenUsageStore {
     });
   }
   snapshots(botId) {
+    return this.usageWindow(botId).then((window2) => window2.snapshots);
+  }
+  usageWindow(botId) {
     let result = [];
+    let usageDay = "";
+    let usageTimeZone = "";
     return this.enqueue(async () => {
       await this.load();
-      if (this.prune(this.now()))
+      const at = this.now();
+      const timeZone = this.timeZone;
+      usageTimeZone = timeZone;
+      usageDay = dayKeyInTimeZone(at, timeZone);
+      if (this.prune(at, timeZone))
         await this.persist();
-      result = (this.data.bots[botId] ?? []).map((snapshot) => structuredClone(snapshot));
-    }).then(() => result);
+      const oldestDay = oldestVisibleDay(usageDay);
+      result = (this.data.bots[botId] ?? []).filter((snapshot) => snapshot.day >= oldestDay && snapshot.day <= usageDay).map((snapshot) => structuredClone(snapshot));
+    }).then(() => ({
+      usageDay,
+      usageTimeZone,
+      snapshots: result
+    }));
   }
   enqueue(operation) {
     const result = this.tail.then(operation, operation);
@@ -32558,11 +32766,11 @@ class DailyTokenUsageStore {
     this.data = { version: 1, bots: valid };
     this.loaded = true;
   }
-  prune(at) {
-    const keep = retainedDays(at);
+  prune(at, timeZone) {
+    const oldestDay = oldestRetainedDay(at, timeZone);
     let changed = false;
     for (const [botId, snapshots] of Object.entries(this.data.bots)) {
-      const retained = snapshots.filter((snapshot) => keep.has(snapshot.day)).sort((a, b) => a.day.localeCompare(b.day)).slice(-7);
+      const retained = snapshots.filter((snapshot) => snapshot.day >= oldestDay).sort((a, b) => a.day.localeCompare(b.day));
       if (retained.length !== snapshots.length || retained.some((snapshot, index2) => snapshot !== snapshots[index2]))
         changed = true;
       if (retained.length === 0)
@@ -32606,6 +32814,7 @@ var WARMUP_CEILING_MS = 30000;
 var RUNTIME_RAW_TRACE_MAX_BYTES = 8 * 1024 * 1024;
 var RUNTIME_RAW_TRACE_AGENT_IDS_ENV = "ALOOK_RUNTIME_RAW_TRACE_AGENT_IDS";
 var STATUS_WRITE_INTERVAL_MS = 5000;
+var TOKEN_USAGE_BACKENDS = new Set(["claude", "codex", "opencode", "pi"]);
 function parseRuntimeRawTraceAgentIds(value) {
   return new Set((value ?? "").split(",").map((agentId) => agentId.trim()).filter((agentId) => agentId.length > 0 && agentId !== "*"));
 }
@@ -32782,10 +32991,14 @@ async function createDaemon(opts) {
         recordProviderQuota("claude", observed);
     }
     const quota = backendId === "claude" || backendId === "codex" ? providerQuotaByBackend.get(backendId) : undefined;
-    const dailyUsage = await dailyTokenUsage2.snapshots(info.agentId);
+    const usageWindow = backendId && TOKEN_USAGE_BACKENDS.has(backendId) ? await dailyTokenUsage2.usageWindow(info.agentId) : null;
     return {
       ...info,
-      ...dailyUsage.length > 0 ? { dailyUsage } : {},
+      ...usageWindow ? {
+        usageTimeZone: usageWindow.usageTimeZone,
+        usageDay: usageWindow.usageDay,
+        ...usageWindow.snapshots.length > 0 ? { dailyUsage: usageWindow.snapshots } : {}
+      } : {},
       ...quota ? { quota: structuredClone(quota) } : {}
     };
   };
@@ -33197,6 +33410,7 @@ async function createDaemon(opts) {
     arch: opts.arch,
     osRelease: opts.osRelease,
     daemonVersion: opts.daemonVersion,
+    timeZone: () => dailyTokenUsage2.timeZone,
     providerQuotas: providerQuotaSnapshots,
     resyncActivities: async () => {
       const activities = await Promise.all(manager.liveAgentActivities().map((info) => activityPayload(info)));

package/dist/index.js

@@ -1125,6 +1125,66 @@ function buildClaudeArgs(config) {
   return args;
 }
 
+// agent-driver/dist/internal/token-usage.js
+function validIdentityPart(value) {
+  return value.trim().length > 0 && Buffer.byteLength(value, "utf8") <= 512;
+}
+function identityKey(identity) {
+  if (!validIdentityPart(identity.runtime) || !validIdentityPart(identity.backendSessionId) || !validIdentityPart(identity.providerRecordId))
+    return null;
+  return JSON.stringify([identity.runtime, identity.backendSessionId, identity.providerRecordId]);
+}
+function metric(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
+}
+function cacheMetric(read, write) {
+  const present = [read, write].filter((value) => value !== undefined);
+  if (present.length === 0)
+    return null;
+  const metrics = present.map(metric);
+  if (metrics.some((value) => value === null))
+    return null;
+  const total = metrics.reduce((sum, value) => sum + value, 0);
+  return Number.isSafeInteger(total) ? total : null;
+}
+
+class SettledUsageProjector {
+  active = new Set;
+  project(record) {
+    const key = identityKey(record);
+    if (!key || this.active.has(key))
+      return null;
+    this.active.add(key);
+    const cache = cacheMetric(record.cacheRead, record.cacheWrite);
+    const rawInput = metric(record.input);
+    const input = record.inputIncludesCache ? rawInput !== null && cache !== null && cache <= rawInput ? rawInput - cache : null : rawInput;
+    const rawOutput = metric(record.output);
+    const reasoning = metric(record.reasoning);
+    const output = record.outputIncludesReasoning ? rawOutput : rawOutput !== null && reasoning !== null && Number.isSafeInteger(rawOutput + reasoning) ? rawOutput + reasoning : null;
+    if (input === null && output === null && cache === null) {
+      this.active.delete(key);
+      return null;
+    }
+    return {
+      kind: "telemetry",
+      name: "token_usage",
+      source: record.source,
+      usage: { input, output, cache }
+    };
+  }
+  release(identity) {
+    const key = identityKey(identity);
+    if (key)
+      this.active.delete(key);
+  }
+  reset() {
+    this.active.clear();
+  }
+  get activeCount() {
+    return this.active.size;
+  }
+}
+
 // agent-driver/dist/internal/utils.js
 import { randomUUID as randomUUID3 } from "crypto";
 function jsonRpcRequest(method, params, id) {
@@ -1144,9 +1204,13 @@ var API_ERROR_RE = /API Error:.*(?:Connection error|\b[45]\d{2}\b)/i;
 class ClaudeEventNormalizer {
   turnProtocol;
   currentSession = null;
+  usageProjector = new SettledUsageProjector;
   constructor(turnProtocol) {
     this.turnProtocol = turnProtocol;
   }
+  beginTurn() {
+    this.usageProjector.reset();
+  }
   get currentSessionId() {
     return this.currentSession;
   }
@@ -1238,7 +1302,7 @@ class ClaudeEventNormalizer {
     const turnOwner = rawOwner ? this.turnProtocol?.claimResult(rawOwner) ?? (this.turnProtocol ? null : `claude:${rawOwner}`) : null;
     if (this.turnProtocol && !turnOwner)
       return;
-    const usage = this.buildUsageTelemetry(event);
+    const usage = this.buildUsageTelemetry(event, rawOwner);
     if (usage)
       out.push(usage);
     if (event.is_error || event.subtype === "error_during_execution") {
@@ -1253,23 +1317,26 @@ class ClaudeEventNormalizer {
   acceptsTurnWork() {
     return this.turnProtocol?.acceptsTurnWork() ?? true;
   }
-  buildUsageTelemetry(event) {
+  buildUsageTelemetry(event, rootRequestId) {
     const u = event?.usage;
     if (!u)
       return null;
-    const metric = (value) => typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
-    const cacheParts = [u.cache_read_input_tokens, u.cache_creation_input_tokens].filter((value) => typeof value === "number" && Number.isSafeInteger(value) && value >= 0);
-    const cache = cacheParts.length > 0 && Number.isSafeInteger(cacheParts.reduce((sum, value) => sum + value, 0)) ? cacheParts.reduce((sum, value) => sum + value, 0) : null;
-    return {
-      kind: "telemetry",
-      name: "token_usage",
+    const backendSessionId = event.session_id ?? this.currentSession;
+    if (typeof backendSessionId !== "string" || !backendSessionId)
+      return null;
+    const providerRecordId = rootRequestId ?? (typeof event.request_id === "string" ? event.request_id : "invocation-result");
+    return this.usageProjector.project({
+      runtime: "claude",
+      backendSessionId,
+      providerRecordId,
       source: "claude_result_usage",
-      usage: {
-        input: metric(u.input_tokens),
-        output: metric(u.output_tokens),
-        cache
-      }
-    };
+      input: u.input_tokens,
+      output: u.output_tokens,
+      cacheRead: u.cache_read_input_tokens,
+      cacheWrite: u.cache_creation_input_tokens,
+      inputIncludesCache: false,
+      outputIncludesReasoning: true
+    });
   }
 }
 
@@ -1472,7 +1539,9 @@ class ClaudeDriver {
   turnProtocol = new ClaudeTurnProtocol;
   eventNormalizer = new ClaudeEventNormalizer(this.turnProtocol);
   beginTurn() {
-    return this.turnProtocol.beginTurn();
+    const receipt = this.turnProtocol.beginTurn();
+    this.eventNormalizer.beginTurn();
+    return receipt;
   }
   probe(command) {
     const explicit = command?.trim();
@@ -1526,14 +1595,6 @@ class ClaudeDriver {
 }
 
 // agent-driver/dist/adapters/codex/telemetry.js
-function metric(value) {
-  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
-}
-function nonCachedInput(input, cached) {
-  if (typeof input !== "number" || !Number.isSafeInteger(input) || input < 0 || typeof cached !== "number" || !Number.isSafeInteger(cached) || cached < 0 || cached > input)
-    return null;
-  return input - cached;
-}
 function canonicalId(value, fallback) {
   return typeof value === "string" && value.length > 0 && new TextEncoder().encode(value).length <= 64 ? value : fallback;
 }
@@ -1627,28 +1688,24 @@ function mapCodexQuotaSnapshots(snapshots, sourceEpoch) {
     }
   };
 }
-function mapCodexTelemetry(method, params, sourceEpoch) {
-  if (method === "thread/tokenUsage/updated") {
-    const u = params?.tokenUsage?.last ?? params?.token_usage?.last;
-    if (!u)
-      return [];
-    const input = u.inputTokens ?? u.input_tokens;
-    const cached = u.cachedInputTokens ?? u.cached_input_tokens;
-    return [{
-      kind: "telemetry",
-      name: "token_usage",
-      source: "codex_thread_token_usage_updated",
-      usage: {
-        input: nonCachedInput(input, cached),
-        output: metric(u.outputTokens ?? u.output_tokens),
-        cache: metric(cached)
-      }
-    }];
-  }
-  if (method === "account/rateLimits/updated") {
-    return [mapCodexQuotaSnapshots([params?.rateLimits ?? params ?? {}], sourceEpoch)];
-  }
-  return [];
+function mapCodexSettledUsage(params, projector) {
+  const backendSessionId = params?.threadId ?? params?.thread_id;
+  const providerRecordId = params?.responseId ?? params?.response_id;
+  const usage = params?.usage;
+  if (typeof backendSessionId !== "string" || typeof providerRecordId !== "string" || !usage)
+    return null;
+  return projector.project({
+    runtime: "codex",
+    backendSessionId,
+    providerRecordId,
+    source: "codex_raw_response_completed",
+    input: usage.inputTokens ?? usage.input_tokens,
+    output: usage.outputTokens ?? usage.output_tokens,
+    cacheRead: usage.cachedInputTokens ?? usage.cached_input_tokens,
+    cacheWrite: usage.cacheWriteInputTokens ?? usage.cache_write_input_tokens,
+    inputIncludesCache: true,
+    outputIncludesReasoning: true
+  });
 }
 
 // agent-driver/dist/adapters/codex/normalizer.js
@@ -1700,7 +1757,8 @@ class CodexEventNormalizer {
   rateLimitSnapshots = new Map;
   quotaSnapshotInitialized = false;
   quotaSourceGeneration = codexQuotaSourceGeneration;
-  pendingTurnUsage = null;
+  usageProjector = new SettledUsageProjector;
+  usageRecordsBySessionAndTurn = new Map;
   threadId = null;
   turnId = null;
   terminalTurn = null;
@@ -1773,7 +1831,8 @@ class CodexEventNormalizer {
     if (threadId !== this.threadId) {
       this.turnId = null;
       this.terminalTurn = null;
-      this.pendingTurnUsage = null;
+      this.usageProjector.reset();
+      this.usageRecordsBySessionAndTurn.clear();
     }
     this.threadId = threadId;
   }
@@ -1822,6 +1881,22 @@ class CodexEventNormalizer {
   }
   handleNotification(method, params) {
     const notificationThreadId = typeof params?.threadId === "string" ? params.threadId : null;
+    if (method === "rawResponse/completed")
+      return this.handleSettledUsage(params);
+    if (method === "turn/completed" && notificationThreadId !== null && notificationThreadId !== this.threadId) {
+      const turnId = this.notificationTurnId(params);
+      if (turnId)
+        this.releaseUsageForTurn(notificationThreadId, turnId);
+      return [];
+    }
+    if (method === "item/completed" && notificationThreadId !== null && notificationThreadId !== this.threadId) {
+      const turnId = this.notificationTurnId(params);
+      const itemType = params?.item?.type ?? params?.type;
+      if (turnId && itemType === "contextCompaction") {
+        this.releaseUsageForTurn(notificationThreadId, turnId);
+      }
+      return [];
+    }
     if (this.threadId !== null && notificationThreadId !== null && notificationThreadId !== this.threadId)
       return [];
     if (this.isRootWorkNotification(method) && !this.acceptRootWork(params))
@@ -1834,7 +1909,6 @@ class CodexEventNormalizer {
           return [];
         this.turnId = params.turn.id;
         this.terminalTurn = null;
-        this.pendingTurnUsage = null;
         return [
           {
             kind: "turn_owner",
@@ -1850,7 +1924,7 @@ class CodexEventNormalizer {
       case "item/started":
         return this.handleItemStarted(params);
       case "item/completed":
-        return this.handleItemCompleted(params);
+        return this.handleItemCompletedAndReleaseUsage(params);
       case "rawResponseItem/completed":
         return [{ kind: "internal_progress", source: "codex_raw_item", itemType: "rawResponseItem" }];
       case "configWarning":
@@ -1863,30 +1937,24 @@ class CodexEventNormalizer {
       case "turn/completed":
         if (!this.acceptRootTerminal(params))
           return [];
-        const usage = this.pendingTurnUsage;
-        this.pendingTurnUsage = null;
+        this.releaseUsageForTurn(params.threadId, params.turn.id);
         if (params.turn.status === "failed") {
           return [
-            ...usage ? [usage] : [],
             { kind: "error", message: "Codex turn failed" },
             { kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }
           ];
         }
         if (params.turn.status === "interrupted") {
-          return [...usage ? [usage] : [], { kind: "error", message: "Codex turn interrupted" }, { kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }];
+          return [{ kind: "error", message: "Codex turn interrupted" }, { kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }];
         }
-        return [...usage ? [usage] : [], { kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }];
+        return [{ kind: "turn_end", sessionId: this.threadId ?? undefined, turnOwner: this.turnReceipt(params.threadId, params.turn.id) }];
       case "error":
         if (params?.willRetry === true) {
           return [{ kind: "runtime_recovery", stage: "retrying", source: "codex_stream" }];
         }
         return [{ kind: "error", message: params?.error?.message ?? params?.message ?? "Codex error" }];
-      case "thread/tokenUsage/updated": {
-        const usage2 = mapCodexTelemetry(method, params, codexQuotaSourceEpoch)[0];
-        if (usage2)
-          this.pendingTurnUsage = usage2;
+      case "thread/tokenUsage/updated":
         return [];
-      }
       case "account/rateLimits/updated":
         return this.mergeQuotaSnapshots(params);
       case "account/updated":
@@ -1897,6 +1965,42 @@ class CodexEventNormalizer {
         return [];
     }
   }
+  handleSettledUsage(params) {
+    const notificationTurnId = this.notificationTurnId(params);
+    if (this.turnId === null && this.terminalTurn?.state === "closed" && notificationTurnId === this.terminalTurn.turnId && params?.threadId === this.terminalTurn.threadId)
+      return [];
+    const backendSessionId = params?.threadId ?? params?.thread_id;
+    const providerRecordId = params?.responseId ?? params?.response_id;
+    if (!notificationTurnId || typeof backendSessionId !== "string" || typeof providerRecordId !== "string")
+      return [];
+    const usage = mapCodexSettledUsage(params, this.usageProjector);
+    if (!usage)
+      return [];
+    const recordsByTurn = this.usageRecordsBySessionAndTurn.get(backendSessionId) ?? new Map;
+    const recordIds = recordsByTurn.get(notificationTurnId) ?? new Set;
+    recordIds.add(providerRecordId);
+    recordsByTurn.set(notificationTurnId, recordIds);
+    this.usageRecordsBySessionAndTurn.set(backendSessionId, recordsByTurn);
+    return [usage];
+  }
+  releaseUsageForTurn(backendSessionId, turnId) {
+    const recordsByTurn = this.usageRecordsBySessionAndTurn.get(backendSessionId);
+    for (const providerRecordId of recordsByTurn?.get(turnId) ?? []) {
+      this.usageProjector.release({ runtime: "codex", backendSessionId, providerRecordId });
+    }
+    recordsByTurn?.delete(turnId);
+    if (recordsByTurn?.size === 0)
+      this.usageRecordsBySessionAndTurn.delete(backendSessionId);
+  }
+  handleItemCompletedAndReleaseUsage(params) {
+    const events = this.handleItemCompleted(params);
+    const turnId = this.notificationTurnId(params);
+    const itemType = params?.item?.type ?? params?.type;
+    if (turnId && itemType === "contextCompaction" && turnId !== this.turnId && typeof params?.threadId === "string") {
+      this.releaseUsageForTurn(params.threadId, turnId);
+    }
+    return events;
+  }
   isRootWorkNotification(method) {
     return method === "item/reasoning/textDelta" || method === "item/reasoning/summaryTextDelta" || method === "item/agentMessage/delta" || method === "item/started" || method === "item/completed" || method === "rawResponseItem/completed";
   }
@@ -3441,6 +3545,7 @@ class OpenCodeServiceLane {
   lastDurableSeq = 0;
   durableSeqById = new Map;
   durableIdBySeq = new Map;
+  usageProjector = new SettledUsageProjector;
   toolNames = new Map;
   handledPermissions = new Set;
   permissionFlights = new Map;
@@ -3981,7 +4086,8 @@ class OpenCodeServiceLane {
     const event = record3(value);
     const durable = record3(event?.durable);
     const data = record3(event?.data);
-    if (!event || typeof event.id !== "string" || typeof event.type !== "string" || !durable || durable.aggregateID !== this.sessionId || !Number.isInteger(durable.seq) || Number(durable.seq) < 0 || data?.sessionID !== this.sessionId) {
+    const backendSessionId = this.sessionId;
+    if (!event || !backendSessionId || typeof event.id !== "string" || typeof event.type !== "string" || !durable || durable.aggregateID !== this.sessionId || !Number.isInteger(durable.seq) || Number(durable.seq) < 0 || data?.sessionID !== this.sessionId) {
       throw new OpenCodeProtocolError("OpenCode session stream emitted an invalid durable event");
     }
     const seq = Number(durable.seq);
@@ -4071,21 +4177,27 @@ class OpenCodeServiceLane {
           });
         }
         const tokens = record3(data.tokens);
-        if (tokens && data.finish !== "tool-calls") {
+        if (tokens) {
           const cache = record3(tokens.cache);
-          const metric2 = (value2) => typeof value2 === "number" && Number.isSafeInteger(value2) && value2 >= 0 ? value2 : null;
-          const cacheParts = [cache?.read, cache?.write].filter((value2) => typeof value2 === "number" && Number.isSafeInteger(value2) && value2 >= 0);
-          const cacheTotal = cacheParts.reduce((sum, value2) => sum + value2, 0);
-          this.events.emit("runtime_event", {
-            kind: "telemetry",
-            name: "token_usage",
+          const identity = {
+            runtime: "opencode",
+            backendSessionId,
+            providerRecordId: event.id
+          };
+          const usage = this.usageProjector.project({
+            ...identity,
             source: "opencode.v2",
-            usage: {
-              input: metric2(tokens.input),
-              output: metric2(tokens.output),
-              cache: cacheParts.length > 0 && Number.isSafeInteger(cacheTotal) ? cacheTotal : null
-            }
+            input: tokens.input,
+            output: tokens.output,
+            reasoning: tokens.reasoning,
+            cacheRead: cache?.read,
+            cacheWrite: cache?.write,
+            inputIncludesCache: false,
+            outputIncludesReasoning: false
           });
+          if (usage)
+            this.events.emit("runtime_event", usage);
+          this.usageProjector.release(identity);
         }
         break;
       }
@@ -4804,6 +4916,11 @@ function readPiSdkVersion() {
   } catch {}
   return resolvePiSdkVersionFromPath();
 }
+function piUsageState(state) {
+  state.usageProjector ??= new SettledUsageProjector;
+  state.pendingUsageRecordIds ??= new Set;
+  return { projector: state.usageProjector, pending: state.pendingUsageRecordIds };
+}
 function mapPiSdkEvent(event, sessionId, state) {
   if (event?.type === "message_update") {
     const d = event.assistantMessageEvent ?? {};
@@ -4824,6 +4941,35 @@ function mapPiSdkEvent(event, sessionId, state) {
     }
   }
   switch (event?.type) {
+    case "message_end": {
+      const message = event.message;
+      if (message?.role !== "assistant" || !message.usage)
+        return [];
+      state.usageRecordSequence = (state.usageRecordSequence ?? 0) + 1;
+      const providerRecordId = typeof message.responseId === "string" && message.responseId ? message.responseId : `live:${message.timestamp ?? "unknown"}:${state.usageRecordSequence}`;
+      const { projector, pending } = piUsageState(state);
+      const identity = { runtime: "pi", backendSessionId: sessionId, providerRecordId };
+      const usage = projector.project({
+        ...identity,
+        source: "pi_message_end",
+        input: message.usage.input,
+        output: message.usage.output,
+        cacheRead: message.usage.cacheRead,
+        cacheWrite: message.usage.cacheWrite,
+        inputIncludesCache: false,
+        outputIncludesReasoning: true
+      });
+      pending.add(providerRecordId);
+      return usage ? [usage] : [];
+    }
+    case "turn_end": {
+      const { projector, pending } = piUsageState(state);
+      for (const providerRecordId of pending) {
+        projector.release({ runtime: "pi", backendSessionId: sessionId, providerRecordId });
+      }
+      pending.clear();
+      return [];
+    }
     case "auto_retry_start":
       return [{ kind: "runtime_recovery", stage: "retrying", source: "pi_auto_retry" }];
     case "auto_retry_end":
@@ -26874,6 +27020,7 @@ var communityMachine = sqliteTable("community_machine", {
   arch: text("arch").notNull().default(""),
   osRelease: text("os_release").notNull().default(""),
   daemonVersion: text("daemon_version").notNull().default(""),
+  timeZone: text("time_zone"),
   metadata: text("metadata"),
   availableRuntimes: text("available_runtimes", { mode: "json" }).$type().notNull().default([]),
   status: text("status").notNull().default("offline"),
@@ -27225,6 +27372,7 @@ class AgentRouter {
     await this.opts.channel.reportReady(this.buildReady());
   }
   buildReady() {
+    const timeZone = typeof this.opts.timeZone === "function" ? this.opts.timeZone() : this.opts.timeZone;
     return {
       runtimeReport: [...this.runtimes.values()],
       capabilities: [CONTROL_HEARTBEAT_CAPABILITY],
@@ -27234,6 +27382,7 @@ class AgentRouter {
       arch: this.opts.arch,
       osRelease: this.opts.osRelease,
       daemonVersion: this.opts.daemonVersion,
+      timeZone,
       ...this.opts.providerQuotas ? { providerQuotas: this.opts.providerQuotas() } : {}
     };
   }
@@ -28951,6 +29100,7 @@ var HostReadyMessageSchema = exports_external.object({
   arch: exports_external.string().optional(),
   osRelease: exports_external.string().optional(),
   daemonVersion: exports_external.string().optional(),
+  timeZone: exports_external.string().min(1).max(128).optional(),
   providerQuotas: exports_external.array(ProviderQuotaSnapshotSchema).max(2).optional().default([])
 });
 var CommunityDaemonReadySchema = exports_external.object({
@@ -28973,6 +29123,8 @@ var AgentActivityMessageSchema = exports_external.object({
   type: exports_external.literal("agent_activity"),
   agentId: exports_external.string(),
   state: exports_external.enum(["idle", "starting", "running", "stopping"]),
+  usageTimeZone: exports_external.string().min(1).max(128).optional(),
+  usageDay: exports_external.string().regex(/^\d{4}-\d{2}-\d{2}$/).optional(),
   dailyUsage: exports_external.array(DailyUsageSnapshotSchema).max(7).optional(),
   quota: ProviderQuotaSnapshotSchema.optional()
 });
@@ -29238,6 +29390,42 @@ var BotAuditEventAckFrameSchema = exports_external.strictObject({
   type: exports_external.literal("bot_audit_event_ack"),
   eventId: exports_external.string().min(1).max(128)
 });
+// ../shared/src/utils/day-key.ts
+function utcDayKey(now) {
+  const d = now instanceof Date ? now : new Date(now);
+  return d.toISOString().slice(0, 10);
+}
+function calendarDayKeyDaysAgo(day, days) {
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(day);
+  if (!match)
+    throw new RangeError("invalid calendar day key");
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const date5 = Number(match[3]);
+  const parsed = new Date(Date.UTC(year, month - 1, date5));
+  if (parsed.getUTCFullYear() !== year || parsed.getUTCMonth() !== month - 1 || parsed.getUTCDate() !== date5) {
+    throw new RangeError("invalid calendar day key");
+  }
+  parsed.setUTCDate(parsed.getUTCDate() - days);
+  return utcDayKey(parsed);
+}
+function dayKeyInTimeZone(now, timeZone) {
+  const date5 = now instanceof Date ? now : new Date(now);
+  const parts = new Intl.DateTimeFormat("en-US", {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  }).formatToParts(date5);
+  const values = new Map(parts.map((part) => [part.type, part.value]));
+  const year = values.get("year");
+  const month = values.get("month");
+  const day = values.get("day");
+  if (!year || !month || !day)
+    throw new RangeError("unable to format calendar day key");
+  return `${year}-${month}-${day}`;
+}
+
 // ../shared/src/db/community-schema.ts
 var exports_community_schema = {};
 __export(exports_community_schema, {
@@ -32726,15 +32914,12 @@ class DaemonSelfSleepScheduler {
 import { chmod, mkdir, open, readFile as readFile2, rename, rm } from "node:fs/promises";
 import { dirname as dirname5, join as join14 } from "node:path";
 import { randomUUID as randomUUID7 } from "node:crypto";
-function dayKey(at) {
-  return at.toISOString().slice(0, 10);
+function oldestRetainedDay(at, timeZone) {
+  const today = dayKeyInTimeZone(at, timeZone);
+  return calendarDayKeyDaysAgo(today, 8);
 }
-function retainedDays(at) {
-  const days = new Set;
-  for (let offset = 0;offset < 7; offset += 1) {
-    days.add(dayKey(new Date(at.getTime() - offset * 86400000)));
-  }
-  return days;
+function oldestVisibleDay(today) {
+  return calendarDayKeyDaysAgo(today, 6);
 }
 function isMetric(value) {
   return value === null || typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
@@ -32779,16 +32964,25 @@ class DailyTokenUsageStore {
   loaded = false;
   data = { version: 1, bots: {} };
   filePath;
-  constructor(workingDirectoryBase, now = () => new Date) {
+  resolveTimeZone;
+  constructor(workingDirectoryBase, now = () => new Date, timeZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone) {
     this.now = now;
+    this.resolveTimeZone = typeof timeZone === "string" ? () => timeZone : timeZone;
+    this.timeZone;
     this.filePath = join14(workingDirectoryBase, ".telemetry", "daily-token-usage.json");
   }
+  get timeZone() {
+    const timeZone = this.resolveTimeZone();
+    dayKeyInTimeZone(0, timeZone);
+    return timeZone;
+  }
   record(botId, delta) {
     return this.enqueue(async () => {
       await this.load();
       const at = this.now();
-      this.prune(at);
-      const day = dayKey(at);
+      const timeZone = this.timeZone;
+      this.prune(at, timeZone);
+      const day = dayKeyInTimeZone(at, timeZone);
       const snapshots = this.data.bots[botId] ?? [];
       const existing = snapshots.find((snapshot) => snapshot.day === day);
       const next = existing ?? emptySnapshot(botId, day);
@@ -32805,13 +32999,27 @@ class DailyTokenUsageStore {
     });
   }
   snapshots(botId) {
+    return this.usageWindow(botId).then((window2) => window2.snapshots);
+  }
+  usageWindow(botId) {
     let result = [];
+    let usageDay = "";
+    let usageTimeZone = "";
     return this.enqueue(async () => {
       await this.load();
-      if (this.prune(this.now()))
+      const at = this.now();
+      const timeZone = this.timeZone;
+      usageTimeZone = timeZone;
+      usageDay = dayKeyInTimeZone(at, timeZone);
+      if (this.prune(at, timeZone))
         await this.persist();
-      result = (this.data.bots[botId] ?? []).map((snapshot) => structuredClone(snapshot));
-    }).then(() => result);
+      const oldestDay = oldestVisibleDay(usageDay);
+      result = (this.data.bots[botId] ?? []).filter((snapshot) => snapshot.day >= oldestDay && snapshot.day <= usageDay).map((snapshot) => structuredClone(snapshot));
+    }).then(() => ({
+      usageDay,
+      usageTimeZone,
+      snapshots: result
+    }));
   }
   enqueue(operation) {
     const result = this.tail.then(operation, operation);
@@ -32856,11 +33064,11 @@ class DailyTokenUsageStore {
     this.data = { version: 1, bots: valid };
     this.loaded = true;
   }
-  prune(at) {
-    const keep = retainedDays(at);
+  prune(at, timeZone) {
+    const oldestDay = oldestRetainedDay(at, timeZone);
     let changed = false;
     for (const [botId, snapshots] of Object.entries(this.data.bots)) {
-      const retained = snapshots.filter((snapshot) => keep.has(snapshot.day)).sort((a, b) => a.day.localeCompare(b.day)).slice(-7);
+      const retained = snapshots.filter((snapshot) => snapshot.day >= oldestDay).sort((a, b) => a.day.localeCompare(b.day));
       if (retained.length !== snapshots.length || retained.some((snapshot, index2) => snapshot !== snapshots[index2]))
         changed = true;
       if (retained.length === 0)
@@ -32904,6 +33112,7 @@ var WARMUP_CEILING_MS = 30000;
 var RUNTIME_RAW_TRACE_MAX_BYTES = 8 * 1024 * 1024;
 var RUNTIME_RAW_TRACE_AGENT_IDS_ENV = "ALOOK_RUNTIME_RAW_TRACE_AGENT_IDS";
 var STATUS_WRITE_INTERVAL_MS = 5000;
+var TOKEN_USAGE_BACKENDS = new Set(["claude", "codex", "opencode", "pi"]);
 function parseRuntimeRawTraceAgentIds(value) {
   return new Set((value ?? "").split(",").map((agentId) => agentId.trim()).filter((agentId) => agentId.length > 0 && agentId !== "*"));
 }
@@ -33080,10 +33289,14 @@ async function createDaemon(opts) {
         recordProviderQuota("claude", observed);
     }
     const quota = backendId === "claude" || backendId === "codex" ? providerQuotaByBackend.get(backendId) : undefined;
-    const dailyUsage = await dailyTokenUsage2.snapshots(info.agentId);
+    const usageWindow = backendId && TOKEN_USAGE_BACKENDS.has(backendId) ? await dailyTokenUsage2.usageWindow(info.agentId) : null;
     return {
       ...info,
-      ...dailyUsage.length > 0 ? { dailyUsage } : {},
+      ...usageWindow ? {
+        usageTimeZone: usageWindow.usageTimeZone,
+        usageDay: usageWindow.usageDay,
+        ...usageWindow.snapshots.length > 0 ? { dailyUsage: usageWindow.snapshots } : {}
+      } : {},
       ...quota ? { quota: structuredClone(quota) } : {}
     };
   };
@@ -33495,6 +33708,7 @@ async function createDaemon(opts) {
     arch: opts.arch,
     osRelease: opts.osRelease,
     daemonVersion: opts.daemonVersion,
+    timeZone: () => dailyTokenUsage2.timeZone,
     providerQuotas: providerQuotaSnapshots,
     resyncActivities: async () => {
       const activities = await Promise.all(manager.liveAgentActivities().map((info) => activityPayload(info)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alook/daemon",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Alook agent daemon — host-side runtime backend, process manager, credential proxy, and control plane.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/alookai/alook#readme",