@lunora/do 1.0.0-alpha.37 → 1.0.0-alpha.39

package/dist/packem_shared/{ROOT_DO_SIZE_WARN_BYTES-CBlw_ir3.mjs → ROOT_DO_SIZE_WARN_BYTES-CJGwzfoT.mjs}

@@ -5,11 +5,11 @@ import { j as jsonResponse } from './json-response-BdbtpOhm.mjs';
 import { e as encodeWire, d as decodeWire } from './wire-codec-CzQc1pvf.mjs';
 import { parseExportShardArgs, parseImportShardArgs } from './exportShardRows-Dy3oFZ26.mjs';
 import { recordAuthEvent, readAuthMetrics } from './AUTH_METRICS_BUCKETS_TABLE-CiHHYeJi.mjs';
-import { n as normalizeLogFields, r as resolveTraceAnchor, a as createTracer, c as createMetrics, d as dispatchRootSpan } from './context-telemetry-DWfYDxCS.mjs';
+import { n as normalizeLogFields, r as resolveTraceAnchor, a as createTracer, c as createMetrics, d as dispatchRootSpan } from './context-telemetry-CqcOObBl.mjs';
 import { DATA_MIGRATION_STATE_TABLE, readMigrationStatus } from './DATA_MIGRATION_STATE_TABLE-CYwBpyTr.mjs';
 import { SCAN_DEP, createDependencyTracker, tableFromDepKey } from './SCAN_DEP-DLJF8dsj.mjs';
 import { readFunctionMetricsTotals, readFunctionMetricIndexHits, recordFunctionMetric, mergeScanAttribution, readFunctionMetrics, readFunctionMetricBuckets } from './FUNCTION_METRICS_BUCKETS_TABLE-UDNVD7FS.mjs';
-import { createFanoutCounters, ADMIN_FUNCTION_PREFIX, RELATION_FUNCTION_PREFIX, selectMatchingIds, ADMIN_FUNCTIONS, findStorageReferences, listTables, summarizeSubscriptions, summarizeFanoutTopics, readTablePage, facetColumn, FLAGS_FUNCTION_PREFIX, recordFanoutPass, MAX_PAGE_SIZE } from './ADMIN_FUNCTIONS-DVk02KpP.mjs';
+import { createFanoutCounters, ADMIN_FUNCTION_PREFIX, RELATION_FUNCTION_PREFIX, selectMatchingIds, ADMIN_FUNCTIONS, findStorageReferences, listTables, summarizeSubscriptions, summarizeFanoutTopics, readTablePage, facetColumn, FLAGS_FUNCTION_PREFIX, recordFanoutPass, MAX_PAGE_SIZE } from './ADMIN_FUNCTIONS-CnZkbXH_.mjs';
 import { LogBuffer } from './LogBuffer-B_Ezju_N.mjs';
 import { recordCapturedMail, clearCapturedMail, readCapturedMail, MAIL_TABLE } from './MAIL_RETENTION-CPpgl-dX.mjs';
 import { stableStringify } from './stableStringify-mC40mZts.mjs';
@@ -22,9 +22,10 @@ import { redact, standardRules } from '@visulima/redact';
 import { i as isDevEnvironment, c as buildSettings, b as buildSecurityAudit } from './security-audit-CucgBice.mjs';
 import { runReadonlySql } from './MAX_SQL_ROWS-iFAA8FbD.mjs';
 import { ConflictError } from './ConflictError-CLoq37xH.mjs';
+import { selectExpiredIds } from './selectExpiredIds-C5W29Upb.mjs';
 import { e as deleteGlobalShapeSnapshotsForConnection, g as readIdempotent, h as writeIdempotent, t as trimIdempotent, r as readClientWatermark, m as migrateClientWatermark, c as advanceClientWatermark, d as deleteGlobalShapeSnapshot, f as readGlobalShapeSnapshot, w as writeGlobalShapeSnapshot } from './ctx-db-idempotency-BdcNpvY4.mjs';
 import { CDC_LOG_TABLE, readCdcChanges, readCdcCursor, readCdcEpoch, minCdcSeq, bumpCdcEpoch } from './CDC_LOG_TABLE-uwOJxJJZ.mjs';
-import { a as selectShapeMemberIds, s as selectShapeRows } from './ctx-db-shapes-Cz9dHyh1.mjs';
+import { a as selectShapeMemberIds, s as selectShapeRows } from './ctx-db-shapes-DTeFiHYS.mjs';
 
 const MAX_BATCH_ENTRIES = 500;
 
@@ -93,12 +94,12 @@ const verifyWsAdminToken = async (secret, token, now = Date.now()) => {
 
 const AUDIT_LOG_TABLE = "__lunora_audit__";
 const AUDIT_LOG_RETENTION = 1e3;
-const runSql$4 = (sql, query, ...params) => {
+const runSql$5 = (sql, query, ...params) => {
   const runner = sql.exec;
   return runner.call(sql, query, ...params);
 };
 const ensureAuditTable = (sql) => {
-  runSql$4(
+  runSql$5(
     sql,
     `CREATE TABLE IF NOT EXISTS "${AUDIT_LOG_TABLE}" (
             seq INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -112,7 +113,7 @@ const ensureAuditTable = (sql) => {
 };
 const appendAuditEntry = (sql, entry) => {
   ensureAuditTable(sql);
-  runSql$4(
+  runSql$5(
     sql,
     `INSERT INTO "${AUDIT_LOG_TABLE}" (ts, op, "table", id, detail) VALUES (?, ?, ?, ?, ?)`,
     entry.ts,
@@ -124,13 +125,13 @@ const appendAuditEntry = (sql, entry) => {
     // eslint-disable-next-line unicorn/no-null -- SQL NULL is the correct value for an op with no associated table/id/detail.
     entry.detail === void 0 ? null : JSON.stringify(entry.detail)
   );
-  runSql$4(sql, `DELETE FROM "${AUDIT_LOG_TABLE}" WHERE seq <= (SELECT MAX(seq) - ? FROM "${AUDIT_LOG_TABLE}")`, AUDIT_LOG_RETENTION);
+  runSql$5(sql, `DELETE FROM "${AUDIT_LOG_TABLE}" WHERE seq <= (SELECT MAX(seq) - ? FROM "${AUDIT_LOG_TABLE}")`, AUDIT_LOG_RETENTION);
 };
 const readAuditLog = (sql, options = {}) => {
   ensureAuditTable(sql);
   const sinceSeq = options.sinceSeq ?? 0;
   const limit = Math.max(1, Math.min(options.limit ?? AUDIT_LOG_RETENTION, 1e4));
-  const rows = runSql$4(
+  const rows = runSql$5(
     sql,
     `SELECT seq, ts, op, "table", id, detail FROM "${AUDIT_LOG_TABLE}" WHERE seq > ? ORDER BY seq DESC LIMIT ?`,
     sinceSeq,
@@ -187,14 +188,14 @@ const ISSUE_STATE_TABLE = "__lunora_issue_state__";
 const HASH_QUERY_BATCH = 100;
 const ISSUE_STATUSES = ["ignored", "open", "resolved"];
 const ISSUE_SEVERITIES = ["critical", "high", "low", "medium"];
-const runSql$3 = (sql, query, ...parameters) => {
+const runSql$4 = (sql, query, ...parameters) => {
   const runner = sql.exec;
   return runner.call(sql, query, ...parameters);
 };
 const SQL_NULL = null;
 const orNull$1 = (value) => value ?? SQL_NULL;
 const ensureIssueStateTable = (sql) => {
-  runSql$3(
+  runSql$4(
     sql,
     `CREATE TABLE IF NOT EXISTS "${ISSUE_STATE_TABLE}" (
             hash TEXT PRIMARY KEY,
@@ -225,7 +226,7 @@ const readIssueStates = (sql, hashes) => {
   for (let start = 0; start < hashes.length; start += HASH_QUERY_BATCH) {
     const batch = hashes.slice(start, start + HASH_QUERY_BATCH);
     const placeholders = batch.map(() => "?").join(", ");
-    const rows = runSql$3(
+    const rows = runSql$4(
       sql,
       `SELECT hash, status, assignee, severity, updated_at, updated_by FROM "${ISSUE_STATE_TABLE}" WHERE hash IN (${placeholders})`,
       ...batch
@@ -244,7 +245,7 @@ const upsertIssueState = (sql, hash, patch, updatedAt, updatedBy) => {
   const severity = orNull$1(patch.severity);
   const clearSeverity = patch.severity === null ? 1 : 0;
   const actor = orNull$1(updatedBy);
-  runSql$3(
+  runSql$4(
     sql,
     `INSERT INTO "${ISSUE_STATE_TABLE}" (hash, status, assignee, severity, updated_at, updated_by)
          VALUES (?, COALESCE(?, 'open'), ?, ?, ?, ?)
@@ -268,7 +269,7 @@ const upsertIssueState = (sql, hash, patch, updatedAt, updatedBy) => {
     updatedAt,
     actor
   );
-  const [row] = runSql$3(
+  const [row] = runSql$4(
     sql,
     `SELECT hash, status, assignee, severity, updated_at, updated_by FROM "${ISSUE_STATE_TABLE}" WHERE hash = ?`,
     hash
@@ -277,7 +278,7 @@ const upsertIssueState = (sql, hash, patch, updatedAt, updatedBy) => {
 };
 
 const DEFAULT_CAPACITY$1 = 256;
-const seriesKey = (event) => `${event.kind}\0${event.name}\0${stableStringify(event.attributes ?? {})}`;
+const metricSeriesKey = (event) => `${event.kind}${event.name}${stableStringify(event.attributes ?? {})}`;
 class MetricBuffer {
   capacity;
   series = /* @__PURE__ */ new Map();
@@ -304,7 +305,7 @@ class MetricBuffer {
   }
   /** Fold one measurement into its series, creating or updating the aggregate. */
   push(event) {
-    const key = seriesKey(event);
+    const key = metricSeriesKey(event);
     const existing = this.series.get(key);
     if (existing === void 0) {
       if (this.series.size >= this.capacity) {
@@ -316,6 +317,7 @@ class MetricBuffer {
       this.series.set(key, {
         ...event.attributes === void 0 ? {} : { attributes: event.attributes },
         count: 1,
+        ...event.traceId === void 0 ? {} : { exemplarTraceId: event.traceId },
         firstTs: event.ts,
         functionPath: event.functionPath,
         kind: event.kind,
@@ -337,10 +339,152 @@ class MetricBuffer {
     existing.last = event.value;
     existing.lastTs = event.ts;
     existing.functionPath = event.functionPath;
+    if (event.traceId !== void 0) {
+      existing.exemplarTraceId = event.traceId;
+    }
     this.series.set(key, existing);
   }
 }
 
+const METRIC_HISTORY_TABLE = "__lunora_metric_history";
+const METRIC_HISTORY_BUCKET_MS = 6e4;
+const METRIC_HISTORY_BUCKET_RETENTION = 1440;
+const METRIC_HISTORY_MAX_SERIES = 1e3;
+const METRIC_HISTORY_READ_LIMIT = 5e3;
+const runSql$3 = (sql, query, ...parameters) => {
+  const runner = sql.exec;
+  return runner.call(sql, query, ...parameters);
+};
+const bucketFloor = (ts) => Math.floor(ts / METRIC_HISTORY_BUCKET_MS) * METRIC_HISTORY_BUCKET_MS;
+const ensureMetricHistoryTable = (sql) => {
+  runSql$3(
+    sql,
+    `CREATE TABLE IF NOT EXISTS "${METRIC_HISTORY_TABLE}" (
+            series_key TEXT NOT NULL,
+            bucket_ms INTEGER NOT NULL,
+            name TEXT NOT NULL,
+            kind TEXT NOT NULL,
+            attrs TEXT NOT NULL DEFAULT '{}',
+            function_path TEXT NOT NULL DEFAULT '',
+            shard_key TEXT,
+            count INTEGER NOT NULL DEFAULT 0,
+            sum REAL NOT NULL DEFAULT 0,
+            min REAL NOT NULL DEFAULT 0,
+            max REAL NOT NULL DEFAULT 0,
+            last REAL NOT NULL DEFAULT 0,
+            last_ts REAL NOT NULL DEFAULT 0,
+            exemplar_trace TEXT,
+            PRIMARY KEY (series_key, bucket_ms)
+        )`
+  );
+};
+const recordMetricHistory = (sql, event, exemplarTraceId) => {
+  ensureMetricHistoryTable(sql);
+  const key = metricSeriesKey(event);
+  const bucket = bucketFloor(event.ts);
+  const bucketExists = runSql$3(sql, `SELECT 1 AS c FROM "${METRIC_HISTORY_TABLE}" WHERE series_key = ? AND bucket_ms = ? LIMIT 1`, key, bucket).toArray().length > 0;
+  if (!bucketExists) {
+    const seriesTracked = runSql$3(sql, `SELECT 1 AS c FROM "${METRIC_HISTORY_TABLE}" WHERE series_key = ? LIMIT 1`, key).toArray().length > 0;
+    if (!seriesTracked) {
+      const seriesCountRow = runSql$3(sql, `SELECT COUNT(DISTINCT series_key) AS n FROM "${METRIC_HISTORY_TABLE}"`).one();
+      if (seriesCountRow.n >= METRIC_HISTORY_MAX_SERIES) {
+        return;
+      }
+    }
+  }
+  const exemplar = exemplarTraceId ?? null;
+  runSql$3(
+    sql,
+    `INSERT INTO "${METRIC_HISTORY_TABLE}"
+            (series_key, bucket_ms, name, kind, attrs, function_path, shard_key, count, sum, min, max, last, last_ts, exemplar_trace)
+         VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?)
+         ON CONFLICT(series_key, bucket_ms) DO UPDATE SET
+            count = count + 1,
+            sum = sum + excluded.sum,
+            min = MIN(min, excluded.min),
+            max = MAX(max, excluded.max),
+            last = excluded.last,
+            last_ts = excluded.last_ts,
+            exemplar_trace = CASE WHEN excluded.exemplar_trace IS NULL THEN exemplar_trace ELSE excluded.exemplar_trace END`,
+    key,
+    bucket,
+    event.name,
+    event.kind,
+    stableStringify(event.attributes ?? {}),
+    event.functionPath,
+    // eslint-disable-next-line unicorn/no-null -- SQL NULL for the unnamed root DO's absent shard key.
+    event.shardKey ?? null,
+    event.value,
+    event.value,
+    event.value,
+    event.value,
+    event.ts,
+    exemplar
+  );
+  if (!bucketExists) {
+    runSql$3(
+      sql,
+      `DELETE FROM "${METRIC_HISTORY_TABLE}"
+             WHERE series_key = ?
+               AND bucket_ms <= (
+                SELECT MAX(bucket_ms) - ? FROM "${METRIC_HISTORY_TABLE}" WHERE series_key = ?
+               )`,
+      key,
+      METRIC_HISTORY_BUCKET_RETENTION * METRIC_HISTORY_BUCKET_MS,
+      key
+    );
+  }
+};
+const parseAttributes = (raw) => {
+  if (raw === "" || raw === "{}") {
+    return void 0;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    return parsed !== null && typeof parsed === "object" ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+};
+const readMetricHistory = (sql, options = {}) => {
+  ensureMetricHistoryTable(sql);
+  const rows = options.sinceMs === void 0 ? runSql$3(sql, `SELECT * FROM "${METRIC_HISTORY_TABLE}" ORDER BY bucket_ms DESC LIMIT ?`, METRIC_HISTORY_READ_LIMIT).toArray() : runSql$3(
+    sql,
+    `SELECT * FROM "${METRIC_HISTORY_TABLE}" WHERE bucket_ms >= ? ORDER BY bucket_ms DESC LIMIT ?`,
+    options.sinceMs,
+    METRIC_HISTORY_READ_LIMIT
+  ).toArray();
+  const bySeries = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    let series = bySeries.get(row.series_key);
+    if (series === void 0) {
+      const attributes = parseAttributes(row.attrs);
+      series = {
+        ...attributes === void 0 ? {} : { attributes },
+        functionPath: row.function_path,
+        kind: row.kind,
+        name: row.name,
+        points: [],
+        ...row.shard_key === null ? {} : { shardKey: row.shard_key }
+      };
+      bySeries.set(row.series_key, series);
+    }
+    series.points.push({
+      bucketMs: row.bucket_ms,
+      count: row.count,
+      ...row.exemplar_trace === null ? {} : { exemplarTraceId: row.exemplar_trace },
+      last: row.last,
+      max: row.max,
+      min: row.min,
+      sum: row.sum
+    });
+  }
+  for (const series of bySeries.values()) {
+    series.points.sort((a, b) => a.bucketMs - b.bucketMs);
+  }
+  return { series: [...bySeries.values()] };
+};
+
 const QUERY_METRICS_TABLE = "__lunora_metrics_queries";
 const QUERY_METRICS_MAX_SQL_LEN = 512;
 const QUERY_METRICS_MAX_STATEMENTS = 500;
@@ -1855,6 +1999,9 @@ const parseRunMigrationArgs = (args) => {
   };
 };
 const SHARD_BULK_DELETE_CAP = MAX_PAGE_SIZE;
+const TTL_SWEEP_BATCH = 200;
+const TTL_SWEEP_MAX_BATCHES = 20;
+const TTL_SWEEP_INTERVAL_MS = 3e4;
 const parseWriteRowArgs = (args) => {
   const { op } = args;
   const table = typeof args["table"] === "string" ? args["table"] : "";
@@ -2461,12 +2608,10 @@ class ShardDO {
    * reason; otherwise the earlier of the two candidate times (never later than
    * `nowMs`, so a source that's already due arms essentially immediately).
    */
-  static nextPollAlarmTarget(globalShapesRemaining, nextSourceDueAt, nowMs) {
+  static nextPollAlarmTarget(globalShapesRemaining, nextSourceDueAt, nextTtlDueAt, nowMs) {
     const globalTarget = globalShapesRemaining > 0 ? nowMs + ShardDO.GLOBAL_SHAPE_POLL_INTERVAL_MS : void 0;
-    if (globalTarget === void 0) {
-      return nextSourceDueAt === void 0 ? void 0 : Math.max(nextSourceDueAt, nowMs);
-    }
-    return nextSourceDueAt === void 0 ? globalTarget : Math.min(globalTarget, nextSourceDueAt);
+    const candidates = [globalTarget, nextSourceDueAt, nextTtlDueAt].filter((value) => value !== void 0).map((value) => Math.max(value, nowMs));
+    return candidates.length > 0 ? Math.min(...candidates) : void 0;
   }
   state;
   env;
@@ -3147,8 +3292,15 @@ class ShardDO {
       this.recordShapeError("source:poll", error);
       nextSourceDueAt = Date.now() + ShardDO.GLOBAL_SHAPE_POLL_INTERVAL_MS;
     }
+    let nextTtlDueAt;
+    try {
+      nextTtlDueAt = await this.pollTtlSweeps();
+    } catch (error) {
+      this.recordShapeError("ttl:sweep", error);
+      nextTtlDueAt = Date.now() + ShardDO.GLOBAL_SHAPE_POLL_INTERVAL_MS;
+    }
     await this.flushChangedTables();
-    const nextAlarmAt = ShardDO.nextPollAlarmTarget(globalShapesRemaining, nextSourceDueAt, Date.now());
+    const nextAlarmAt = ShardDO.nextPollAlarmTarget(globalShapesRemaining, nextSourceDueAt, nextTtlDueAt, Date.now());
     if (nextAlarmAt !== void 0) {
       await this.scheduleGlobalPoll(nextAlarmAt);
     }
@@ -4337,6 +4489,60 @@ class ShardDO {
   scheduleSourcePoll() {
     return this.scheduleGlobalPoll();
   }
+  /**
+   * The resolved TTL policies (`.ttl(field, { after })`) for this DO's schema —
+   * one {@link TtlSweepSpec} per table that declares a TTL. The base `ShardDO`
+   * has no schema, so it returns `[]` and the TTL tier stays dormant. The
+   * codegen subclass overrides it to read each table's `ttlPolicy` (+ its
+   * `.softDelete()` marker) off the imported schema.
+   */
+  // eslint-disable-next-line class-methods-use-this -- base-class override hook: the codegen subclass reads the imported schema
+  ttlSweeps() {
+    return [];
+  }
+  /**
+   * Sweep every `.ttl()` table once: page the rows past their expiry and remove
+   * each THROUGH the schema-aware writer (`deleteRowThroughWriter`) so companions
+   * / CDC / live subscriptions stay correct and a `.softDelete()` table soft-deletes
+   * instead of physically removing the row. Work is bounded per tick
+   * ({@link TTL_SWEEP_BATCH} × {@link TTL_SWEEP_MAX_BATCHES}) so a large backlog
+   * drains across several alarms without stalling the shard.
+   *
+   * Returns the next-due timestamp (a coarse {@link TTL_SWEEP_INTERVAL_MS}
+   * cadence, so freshly-written rows expire within a bounded window) while any
+   * TTL table exists, or `undefined` when there are none — so a DO with no TTL
+   * table never arms this tier.
+   */
+  async pollTtlSweeps() {
+    const specs = this.ttlSweeps();
+    if (specs.length === 0) {
+      return void 0;
+    }
+    const sql = this.sql;
+    const now = Date.now();
+    for (const spec of specs) {
+      let batches = 0;
+      let hasMore = true;
+      while (hasMore && batches < TTL_SWEEP_MAX_BATCHES) {
+        const page = selectExpiredIds(sql, spec, now, TTL_SWEEP_BATCH);
+        for (const id of page.ids) {
+          await this.deleteRowThroughWriter(spec.table, id);
+        }
+        hasMore = page.hasMore;
+        batches += 1;
+      }
+    }
+    return now + TTL_SWEEP_INTERVAL_MS;
+  }
+  /**
+   * Arm the shared poll alarm for the TTL sweep. Mirrors {@link scheduleSourcePoll};
+   * the codegen subclass calls it once on construction when the schema declares a
+   * `.ttl()` table so the sweep loop starts, after which {@link ShardDO.alarm}
+   * re-arms itself. Idempotent; a no-op when the runtime exposes no `setAlarm`.
+   */
+  scheduleTtlSweep() {
+    return this.scheduleGlobalPoll();
+  }
   /** This DO's shard key (its DO name), or `__root__` for the single-DO default. The `tenantBy` mapper binds it into the source query. */
   currentShardKey() {
     return this.state.id?.name ?? ROOT_SHARD_NAME;
@@ -4595,15 +4801,23 @@ class ShardDO {
    * cross-instance aggregation is still the sink's job.
    */
   recordMetric(event, sink) {
-    try {
-      this.metricSeries.push(event);
-    } catch {
-    }
-    if (sink?.onMetric) {
+    const exemplarTraceId = this.currentRequestTrace?.traceId;
+    const stamped = exemplarTraceId === void 0 ? event : { ...event, traceId: exemplarTraceId };
+    const bestEffort = (run) => {
       try {
-        sink.onMetric(event, { waitUntil: this.state.waitUntil?.bind(this.state) });
+        run();
       } catch {
       }
+    };
+    bestEffort(() => {
+      this.metricSeries.push(stamped);
+    });
+    const rawSql = this.state.storage.sql;
+    bestEffort(() => {
+      recordMetricHistory(rawSql, stamped, exemplarTraceId);
+    });
+    if (sink?.onMetric) {
+      bestEffort(() => sink.onMetric?.(stamped, { waitUntil: this.state.waitUntil?.bind(this.state) }));
     }
   }
   /**
@@ -5809,6 +6023,9 @@ class ShardDO {
     if (functionPath === ADMIN_FUNCTIONS.getMetricSeries) {
       return { series: this.metricSeries.entries() };
     }
+    if (functionPath === ADMIN_FUNCTIONS.getMetricHistory) {
+      return readMetricHistory(this.sql);
+    }
     if (functionPath === ADMIN_FUNCTIONS.getSettings) {
       return buildSettings(this.env);
     }

package/dist/packem_shared/{backfillAggregateIndexes-DDoT-UUI.mjs → backfillAggregateIndexes-BGTwynwh.mjs}

@@ -2,7 +2,7 @@ import { sql } from 'drizzle-orm';
 import { matchesStaticWhere } from './AGGREGATE_SQL_FUNCTION-CQsu2Xga.mjs';
 import { encodeAggregateKey, foldAggregateTally, aggregateTableName } from './aggregateTableName-CxNqY1Sl.mjs';
 import { r as runDrizzle } from './do-exec-5eQy5cEi.mjs';
-import { D as DOC_COLUMN, r as rowToDocument, A as AGG_KEY, a as AGG_VALUE, b as AGG_COUNT } from './do-sql-BCHCWtrD.mjs';
+import { D as DOC_COLUMN, r as rowToDocument, A as AGG_KEY, a as AGG_VALUE, b as AGG_COUNT } from './do-sql-CGAgiQUz.mjs';
 import { param } from './renderSql-D6eUcn2N.mjs';
 import { sortColumnName, matchesRankStaticWhere, encodePartitionKey, rankTableName } from './RANK_TIEBREAK-CXhdcA1o.mjs';
 import { s as serializeSqlValue } from './serialize-sql-BlRUoiQe.mjs';

package/dist/packem_shared/{context-telemetry-DWfYDxCS.mjs → context-telemetry-CqcOObBl.mjs}

@@ -69,10 +69,19 @@ const createTracer = (deps) => {
     const spanId = otlpRandomHex(8);
     const startTs = Date.now();
     const normalized = normalizeLogFields(attributes);
+    const collected = {};
+    const spanHandle = {
+      setAttribute: (key, value) => {
+        Object.assign(collected, normalizeLogFields({ [key]: value }));
+      },
+      setAttributes: (fields) => {
+        Object.assign(collected, normalizeLogFields(fields));
+      }
+    };
     let ok = true;
     let error;
     try {
-      return await function_(tracerFor(spanId));
+      return await function_(tracerFor(spanId), spanHandle);
     } catch (error_) {
       ok = false;
       error = {
@@ -84,8 +93,9 @@ const createTracer = (deps) => {
       throw error_;
     } finally {
       try {
+        const merged = { ...normalized, ...collected };
         record({
-          ...normalized === void 0 ? {} : { attributes: normalized },
+          ...Object.keys(merged).length === 0 ? {} : { attributes: merged },
           durationMs: Date.now() - startTs,
           ...error === void 0 ? {} : { error },
           functionPath,

package/dist/packem_shared/{createMetrics-BIL8Cl8X.mjs → createMetrics-Dk4eQ2aJ.mjs}

@@ -1 +1 @@
-export { c as createMetrics, a as createTracer, d as dispatchRootSpan } from './context-telemetry-DWfYDxCS.mjs';
+export { c as createMetrics, a as createTracer, d as dispatchRootSpan } from './context-telemetry-CqcOObBl.mjs';

package/dist/packem_shared/{ctx-db-shapes-Cz9dHyh1.mjs → ctx-db-shapes-DTeFiHYS.mjs}

@@ -1,6 +1,6 @@
 import { sql } from 'drizzle-orm';
 import { r as runDrizzle } from './do-exec-5eQy5cEi.mjs';
-import { D as DOC_COLUMN, r as rowToDocument, j as jsonPathSql } from './do-sql-BCHCWtrD.mjs';
+import { D as DOC_COLUMN, r as rowToDocument, j as jsonPathSql } from './do-sql-CGAgiQUz.mjs';
 import { compileWhereSql } from './compileWhereSql-DE6yfRcQ.mjs';
 import { s as serializeSqlValue } from './serialize-sql-BlRUoiQe.mjs';
 

package/dist/packem_shared/{do-sql-BCHCWtrD.mjs → do-sql-CGAgiQUz.mjs}

@@ -2,6 +2,7 @@ import { sql } from 'drizzle-orm';
 import { r as runDrizzle } from './do-exec-5eQy5cEi.mjs';
 
 const DOC_COLUMN = "__doc__";
+const geoTableName = (table, indexName) => `${table}__geo_${indexName}`;
 const quoteIdentifier = (name) => `"${name.replaceAll('"', '""')}"`;
 const jsonPath = (field) => {
   if (field === "_id" || field === "id") {
@@ -84,4 +85,4 @@ const isFtsAvailable = (sql$1) => {
   return available;
 };
 
-export { AGG_KEY as A, DOC_COLUMN as D, AGG_VALUE as a, AGG_COUNT as b, createIndexSql as c, aggUpsertSql as d, qualifiedJsonPathSql as e, isFtsAvailable as i, jsonPathSql as j, quoteIdentifier as q, rowToDocument as r, tableColumns as t };
+export { AGG_KEY as A, DOC_COLUMN as D, AGG_VALUE as a, AGG_COUNT as b, createIndexSql as c, aggUpsertSql as d, qualifiedJsonPathSql as e, geoTableName as g, isFtsAvailable as i, jsonPathSql as j, quoteIdentifier as q, rowToDocument as r, tableColumns as t };

package/dist/packem_shared/{isSoftDeleted-YLKR6JYw.mjs → isSoftDeleted-CFJmhjFP.mjs}

@@ -1,7 +1,7 @@
 import { LunoraError } from '@lunora/errors';
 import { sql } from 'drizzle-orm';
 import { r as runDrizzle } from './do-exec-5eQy5cEi.mjs';
-import { runExternalSourceTick, materializeExternalRowsIncremental } from './materializeExternalRows-DlQWMlw_.mjs';
+import { runExternalSourceTick, materializeExternalRowsIncremental } from './materializeExternalRows-BtEGs1Fv.mjs';
 
 const SOURCE_CURSOR_TABLE = "__lunora_source_cursor";
 const serializeCursor = (value) => {

package/dist/packem_shared/{materializeExternalRows-DlQWMlw_.mjs → materializeExternalRows-BtEGs1Fv.mjs}

@@ -1,5 +1,5 @@
 import { applyCdcChanges } from './CDC_LOG_TABLE-uwOJxJJZ.mjs';
-import { s as selectShapeRows } from './ctx-db-shapes-Cz9dHyh1.mjs';
+import { s as selectShapeRows } from './ctx-db-shapes-DTeFiHYS.mjs';
 import { diffExternalSource, projectExternalSourceRow } from './diffExternalSource-CovHfdyo.mjs';
 import { stableStringify } from './stableStringify-mC40mZts.mjs';
 

package/dist/packem_shared/{runShardMigrations-DFzx6Qld.mjs → runShardMigrations-BVax6rYu.mjs}

@@ -3,7 +3,7 @@ import { aggregateTableName } from './aggregateTableName-CxNqY1Sl.mjs';
 import { migrateCdcLog, migrateCdcMeta } from './CDC_LOG_TABLE-uwOJxJJZ.mjs';
 import { m as migrateClientWatermark, a as migrateIdempotency, b as migrateGlobalShapeSnapshot } from './ctx-db-idempotency-BdcNpvY4.mjs';
 import { r as runDrizzle } from './do-exec-5eQy5cEi.mjs';
-import { D as DOC_COLUMN, j as jsonPathSql, c as createIndexSql, t as tableColumns, i as isFtsAvailable, A as AGG_KEY, a as AGG_VALUE, b as AGG_COUNT } from './do-sql-BCHCWtrD.mjs';
+import { D as DOC_COLUMN, j as jsonPathSql, c as createIndexSql, t as tableColumns, i as isFtsAvailable, A as AGG_KEY, a as AGG_VALUE, b as AGG_COUNT, g as geoTableName } from './do-sql-CGAgiQUz.mjs';
 import { sortColumnName, rankTableName } from './RANK_TIEBREAK-CXhdcA1o.mjs';
 import { ftsTableName } from './buildFtsMatch-BLEMawrp.mjs';
 
@@ -36,6 +36,20 @@ const migrateSearchIndexes = (sql$1, tableName, definition) => {
     );
   }
 };
+const migrateGeoIndexes = (sql$1, tableName, definition) => {
+  if (!definition.geoIndexes) {
+    return;
+  }
+  for (const index of definition.geoIndexes) {
+    const geoTable = geoTableName(tableName, index.name);
+    runDrizzle(
+      sql$1,
+      sql`CREATE TABLE IF NOT EXISTS ${sql.identifier(geoTable)} (${sql.identifier("__id__")} TEXT PRIMARY KEY, ${sql.identifier("__geohash__")} TEXT NOT NULL, ${sql.identifier("__lat__")} REAL NOT NULL, ${sql.identifier("__lng__")} REAL NOT NULL)`
+    );
+    const btreeName = `${tableName}__geo_${index.name}__btree`;
+    runDrizzle(sql$1, createIndexSql(btreeName, geoTable, sql`${sql.identifier("__geohash__")} ASC, ${sql.identifier("__id__")} ASC`, false));
+  }
+};
 const migrateAggregateIndexes = (sql$1, tableName, definition) => {
   if (!definition.aggregateIndexes) {
     return;
@@ -90,6 +104,7 @@ const runShardMigrations = (sql$1, schema, options = {}) => {
     );
     migrateSecondaryIndexes(sql$1, tableName, definition);
     migrateSearchIndexes(sql$1, tableName, definition);
+    migrateGeoIndexes(sql$1, tableName, definition);
     migrateAggregateIndexes(sql$1, tableName, definition);
     migrateRankIndexes(sql$1, tableName, definition);
   }

package/dist/packem_shared/selectExpiredIds-C5W29Upb.mjs

@@ -0,0 +1,18 @@
+import { sql } from 'drizzle-orm';
+import { r as runDrizzle } from './do-exec-5eQy5cEi.mjs';
+import { j as jsonPathSql } from './do-sql-CGAgiQUz.mjs';
+
+const selectExpiredIds = (sql$1, spec, now, limit) => {
+  const cutoff = now - (spec.after ?? 0);
+  const conditions = [sql`${jsonPathSql(spec.field)} IS NOT NULL`, sql`${jsonPathSql(spec.field)} < ${cutoff}`];
+  if (spec.softDeleteField !== void 0) {
+    conditions.push(sql`${jsonPathSql(spec.softDeleteField)} IS NULL`);
+  }
+  const query = sql`SELECT id FROM ${sql.identifier(spec.table)} WHERE ${sql.join(conditions, sql` AND `)} LIMIT ${sql.raw(String(Math.max(0, Math.floor(limit)) + 1))}`;
+  const rows = runDrizzle(sql$1, query).toArray();
+  const hasMore = rows.length > limit;
+  const ids = rows.slice(0, limit).map((row) => row.id);
+  return { hasMore, ids };
+};
+
+export { selectExpiredIds };

package/dist/packem_shared/{serveRelationFanout-FdrPflv1.mjs → serveRelationFanout-k7HTh3CC.mjs}

@@ -1,5 +1,5 @@
 import { LunoraError } from '@lunora/errors';
-import { RELATION_FUNCTION_PREFIX } from './ADMIN_FUNCTIONS-DVk02KpP.mjs';
+import { RELATION_FUNCTION_PREFIX } from './ADMIN_FUNCTIONS-CnZkbXH_.mjs';
 
 const serveRelationFanout = async (schema, database, functionPath, args) => {
   const table = typeof args["table"] === "string" ? args["table"] : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunora/do",
-  "version": "1.0.0-alpha.37",
+  "version": "1.0.0-alpha.39",
   "description": "Lunora Durable Objects: ShardDO (SQLite, OCC, hibernated WebSocket subscriptions) and SessionDO",
   "keywords": [
     "cloudflare",
@@ -46,7 +46,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@lunora/errors": "1.0.0-alpha.6",
+    "@lunora/errors": "1.0.0-alpha.7",
     "@lunora/fingerprint": "1.0.0-alpha.3",
     "@visulima/redact": "3.0.0",
     "drizzle-orm": "^0.45.2"