@openhoo/hoopilot 2.1.8 → 2.1.10

package/dist/cli.js

@@ -9,14 +9,16 @@ import {
   isTrustedTokenBaseUrl,
   main,
   modelIdsFromResponse,
+  parseBooleanEnv,
   parseJsonObject,
   parseStreamingProxyMode,
+  parseUsageAccountingMode,
   randomId,
   removeUndefined,
   safeJsonParse,
   trimTrailingSlash,
   truncatedResponseText
-} from "./chunk-2GLKVNAA.js";
+} from "./chunk-2GIR4W4A.js";
 
 // src/cli.ts
 import { spawn } from "child_process";
@@ -1600,7 +1602,7 @@ function anthropicMessagesToResponsesInput(messages) {
             arguments: JSON.stringify(asRecord(part.input)),
             cache_control: anthropicCacheControl(part.cache_control),
             call_id: textValue(part.id) || `call_hoopilot_${fallbackToolCallIndex++}`,
-            name: textValue(part.name),
+            name: requiredAnthropicText(part.name, "tool_use name"),
             type: "function_call"
           })
         );
@@ -1746,7 +1748,7 @@ function anthropicTools(tools) {
     return removeUndefined({
       cache_control: anthropicCacheControl(record.cache_control),
       description: record.description,
-      name: record.name,
+      name: requiredAnthropicText(record.name, "tool name"),
       parameters: record.input_schema,
       strict: record.strict,
       type: "function"
@@ -1819,12 +1821,19 @@ function anthropicToolChoice(toolChoice) {
     return "none";
   }
   if (type === "tool") {
-    return { name: textValue(record.name), type: "function" };
+    return { name: requiredAnthropicText(record.name, "tool_choice name"), type: "function" };
   }
   throw new AnthropicCompatibilityError(
     `Anthropic tool_choice type "${type || "unknown"}" is not supported.`
   );
 }
+function requiredAnthropicText(value, field) {
+  const text = textValue(value).trim();
+  if (!text) {
+    throw new AnthropicCompatibilityError(`Anthropic ${field} is required.`);
+  }
+  return text;
+}
 function anthropicThinkingToReasoning(thinking) {
   const record = asRecord(thinking);
   if (Object.keys(record).length === 0) {
@@ -3113,6 +3122,17 @@ function isLoopbackOrigin(origin) {
 }
 
 // src/http/responses.ts
+var HOP_BY_HOP_HEADERS = [
+  "connection",
+  "keep-alive",
+  "proxy-authenticate",
+  "proxy-authorization",
+  "te",
+  "trailer",
+  "transfer-encoding",
+  "upgrade"
+];
+var STALE_BODY_HEADERS = ["content-encoding", "content-length"];
 function jsonResponse(body, status = 200) {
   return new Response(JSON.stringify(body), {
     headers: {
@@ -3152,9 +3172,7 @@ function responseFromText(source, text) {
 }
 function proxyResponse(upstream) {
   const headers = new Headers(upstream.headers);
-  headers.delete("content-encoding");
-  headers.delete("content-length");
-  headers.delete("transfer-encoding");
+  stripProxyUnsafeHeaders(headers);
   for (const [key, value] of Object.entries(corsHeaders())) {
     headers.set(key, value);
   }
@@ -3180,11 +3198,30 @@ function websocketUnsupportedResponse() {
   response.headers.set("upgrade", "websocket");
   return response;
 }
+function stripProxyUnsafeHeaders(headers) {
+  const connection = headers.get("connection");
+  if (connection) {
+    for (const name of connection.split(",")) {
+      const trimmed = name.trim();
+      if (trimmed) {
+        headers.delete(trimmed);
+      }
+    }
+  }
+  for (const name of HOP_BY_HOP_HEADERS) {
+    headers.delete(name);
+  }
+  for (const name of STALE_BODY_HEADERS) {
+    headers.delete(name);
+  }
+}
 
 // src/metrics.ts
 var PROMETHEUS_CONTENT_TYPE = "text/plain; version=0.0.4; charset=utf-8";
 var DURATION_BUCKETS_SECONDS = [0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 30, 60];
 var USAGE_BUFFER_LIMIT_BYTES = 16 * 1024 * 1024;
+var PROMETHEUS_CACHE_TTL_MS = 1e3;
+var PROMETHEUS_CACHE_NEUTRAL_ROUTES = /* @__PURE__ */ new Set(["metrics"]);
 var MAX_TRACKED_MODELS = 200;
 var MAX_MODEL_LABEL_LENGTH = 200;
 var MAX_TRACKED_RATELIMIT_RESOURCES = 32;
@@ -3193,6 +3230,9 @@ var UNKNOWN_MODEL = "unknown";
 function emptyModelTotals() {
   return { cached: 0, completion: 0, prompt: 0, reasoning: 0, requests: 0, total: 0 };
 }
+function isPrometheusCacheNeutralRoute(route) {
+  return route !== void 0 && PROMETHEUS_CACHE_NEUTRAL_ROUTES.has(route);
+}
 var MetricsRegistry = class {
   #startedAtMs;
   #inFlight = 0;
@@ -3204,11 +3244,16 @@ var MetricsRegistry = class {
   #copilotQuota;
   #githubRateLimit = /* @__PURE__ */ new Map();
   #extraction = { extracted: 0, missing: 0 };
+  #generation = 0;
+  #prometheusCache;
   constructor(options = {}) {
     this.#startedAtMs = (options.now ?? Date.now)();
   }
   /** Mark a request as started; pair with exactly one {@link observe}. */
   startRequest(route) {
+    if (!isPrometheusCacheNeutralRoute(route)) {
+      this.#changed();
+    }
     this.#inFlight += 1;
     if (route) {
       this.#inFlightByRoute.set(route, (this.#inFlightByRoute.get(route) ?? 0) + 1);
@@ -3216,6 +3261,9 @@ var MetricsRegistry = class {
   }
   /** Record a completed request and clear its in-flight slot. */
   observe(observation) {
+    if (!isPrometheusCacheNeutralRoute(observation.route)) {
+      this.#changed();
+    }
     if (this.#inFlight > 0) {
       this.#inFlight -= 1;
     }
@@ -3236,6 +3284,7 @@ var MetricsRegistry = class {
    * rising miss rate flags clients whose token usage is going unaccounted.
    */
   recordTokenExtraction(extracted) {
+    this.#changed();
     if (extracted) {
       this.#extraction.extracted += 1;
     } else {
@@ -3244,6 +3293,7 @@ var MetricsRegistry = class {
   }
   /** Accumulate token counts for a model from one upstream completion. */
   recordTokens(model, usage) {
+    this.#changed();
     const name = this.#modelLabel(model);
     const totals = this.#tokens.get(name) ?? emptyModelTotals();
     totals.requests += 1;
@@ -3256,11 +3306,13 @@ var MetricsRegistry = class {
   }
   /** Record one upstream Copilot call and whether it succeeded. */
   recordUpstream(path, ok) {
+    this.#changed();
     const key = labelKey(path, ok ? "ok" : "error");
     this.#upstream.set(key, (this.#upstream.get(key) ?? 0) + 1);
   }
   /** Store the latest Copilot quota so /metrics can expose it as gauges. */
   recordCopilotQuota(usage) {
+    this.#changed();
     this.#copilotQuota = usage;
   }
   /**
@@ -3272,6 +3324,7 @@ var MetricsRegistry = class {
     if (!rateLimit) {
       return;
     }
+    this.#changed();
     const resource = this.#rateLimitResource(rateLimit.resource);
     this.#githubRateLimit.set(resource, { ...rateLimit, resource });
   }
@@ -3308,6 +3361,9 @@ var MetricsRegistry = class {
     }
     this.#durations.set(route, entry);
   }
+  #changed() {
+    this.#generation += 1;
+  }
   /** A JSON-friendly view of the current counters. */
   snapshot(nowOrOptions = Date.now) {
     const options = typeof nowOrOptions === "function" ? { now: nowOrOptions } : nowOrOptions;
@@ -3411,13 +3467,18 @@ var MetricsRegistry = class {
   }
   /** Render the Prometheus text exposition format (version 0.0.4). */
   renderPrometheus(now = Date.now) {
+    const nowMs = now();
+    const cached = this.#prometheusCache;
+    if (cached && cached.generation === this.#generation && nowMs - cached.renderedAtMs < PROMETHEUS_CACHE_TTL_MS) {
+      return cached.text;
+    }
     const lines = [];
     lines.push("# HELP hoopilot_process_start_time_seconds Unix epoch when the proxy started.");
     lines.push("# TYPE hoopilot_process_start_time_seconds gauge");
     lines.push(`hoopilot_process_start_time_seconds ${this.#startedAtMs / 1e3}`);
     lines.push("# HELP hoopilot_uptime_seconds Seconds since the proxy started.");
     lines.push("# TYPE hoopilot_uptime_seconds gauge");
-    lines.push(`hoopilot_uptime_seconds ${Math.max(0, (now() - this.#startedAtMs) / 1e3)}`);
+    lines.push(`hoopilot_uptime_seconds ${Math.max(0, (nowMs - this.#startedAtMs) / 1e3)}`);
     lines.push("# HELP hoopilot_requests_in_flight Requests currently being served.");
     lines.push("# TYPE hoopilot_requests_in_flight gauge");
     lines.push(`hoopilot_requests_in_flight ${this.#inFlight}`);
@@ -3483,8 +3544,10 @@ var MetricsRegistry = class {
     }
     this.#renderGithubRateLimit(lines);
     this.#renderCopilotQuota(lines);
-    return `${lines.join("\n")}
+    const text = `${lines.join("\n")}
 `;
+    this.#prometheusCache = { generation: this.#generation, renderedAtMs: nowMs, text };
+    return text;
   }
   #renderGithubRateLimit(lines) {
     const entries = [...this.#githubRateLimit.values()];
@@ -3619,21 +3682,6 @@ var MetricsRegistry = class {
     }
   }
 };
-function observeResponseUsage(response, fallbackModel, onUsage, signal, onOutcome) {
-  const body = response.body;
-  if (!body) {
-    return response;
-  }
-  const isSse = response.headers.get("content-type")?.includes("text/event-stream") ?? false;
-  return new Response(
-    streamWithUsageObservation(body, isSse, fallbackModel, onUsage, signal, onOutcome),
-    {
-      headers: response.headers,
-      status: response.status,
-      statusText: response.statusText
-    }
-  );
-}
 function recordResponseTextUsage(text, isSse, fallbackModel, onUsage, onOutcome) {
   const accumulator = createUsageAccumulator(fallbackModel, onUsage, onOutcome);
   if (isSse) {
@@ -3648,9 +3696,10 @@ function recordResponseTextUsage(text, isSse, fallbackModel, onUsage, onOutcome)
   }
   accumulator.finish();
 }
-function streamWithUsageObservation(stream, isSse, fallbackModel, onUsage, signal, onOutcome) {
+function streamWithUsageObservation(stream, isSse, fallbackModel, onUsage, signal, onOutcome, onComplete) {
   const reader = stream.getReader();
   let aborted = signal?.aborted ?? false;
+  let completed = false;
   let released = false;
   const onAbort = () => {
     aborted = true;
@@ -3679,6 +3728,10 @@ function streamWithUsageObservation(stream, isSse, fallbackModel, onUsage, signa
     }
     released = true;
     signal?.removeEventListener("abort", onAbort);
+    if (!completed) {
+      completed = true;
+      onComplete?.();
+    }
     reader.releaseLock();
   };
   const observeChunk = (chunkBytes) => {
@@ -3788,6 +3841,9 @@ function considerSseLine(line, consider) {
   if (!data || data === "[DONE]") {
     return;
   }
+  if (!data.includes('"usage"')) {
+    return;
+  }
   const parsed = safeJsonParse(data);
   if (parsed !== void 0) {
     consider(parsed);
@@ -3917,17 +3973,28 @@ function createHoopilotHandler(options = {}) {
   const recordTokens = (model, usage) => metrics.recordTokens(model, usage);
   const recordExtraction = (extracted) => metrics.recordTokenExtraction(extracted);
   const bufferProxyBodies = shouldBufferProxyBodies(resolveStreamingProxyMode(options));
+  const usageAccountingMode = resolveUsageAccountingMode(options);
+  const accessLog = resolveAccessLog(options);
+  const responseUsage = /* @__PURE__ */ new WeakMap();
+  const markUsage = (response, fallbackModel, cost) => {
+    if (shouldExtractUsage(usageAccountingMode, cost)) {
+      responseUsage.set(response, { fallbackModel, recordExtraction, recordTokens });
+    }
+    return response;
+  };
   const requestContext = /* @__PURE__ */ new WeakMap();
   const app = buildApp({
     apiKey,
     allowedOrigins,
     bufferProxyBodies,
     client,
+    markUsage,
     metrics,
     readUsage,
     recordExtraction,
     recordTokens,
-    requestContext
+    requestContext,
+    usageAccountingMode
   });
   return async (request) => {
     const startedAt = performance.now();
@@ -3963,11 +4030,14 @@ function createHoopilotHandler(options = {}) {
     }
     return finishResponse(response, {
       corsOrigin,
+      accessLog,
       logger: requestLogger,
       method: request.method,
       metrics,
       requestId,
+      signal: request.signal,
       route,
+      usageObservation: responseUsage.get(response),
       startedAt,
       closeConnection: bufferProxyBodies,
       trackStreamingBody: !bufferProxyBodies
@@ -3980,11 +4050,13 @@ function buildApp(deps) {
     allowedOrigins,
     bufferProxyBodies,
     client,
+    markUsage,
     metrics,
     readUsage,
     recordExtraction,
     recordTokens,
-    requestContext
+    requestContext,
+    usageAccountingMode
   } = deps;
   const contextFor = (request) => {
     const stored = requestContext.get(request);
@@ -4072,11 +4144,13 @@ function buildApp(deps) {
     ({ request }) => handleAnthropicMessages(
       client,
       metrics,
+      markUsage,
       recordTokens,
       recordExtraction,
       request,
       loggerFor(request),
-      bufferProxyBodies
+      bufferProxyBodies,
+      usageAccountingMode
     ),
     noBody
   ).post(
@@ -4088,11 +4162,13 @@ function buildApp(deps) {
     ({ request }) => handleChatCompletions(
       client,
       metrics,
+      markUsage,
       recordTokens,
       recordExtraction,
       request,
       loggerFor(request),
-      bufferProxyBodies
+      bufferProxyBodies,
+      usageAccountingMode
     ),
     noBody
   ).post(
@@ -4100,11 +4176,13 @@ function buildApp(deps) {
     ({ request }) => handleCompletions(
       client,
       metrics,
+      markUsage,
       recordTokens,
       recordExtraction,
       request,
       loggerFor(request),
-      bufferProxyBodies
+      bufferProxyBodies,
+      usageAccountingMode
     ),
     noBody
   ).post(
@@ -4115,7 +4193,8 @@ function buildApp(deps) {
       recordTokens,
       recordExtraction,
       request,
-      loggerFor(request)
+      loggerFor(request),
+      usageAccountingMode
     ),
     noBody
   ).post(
@@ -4123,11 +4202,13 @@ function buildApp(deps) {
     ({ request }) => handleResponses(
       client,
       metrics,
+      markUsage,
       recordTokens,
       recordExtraction,
       request,
       loggerFor(request),
-      bufferProxyBodies
+      bufferProxyBodies,
+      usageAccountingMode
     ),
     noBody
   );
@@ -4180,7 +4261,7 @@ function startHoopilotServer(options = {}) {
     url: `http://${urlHost(host)}:${server.port}`
   };
 }
-async function handleAnthropicMessages(client, metrics, recordTokens, recordExtraction, request, logger, bufferProxyBodies) {
+async function handleAnthropicMessages(client, metrics, markUsage, recordTokens, recordExtraction, request, logger, bufferProxyBodies, usageAccountingMode) {
   const anthropicRequest = await readJson(request);
   const responsesRequest = anthropicMessagesToResponsesRequest(anthropicRequest);
   const upstream = await client.responses(JSON.stringify(responsesRequest), request.signal);
@@ -4193,36 +4274,32 @@ async function handleAnthropicMessages(client, metrics, recordTokens, recordExtr
   if (isStreamingResponse(upstream) && upstream.body) {
     if (bufferProxyBodies) {
       const text = await upstream.text();
-      recordResponseTextUsage(text, true, model, recordTokens, recordExtraction);
+      recordBufferedUsage(text, true, model, usageAccountingMode, recordTokens, recordExtraction);
       return proxyResponse(
         responseFromText(upstream, responsesSseTextToAnthropicSseText(text, { model }))
       );
     }
-    const observed = observeResponseUsage(
-      upstream,
+    return markUsage(
+      proxyResponse(
+        new Response(responsesStreamToAnthropicStream(upstream.body, { model }), {
+          headers: upstream.headers,
+          status: upstream.status,
+          statusText: upstream.statusText
+        })
+      ),
       model,
-      recordTokens,
-      request.signal,
-      recordExtraction
-    );
-    if (!observed.body) {
-      return proxyResponse(observed);
-    }
-    return proxyResponse(
-      new Response(responsesStreamToAnthropicStream(observed.body, { model }), {
-        headers: observed.headers,
-        status: observed.status,
-        statusText: observed.statusText
-      })
+      "body"
     );
   }
   const body = asRecord(await upstream.json());
-  const usage = extractTokenUsage(body.usage);
-  if (usage) {
-    const responseModel = typeof body.model === "string" ? body.model.trim() : "";
-    recordTokens(responseModel || model, usage);
-  }
-  recordExtraction(usage !== void 0);
+  recordParsedUsage(
+    body.usage,
+    typeof body.model === "string" ? body.model.trim() : model,
+    model,
+    usageAccountingMode,
+    recordTokens,
+    recordExtraction
+  );
   return jsonResponse(responsesResponseToAnthropicMessage(body, model));
 }
 async function handleAnthropicCountTokens(request) {
@@ -4249,7 +4326,7 @@ async function handleModels(client, metrics, signal, logger) {
   logUpstreamSuccess(logger, "/models", upstream.status);
   return jsonResponse(normalizeModelsResponse(await upstream.json()));
 }
-async function handleChatCompletions(client, metrics, recordTokens, recordExtraction, request, logger, bufferProxyBodies) {
+async function handleChatCompletions(client, metrics, markUsage, recordTokens, recordExtraction, request, logger, bufferProxyBodies, usageAccountingMode) {
   const chatRequest = normalizeChatCompletionRequest(await readJson(request));
   const upstream = await client.chatCompletions(chatRequest, request.signal);
   metrics.recordUpstream("/chat/completions", upstream.ok);
@@ -4258,18 +4335,17 @@ async function handleChatCompletions(client, metrics, recordTokens, recordExtrac
   }
   logUpstreamSuccess(logger, "/chat/completions", upstream.status);
   const model = normalizeRequestedModel(chatRequest.model);
-  return proxyResponse(
-    await responseWithObservedUsage(
-      upstream,
-      model,
-      recordTokens,
-      request.signal,
-      bufferProxyBodies,
-      recordExtraction
-    )
+  return proxiedResponseWithOptionalUsage(
+    upstream,
+    model,
+    markUsage,
+    usageAccountingMode,
+    recordTokens,
+    recordExtraction,
+    bufferProxyBodies
   );
 }
-async function handleCompletions(client, metrics, recordTokens, recordExtraction, request, logger, bufferProxyBodies) {
+async function handleCompletions(client, metrics, markUsage, recordTokens, recordExtraction, request, logger, bufferProxyBodies, usageAccountingMode) {
   const body = await readJson(request);
   const upstream = await client.chatCompletions(
     completionsRequestToChatCompletion(body),
@@ -4284,34 +4360,41 @@ async function handleCompletions(client, metrics, recordTokens, recordExtraction
   if (isStreamingResponse(upstream) && upstream.body) {
     if (bufferProxyBodies) {
       const upstreamText = await upstream.text();
-      recordResponseTextUsage(upstreamText, true, model, recordTokens, recordExtraction);
+      recordBufferedUsage(
+        upstreamText,
+        true,
+        model,
+        usageAccountingMode,
+        recordTokens,
+        recordExtraction
+      );
       const text = completionSseTextFromChatSseText(upstreamText);
       return proxyResponse(responseFromText(upstream, text));
     }
-    return proxyResponse(
-      observeResponseUsage(
+    return markUsage(
+      proxyResponse(
         new Response(completionStreamFromChatStream(upstream.body), {
           headers: upstream.headers,
           status: upstream.status,
           statusText: upstream.statusText
-        }),
-        model,
-        recordTokens,
-        request.signal,
-        recordExtraction
-      )
+        })
+      ),
+      model,
+      "body"
     );
   }
   const completion = asRecord(await upstream.json());
-  const usage = extractTokenUsage(completion.usage);
-  if (usage) {
-    const responseModel = typeof completion.model === "string" ? completion.model.trim() : "";
-    recordTokens(responseModel || model, usage);
-  }
-  recordExtraction(usage !== void 0);
+  recordParsedUsage(
+    completion.usage,
+    typeof completion.model === "string" ? completion.model.trim() : model,
+    model,
+    usageAccountingMode,
+    recordTokens,
+    recordExtraction
+  );
   return jsonResponse(chatCompletionToCompletion(completion));
 }
-async function handleResponses(client, metrics, recordTokens, recordExtraction, request, logger, bufferProxyBodies) {
+async function handleResponses(client, metrics, markUsage, recordTokens, recordExtraction, request, logger, bufferProxyBodies, usageAccountingMode) {
   const { json, text: body } = await readJsonText(request);
   if (isResponsesCompactionRequest(json)) {
     return handleResponsesCompactionV2(
@@ -4321,7 +4404,8 @@ async function handleResponses(client, metrics, recordTokens, recordExtraction,
       recordExtraction,
       json,
       request,
-      logger
+      logger,
+      usageAccountingMode
     );
   }
   const upstream = await client.responses(
@@ -4334,18 +4418,17 @@ async function handleResponses(client, metrics, recordTokens, recordExtraction,
   }
   logUpstreamSuccess(logger, "/responses", upstream.status);
   const model = normalizeRequestedModel(json.model);
-  return proxyResponse(
-    await responseWithObservedUsage(
-      upstream,
-      model,
-      recordTokens,
-      request.signal,
-      bufferProxyBodies,
-      recordExtraction
-    )
+  return proxiedResponseWithOptionalUsage(
+    upstream,
+    model,
+    markUsage,
+    usageAccountingMode,
+    recordTokens,
+    recordExtraction,
+    bufferProxyBodies
   );
 }
-async function handleResponsesCompact(client, metrics, recordTokens, recordExtraction, request, logger) {
+async function handleResponsesCompact(client, metrics, recordTokens, recordExtraction, request, logger, usageAccountingMode) {
   const body = await readJson(request);
   const upstream = await client.responses(responsesCompactionRequestBody(body), request.signal);
   metrics.recordUpstream("/responses", upstream.ok);
@@ -4355,16 +4438,17 @@ async function handleResponsesCompact(client, metrics, recordTokens, recordExtra
   logUpstreamSuccess(logger, "/responses", upstream.status);
   const isSse = isStreamingResponse(upstream);
   const text = await upstream.text();
-  recordResponseTextUsage(
+  recordBufferedUsage(
     text,
     isSse,
     normalizeRequestedModel(body.model),
+    usageAccountingMode,
     recordTokens,
     recordExtraction
   );
   return jsonResponse(responsesCompactionResult(text, isSse));
 }
-async function handleResponsesCompactionV2(client, metrics, recordTokens, recordExtraction, json, request, logger) {
+async function handleResponsesCompactionV2(client, metrics, recordTokens, recordExtraction, json, request, logger, usageAccountingMode) {
   const upstream = await client.responses(responsesCompactionRequestBody(json), request.signal);
   metrics.recordUpstream("/responses", upstream.ok);
   if (!upstream.ok) {
@@ -4374,20 +4458,43 @@ async function handleResponsesCompactionV2(client, metrics, recordTokens, record
   const isSse = isStreamingResponse(upstream);
   const text = await upstream.text();
   const model = normalizeRequestedModel(json.model);
-  recordResponseTextUsage(text, isSse, model, recordTokens, recordExtraction);
+  recordBufferedUsage(text, isSse, model, usageAccountingMode, recordTokens, recordExtraction);
   if (json.stream === true) {
     return textResponse(responsesCompactionSseText(text, isSse, model), "text/event-stream");
   }
   return jsonResponse(responsesCompactionResponse(text, isSse, model));
 }
-async function responseWithObservedUsage(response, fallbackModel, recordTokens, signal, bufferBody, recordExtraction) {
+async function proxiedResponseWithOptionalUsage(response, fallbackModel, markUsage, usageAccountingMode, recordTokens, recordExtraction, bufferProxyBodies) {
   const isSse = isStreamingResponse(response);
-  if (bufferBody && response.body) {
+  if (bufferProxyBodies && response.body) {
     const text = await response.text();
-    recordResponseTextUsage(text, isSse, fallbackModel, recordTokens, recordExtraction);
-    return responseFromText(response, text);
+    recordBufferedUsage(
+      text,
+      isSse,
+      fallbackModel,
+      usageAccountingMode,
+      recordTokens,
+      recordExtraction
+    );
+    return proxyResponse(responseFromText(response, text));
+  }
+  return markUsage(proxyResponse(response), fallbackModel, "body");
+}
+function recordParsedUsage(rawUsage, responseModel, fallbackModel, usageAccountingMode, recordTokens, recordExtraction) {
+  if (!shouldExtractUsage(usageAccountingMode, "parsed")) {
+    return;
+  }
+  const usage = extractTokenUsage(rawUsage);
+  if (usage) {
+    recordTokens(responseModel || fallbackModel, usage);
+  }
+  recordExtraction(usage !== void 0);
+}
+function recordBufferedUsage(text, isSse, fallbackModel, usageAccountingMode, recordTokens, recordExtraction) {
+  if (!shouldExtractUsage(usageAccountingMode, "buffered")) {
+    return;
   }
-  return observeResponseUsage(response, fallbackModel, recordTokens, signal, recordExtraction);
+  recordResponseTextUsage(text, isSse, fallbackModel, recordTokens, recordExtraction);
 }
 async function proxyError(upstream, logger) {
   const text = await upstream.text();
@@ -4443,7 +4550,24 @@ function shouldBufferProxyBodies(mode) {
   }
   return process.platform === "win32" && IS_STANDALONE_BINARY;
 }
+function resolveUsageAccountingMode(options) {
+  const value = options.usageAccountingMode ?? envValue(options.env?.HOOPILOT_USAGE_ACCOUNTING) ?? "basic";
+  return parseUsageAccountingMode(value);
+}
+function resolveAccessLog(options) {
+  return options.accessLog ?? parseBooleanEnv(options.env?.HOOPILOT_ACCESS_LOG, "HOOPILOT_ACCESS_LOG") ?? false;
+}
+function shouldExtractUsage(mode, cost) {
+  if (mode === "off") {
+    return false;
+  }
+  if (mode === "basic") {
+    return cost === "parsed";
+  }
+  return true;
+}
 function finishResponse(response, options) {
+  const usageObservation = options.usageObservation;
   const withRequestId = responseWithRequestId(
     response,
     options.requestId,
@@ -4452,11 +4576,36 @@ function finishResponse(response, options) {
   );
   const stream = isStreamingResponse(withRequestId);
   const status = withRequestId.status;
+  let completed = false;
   const complete = () => {
+    if (completed) {
+      return;
+    }
+    completed = true;
     const durationMs = Math.round((performance.now() - options.startedAt) * 100) / 100;
     options.metrics.observe({ durationMs, method: options.method, route: options.route, status });
-    logRequestCompleted(options.logger, status, stream, durationMs);
+    logRequestCompleted(options.logger, status, stream, durationMs, options.accessLog);
   };
+  if (withRequestId.body && usageObservation) {
+    const shouldTrackCompletion = stream && options.trackStreamingBody;
+    const observedBody = streamWithUsageObservation(
+      withRequestId.body,
+      stream,
+      usageObservation.fallbackModel,
+      usageObservation.recordTokens,
+      options.signal,
+      usageObservation.recordExtraction,
+      shouldTrackCompletion ? complete : void 0
+    );
+    if (!shouldTrackCompletion) {
+      complete();
+    }
+    return new Response(observedBody, {
+      headers: withRequestId.headers,
+      status,
+      statusText: withRequestId.statusText
+    });
+  }
   if (stream && withRequestId.body && options.trackStreamingBody) {
     return new Response(trackStreamCompletion(withRequestId.body, complete), {
       headers: withRequestId.headers,
@@ -4526,7 +4675,7 @@ function trackStreamCompletion(body, onComplete) {
     }
   });
 }
-function logRequestCompleted(logger, status, stream, durationMs) {
+function logRequestCompleted(logger, status, stream, durationMs, accessLog) {
   const fields = {
     durationMs,
     event: "http.request.completed",
@@ -4541,6 +4690,9 @@ function logRequestCompleted(logger, status, stream, durationMs) {
     logger.warn(fields, "request completed with client error");
     return;
   }
+  if (!accessLog) {
+    return;
+  }
   logger.info(fields, "request completed");
 }
 function requestIdFor(request) {
@@ -4585,11 +4737,17 @@ var API_ROUTES = [
   { method: "POST", path: "/v1/responses/compact", name: "responses_compact" },
   { method: "POST", path: "/v1/responses", name: "responses" }
 ];
+var ROUTE_NAMES = new Map(
+  API_ROUTES.map((entry) => [routeKey(entry.method, entry.path), entry.name])
+);
 function routeFor(method, path) {
   if (method === "OPTIONS") {
     return "cors.preflight";
   }
-  return API_ROUTES.find((entry) => entry.method === method && entry.path === path)?.name ?? "not_found";
+  return ROUTE_NAMES.get(routeKey(method, path)) ?? "not_found";
+}
+function routeKey(method, path) {
+  return `${method} ${path}`;
 }
 function isStreamingResponse(response) {
   return response.headers.get("content-type")?.includes("text/event-stream") ?? false;
@@ -4628,7 +4786,7 @@ function dashboardResponse() {
 }
 async function handleUsage(metrics, readUsage, request) {
   const view = new URL(request.url).searchParams.get("view");
-  const { copilot, error } = await readUsage(request.signal);
+  const { copilot, error } = await readUsage();
   const proxy = view === DASHBOARD_USAGE_VIEW ? metrics.snapshot({
     excludeRoutes: DASHBOARD_EXCLUDED_ROUTES,
     excludeUpstreamPaths: DASHBOARD_EXCLUDED_UPSTREAM_PATHS
@@ -4647,12 +4805,24 @@ async function handleUsage(metrics, readUsage, request) {
 function createUsageReader(client, metrics, now = Date.now, ttlMs = USAGE_CACHE_TTL_MS) {
   const usagePath = "/copilot_internal/user";
   let cache;
-  return async (signal) => {
+  let inFlight;
+  return async () => {
     if (cache && now() - cache.atMs < ttlMs) {
       return cache.result;
     }
+    if (inFlight) {
+      return inFlight;
+    }
+    inFlight = readFreshUsage();
+    try {
+      return await inFlight;
+    } finally {
+      inFlight = void 0;
+    }
+  };
+  async function readFreshUsage() {
     try {
-      const upstream = await client.usage(signal);
+      const upstream = await client.usage();
       metrics.recordUpstream(usagePath, upstream.ok);
       metrics.recordGithubRateLimit(parseRateLimitHeaders(upstream.headers, now()));
       if (!upstream.ok) {
@@ -4674,7 +4844,7 @@ function createUsageReader(client, metrics, now = Date.now, ttlMs = USAGE_CACHE_
       cache = { atMs: now(), result };
       return result;
     }
-  };
+  }
 }
 
 // src/update.ts
@@ -5346,6 +5516,14 @@ function parseArgs(argv) {
       args.allowUnauthenticated = true;
       continue;
     }
+    if (arg === "--access-log") {
+      args.accessLog = true;
+      continue;
+    }
+    if (arg === "--no-access-log") {
+      args.accessLog = false;
+      continue;
+    }
     if (arg === "--no-update-check") {
       args.noUpdateCheck = true;
       continue;
@@ -5380,6 +5558,9 @@ function parseArgs(argv) {
       case "--stream-mode":
         args.streamingProxyMode = parseStreamingProxyMode(optionValue(name, inlineValue, rest));
         break;
+      case "--usage-accounting":
+        args.usageAccountingMode = parseUsageAccountingMode(optionValue(name, inlineValue, rest));
+        break;
       case "--host":
         args.host = optionValue(name, inlineValue, rest);
         break;
@@ -5684,6 +5865,9 @@ Options:
       --log-level <level>           trace, debug, info, warn, error, fatal, or silent
       --log-format <format>         json or pretty. Default: pretty
       --stream-mode <mode>          auto, live, or buffer. Auto buffers Windows standalone streams.
+      --usage-accounting <mode>     basic, full, or off. Default: basic
+      --access-log                  Log successful requests
+      --no-access-log               Do not log successful requests. Default
       --no-update-check             Do not check GitHub for a newer release
       --allow-unauthenticated       Allow non-loopback bind without --api-key
   -h, --help                        Show help
@@ -5697,6 +5881,8 @@ Environment:
   HOOPILOT_LOG_FORMAT               json or pretty. Default: pretty
   HOOPILOT_LOG_LEVEL                trace, debug, info, warn, error, fatal, or silent
   HOOPILOT_STREAM_MODE              auto, live, or buffer
+  HOOPILOT_USAGE_ACCOUNTING         basic, full, or off
+  HOOPILOT_ACCESS_LOG               1/0, true/false, yes/no, or on/off
   COPILOT_API_BASE_URL
   HOOPILOT_GITHUB_API_BASE_URL      GitHub REST base for the usage/quota lookup. Default: https://api.github.com
   HOOPILOT_ALLOW_UNSAFE_UPSTREAM    Set to 1 to allow nonstandard HTTPS token hosts