cartethyia 2.5.10 → 2.6.1

package/src/observability/client-name.ts

@@ -0,0 +1,22 @@
+/**
+ * Client identity straight from the stored `User-Agent`: the first RFC 9110
+ * product token carries both the client and its version (`bun/1.2.3`,
+ * `codex-cli/0.1.0`), so no prefix catalog can drift from what the client
+ * actually sent. Browser agents start with the historical `Mozilla/5.0`
+ * token, which names no real client, so they report as `Browser`.
+ *
+ * Canonical location: this is stamped at ingestion (`telemetryEventRow`) so
+ * `telemetry_events.client_name` groups client breakdowns in SQL, and reused
+ * by the console read side and the backfill for the same grouping.
+ */
+export function clientNameFromUserAgent(userAgent: string | null | undefined): string {
+  const raw = userAgent?.trim();
+  if (!raw) return "unknown";
+  if (/^mozilla\//i.test(raw)) return "Browser";
+  const product = raw.split(/\s+/, 1)[0] ?? "";
+  const slash = product.indexOf("/");
+  const token = slash <= 0
+    ? product
+    : product.slice(0, slash + 1).concat(product.slice(slash + 1).split(/[;,)]/, 1)[0] ?? "");
+  return token || "unknown";
+}

package/src/observability/event-log.ts

@@ -2,6 +2,7 @@ import { open, readdir } from "node:fs/promises";
 import { join } from "node:path";
 import { resolveTelemetryRetentionDays } from "../config/telemetry";
 import { resolveDataDir } from "../persistence/db-mode";
+import { hourStamp } from "../shared/time";
 
 /**
  * Per-request telemetry lives in hourly JSONL files, not in Postgres. The
@@ -10,7 +11,7 @@ import { resolveDataDir } from "../persistence/db-mode";
  * `telemetry_events` table.
  */
 /**
- * Where hourly event files and their compacted summaries live.
+ * Where raw hourly event files live.
  *
  * Resolved from the configured data directory, never relative to the working
  * directory: the gateway can be started from anywhere, and a relative path
@@ -20,26 +21,6 @@ import { resolveDataDir } from "../persistence/db-mode";
  */
 export const TELEMETRY_EVENT_DIR = join(resolveDataDir(), "telemetry-events");
 
-/**
- * The source file an event lands in: one per closed `windowMinutes` bucket.
- *
- * The name is the bucket's own start (`YYYY-MM-DDTHH-MM`), so both the writer
- * and the compactor derive it from a timestamp and cannot disagree. It is also
- * what makes "is this window closed?" a name comparison rather than a read.
- */
-export function windowFileName(at: Date, windowMinutes: number): string {
-  // `2026-10-22T05-15.jsonl`: ISO to the minute with the colon replaced, so the
-  // name sorts chronologically and needs no separate timestamp column.
-  return `${bucketStart(at, windowMinutes).toISOString().slice(0, 16).replace(":", "-")}.jsonl`;
-}
-
-/** The start of the window containing `at`, floored to `windowMinutes`. */
-export function bucketStart(at: Date, windowMinutes: number): Date {
-  const ms = Math.max(1, Math.floor(windowMinutes)) * 60_000;
-  return new Date(Math.floor(at.getTime() / ms) * ms);
-}
-
-
 export interface TelemetryEventRecord {
   readonly id: string;
   readonly createdAt: string;
@@ -144,10 +125,6 @@ function eventFileHour(file: string): string {
   return stamp;
 }
 
-function hourStamp(date: Date): string {
-  return date.toISOString().slice(0, 13).replaceAll(":", "-");
-}
-
 /** Chunk size for the streaming scan: one line can be long, a file cannot. */
 const READ_CHUNK_BYTES = 256 * 1024;
 
@@ -326,8 +303,7 @@ export async function queryTelemetryEvents(query: EventQuery): Promise<Telemetry
   // The lower bound is the retention window, not just `since`: a caller that
   // asks for all time still must not scan files that have already been aged
   // out, and one that passes no `since` at all must not read every file ever
-  // written. Files older than retention are gone or compacted; either way they
-  // are not here.
+  // written. Retention removes whole raw files; no summary is substituted.
   const retentionFloor = hourStamp(
     new Date(Date.now() - resolveTelemetryRetentionDays() * 24 * 60 * 60_000),
   );
@@ -361,8 +337,8 @@ export async function queryTelemetryEvents(query: EventQuery): Promise<Telemetry
   // A single-row lookup: stop at the first (newest) match instead of parsing
   // the whole retention window.
   const oneRow = query.requestId !== undefined || query.id !== undefined;
-  // With one file per day, a plain page of the newest rows would otherwise
-  // parse the whole day to return fifty lines. When nothing filters on
+  // With one file per hour, a plain page of the newest rows does not need to
+  // parse the whole retention window to return fifty lines. When nothing filters on
   // content — no status, no key, no account — the newest rows are the last
   // lines, so they are read backwards from the end and the scan stops once the
   // page is full.