@mastra/duckdb 1.1.0-alpha.1 → 1.1.0-alpha.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @mastra/duckdb
 
+## 1.1.0-alpha.2
+
+### Minor Changes
+
+- Updated DuckDB observability storage to support the current Mastra observability fields for logs, metrics, scores, and feedback. ([#14851](https://github.com/mastra-ai/mastra/pull/14851))
+
+  Scores and feedback stored in DuckDB now include the new correlation data used across Mastra observability.
+
+### Patch Changes
+
+- Updated dependencies [[`fbf22a7`](https://github.com/mastra-ai/mastra/commit/fbf22a7ad86bcb50dcf30459f0d075e51ddeb468), [`04160ee`](https://github.com/mastra-ai/mastra/commit/04160eedf3130003cf842ad08428c8ff69af4cc1), [`2c27503`](https://github.com/mastra-ai/mastra/commit/2c275032510d131d2cde47f99953abf0fe02c081), [`424a1df`](https://github.com/mastra-ai/mastra/commit/424a1df7bee59abb5c83717a54807fdd674a6224), [`12c88a6`](https://github.com/mastra-ai/mastra/commit/12c88a6e32bf982c2fe0c6af62e65a3414519a75), [`43595bf`](https://github.com/mastra-ai/mastra/commit/43595bf7b8df1a6edce7a23b445b5124d2a0b473), [`78670e9`](https://github.com/mastra-ai/mastra/commit/78670e97e76d7422cf7025faf371b2aeafed860d), [`d400e7c`](https://github.com/mastra-ai/mastra/commit/d400e7c8b8d7afa6ba2c71769eace4048e3cef8e), [`f58d1a7`](https://github.com/mastra-ai/mastra/commit/f58d1a7a457588a996c3ecb53201a68f3d28c432), [`a49a929`](https://github.com/mastra-ai/mastra/commit/a49a92904968b4fc67e01effee8c7c8d0464ba85)]:
+  - @mastra/core@1.18.0-alpha.4
+
 ## 1.1.0-alpha.1
 
 ### Minor Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-duckdb
 description: Documentation for @mastra/duckdb. Use when working with @mastra/duckdb APIs, configuration, or implementation.
 metadata:
   package: "@mastra/duckdb"
-  version: "1.1.0-alpha.1"
+  version: "1.1.0-alpha.2"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-alpha.1",
+  "version": "1.1.0-alpha.2",
   "package": "@mastra/duckdb",
   "exports": {
     "DuckDBConnection": {

package/dist/index.cjs

@@ -583,7 +583,7 @@ var ObservabilityStorageDuckDB = class extends storage.ObservabilityStorage {
       return null;
     }
     if (!this.loadPromise) {
-      this.loadPromise = import('./observability-W2QRBK56.cjs').then(({ ObservabilityStorageDuckDB: ObservabilityStorageDuckDB2 }) => {
+      this.loadPromise = import('./observability-AMG7NSKE.cjs').then(({ ObservabilityStorageDuckDB: ObservabilityStorageDuckDB2 }) => {
         const delegate = new ObservabilityStorageDuckDB2({ db: this.db });
         this.delegate = delegate;
         return delegate;

package/dist/index.js

@@ -582,7 +582,7 @@ var ObservabilityStorageDuckDB = class extends ObservabilityStorage {
       return null;
     }
     if (!this.loadPromise) {
-      this.loadPromise = import('./observability-PW6J27KS.js').then(({ ObservabilityStorageDuckDB: ObservabilityStorageDuckDB2 }) => {
+      this.loadPromise = import('./observability-X7G4VJKT.js').then(({ ObservabilityStorageDuckDB: ObservabilityStorageDuckDB2 }) => {
         const delegate = new ObservabilityStorageDuckDB2({ db: this.db });
         this.delegate = delegate;
         return delegate;

package/dist/{observability-W2QRBK56.cjs → observability-AMG7NSKE.cjs}

@@ -82,7 +82,7 @@ CREATE TABLE IF NOT EXISTS metric_events (
   threadId VARCHAR,
   requestId VARCHAR,
   environment VARCHAR,
-  source VARCHAR,
+  executionSource VARCHAR,
   serviceName VARCHAR,
 
   -- Metric-specific scalars
@@ -130,7 +130,7 @@ CREATE TABLE IF NOT EXISTS log_events (
   threadId VARCHAR,
   requestId VARCHAR,
   environment VARCHAR,
-  source VARCHAR,
+  executionSource VARCHAR,
   serviceName VARCHAR,
 
   -- Log-specific scalars
@@ -154,15 +154,41 @@ CREATE TABLE IF NOT EXISTS score_events (
   experimentId VARCHAR,
   scoreTraceId VARCHAR,
 
+  -- Entity hierarchy
+  entityType VARCHAR,
+  entityId VARCHAR,
+  entityName VARCHAR,
+  parentEntityType VARCHAR,
+  parentEntityId VARCHAR,
+  parentEntityName VARCHAR,
+  rootEntityType VARCHAR,
+  rootEntityId VARCHAR,
+  rootEntityName VARCHAR,
+
+  -- Context
+  userId VARCHAR,
+  organizationId VARCHAR,
+  resourceId VARCHAR,
+  runId VARCHAR,
+  sessionId VARCHAR,
+  threadId VARCHAR,
+  requestId VARCHAR,
+  environment VARCHAR,
+  executionSource VARCHAR,
+  serviceName VARCHAR,
+
   -- Score-specific scalars
   scorerId VARCHAR NOT NULL,
   scorerVersion VARCHAR,
   source VARCHAR,
+  scoreSource VARCHAR,
   score DOUBLE NOT NULL,
   reason VARCHAR,
 
   -- JSON fields
-  metadata JSON
+  tags JSON,
+  metadata JSON,
+  scope JSON
 )`;
 var FEEDBACK_EVENTS_DDL = `
 CREATE TABLE IF NOT EXISTS feedback_events (
@@ -173,19 +199,139 @@ CREATE TABLE IF NOT EXISTS feedback_events (
   traceId VARCHAR NOT NULL,
   spanId VARCHAR,
   experimentId VARCHAR,
+  -- Entity hierarchy
+  entityType VARCHAR,
+  entityId VARCHAR,
+  entityName VARCHAR,
+  parentEntityType VARCHAR,
+  parentEntityId VARCHAR,
+  parentEntityName VARCHAR,
+  rootEntityType VARCHAR,
+  rootEntityId VARCHAR,
+  rootEntityName VARCHAR,
+
+  -- Context
   userId VARCHAR,
+  organizationId VARCHAR,
+  resourceId VARCHAR,
+  runId VARCHAR,
+  sessionId VARCHAR,
+  threadId VARCHAR,
+  requestId VARCHAR,
+  environment VARCHAR,
+  executionSource VARCHAR,
+  serviceName VARCHAR,
+
+  -- Feedback actor / linkage
+  feedbackUserId VARCHAR,
   sourceId VARCHAR,
 
   -- Feedback-specific scalars
-  source VARCHAR NOT NULL,
+  source VARCHAR,
+  feedbackSource VARCHAR NOT NULL,
   feedbackType VARCHAR NOT NULL,
   value VARCHAR NOT NULL,
   comment VARCHAR,
 
   -- JSON fields
-  metadata JSON
+  tags JSON,
+  metadata JSON,
+  scope JSON
 )`;
 var ALL_DDL = [SPAN_EVENTS_DDL, METRIC_EVENTS_DDL, LOG_EVENTS_DDL, SCORE_EVENTS_DDL, FEEDBACK_EVENTS_DDL];
+var ALL_MIGRATIONS = [
+  // Metrics
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS experimentId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS parentEntityType VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS parentEntityId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS parentEntityName VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS rootEntityType VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS rootEntityId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS rootEntityName VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS userId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS organizationId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS resourceId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS runId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS sessionId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS threadId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS requestId VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS environment VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS executionSource VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS serviceName VARCHAR`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS costMetadata JSON`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS metadata JSON`,
+  `ALTER TABLE metric_events ADD COLUMN IF NOT EXISTS scope JSON`,
+  // Logs
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS experimentId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS parentEntityType VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS parentEntityId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS parentEntityName VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS rootEntityType VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS rootEntityId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS rootEntityName VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS userId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS organizationId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS resourceId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS runId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS sessionId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS threadId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS requestId VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS environment VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS executionSource VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS serviceName VARCHAR`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS tags JSON`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS metadata JSON`,
+  `ALTER TABLE log_events ADD COLUMN IF NOT EXISTS scope JSON`,
+  // Scores
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS entityType VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS entityId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS entityName VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS parentEntityType VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS parentEntityId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS parentEntityName VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS rootEntityType VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS rootEntityId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS rootEntityName VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS userId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS organizationId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS resourceId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS runId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS sessionId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS threadId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS requestId VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS environment VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS executionSource VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS serviceName VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS tags JSON`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS scope JSON`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS source VARCHAR`,
+  `ALTER TABLE score_events ADD COLUMN IF NOT EXISTS scoreSource VARCHAR`,
+  // Feedback
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS entityType VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS entityId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS entityName VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS parentEntityType VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS parentEntityId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS parentEntityName VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS rootEntityType VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS rootEntityId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS rootEntityName VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS organizationId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS resourceId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS runId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS sessionId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS threadId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS requestId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS environment VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS executionSource VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS serviceName VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS feedbackUserId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS sourceId VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS tags JSON`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS scope JSON`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS source VARCHAR`,
+  `ALTER TABLE feedback_events ADD COLUMN IF NOT EXISTS feedbackSource VARCHAR`
+];
 function unionDistinctQueries(selects, orderBy) {
   return `${selects.join("\nUNION\n")}
 ORDER BY ${orderBy}`;
@@ -292,7 +438,7 @@ function buildWhereClause(filters, fieldMappings) {
   const params = [];
   for (const [key, value] of Object.entries(filters)) {
     if (value === void 0 || value === null) continue;
-    const column = sanitizeColumn(key);
+    const column = sanitizeColumn(fieldMappings?.[key] ?? key);
     if (key === "timestamp" || key === "startedAt" || key === "endedAt") {
       const dateRange = value;
       if (dateRange.start) {
@@ -424,42 +570,99 @@ function parseJsonArray(value) {
 // src/storage/domains/observability/feedback.ts
 async function createFeedback(db, args) {
   const f = args.feedback;
+  const feedbackSource = f.feedbackSource ?? f.source ?? "";
+  const feedbackUserId = f.feedbackUserId ?? f.userId ?? null;
   await db.execute(
-    `INSERT INTO feedback_events (timestamp, traceId, spanId, experimentId, userId, sourceId, source, feedbackType, value, comment, metadata)
+    `INSERT INTO feedback_events (
+      timestamp, traceId, spanId, experimentId,
+      entityType, entityId, entityName, parentEntityType, parentEntityId, parentEntityName, rootEntityType, rootEntityId, rootEntityName,
+      userId, organizationId, resourceId, runId, sessionId, threadId, requestId, environment, executionSource, serviceName,
+      feedbackUserId, sourceId, feedbackSource, feedbackType, value, comment, tags, metadata, scope
+    )
      VALUES (${[
       v(f.timestamp),
       v(f.traceId),
       v(f.spanId ?? null),
       v(f.experimentId ?? null),
+      v(f.entityType ?? null),
+      v(f.entityId ?? null),
+      v(f.entityName ?? null),
+      v(f.parentEntityType ?? null),
+      v(f.parentEntityId ?? null),
+      v(f.parentEntityName ?? null),
+      v(f.rootEntityType ?? null),
+      v(f.rootEntityId ?? null),
+      v(f.rootEntityName ?? null),
       v(f.userId ?? null),
+      v(f.organizationId ?? null),
+      v(f.resourceId ?? null),
+      v(f.runId ?? null),
+      v(f.sessionId ?? null),
+      v(f.threadId ?? null),
+      v(f.requestId ?? null),
+      v(f.environment ?? null),
+      v(f.executionSource ?? null),
+      v(f.serviceName ?? null),
+      v(feedbackUserId),
       v(f.sourceId ?? null),
-      v(f.source),
+      v(feedbackSource),
       v(f.feedbackType),
       v(String(f.value)),
       v(f.comment ?? null),
-      jsonV(f.metadata)
+      jsonV(f.tags ?? null),
+      jsonV(f.metadata),
+      jsonV(f.scope ?? null)
     ].join(", ")})`
   );
 }
 async function batchCreateFeedback(db, args) {
   if (args.feedbacks.length === 0) return;
-  const tuples = args.feedbacks.map(
-    (f) => `(${[
-      v(f.timestamp),
-      v(f.traceId),
-      v(f.spanId ?? null),
-      v(f.experimentId ?? null),
-      v(f.userId ?? null),
-      v(f.sourceId ?? null),
-      v(f.source),
-      v(f.feedbackType),
-      v(String(f.value)),
-      v(f.comment ?? null),
-      jsonV(f.metadata)
-    ].join(", ")})`
-  );
+  const tuples = args.feedbacks.map((f) => {
+    const legacyFeedback = f;
+    const feedbackSource = legacyFeedback.feedbackSource ?? legacyFeedback.source ?? "";
+    const feedbackUserId = legacyFeedback.feedbackUserId ?? legacyFeedback.userId ?? null;
+    return `(${[
+      v(legacyFeedback.timestamp),
+      v(legacyFeedback.traceId),
+      v(legacyFeedback.spanId ?? null),
+      v(legacyFeedback.experimentId ?? null),
+      v(legacyFeedback.entityType ?? null),
+      v(legacyFeedback.entityId ?? null),
+      v(legacyFeedback.entityName ?? null),
+      v(legacyFeedback.parentEntityType ?? null),
+      v(legacyFeedback.parentEntityId ?? null),
+      v(legacyFeedback.parentEntityName ?? null),
+      v(legacyFeedback.rootEntityType ?? null),
+      v(legacyFeedback.rootEntityId ?? null),
+      v(legacyFeedback.rootEntityName ?? null),
+      v(legacyFeedback.userId ?? null),
+      v(legacyFeedback.organizationId ?? null),
+      v(legacyFeedback.resourceId ?? null),
+      v(legacyFeedback.runId ?? null),
+      v(legacyFeedback.sessionId ?? null),
+      v(legacyFeedback.threadId ?? null),
+      v(legacyFeedback.requestId ?? null),
+      v(legacyFeedback.environment ?? null),
+      v(legacyFeedback.executionSource ?? null),
+      v(legacyFeedback.serviceName ?? null),
+      v(feedbackUserId),
+      v(legacyFeedback.sourceId ?? null),
+      v(feedbackSource),
+      v(legacyFeedback.feedbackType),
+      v(String(legacyFeedback.value)),
+      v(legacyFeedback.comment ?? null),
+      jsonV(legacyFeedback.tags ?? null),
+      jsonV(legacyFeedback.metadata),
+      jsonV(legacyFeedback.scope ?? null)
+    ].join(", ")})`;
+  });
   await db.execute(
-    `INSERT INTO feedback_events (timestamp, traceId, spanId, experimentId, userId, sourceId, source, feedbackType, value, comment, metadata)
+    `INSERT INTO feedback_events (
+      timestamp, traceId, spanId, experimentId,
+      entityType, entityId, entityName, parentEntityType, parentEntityId, parentEntityName, rootEntityType, rootEntityId, rootEntityName,
+      userId, organizationId, resourceId, runId, sessionId, threadId, requestId, environment, executionSource, serviceName,
+      feedbackUserId, sourceId, feedbackSource, feedbackType, value, comment, tags, metadata, scope
+    )
      VALUES ${tuples.join(",\n       ")}`
   );
 }
@@ -468,7 +671,9 @@ async function listFeedback(db, args) {
   const page = Number(args.pagination?.page ?? 0);
   const perPage = Number(args.pagination?.perPage ?? 10);
   const orderBy = { field: args.orderBy?.field ?? "timestamp", direction: args.orderBy?.direction ?? "DESC" };
-  const { clause: filterClause, params: filterParams } = buildWhereClause(filters);
+  const { clause: filterClause, params: filterParams } = buildWhereClause(filters, {
+    source: "feedbackSource"
+  });
   const orderByClause = buildOrderByClause(orderBy);
   const { clause: paginationClause, params: paginationParams } = buildPaginationClause({ page, perPage });
   const countResult = await db.query(
@@ -491,13 +696,35 @@ async function listFeedback(db, args) {
       traceId: r.traceId,
       spanId: r.spanId ?? null,
       experimentId: r.experimentId ?? null,
+      entityType: r.entityType ?? null,
+      entityId: r.entityId ?? null,
+      entityName: r.entityName ?? null,
+      parentEntityType: r.parentEntityType ?? null,
+      parentEntityId: r.parentEntityId ?? null,
+      parentEntityName: r.parentEntityName ?? null,
+      rootEntityType: r.rootEntityType ?? null,
+      rootEntityId: r.rootEntityId ?? null,
+      rootEntityName: r.rootEntityName ?? null,
       userId: r.userId ?? null,
+      organizationId: r.organizationId ?? null,
+      resourceId: r.resourceId ?? null,
+      runId: r.runId ?? null,
+      sessionId: r.sessionId ?? null,
+      threadId: r.threadId ?? null,
+      requestId: r.requestId ?? null,
+      environment: r.environment ?? null,
+      executionSource: r.executionSource ?? null,
+      serviceName: r.serviceName ?? null,
+      feedbackUserId: r.feedbackUserId ?? null,
       sourceId: r.sourceId ?? null,
-      source: r.source,
+      source: r.feedbackSource,
+      feedbackSource: r.feedbackSource,
       feedbackType: r.feedbackType,
       value,
       comment: r.comment ?? null,
-      metadata: parseJson(r.metadata)
+      tags: parseJsonArray(r.tags),
+      metadata: parseJson(r.metadata),
+      scope: parseJson(r.scope)
     };
   });
   return {
@@ -531,7 +758,7 @@ var COLUMNS = [
   "threadId",
   "requestId",
   "environment",
-  "source",
+  "executionSource",
   "serviceName",
   "experimentId",
   "tags",
@@ -564,7 +791,7 @@ function rowToLogRecord(row) {
     threadId: row.threadId ?? null,
     requestId: row.requestId ?? null,
     environment: row.environment ?? null,
-    source: row.source ?? null,
+    executionSource: row.executionSource ?? null,
     serviceName: row.serviceName ?? null,
     experimentId: row.experimentId ?? null,
     tags: parseJsonArray(row.tags),
@@ -599,7 +826,7 @@ async function batchCreateLogs(db, args) {
       v(log.threadId ?? null),
       v(log.requestId ?? null),
       v(log.environment ?? null),
-      v(log.source ?? null),
+      v(log.executionSource ?? null),
       v(log.serviceName ?? null),
       v(log.experimentId ?? null),
       jsonV(log.tags),
@@ -696,7 +923,7 @@ var METRIC_COLUMNS = [
   "threadId",
   "requestId",
   "environment",
-  "source",
+  "executionSource",
   "serviceName",
   "experimentId",
   "provider",
@@ -796,7 +1023,7 @@ function rowToMetricRecord(row) {
     threadId: row.threadId ?? null,
     requestId: row.requestId ?? null,
     environment: row.environment ?? null,
-    source: row.source ?? null,
+    executionSource: row.executionSource ?? null,
     serviceName: row.serviceName ?? null,
     experimentId: row.experimentId ?? null,
     provider: row.provider ?? null,
@@ -836,7 +1063,7 @@ async function batchCreateMetrics(db, args) {
       v(m.threadId ?? null),
       v(m.requestId ?? null),
       v(m.environment ?? null),
-      v(m.source ?? null),
+      v(m.executionSource ?? null),
       v(m.serviceName ?? null),
       v(m.experimentId ?? null),
       v(m.provider ?? null),
@@ -1153,42 +1380,97 @@ async function getMetricLabelValues(db, args) {
 // src/storage/domains/observability/scores.ts
 async function createScore(db, args) {
   const s = args.score;
+  const scoreSource = s.scoreSource ?? s.source ?? null;
   await db.execute(
-    `INSERT INTO score_events (timestamp, traceId, spanId, scorerId, scorerVersion, source, score, reason, experimentId, scoreTraceId, metadata)
+    `INSERT INTO score_events (
+      timestamp, traceId, spanId, experimentId, scoreTraceId,
+      entityType, entityId, entityName, parentEntityType, parentEntityId, parentEntityName, rootEntityType, rootEntityId, rootEntityName,
+      userId, organizationId, resourceId, runId, sessionId, threadId, requestId, environment, executionSource, serviceName,
+      scorerId, scorerVersion, scoreSource, score, reason, tags, metadata, scope
+    )
      VALUES (${[
       v(s.timestamp),
       v(s.traceId),
       v(s.spanId ?? null),
+      v(s.experimentId ?? null),
+      v(s.scoreTraceId ?? null),
+      v(s.entityType ?? null),
+      v(s.entityId ?? null),
+      v(s.entityName ?? null),
+      v(s.parentEntityType ?? null),
+      v(s.parentEntityId ?? null),
+      v(s.parentEntityName ?? null),
+      v(s.rootEntityType ?? null),
+      v(s.rootEntityId ?? null),
+      v(s.rootEntityName ?? null),
+      v(s.userId ?? null),
+      v(s.organizationId ?? null),
+      v(s.resourceId ?? null),
+      v(s.runId ?? null),
+      v(s.sessionId ?? null),
+      v(s.threadId ?? null),
+      v(s.requestId ?? null),
+      v(s.environment ?? null),
+      v(s.executionSource ?? null),
+      v(s.serviceName ?? null),
       v(s.scorerId),
       v(s.scorerVersion ?? null),
-      v(s.source ?? null),
+      v(scoreSource),
       v(s.score),
       v(s.reason ?? null),
-      v(s.experimentId ?? null),
-      v(s.scoreTraceId ?? null),
-      jsonV(s.metadata)
+      jsonV(s.tags ?? null),
+      jsonV(s.metadata),
+      jsonV(s.scope ?? null)
     ].join(", ")})`
   );
 }
 async function batchCreateScores(db, args) {
   if (args.scores.length === 0) return;
-  const tuples = args.scores.map(
-    (s) => `(${[
-      v(s.timestamp),
-      v(s.traceId),
-      v(s.spanId ?? null),
-      v(s.scorerId),
-      v(s.scorerVersion ?? null),
-      v(s.source ?? null),
-      v(s.score),
-      v(s.reason ?? null),
-      v(s.experimentId ?? null),
-      v(s.scoreTraceId ?? null),
-      jsonV(s.metadata)
-    ].join(", ")})`
-  );
+  const tuples = args.scores.map((s) => {
+    const legacyScore = s;
+    const scoreSource = legacyScore.scoreSource ?? legacyScore.source ?? null;
+    return `(${[
+      v(legacyScore.timestamp),
+      v(legacyScore.traceId),
+      v(legacyScore.spanId ?? null),
+      v(legacyScore.experimentId ?? null),
+      v(legacyScore.scoreTraceId ?? null),
+      v(legacyScore.entityType ?? null),
+      v(legacyScore.entityId ?? null),
+      v(legacyScore.entityName ?? null),
+      v(legacyScore.parentEntityType ?? null),
+      v(legacyScore.parentEntityId ?? null),
+      v(legacyScore.parentEntityName ?? null),
+      v(legacyScore.rootEntityType ?? null),
+      v(legacyScore.rootEntityId ?? null),
+      v(legacyScore.rootEntityName ?? null),
+      v(legacyScore.userId ?? null),
+      v(legacyScore.organizationId ?? null),
+      v(legacyScore.resourceId ?? null),
+      v(legacyScore.runId ?? null),
+      v(legacyScore.sessionId ?? null),
+      v(legacyScore.threadId ?? null),
+      v(legacyScore.requestId ?? null),
+      v(legacyScore.environment ?? null),
+      v(legacyScore.executionSource ?? null),
+      v(legacyScore.serviceName ?? null),
+      v(legacyScore.scorerId),
+      v(legacyScore.scorerVersion ?? null),
+      v(scoreSource),
+      v(legacyScore.score),
+      v(legacyScore.reason ?? null),
+      jsonV(legacyScore.tags ?? null),
+      jsonV(legacyScore.metadata),
+      jsonV(legacyScore.scope ?? null)
+    ].join(", ")})`;
+  });
   await db.execute(
-    `INSERT INTO score_events (timestamp, traceId, spanId, scorerId, scorerVersion, source, score, reason, experimentId, scoreTraceId, metadata)
+    `INSERT INTO score_events (
+      timestamp, traceId, spanId, experimentId, scoreTraceId,
+      entityType, entityId, entityName, parentEntityType, parentEntityId, parentEntityName, rootEntityType, rootEntityId, rootEntityName,
+      userId, organizationId, resourceId, runId, sessionId, threadId, requestId, environment, executionSource, serviceName,
+      scorerId, scorerVersion, scoreSource, score, reason, tags, metadata, scope
+    )
      VALUES ${tuples.join(",\n       ")}`
   );
 }
@@ -1197,7 +1479,9 @@ async function listScores(db, args) {
   const page = Number(args.pagination?.page ?? 0);
   const perPage = Number(args.pagination?.perPage ?? 10);
   const orderBy = { field: args.orderBy?.field ?? "timestamp", direction: args.orderBy?.direction ?? "DESC" };
-  const { clause: filterClause, params: filterParams } = buildWhereClause(filters);
+  const { clause: filterClause, params: filterParams } = buildWhereClause(filters, {
+    source: "scoreSource"
+  });
   const orderByClause = buildOrderByClause(orderBy);
   const { clause: paginationClause, params: paginationParams } = buildPaginationClause({ page, perPage });
   const countResult = await db.query(
@@ -1215,14 +1499,36 @@ async function listScores(db, args) {
       timestamp: toDate(r.timestamp),
       traceId: r.traceId,
       spanId: r.spanId ?? null,
+      experimentId: r.experimentId ?? null,
+      scoreTraceId: r.scoreTraceId ?? null,
+      entityType: r.entityType ?? null,
+      entityId: r.entityId ?? null,
+      entityName: r.entityName ?? null,
+      parentEntityType: r.parentEntityType ?? null,
+      parentEntityId: r.parentEntityId ?? null,
+      parentEntityName: r.parentEntityName ?? null,
+      rootEntityType: r.rootEntityType ?? null,
+      rootEntityId: r.rootEntityId ?? null,
+      rootEntityName: r.rootEntityName ?? null,
+      userId: r.userId ?? null,
+      organizationId: r.organizationId ?? null,
+      resourceId: r.resourceId ?? null,
+      runId: r.runId ?? null,
+      sessionId: r.sessionId ?? null,
+      threadId: r.threadId ?? null,
+      requestId: r.requestId ?? null,
+      environment: r.environment ?? null,
+      executionSource: r.executionSource ?? null,
+      serviceName: r.serviceName ?? null,
       scorerId: r.scorerId,
       scorerVersion: r.scorerVersion ?? null,
-      source: r.source ?? null,
+      source: r.scoreSource ?? null,
+      scoreSource: r.scoreSource ?? null,
       score: Number(r.score),
       reason: r.reason ?? null,
-      experimentId: r.experimentId ?? null,
-      scoreTraceId: r.scoreTraceId ?? null,
-      metadata: parseJson(r.metadata)
+      tags: parseJsonArray(r.tags),
+      metadata: parseJson(r.metadata),
+      scope: parseJson(r.scope)
     };
   });
   return {
@@ -1563,6 +1869,9 @@ var ObservabilityStorageDuckDB = class extends storage.ObservabilityStorage {
     for (const ddl of ALL_DDL) {
       await this.db.execute(ddl);
     }
+    for (const migration of ALL_MIGRATIONS) {
+      await this.db.execute(migration);
+    }
   }
   /** Delete all rows from every observability table. Use with caution. */
   async dangerouslyClearAll() {
@@ -1673,5 +1982,5 @@ var ObservabilityStorageDuckDB = class extends storage.ObservabilityStorage {
 };
 
 exports.ObservabilityStorageDuckDB = ObservabilityStorageDuckDB;
-//# sourceMappingURL=observability-W2QRBK56.cjs.map
-//# sourceMappingURL=observability-W2QRBK56.cjs.map
+//# sourceMappingURL=observability-AMG7NSKE.cjs.map
+//# sourceMappingURL=observability-AMG7NSKE.cjs.map