@alook/daemon 0.1.28 → 0.1.29

package/README.md

@@ -97,12 +97,14 @@ Pi declares the `in_process_sdk` transport and
 `midTurnDelivery: "steer"`. Its lane delegates prompt, steer, abort, and dispose
 to the SDK while preserving the same receipts, events, and terminal contract.
 
-### Persistent queued runtime (Cursor)
+### Persistent steering runtime (Cursor)
 
 Cursor keeps one `cursor-agent acp` process and ACP session for the logical
-session. Each idle command is a `session/prompt` request; while one is active,
-later commands remain in the logical next-turn FIFO until its correlated
-response arrives. Interrupt sends `session/cancel` without killing the process.
+session. A root command starts a `session/prompt`; busy commands steer the same
+logical turn through concurrent prompt requests. Each request has its own
+JSON-RPC id, while the root receipt remains the stable terminal owner. Old
+responses cannot settle the current turn. Interrupt sends `session/cancel`
+without killing the process.
 
 ### Persistent service runtime (OpenCode)
 
@@ -120,7 +122,7 @@ live stream handles permissions.
 | **claude** | persistent session | stream-json NDJSON | `safe_boundary_queue` | stdin user-message line | stream-json |
 | **codex** | persistent session | JSON-RPC 2.0 (`app-server --listen stdio://`) | `safe_boundary_queue` | `initialize` → `thread/start`/`resume` | JSON-RPC notifications |
 | **pi** | persistent session | `@earendil-works/pi-coding-agent` | `steer` | `session.prompt()` | SDK callback |
-| **cursor** | persistent session | ACP JSON-RPC 2.0 (`cursor-agent acp`) | `next_turn_queue` | `session/prompt` | `session/update` + correlated prompt response |
+| **cursor** | persistent session | ACP JSON-RPC 2.0 (`cursor-agent acp`) | `steer` | `session/prompt` | `session/update` + correlated prompt response |
 | **opencode** | persistent session | authenticated HTTP + SSE (`opencode serve --pure`) | `steer` | v2 session prompt API | durable + live SSE |
 
 (Exact launch flags live in `agent-driver/src/adapters/<backend>/`.)

package/dist/cli/index.js

@@ -16934,6 +16934,7 @@ var ALLOWED_ICON_MIME_TYPES = [
 ];
 var MAX_ICON_SOURCE_FILE_SIZE_BYTES = 15 * 1024 * 1024;
 // ../shared/src/provider-telemetry.ts
+var DAILY_TOKEN_USAGE_WINDOW_DAYS = 30;
 var safeToken = exports_external.number().int().min(0).max(Number.MAX_SAFE_INTEGER);
 var boundedText = exports_external.string().min(1).refine((value) => new TextEncoder().encode(value).length <= 64, { message: "must be at most 64 UTF-8 bytes" });
 var DailyUsageMetricSchema = safeToken.nullable();
@@ -17665,7 +17666,7 @@ var AgentActivityMessageSchema = exports_external.object({
   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(),
+  dailyUsage: exports_external.array(DailyUsageSnapshotSchema).max(DAILY_TOKEN_USAGE_WINDOW_DAYS).optional(),
   quota: ProviderQuotaSnapshotSchema.optional()
 });
 var AgentTypingMessageSchema = exports_external.object({
@@ -20637,11 +20638,33 @@ function tryParseJsonLine(line) {
 
 // agent-driver/dist/adapters/claude/normalizer.js
 var API_ERROR_RE = /API Error:.*(?:Connection error|\b[45]\d{2}\b)/i;
+var CLAUDE_USAGE_COMPONENTS = [
+  "inputTokens",
+  "outputTokens",
+  "cacheReadInputTokens",
+  "cacheCreationInputTokens"
+];
+function safeCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
+}
+function safeMoney(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
+}
+function safeAdd(left, right) {
+  const total = left + right;
+  return Number.isSafeInteger(total) ? total : null;
+}
+function equalCost(left, right) {
+  return Math.abs(left - right) <= Math.max(0.000000000001, Math.abs(right) * 0.000000001);
+}
 
 class ClaudeEventNormalizer {
   turnProtocol;
   currentSession = null;
   usageProjector = new SettledUsageProjector;
+  claudeUsageSession = null;
+  claudeModelUsageHighWater = new Map;
+  claudeUsageMode = "unknown";
   constructor(turnProtocol) {
     this.turnProtocol = turnProtocol;
   }
@@ -20755,14 +20778,39 @@ class ClaudeEventNormalizer {
     return this.turnProtocol?.acceptsTurnWork() ?? true;
   }
   buildUsageTelemetry(event, rootRequestId) {
-    const u = event?.usage;
-    if (!u)
-      return null;
     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({
+    const cumulative = this.prepareClaudeModelUsage(event, backendSessionId);
+    if (cumulative === null)
+      return null;
+    if (cumulative) {
+      const hasDelta = cumulative.input > 0 || cumulative.output > 0 || cumulative.cacheRead > 0 || cumulative.cacheWrite > 0;
+      if (!hasDelta) {
+        this.commitClaudeModelUsage(backendSessionId, cumulative);
+        return null;
+      }
+      const projected2 = this.usageProjector.project({
+        runtime: "claude",
+        backendSessionId,
+        providerRecordId,
+        source: "claude_result_model_usage",
+        input: cumulative.input,
+        output: cumulative.output,
+        cacheRead: cumulative.cacheRead,
+        cacheWrite: cumulative.cacheWrite,
+        inputIncludesCache: false,
+        outputIncludesReasoning: true
+      });
+      if (projected2)
+        this.commitClaudeModelUsage(backendSessionId, cumulative);
+      return projected2;
+    }
+    const u = event?.usage;
+    if (!u)
+      return null;
+    const projected = this.usageProjector.project({
       runtime: "claude",
       backendSessionId,
       providerRecordId,
@@ -20774,6 +20822,102 @@ class ClaudeEventNormalizer {
       inputIncludesCache: false,
       outputIncludesReasoning: true
     });
+    if (projected)
+      this.claudeUsageMode = "legacy";
+    return projected;
+  }
+  prepareClaudeModelUsage(event, backendSessionId) {
+    if (this.claudeUsageMode === "invalid")
+      return null;
+    if (!Object.hasOwn(event ?? {}, "modelUsage")) {
+      if (this.claudeUsageMode !== "model_usage")
+        return;
+      return event?.usage ? this.lockClaudeUsageMode() : null;
+    }
+    if (this.claudeUsageMode === "legacy")
+      return this.lockClaudeUsageMode();
+    if (this.claudeUsageMode === "unknown")
+      this.claudeUsageMode = "model_usage";
+    this.claudeUsageSession ??= backendSessionId;
+    if (this.claudeUsageSession !== null && this.claudeUsageSession !== backendSessionId) {
+      return this.lockClaudeUsageMode();
+    }
+    if (!event.modelUsage || typeof event.modelUsage !== "object" || Array.isArray(event.modelUsage)) {
+      return null;
+    }
+    const entries = Object.entries(event.modelUsage);
+    if (entries.length === 0)
+      return null;
+    const highWater = new Map;
+    let input = 0;
+    let output = 0;
+    let cacheRead = 0;
+    let cacheWrite = 0;
+    let snapshotCost = 0;
+    for (const [model, rawValue] of entries) {
+      if (!model.trim() || !rawValue || typeof rawValue !== "object" || Array.isArray(rawValue)) {
+        return null;
+      }
+      const raw = rawValue;
+      const current = {
+        inputTokens: safeCount(raw.inputTokens),
+        outputTokens: safeCount(raw.outputTokens),
+        cacheReadInputTokens: safeCount(raw.cacheReadInputTokens),
+        cacheCreationInputTokens: safeCount(raw.cacheCreationInputTokens),
+        costUSD: safeMoney(raw.costUSD)
+      };
+      if (Object.values(current).some((value) => value === null)) {
+        return null;
+      }
+      const snapshot = current;
+      const prior = this.claudeModelUsageHighWater.get(model) ?? {
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadInputTokens: 0,
+        cacheCreationInputTokens: 0,
+        costUSD: 0
+      };
+      for (const component of CLAUDE_USAGE_COMPONENTS) {
+        if (snapshot[component] < prior[component])
+          return null;
+      }
+      if (snapshot.costUSD < prior.costUSD)
+        return null;
+      const nextInput = safeAdd(input, snapshot.inputTokens - prior.inputTokens);
+      const nextOutput = safeAdd(output, snapshot.outputTokens - prior.outputTokens);
+      const nextCacheRead = safeAdd(cacheRead, snapshot.cacheReadInputTokens - prior.cacheReadInputTokens);
+      const nextCacheWrite = safeAdd(cacheWrite, snapshot.cacheCreationInputTokens - prior.cacheCreationInputTokens);
+      if (nextInput === null || nextOutput === null || nextCacheRead === null || nextCacheWrite === null) {
+        return null;
+      }
+      input = nextInput;
+      output = nextOutput;
+      cacheRead = nextCacheRead;
+      cacheWrite = nextCacheWrite;
+      snapshotCost += snapshot.costUSD;
+      if (!Number.isFinite(snapshotCost))
+        return null;
+      highWater.set(model, snapshot);
+    }
+    for (const model of this.claudeModelUsageHighWater.keys()) {
+      if (!highWater.has(model))
+        return null;
+    }
+    if (Object.hasOwn(event, "total_cost_usd")) {
+      const totalCost = safeMoney(event.total_cost_usd);
+      if (totalCost === null || !equalCost(snapshotCost, totalCost))
+        return null;
+    }
+    return { highWater, input, output, cacheRead, cacheWrite };
+  }
+  commitClaudeModelUsage(backendSessionId, projection) {
+    this.claudeUsageSession ??= backendSessionId;
+    this.claudeModelUsageHighWater = projection.highWater;
+    this.claudeUsageMode = "model_usage";
+  }
+  lockClaudeUsageMode() {
+    this.claudeUsageMode = "invalid";
+    return null;
   }
 }
 
@@ -22255,7 +22399,8 @@ class CursorAcpLane {
   started = false;
   ready = false;
   sessionId = null;
-  activePrompt = null;
+  currentPromptRequestId = null;
+  terminalOwner = null;
   requestedStopReason;
   spawnPromise;
   stopPromise;
@@ -22327,16 +22472,19 @@ class CursorAcpLane {
   async send(input) {
     if (!this.ready || !this.process || this.isClosed())
       return { ok: false, reason: "closed" };
-    if (input.mode !== "idle") {
-      return { ok: false, reason: "unsupported", error: "Cursor ACP does not support mid-turn steering" };
+    if (input.mode === "busy") {
+      if (this.currentPromptRequestId === null) {
+        return { ok: false, reason: "runtime_busy", error: "Cursor ACP has no active prompt to steer" };
+      }
+      return this.admitPrompt(input.text, "steer");
     }
-    if (this.activePrompt) {
+    if (this.currentPromptRequestId !== null) {
       return { ok: false, reason: "runtime_busy", error: "Cursor ACP prompt is still active" };
     }
     return this.admitPrompt(input.text);
   }
   async interrupt(_input) {
-    if (!this.ready || !this.sessionId || !this.activePrompt || this.isClosed())
+    if (!this.ready || !this.sessionId || this.currentPromptRequestId === null || this.isClosed())
       return false;
     this.write({ jsonrpc: "2.0", method: "session/cancel", params: { sessionId: this.sessionId } });
     return true;
@@ -22344,7 +22492,8 @@ class CursorAcpLane {
   stop(input = {}) {
     this.requestedStopReason ??= input.reason ?? "requested_stop";
     this.ready = false;
-    this.activePrompt = null;
+    this.currentPromptRequestId = null;
+    this.terminalOwner = null;
     this.openToolCalls.clear();
     this.rejectAllPending(new Error("Cursor ACP lane stopped"));
     this.stopPromise ??= this.stopPhysicalOnce(input);
@@ -22450,19 +22599,22 @@ class CursorAcpLane {
       throw new CursorAcpIncompatibleError("Cursor ACP did not confirm the exact configured model");
     }
   }
-  admitPrompt(text2) {
+  admitPrompt(text2, delivery = "prompt") {
     if (!this.sessionId)
       return { ok: false, reason: "not_ready", error: "Cursor ACP session is not ready" };
-    if (this.activePrompt)
-      return { ok: false, reason: "runtime_busy", error: "Cursor ACP prompt is still active" };
     const requestId = ++this.requestSequence;
-    const active = {
+    const prompt = {
       requestId,
       receipt: `cursor:acp:${requestId}`
     };
+    const previousPromptRequestId = this.currentPromptRequestId;
+    const previousTerminalOwner = this.terminalOwner;
+    const previousOpenToolCalls = new Set(this.openToolCalls);
+    if (delivery === "prompt")
+      this.terminalOwner = prompt.receipt;
+    this.currentPromptRequestId = requestId;
     this.openToolCalls.clear();
-    this.activePrompt = active;
-    this.pending.set(requestId, { kind: "prompt", method: "session/prompt", active });
+    this.pending.set(requestId, { kind: "prompt", method: "session/prompt", prompt });
     try {
       this.write({
         jsonrpc: "2.0",
@@ -22475,32 +22627,41 @@ class CursorAcpLane {
       });
     } catch (error51) {
       this.pending.delete(requestId);
-      if (this.activePrompt?.requestId === requestId)
-        this.activePrompt = null;
+      if (this.currentPromptRequestId === requestId) {
+        this.currentPromptRequestId = previousPromptRequestId;
+        this.terminalOwner = previousTerminalOwner;
+        this.openToolCalls.clear();
+        for (const toolCallId of previousOpenToolCalls)
+          this.openToolCalls.add(toolCallId);
+      }
       throw error51;
     }
-    return { ok: true, acceptedAs: "prompt", receipt: active.receipt };
+    return { ok: true, acceptedAs: delivery, receipt: prompt.receipt };
   }
-  completePrompt(active, value) {
-    if (this.activePrompt?.requestId !== active.requestId)
+  completePrompt(prompt, value) {
+    if (this.currentPromptRequestId !== prompt.requestId)
       return;
     const result = record3(value);
     if (!result || typeof result.stopReason !== "string" || !PROMPT_STOP_REASONS.has(result.stopReason)) {
-      this.failPrompt(active, new Error("Cursor ACP prompt response did not contain a supported stopReason"));
+      this.failPrompt(prompt, new Error("Cursor ACP prompt response did not contain a supported stopReason"));
       return;
     }
-    this.activePrompt = null;
+    const terminalOwner = this.terminalOwner ?? prompt.receipt;
+    this.currentPromptRequestId = null;
+    this.terminalOwner = null;
     this.openToolCalls.clear();
     this.events.emit("runtime_event", {
       kind: "turn_end",
       sessionId: this.sessionId ?? undefined,
-      turnOwner: active.receipt
+      turnOwner: terminalOwner
     });
   }
-  failPrompt(active, error51) {
-    if (this.activePrompt?.requestId !== active.requestId)
+  failPrompt(prompt, error51) {
+    if (this.currentPromptRequestId !== prompt.requestId)
       return;
-    this.activePrompt = null;
+    const terminalOwner = this.terminalOwner ?? prompt.receipt;
+    this.currentPromptRequestId = null;
+    this.terminalOwner = null;
     this.openToolCalls.clear();
     this.events.emit("runtime_event", {
       kind: "error",
@@ -22509,7 +22670,7 @@ class CursorAcpLane {
     this.events.emit("runtime_event", {
       kind: "turn_end",
       sessionId: this.sessionId ?? undefined,
-      turnOwner: active.receipt
+      turnOwner: terminalOwner
     });
   }
   call(method, params) {
@@ -22595,7 +22756,8 @@ class CursorAcpLane {
       }
       this.processTerminal = true;
       this.ready = false;
-      this.activePrompt = null;
+      this.currentPromptRequestId = null;
+      this.terminalOwner = null;
       this.openToolCalls.clear();
       this.stopPromise ??= this.stopPhysicalOnce({ reason: "runtime_error", forceAfterMs: 0 });
       this.stopPromise.catch(() => {});
@@ -22613,7 +22775,8 @@ class CursorAcpLane {
         return;
       this.processTerminal = true;
       this.ready = false;
-      this.activePrompt = null;
+      this.currentPromptRequestId = null;
+      this.terminalOwner = null;
       this.openToolCalls.clear();
       this.rejectAllPending(new Error("Cursor ACP process exited"));
       if (this.suppressExit || !this.processActivated)
@@ -22655,11 +22818,11 @@ class CursorAcpLane {
       this.pending.delete(id);
       if (message2.error !== undefined) {
         const payload = record3(message2.error);
-        this.failPrompt(pending.active, new CursorAcpRpcError(pending.method, typeof payload?.code === "number" ? payload.code : undefined, rpcErrorMessage(message2.error)));
+        this.failPrompt(pending.prompt, new CursorAcpRpcError(pending.method, typeof payload?.code === "number" ? payload.code : undefined, rpcErrorMessage(message2.error)));
       } else if (!("result" in message2)) {
-        this.failPrompt(pending.active, new Error("Cursor ACP response omitted result"));
+        this.failPrompt(pending.prompt, new Error("Cursor ACP response omitted result"));
       } else {
-        this.completePrompt(pending.active, message2.result);
+        this.completePrompt(pending.prompt, message2.result);
       }
       return;
     }
@@ -22700,7 +22863,7 @@ class CursorAcpLane {
     const sameSession = payload?.sessionId === this.sessionId;
     const options = Array.isArray(payload?.options) ? payload.options.map(record3).filter(Boolean) : [];
     const allowOnce = options.find((option) => option.kind === "allow_once" && typeof option.optionId === "string" && option.optionId.trim().length > 0);
-    if (!this.ready || !this.activePrompt || !sameSession || !allowOnce) {
+    if (!this.ready || this.currentPromptRequestId === null || !sameSession || !allowOnce) {
       this.write({ jsonrpc: "2.0", id, result: { outcome: { outcome: "cancelled" } } });
       this.diagnostic("error", "Cursor ACP permission request was not allowed for the active prompt");
       return;
@@ -22724,7 +22887,7 @@ class CursorAcpLane {
       this.diagnostic("warning", "Cursor ACP emitted an update for a different session");
       return;
     }
-    if (!this.ready || !this.activePrompt) {
+    if (!this.ready || this.currentPromptRequestId === null) {
       this.diagnostic("warning", "Cursor ACP emitted a session update without an active prompt");
       return;
     }
@@ -24652,7 +24815,7 @@ var capabilities = {
     commandOverride: true,
     resume: "by_id",
     sessionLifetime: "persistent",
-    midTurnDelivery: "next_turn_queue",
+    midTurnDelivery: "steer",
     interrupt: true
   },
   opencode: {
@@ -32616,12 +32779,15 @@ 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";
+var TOKEN_USAGE_WINDOW_DAYS = 30;
+var TOKEN_USAGE_RECOVERY_DAYS = 2;
+var TOKEN_USAGE_RETENTION_DAYS = TOKEN_USAGE_WINDOW_DAYS + TOKEN_USAGE_RECOVERY_DAYS;
 function oldestRetainedDay(at, timeZone) {
   const today = dayKeyInTimeZone(at, timeZone);
-  return calendarDayKeyDaysAgo(today, 8);
+  return calendarDayKeyDaysAgo(today, TOKEN_USAGE_RETENTION_DAYS - 1);
 }
 function oldestVisibleDay(today) {
-  return calendarDayKeyDaysAgo(today, 6);
+  return calendarDayKeyDaysAgo(today, TOKEN_USAGE_WINDOW_DAYS - 1);
 }
 function isMetric(value) {
   return value === null || typeof value === "number" && Number.isSafeInteger(value) && value >= 0;

package/dist/index.js

@@ -1200,11 +1200,33 @@ function tryParseJsonLine(line) {
 
 // agent-driver/dist/adapters/claude/normalizer.js
 var API_ERROR_RE = /API Error:.*(?:Connection error|\b[45]\d{2}\b)/i;
+var CLAUDE_USAGE_COMPONENTS = [
+  "inputTokens",
+  "outputTokens",
+  "cacheReadInputTokens",
+  "cacheCreationInputTokens"
+];
+function safeCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
+}
+function safeMoney(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
+}
+function safeAdd(left, right) {
+  const total = left + right;
+  return Number.isSafeInteger(total) ? total : null;
+}
+function equalCost(left, right) {
+  return Math.abs(left - right) <= Math.max(0.000000000001, Math.abs(right) * 0.000000001);
+}
 
 class ClaudeEventNormalizer {
   turnProtocol;
   currentSession = null;
   usageProjector = new SettledUsageProjector;
+  claudeUsageSession = null;
+  claudeModelUsageHighWater = new Map;
+  claudeUsageMode = "unknown";
   constructor(turnProtocol) {
     this.turnProtocol = turnProtocol;
   }
@@ -1318,14 +1340,39 @@ class ClaudeEventNormalizer {
     return this.turnProtocol?.acceptsTurnWork() ?? true;
   }
   buildUsageTelemetry(event, rootRequestId) {
-    const u = event?.usage;
-    if (!u)
-      return null;
     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({
+    const cumulative = this.prepareClaudeModelUsage(event, backendSessionId);
+    if (cumulative === null)
+      return null;
+    if (cumulative) {
+      const hasDelta = cumulative.input > 0 || cumulative.output > 0 || cumulative.cacheRead > 0 || cumulative.cacheWrite > 0;
+      if (!hasDelta) {
+        this.commitClaudeModelUsage(backendSessionId, cumulative);
+        return null;
+      }
+      const projected2 = this.usageProjector.project({
+        runtime: "claude",
+        backendSessionId,
+        providerRecordId,
+        source: "claude_result_model_usage",
+        input: cumulative.input,
+        output: cumulative.output,
+        cacheRead: cumulative.cacheRead,
+        cacheWrite: cumulative.cacheWrite,
+        inputIncludesCache: false,
+        outputIncludesReasoning: true
+      });
+      if (projected2)
+        this.commitClaudeModelUsage(backendSessionId, cumulative);
+      return projected2;
+    }
+    const u = event?.usage;
+    if (!u)
+      return null;
+    const projected = this.usageProjector.project({
       runtime: "claude",
       backendSessionId,
       providerRecordId,
@@ -1337,6 +1384,102 @@ class ClaudeEventNormalizer {
       inputIncludesCache: false,
       outputIncludesReasoning: true
     });
+    if (projected)
+      this.claudeUsageMode = "legacy";
+    return projected;
+  }
+  prepareClaudeModelUsage(event, backendSessionId) {
+    if (this.claudeUsageMode === "invalid")
+      return null;
+    if (!Object.hasOwn(event ?? {}, "modelUsage")) {
+      if (this.claudeUsageMode !== "model_usage")
+        return;
+      return event?.usage ? this.lockClaudeUsageMode() : null;
+    }
+    if (this.claudeUsageMode === "legacy")
+      return this.lockClaudeUsageMode();
+    if (this.claudeUsageMode === "unknown")
+      this.claudeUsageMode = "model_usage";
+    this.claudeUsageSession ??= backendSessionId;
+    if (this.claudeUsageSession !== null && this.claudeUsageSession !== backendSessionId) {
+      return this.lockClaudeUsageMode();
+    }
+    if (!event.modelUsage || typeof event.modelUsage !== "object" || Array.isArray(event.modelUsage)) {
+      return null;
+    }
+    const entries = Object.entries(event.modelUsage);
+    if (entries.length === 0)
+      return null;
+    const highWater = new Map;
+    let input = 0;
+    let output = 0;
+    let cacheRead = 0;
+    let cacheWrite = 0;
+    let snapshotCost = 0;
+    for (const [model, rawValue] of entries) {
+      if (!model.trim() || !rawValue || typeof rawValue !== "object" || Array.isArray(rawValue)) {
+        return null;
+      }
+      const raw = rawValue;
+      const current = {
+        inputTokens: safeCount(raw.inputTokens),
+        outputTokens: safeCount(raw.outputTokens),
+        cacheReadInputTokens: safeCount(raw.cacheReadInputTokens),
+        cacheCreationInputTokens: safeCount(raw.cacheCreationInputTokens),
+        costUSD: safeMoney(raw.costUSD)
+      };
+      if (Object.values(current).some((value) => value === null)) {
+        return null;
+      }
+      const snapshot = current;
+      const prior = this.claudeModelUsageHighWater.get(model) ?? {
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadInputTokens: 0,
+        cacheCreationInputTokens: 0,
+        costUSD: 0
+      };
+      for (const component of CLAUDE_USAGE_COMPONENTS) {
+        if (snapshot[component] < prior[component])
+          return null;
+      }
+      if (snapshot.costUSD < prior.costUSD)
+        return null;
+      const nextInput = safeAdd(input, snapshot.inputTokens - prior.inputTokens);
+      const nextOutput = safeAdd(output, snapshot.outputTokens - prior.outputTokens);
+      const nextCacheRead = safeAdd(cacheRead, snapshot.cacheReadInputTokens - prior.cacheReadInputTokens);
+      const nextCacheWrite = safeAdd(cacheWrite, snapshot.cacheCreationInputTokens - prior.cacheCreationInputTokens);
+      if (nextInput === null || nextOutput === null || nextCacheRead === null || nextCacheWrite === null) {
+        return null;
+      }
+      input = nextInput;
+      output = nextOutput;
+      cacheRead = nextCacheRead;
+      cacheWrite = nextCacheWrite;
+      snapshotCost += snapshot.costUSD;
+      if (!Number.isFinite(snapshotCost))
+        return null;
+      highWater.set(model, snapshot);
+    }
+    for (const model of this.claudeModelUsageHighWater.keys()) {
+      if (!highWater.has(model))
+        return null;
+    }
+    if (Object.hasOwn(event, "total_cost_usd")) {
+      const totalCost = safeMoney(event.total_cost_usd);
+      if (totalCost === null || !equalCost(snapshotCost, totalCost))
+        return null;
+    }
+    return { highWater, input, output, cacheRead, cacheWrite };
+  }
+  commitClaudeModelUsage(backendSessionId, projection) {
+    this.claudeUsageSession ??= backendSessionId;
+    this.claudeModelUsageHighWater = projection.highWater;
+    this.claudeUsageMode = "model_usage";
+  }
+  lockClaudeUsageMode() {
+    this.claudeUsageMode = "invalid";
+    return null;
   }
 }
 
@@ -2818,7 +2961,8 @@ class CursorAcpLane {
   started = false;
   ready = false;
   sessionId = null;
-  activePrompt = null;
+  currentPromptRequestId = null;
+  terminalOwner = null;
   requestedStopReason;
   spawnPromise;
   stopPromise;
@@ -2890,16 +3034,19 @@ class CursorAcpLane {
   async send(input) {
     if (!this.ready || !this.process || this.isClosed())
       return { ok: false, reason: "closed" };
-    if (input.mode !== "idle") {
-      return { ok: false, reason: "unsupported", error: "Cursor ACP does not support mid-turn steering" };
+    if (input.mode === "busy") {
+      if (this.currentPromptRequestId === null) {
+        return { ok: false, reason: "runtime_busy", error: "Cursor ACP has no active prompt to steer" };
+      }
+      return this.admitPrompt(input.text, "steer");
     }
-    if (this.activePrompt) {
+    if (this.currentPromptRequestId !== null) {
       return { ok: false, reason: "runtime_busy", error: "Cursor ACP prompt is still active" };
     }
     return this.admitPrompt(input.text);
   }
   async interrupt(_input) {
-    if (!this.ready || !this.sessionId || !this.activePrompt || this.isClosed())
+    if (!this.ready || !this.sessionId || this.currentPromptRequestId === null || this.isClosed())
       return false;
     this.write({ jsonrpc: "2.0", method: "session/cancel", params: { sessionId: this.sessionId } });
     return true;
@@ -2907,7 +3054,8 @@ class CursorAcpLane {
   stop(input = {}) {
     this.requestedStopReason ??= input.reason ?? "requested_stop";
     this.ready = false;
-    this.activePrompt = null;
+    this.currentPromptRequestId = null;
+    this.terminalOwner = null;
     this.openToolCalls.clear();
     this.rejectAllPending(new Error("Cursor ACP lane stopped"));
     this.stopPromise ??= this.stopPhysicalOnce(input);
@@ -3013,19 +3161,22 @@ class CursorAcpLane {
       throw new CursorAcpIncompatibleError("Cursor ACP did not confirm the exact configured model");
     }
   }
-  admitPrompt(text) {
+  admitPrompt(text, delivery = "prompt") {
     if (!this.sessionId)
       return { ok: false, reason: "not_ready", error: "Cursor ACP session is not ready" };
-    if (this.activePrompt)
-      return { ok: false, reason: "runtime_busy", error: "Cursor ACP prompt is still active" };
     const requestId = ++this.requestSequence;
-    const active = {
+    const prompt = {
       requestId,
       receipt: `cursor:acp:${requestId}`
     };
+    const previousPromptRequestId = this.currentPromptRequestId;
+    const previousTerminalOwner = this.terminalOwner;
+    const previousOpenToolCalls = new Set(this.openToolCalls);
+    if (delivery === "prompt")
+      this.terminalOwner = prompt.receipt;
+    this.currentPromptRequestId = requestId;
     this.openToolCalls.clear();
-    this.activePrompt = active;
-    this.pending.set(requestId, { kind: "prompt", method: "session/prompt", active });
+    this.pending.set(requestId, { kind: "prompt", method: "session/prompt", prompt });
     try {
       this.write({
         jsonrpc: "2.0",
@@ -3038,32 +3189,41 @@ class CursorAcpLane {
       });
     } catch (error) {
       this.pending.delete(requestId);
-      if (this.activePrompt?.requestId === requestId)
-        this.activePrompt = null;
+      if (this.currentPromptRequestId === requestId) {
+        this.currentPromptRequestId = previousPromptRequestId;
+        this.terminalOwner = previousTerminalOwner;
+        this.openToolCalls.clear();
+        for (const toolCallId of previousOpenToolCalls)
+          this.openToolCalls.add(toolCallId);
+      }
       throw error;
     }
-    return { ok: true, acceptedAs: "prompt", receipt: active.receipt };
+    return { ok: true, acceptedAs: delivery, receipt: prompt.receipt };
   }
-  completePrompt(active, value) {
-    if (this.activePrompt?.requestId !== active.requestId)
+  completePrompt(prompt, value) {
+    if (this.currentPromptRequestId !== prompt.requestId)
       return;
     const result = record2(value);
     if (!result || typeof result.stopReason !== "string" || !PROMPT_STOP_REASONS.has(result.stopReason)) {
-      this.failPrompt(active, new Error("Cursor ACP prompt response did not contain a supported stopReason"));
+      this.failPrompt(prompt, new Error("Cursor ACP prompt response did not contain a supported stopReason"));
       return;
     }
-    this.activePrompt = null;
+    const terminalOwner = this.terminalOwner ?? prompt.receipt;
+    this.currentPromptRequestId = null;
+    this.terminalOwner = null;
     this.openToolCalls.clear();
     this.events.emit("runtime_event", {
       kind: "turn_end",
       sessionId: this.sessionId ?? undefined,
-      turnOwner: active.receipt
+      turnOwner: terminalOwner
     });
   }
-  failPrompt(active, error) {
-    if (this.activePrompt?.requestId !== active.requestId)
+  failPrompt(prompt, error) {
+    if (this.currentPromptRequestId !== prompt.requestId)
       return;
-    this.activePrompt = null;
+    const terminalOwner = this.terminalOwner ?? prompt.receipt;
+    this.currentPromptRequestId = null;
+    this.terminalOwner = null;
     this.openToolCalls.clear();
     this.events.emit("runtime_event", {
       kind: "error",
@@ -3072,7 +3232,7 @@ class CursorAcpLane {
     this.events.emit("runtime_event", {
       kind: "turn_end",
       sessionId: this.sessionId ?? undefined,
-      turnOwner: active.receipt
+      turnOwner: terminalOwner
     });
   }
   call(method, params) {
@@ -3158,7 +3318,8 @@ class CursorAcpLane {
       }
       this.processTerminal = true;
       this.ready = false;
-      this.activePrompt = null;
+      this.currentPromptRequestId = null;
+      this.terminalOwner = null;
       this.openToolCalls.clear();
       this.stopPromise ??= this.stopPhysicalOnce({ reason: "runtime_error", forceAfterMs: 0 });
       this.stopPromise.catch(() => {});
@@ -3176,7 +3337,8 @@ class CursorAcpLane {
         return;
       this.processTerminal = true;
       this.ready = false;
-      this.activePrompt = null;
+      this.currentPromptRequestId = null;
+      this.terminalOwner = null;
       this.openToolCalls.clear();
       this.rejectAllPending(new Error("Cursor ACP process exited"));
       if (this.suppressExit || !this.processActivated)
@@ -3218,11 +3380,11 @@ class CursorAcpLane {
       this.pending.delete(id);
       if (message.error !== undefined) {
         const payload = record2(message.error);
-        this.failPrompt(pending.active, new CursorAcpRpcError(pending.method, typeof payload?.code === "number" ? payload.code : undefined, rpcErrorMessage(message.error)));
+        this.failPrompt(pending.prompt, new CursorAcpRpcError(pending.method, typeof payload?.code === "number" ? payload.code : undefined, rpcErrorMessage(message.error)));
       } else if (!("result" in message)) {
-        this.failPrompt(pending.active, new Error("Cursor ACP response omitted result"));
+        this.failPrompt(pending.prompt, new Error("Cursor ACP response omitted result"));
       } else {
-        this.completePrompt(pending.active, message.result);
+        this.completePrompt(pending.prompt, message.result);
       }
       return;
     }
@@ -3263,7 +3425,7 @@ class CursorAcpLane {
     const sameSession = payload?.sessionId === this.sessionId;
     const options = Array.isArray(payload?.options) ? payload.options.map(record2).filter(Boolean) : [];
     const allowOnce = options.find((option) => option.kind === "allow_once" && typeof option.optionId === "string" && option.optionId.trim().length > 0);
-    if (!this.ready || !this.activePrompt || !sameSession || !allowOnce) {
+    if (!this.ready || this.currentPromptRequestId === null || !sameSession || !allowOnce) {
       this.write({ jsonrpc: "2.0", id, result: { outcome: { outcome: "cancelled" } } });
       this.diagnostic("error", "Cursor ACP permission request was not allowed for the active prompt");
       return;
@@ -3287,7 +3449,7 @@ class CursorAcpLane {
       this.diagnostic("warning", "Cursor ACP emitted an update for a different session");
       return;
     }
-    if (!this.ready || !this.activePrompt) {
+    if (!this.ready || this.currentPromptRequestId === null) {
       this.diagnostic("warning", "Cursor ACP emitted a session update without an active prompt");
       return;
     }
@@ -5215,7 +5377,7 @@ var capabilities = {
     commandOverride: true,
     resume: "by_id",
     sessionLifetime: "persistent",
-    midTurnDelivery: "next_turn_queue",
+    midTurnDelivery: "steer",
     interrupt: true
   },
   opencode: {
@@ -28394,6 +28556,7 @@ var ALLOWED_ICON_MIME_TYPES = [
 ];
 var MAX_ICON_SOURCE_FILE_SIZE_BYTES = 15 * 1024 * 1024;
 // ../shared/src/provider-telemetry.ts
+var DAILY_TOKEN_USAGE_WINDOW_DAYS = 30;
 var safeToken = exports_external.number().int().min(0).max(Number.MAX_SAFE_INTEGER);
 var boundedText = exports_external.string().min(1).refine((value) => new TextEncoder().encode(value).length <= 64, { message: "must be at most 64 UTF-8 bytes" });
 var DailyUsageMetricSchema = safeToken.nullable();
@@ -29125,7 +29288,7 @@ var AgentActivityMessageSchema = exports_external.object({
   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(),
+  dailyUsage: exports_external.array(DailyUsageSnapshotSchema).max(DAILY_TOKEN_USAGE_WINDOW_DAYS).optional(),
   quota: ProviderQuotaSnapshotSchema.optional()
 });
 var AgentTypingMessageSchema = exports_external.object({
@@ -32914,12 +33077,15 @@ 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";
+var TOKEN_USAGE_WINDOW_DAYS = 30;
+var TOKEN_USAGE_RECOVERY_DAYS = 2;
+var TOKEN_USAGE_RETENTION_DAYS = TOKEN_USAGE_WINDOW_DAYS + TOKEN_USAGE_RECOVERY_DAYS;
 function oldestRetainedDay(at, timeZone) {
   const today = dayKeyInTimeZone(at, timeZone);
-  return calendarDayKeyDaysAgo(today, 8);
+  return calendarDayKeyDaysAgo(today, TOKEN_USAGE_RETENTION_DAYS - 1);
 }
 function oldestVisibleDay(today) {
-  return calendarDayKeyDaysAgo(today, 6);
+  return calendarDayKeyDaysAgo(today, TOKEN_USAGE_WINDOW_DAYS - 1);
 }
 function isMetric(value) {
   return value === null || typeof value === "number" && Number.isSafeInteger(value) && value >= 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alook/daemon",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "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",