@mastra/duckdb 1.5.1 → 1.5.2-alpha.0

package/dist/{observability-M35AJUGT.js → observability-ZEJILRUN.js}

@@ -1,4 +1,4 @@
-import { DuckDBConnection } from './chunk-4LIZE4MC.js';
+import { DuckDBConnection } from './chunk-SBS7DUKU.js';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { BRANCH_SPAN_TYPES, ObservabilityStorage, createStorageErrorId, listTracesArgsSchema, toTraceSpans, listBranchesArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listFeedbackArgsSchema, METRIC_DISTINCT_COLUMNS } from '@mastra/core/storage';
 import { EntityType } from '@mastra/core/observability';
@@ -2676,6 +2676,44 @@ var SPAN_RECONSTRUCT_SELECT_LIGHT = `
     ${argMaxNonNull("error")}
   FROM span_events
 `;
+var POSTAGG_FILTER_COLUMNS = {
+  status: ["endedAt", "error"],
+  endedAt: ["endedAt"],
+  tags: ["tags"],
+  metadata: ["metadata"],
+  scope: ["scope"]
+};
+function buildPostAggReconstructSelect(postAgg, orderByField) {
+  const columns = /* @__PURE__ */ new Set();
+  if (orderByField === "endedAt") columns.add("endedAt");
+  for (const key of Object.keys(postAgg)) {
+    for (const column of POSTAGG_FILTER_COLUMNS[key] ?? []) {
+      columns.add(column);
+    }
+  }
+  const argMaxCols = [...columns].map((col) => `${argMaxNonNull(col)},`).join("\n    ");
+  return `
+  SELECT
+    traceId, spanId,
+    ${argMaxCols}
+    coalesce(min(timestamp) FILTER (WHERE eventType = 'start'), min(timestamp)) as startedAt
+  FROM span_events
+`;
+}
+function reconstructForAnchors(reconstructSelect, anchorCte) {
+  return `
+    ${reconstructSelect}
+    WHERE timestamp >= (SELECT min(anchorStartedAt) FROM ${anchorCte})
+      AND (traceId, spanId) IN (SELECT traceId, spanId FROM ${anchorCte})
+    GROUP BY traceId, spanId`;
+}
+function reconstructForAnchorsWithBoundParam(reconstructSelect, anchorCte) {
+  return `
+    ${reconstructSelect}
+    WHERE timestamp >= ?
+      AND (traceId, spanId) IN (SELECT traceId, spanId FROM ${anchorCte})
+    GROUP BY traceId, spanId`;
+}
 function rowToLightSpanRecord(row) {
   return {
     traceId: row.traceId,
@@ -3021,15 +3059,13 @@ async function listTraceRows(db, args, reconstructSelect, mapRow, toSpans) {
     const total2 = Number(countResult2[0]?.total ?? 0);
     const pageSql = `
       WITH page_roots AS (
-        SELECT traceId, spanId
+        SELECT traceId, spanId, timestamp AS anchorStartedAt
         FROM span_events AS ${outerAlias}
         ${prefilterWhere}
         ${prefilterOrderBy}
         LIMIT ? OFFSET ?
       )
-      ${reconstructSelect}
-      WHERE (traceId, spanId) IN (SELECT traceId, spanId FROM page_roots)
-      GROUP BY traceId, spanId
+      ${reconstructForAnchors(reconstructSelect, "page_roots")}
       ${buildOrderByClause(orderBy)}
     `;
     const rows2 = await db.query(pageSql, [...prefilterParams, perPage, offset]);
@@ -3052,7 +3088,7 @@ async function listTraceRows(db, args, reconstructSelect, mapRow, toSpans) {
       ${prefilterWhere}
     ),
     root_spans AS (
-      ${reconstructSelect}
+      ${buildPostAggReconstructSelect(postAgg, orderBy.field)}
       WHERE (traceId, spanId) IN (SELECT traceId, spanId FROM candidate_roots)
       GROUP BY traceId, spanId
     )
@@ -3066,8 +3102,13 @@ async function listTraceRows(db, args, reconstructSelect, mapRow, toSpans) {
   const countResult = await db.query(countSql, [...prefilterParams, ...postAggParams]);
   const total = Number(countResult[0]?.total ?? 0);
   const dataSql = `
-    ${cteSql}
-    SELECT * FROM root_spans ${postAggWhere} ${orderByClause} ${paginationClause}
+    ${cteSql},
+    page_roots AS (
+      SELECT traceId, spanId, startedAt AS anchorStartedAt
+      FROM root_spans ${postAggWhere} ${orderByClause} ${paginationClause}
+    )
+    ${reconstructForAnchors(reconstructSelect, "page_roots")}
+    ${orderByClause}
   `;
   const rows = await db.query(dataSql, [...prefilterParams, ...postAggParams, ...paginationParams]);
   const spans = rows.map((row) => mapRow(row));
@@ -3079,8 +3120,6 @@ async function listTraceRows(db, args, reconstructSelect, mapRow, toSpans) {
 async function listTraces(db, args) {
   const { mode, filters, pagination, orderBy, after, limit } = listTracesArgsSchema.parse(args);
   const filterRecord = filters ?? {};
-  const page = Number(pagination.page);
-  const perPage = Number(pagination.perPage);
   if (mode === "delta") {
     assertDeltaPollingEnabled();
     const streamHeadCursor = await getTraceStreamHeadCursor(db);
@@ -3092,135 +3131,78 @@ async function listTraces(db, args) {
       };
     }
     const afterCursorId = validateCursorId(after);
-    const { prefilter: prefilter2, postAgg: postAgg2, hasChildError: hasChildError2 } = partitionAnchorFilters(filterRecord);
-    const { clause: prefilterClause2, params: prefilterParams2 } = buildWhereClause(prefilter2);
-    const prefilterParts2 = [
+    const { prefilter, postAgg, hasChildError } = partitionAnchorFilters(filterRecord);
+    const { clause: prefilterClause, params: prefilterParams } = buildWhereClause(prefilter);
+    const prefilterParts = [
       `eventType = 'start'`,
       `parentSpanId IS NULL`,
       `cursorId IS NOT NULL`,
       `cursorId > CAST(? AS BIGINT)`
     ];
-    if (prefilterClause2) prefilterParts2.push(prefilterClause2.replace(/^WHERE\s+/i, ""));
-    const prefilterWhere2 = `WHERE ${prefilterParts2.join(" AND ")}`;
-    const { clause: postAggClause2, params: postAggParams2 } = buildWhereClause(postAgg2);
-    const postAggParts2 = [];
-    if (postAggClause2) postAggParts2.push(postAggClause2.replace(/^WHERE\s+/i, ""));
-    const childErrorClause2 = buildHasChildErrorClause(hasChildError2, "root_spans");
-    if (childErrorClause2) postAggParts2.push(childErrorClause2);
-    const postAggWhere2 = postAggParts2.length > 0 ? `WHERE ${postAggParts2.join(" AND ")}` : "";
-    const outerAlias2 = "outer_root";
-    const dataSql2 = `
+    if (prefilterClause) prefilterParts.push(prefilterClause.replace(/^WHERE\s+/i, ""));
+    const prefilterWhere = `WHERE ${prefilterParts.join(" AND ")}`;
+    const { clause: postAggClause, params: postAggParams } = buildWhereClause(postAgg);
+    const postAggParts = [];
+    if (postAggClause) postAggParts.push(postAggClause.replace(/^WHERE\s+/i, ""));
+    const childErrorClause = buildHasChildErrorClause(hasChildError, "root_spans");
+    if (childErrorClause) postAggParts.push(childErrorClause);
+    const postAggWhere = postAggParts.length > 0 ? `WHERE ${postAggParts.join(" AND ")}` : "";
+    const outerAlias = "outer_root";
+    const boundResult = await db.query(
+      `SELECT min(timestamp) as minTs FROM span_events AS ${outerAlias} ${prefilterWhere}`,
+      [afterCursorId, ...prefilterParams]
+    );
+    const minTs = boundResult[0]?.minTs ?? null;
+    if (minTs === null) {
+      return {
+        spans: [],
+        delta: { limit, hasMore: false },
+        deltaCursor: streamHeadCursor
+      };
+    }
+    const dataSql = `
       WITH candidate_roots AS (
         SELECT traceId, spanId, cursorId
-        FROM span_events AS ${outerAlias2}
-        ${prefilterWhere2}
+        FROM span_events AS ${outerAlias}
+        ${prefilterWhere}
       ),
       root_spans AS (
         SELECT reconstructed.*, candidate_roots.cursorId AS anchorCursorId
         FROM (
-          ${SPAN_RECONSTRUCT_SELECT}
-          WHERE (traceId, spanId) IN (SELECT traceId, spanId FROM candidate_roots)
-          GROUP BY traceId, spanId
+          ${reconstructForAnchorsWithBoundParam(SPAN_RECONSTRUCT_SELECT, "candidate_roots")}
         ) AS reconstructed
         INNER JOIN candidate_roots USING (traceId, spanId)
       )
-      SELECT * FROM root_spans ${postAggWhere2} ORDER BY anchorCursorId ASC LIMIT ?
+      SELECT * FROM root_spans ${postAggWhere} ORDER BY anchorCursorId ASC LIMIT ?
     `;
-    const rows2 = await db.query(dataSql2, [
+    const rows = await db.query(dataSql, [
       afterCursorId,
-      ...prefilterParams2,
-      ...postAggParams2,
+      ...prefilterParams,
+      minTs,
+      ...postAggParams,
       limit + 1
     ]);
-    const visibleRows = rows2.slice(0, limit).map((row) => ({
+    const visibleRows = rows.slice(0, limit).map((row) => ({
       cursorId: row.anchorCursorId,
       span: rowToSpanRecord(row)
     }));
     return {
       spans: toTraceSpans(visibleRows.map((row) => row.span)),
-      delta: { limit, hasMore: rows2.length > limit },
+      delta: { limit, hasMore: rows.length > limit },
       deltaCursor: visibleRows.length > 0 ? encodeDeltaCursor(visibleRows[visibleRows.length - 1]?.cursorId) : streamHeadCursor
     };
   }
-  const { prefilter, postAgg, hasChildError } = partitionAnchorFilters(filterRecord);
-  const { clause: prefilterClause, params: prefilterParams } = buildWhereClause(prefilter);
-  const prefilterParts = [`eventType = 'start'`, `parentSpanId IS NULL`];
-  if (prefilterClause) prefilterParts.push(prefilterClause.replace(/^WHERE\s+/i, ""));
-  const prefilterWhere = `WHERE ${prefilterParts.join(" AND ")}`;
-  const outerAlias = "outer_root";
-  const orderDir = orderBy.direction.toUpperCase();
-  if (orderDir !== "ASC" && orderDir !== "DESC") {
-    throw new Error(`Invalid sort direction: ${orderBy.direction}`);
-  }
   const currentDeltaCursor = deltaPollingFeatureEnabled() ? await getTraceDeltaCursor(db, filters) : void 0;
-  const canOrderInPrefilter = SAFE_PREFILTER_ORDER_FIELDS.has(orderBy.field);
-  const hasPostAggFilters = Object.keys(postAgg).length > 0 || hasChildError !== void 0 || !canOrderInPrefilter;
-  if (!hasPostAggFilters) {
-    const prefilterOrderBy = `ORDER BY timestamp ${orderDir}`;
-    const offset = page * perPage;
-    const countSql2 = `
-      SELECT COUNT(*) as total
-      FROM span_events AS ${outerAlias}
-      ${prefilterWhere}
-    `;
-    const countResult2 = await db.query(countSql2, prefilterParams);
-    const total2 = Number(countResult2[0]?.total ?? 0);
-    const pageSql = `
-      WITH page_roots AS (
-        SELECT traceId, spanId
-        FROM span_events AS ${outerAlias}
-        ${prefilterWhere}
-        ${prefilterOrderBy}
-        LIMIT ? OFFSET ?
-      )
-      ${SPAN_RECONSTRUCT_SELECT}
-      WHERE (traceId, spanId) IN (SELECT traceId, spanId FROM page_roots)
-      GROUP BY traceId, spanId
-      ${buildOrderByClause(orderBy)}
-    `;
-    const rows2 = await db.query(pageSql, [...prefilterParams, perPage, offset]);
-    const spans2 = rows2.map((row) => rowToSpanRecord(row));
-    return {
-      pagination: { total: total2, page, perPage, hasMore: (page + 1) * perPage < total2 },
-      spans: toTraceSpans(spans2),
-      ...deltaPollingFeatureEnabled() ? { deltaCursor: currentDeltaCursor } : {}
-    };
-  }
-  const { clause: postAggClause, params: postAggParams } = buildWhereClause(postAgg);
-  const postAggParts = [];
-  if (postAggClause) postAggParts.push(postAggClause.replace(/^WHERE\s+/i, ""));
-  const childErrorClause = buildHasChildErrorClause(hasChildError, "root_spans");
-  if (childErrorClause) postAggParts.push(childErrorClause);
-  const postAggWhere = postAggParts.length > 0 ? `WHERE ${postAggParts.join(" AND ")}` : "";
-  const cteSql = `
-    WITH candidate_roots AS (
-      SELECT traceId, spanId
-      FROM span_events AS ${outerAlias}
-      ${prefilterWhere}
-    ),
-    root_spans AS (
-      ${SPAN_RECONSTRUCT_SELECT}
-      WHERE (traceId, spanId) IN (SELECT traceId, spanId FROM candidate_roots)
-      GROUP BY traceId, spanId
-    )
-  `;
-  const orderByClause = buildOrderByClause(orderBy);
-  const { clause: paginationClause, params: paginationParams } = buildPaginationClause({ page, perPage });
-  const countSql = `
-    ${cteSql}
-    SELECT COUNT(*) as total FROM root_spans ${postAggWhere}
-  `;
-  const countResult = await db.query(countSql, [...prefilterParams, ...postAggParams]);
-  const total = Number(countResult[0]?.total ?? 0);
-  const dataSql = `
-    ${cteSql}
-    SELECT * FROM root_spans ${postAggWhere} ${orderByClause} ${paginationClause}
-  `;
-  const rows = await db.query(dataSql, [...prefilterParams, ...postAggParams, ...paginationParams]);
-  const spans = rows.map((row) => rowToSpanRecord(row));
+  const { pagination: resultPagination, spans } = await listTraceRows(
+    db,
+    { filters, pagination, orderBy },
+    SPAN_RECONSTRUCT_SELECT,
+    rowToSpanRecord,
+    toTraceSpans
+  );
   return {
-    pagination: { total, page, perPage, hasMore: (page + 1) * perPage < total },
-    spans: toTraceSpans(spans),
+    pagination: resultPagination,
+    spans,
     ...deltaPollingFeatureEnabled() ? { deltaCursor: currentDeltaCursor } : {}
   };
 }
@@ -3304,6 +3286,18 @@ async function listBranches(db, args) {
     const { clause: postAggClause2, params: postAggParams2 } = buildWhereClause(postAgg2);
     const postAggWhere2 = postAggClause2 ? postAggClause2 : "";
     const outerAlias2 = "outer_anchor";
+    const boundResult = await db.query(
+      `SELECT min(timestamp) as minTs FROM span_events AS ${outerAlias2} ${prefilterWhere2}`,
+      prefilterParams2
+    );
+    const minTs = boundResult[0]?.minTs ?? null;
+    if (minTs === null) {
+      return {
+        branches: [],
+        delta: { limit, hasMore: false },
+        deltaCursor: streamHeadCursor
+      };
+    }
     const dataSql2 = `
       WITH candidate_anchors AS (
         SELECT traceId, spanId, cursorId
@@ -3313,15 +3307,18 @@ async function listBranches(db, args) {
       branch_anchors AS (
         SELECT reconstructed.*, candidate_anchors.cursorId AS anchorCursorId
         FROM (
-          ${SPAN_RECONSTRUCT_SELECT}
-          WHERE (traceId, spanId) IN (SELECT traceId, spanId FROM candidate_anchors)
-          GROUP BY traceId, spanId
+          ${reconstructForAnchorsWithBoundParam(SPAN_RECONSTRUCT_SELECT, "candidate_anchors")}
         ) AS reconstructed
         INNER JOIN candidate_anchors USING (traceId, spanId)
       )
       SELECT * FROM branch_anchors ${postAggWhere2} ORDER BY anchorCursorId ASC LIMIT ?
     `;
-    const rows2 = await db.query(dataSql2, [...prefilterParams2, ...postAggParams2, limit + 1]);
+    const rows2 = await db.query(dataSql2, [
+      ...prefilterParams2,
+      minTs,
+      ...postAggParams2,
+      limit + 1
+    ]);
     const visibleRows = rows2.slice(0, limit).map((row) => ({
       cursorId: row.anchorCursorId,
       branch: rowToSpanRecord(row)
@@ -3374,15 +3371,13 @@ async function listBranches(db, args) {
     }
     const pageSql = `
       WITH page_anchors AS (
-        SELECT traceId, spanId
+        SELECT traceId, spanId, timestamp AS anchorStartedAt
         FROM span_events AS ${outerAlias}
         ${prefilterWhere}
         ${prefilterOrderBy}
         LIMIT ? OFFSET ?
       )
-      ${SPAN_RECONSTRUCT_SELECT}
-      WHERE (traceId, spanId) IN (SELECT traceId, spanId FROM page_anchors)
-      GROUP BY traceId, spanId
+      ${reconstructForAnchors(SPAN_RECONSTRUCT_SELECT, "page_anchors")}
       ${buildOrderByClause(orderBy)}
     `;
     const rows2 = await db.query(pageSql, [...prefilterParams, perPage, offset]);
@@ -3404,7 +3399,7 @@ async function listBranches(db, args) {
       ${prefilterWhere}
     ),
     branch_anchors AS (
-      ${SPAN_RECONSTRUCT_SELECT}
+      ${buildPostAggReconstructSelect(postAgg, orderBy.field)}
       WHERE (traceId, spanId) IN (SELECT traceId, spanId FROM candidate_anchors)
       GROUP BY traceId, spanId
     )
@@ -3423,8 +3418,13 @@ async function listBranches(db, args) {
     };
   }
   const dataSql = `
-    ${cteSql}
-    SELECT * FROM branch_anchors ${postAggWhere} ${orderByClause} ${paginationClause}
+    ${cteSql},
+    page_anchors AS (
+      SELECT traceId, spanId, startedAt AS anchorStartedAt
+      FROM branch_anchors ${postAggWhere} ${orderByClause} ${paginationClause}
+    )
+    ${reconstructForAnchors(SPAN_RECONSTRUCT_SELECT, "page_anchors")}
+    ${orderByClause}
   `;
   const rows = await db.query(dataSql, [...prefilterParams, ...postAggParams, ...paginationParams]);
   const spans = rows.map((row) => rowToSpanRecord(row));
@@ -3802,5 +3802,5 @@ var ObservabilityStorageDuckDB = class extends ObservabilityStorage {
 };
 
 export { ObservabilityStorageDuckDB };
-//# sourceMappingURL=observability-M35AJUGT.js.map
-//# sourceMappingURL=observability-M35AJUGT.js.map
+//# sourceMappingURL=observability-ZEJILRUN.js.map
+//# sourceMappingURL=observability-ZEJILRUN.js.map