@mastra/clickhouse 0.0.0-toolOptionTypes-20250917085558 → 0.0.0-top-level-fix-20251211111608

package/dist/index.cjs

@@ -4,6 +4,7 @@ var client = require('@clickhouse/client');
 var error = require('@mastra/core/error');
 var storage = require('@mastra/core/storage');
 var agent = require('@mastra/core/agent');
+var evals = require('@mastra/core/evals');
 
 // src/storage/index.ts
 var TABLE_ENGINES = {
@@ -11,11 +12,11 @@ var TABLE_ENGINES = {
   [storage.TABLE_WORKFLOW_SNAPSHOT]: `ReplacingMergeTree()`,
   [storage.TABLE_TRACES]: `MergeTree()`,
   [storage.TABLE_THREADS]: `ReplacingMergeTree()`,
-  [storage.TABLE_EVALS]: `MergeTree()`,
   [storage.TABLE_SCORERS]: `MergeTree()`,
   [storage.TABLE_RESOURCES]: `ReplacingMergeTree()`,
-  // TODO: verify this is the correct engine for ai spans when implementing clickhouse storage
-  [storage.TABLE_AI_SPANS]: `ReplacingMergeTree()`
+  // TODO: verify this is the correct engine for Spans when implementing clickhouse storage
+  [storage.TABLE_SPANS]: `ReplacingMergeTree()`,
+  mastra_agents: `ReplacingMergeTree()`
 };
 var COLUMN_TYPES = {
   text: "String",
@@ -46,8 +47,26 @@ function transformRows(rows) {
   return rows.map((row) => transformRow(row));
 }
 
-// src/storage/domains/legacy-evals/index.ts
-var LegacyEvalsStorageClickhouse = class extends storage.LegacyEvalsStorage {
+// src/storage/domains/memory/index.ts
+function serializeMetadata(metadata) {
+  if (!metadata || Object.keys(metadata).length === 0) {
+    return "{}";
+  }
+  return JSON.stringify(metadata);
+}
+function parseMetadata(metadata) {
+  if (!metadata) return {};
+  if (typeof metadata === "object") return metadata;
+  if (typeof metadata !== "string") return {};
+  const trimmed = metadata.trim();
+  if (trimmed === "" || trimmed === "null") return {};
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return {};
+  }
+}
+var MemoryStorageClickhouse = class extends storage.MemoryStorage {
   client;
   operations;
   constructor({ client, operations }) {
@@ -55,127 +74,128 @@ var LegacyEvalsStorageClickhouse = class extends storage.LegacyEvalsStorage {
     this.client = client;
     this.operations = operations;
   }
-  transformEvalRow(row) {
-    row = transformRow(row);
-    let resultValue;
-    try {
-      if (row.result && typeof row.result === "string" && row.result.trim() !== "") {
-        resultValue = JSON.parse(row.result);
-      } else if (typeof row.result === "object" && row.result !== null) {
-        resultValue = row.result;
-      } else if (row.result === null || row.result === void 0 || row.result === "") {
-        resultValue = { score: 0 };
-      } else {
-        throw new Error(`Invalid or empty result field: ${JSON.stringify(row.result)}`);
-      }
-    } catch (error$1) {
-      console.error("Error parsing result field:", row.result, error$1);
-      throw new error.MastraError({
-        id: "CLICKHOUSE_STORAGE_INVALID_RESULT_FORMAT",
-        text: `Invalid result format: ${JSON.stringify(row.result)}`,
-        domain: error.ErrorDomain.STORAGE,
-        category: error.ErrorCategory.USER
-      });
-    }
-    let testInfoValue;
-    try {
-      if (row.test_info && typeof row.test_info === "string" && row.test_info.trim() !== "" && row.test_info !== "null") {
-        testInfoValue = JSON.parse(row.test_info);
-      } else if (typeof row.test_info === "object" && row.test_info !== null) {
-        testInfoValue = row.test_info;
-      }
-    } catch {
-      testInfoValue = void 0;
-    }
-    if (!resultValue || typeof resultValue !== "object" || !("score" in resultValue)) {
-      throw new error.MastraError({
-        id: "CLICKHOUSE_STORAGE_INVALID_METRIC_FORMAT",
-        text: `Invalid MetricResult format: ${JSON.stringify(resultValue)}`,
-        domain: error.ErrorDomain.STORAGE,
-        category: error.ErrorCategory.USER
-      });
-    }
-    return {
-      input: row.input,
-      output: row.output,
-      result: resultValue,
-      agentName: row.agent_name,
-      metricName: row.metric_name,
-      instructions: row.instructions,
-      testInfo: testInfoValue,
-      globalRunId: row.global_run_id,
-      runId: row.run_id,
-      createdAt: row.created_at
-    };
-  }
-  async getEvalsByAgentName(agentName, type) {
+  async listMessagesById({ messageIds }) {
+    if (messageIds.length === 0) return { messages: [] };
     try {
-      const baseQuery = `SELECT *, toDateTime64(created_at, 3) as createdAt FROM ${storage.TABLE_EVALS} WHERE agent_name = {var_agent_name:String}`;
-      const typeCondition = type === "test" ? " AND test_info IS NOT NULL AND test_info != 'null' AND JSONExtractString(test_info, 'testPath') IS NOT NULL AND JSONExtractString(test_info, 'testPath') != ''" : type === "live" ? " AND (test_info IS NULL OR test_info = 'null' OR JSONExtractString(test_info, 'testPath') IS NULL OR JSONExtractString(test_info, 'testPath') = '')" : "";
       const result = await this.client.query({
-        query: `${baseQuery}${typeCondition} ORDER BY createdAt DESC`,
-        query_params: { var_agent_name: agentName },
+        query: `
+        SELECT 
+          id, 
+          content, 
+          role, 
+          type,
+          toDateTime64(createdAt, 3) as createdAt,
+          thread_id AS "threadId",
+          "resourceId"
+        FROM "${storage.TABLE_MESSAGES}"
+        WHERE id IN {messageIds:Array(String)}
+        ORDER BY "createdAt" DESC
+        `,
+        query_params: {
+          messageIds
+        },
         clickhouse_settings: {
+          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
           date_time_input_format: "best_effort",
           date_time_output_format: "iso",
           use_client_time_zone: 1,
           output_format_json_quote_64bit_integers: 0
         }
       });
-      if (!result) {
-        return [];
-      }
       const rows = await result.json();
-      return rows.data.map((row) => this.transformEvalRow(row));
+      const messages = transformRows(rows.data);
+      messages.forEach((message) => {
+        if (typeof message.content === "string") {
+          try {
+            message.content = JSON.parse(message.content);
+          } catch {
+          }
+        }
+      });
+      const list = new agent.MessageList().add(messages, "memory");
+      return { messages: list.get.all.db() };
     } catch (error$1) {
-      if (error$1?.message?.includes("no such table") || error$1?.message?.includes("does not exist")) {
-        return [];
-      }
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_EVALS_BY_AGENT_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: { agentName, type: type ?? null }
+          details: { messageIds: JSON.stringify(messageIds) }
         },
         error$1
       );
     }
   }
-  async getEvals(options = {}) {
-    const { agentName, type, page = 0, perPage = 100, dateRange } = options;
-    const fromDate = dateRange?.start;
-    const toDate = dateRange?.end;
-    const conditions = [];
-    if (agentName) {
-      conditions.push(`agent_name = {var_agent_name:String}`);
-    }
-    if (type === "test") {
-      conditions.push(
-        `(test_info IS NOT NULL AND test_info != 'null' AND JSONExtractString(test_info, 'testPath') IS NOT NULL AND JSONExtractString(test_info, 'testPath') != '')`
-      );
-    } else if (type === "live") {
-      conditions.push(
-        `(test_info IS NULL OR test_info = 'null' OR JSONExtractString(test_info, 'testPath') IS NULL OR JSONExtractString(test_info, 'testPath') = '')`
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const rawThreadIds = Array.isArray(threadId) ? threadId : [threadId];
+    const threadIds = rawThreadIds.filter((id) => id !== void 0 && id !== null).map((id) => (typeof id === "string" ? id : String(id)).trim()).filter((id) => id.length > 0);
+    if (page < 0) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_MESSAGES", "INVALID_PAGE"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
       );
     }
-    if (fromDate) {
-      conditions.push(`created_at >= parseDateTime64BestEffort({var_from_date:String})`);
-      fromDate.toISOString();
-    }
-    if (toDate) {
-      conditions.push(`created_at <= parseDateTime64BestEffort({var_to_date:String})`);
-      toDate.toISOString();
+    if (threadIds.length === 0) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_MESSAGES", "INVALID_THREAD_ID"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { threadId: Array.isArray(threadId) ? JSON.stringify(threadId) : String(threadId) }
+        },
+        new Error("threadId must be a non-empty string or array of non-empty strings")
+      );
     }
-    const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+    const perPageForQuery = storage.normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPageForQuery);
     try {
-      const countResult = await this.client.query({
-        query: `SELECT COUNT(*) as count FROM ${storage.TABLE_EVALS} ${whereClause}`,
-        query_params: {
-          ...agentName ? { var_agent_name: agentName } : {},
-          ...fromDate ? { var_from_date: fromDate.toISOString() } : {},
-          ...toDate ? { var_to_date: toDate.toISOString() } : {}
-        },
+      const threadCondition = threadIds.length === 1 ? `thread_id = {threadId0:String}` : `thread_id IN (${threadIds.map((_, i) => `{threadId${i}:String}`).join(", ")})`;
+      let dataQuery = `
+        SELECT 
+          id,
+          content,
+          role,
+          type,
+          toDateTime64(createdAt, 3) as createdAt,
+          thread_id AS "threadId",
+          resourceId
+        FROM ${storage.TABLE_MESSAGES}
+        WHERE ${threadCondition}
+      `;
+      const dataParams = {};
+      threadIds.forEach((tid, i) => {
+        dataParams[`threadId${i}`] = tid;
+      });
+      if (resourceId) {
+        dataQuery += ` AND resourceId = {resourceId:String}`;
+        dataParams.resourceId = resourceId;
+      }
+      if (filter?.dateRange?.start) {
+        const startDate = filter.dateRange.start instanceof Date ? filter.dateRange.start.toISOString() : new Date(filter.dateRange.start).toISOString();
+        dataQuery += ` AND createdAt >= parseDateTime64BestEffort({fromDate:String}, 3)`;
+        dataParams.fromDate = startDate;
+      }
+      if (filter?.dateRange?.end) {
+        const endDate = filter.dateRange.end instanceof Date ? filter.dateRange.end.toISOString() : new Date(filter.dateRange.end).toISOString();
+        dataQuery += ` AND createdAt <= parseDateTime64BestEffort({toDate:String}, 3)`;
+        dataParams.toDate = endDate;
+      }
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+      dataQuery += ` ORDER BY "${field}" ${direction}`;
+      if (perPageForResponse === false) ; else {
+        dataQuery += ` LIMIT {limit:Int64} OFFSET {offset:Int64}`;
+        dataParams.limit = perPageForQuery;
+        dataParams.offset = offset;
+      }
+      const result = await this.client.query({
+        query: dataQuery,
+        query_params: dataParams,
         clickhouse_settings: {
           date_time_input_format: "best_effort",
           date_time_output_format: "iso",
@@ -183,28 +203,31 @@ var LegacyEvalsStorageClickhouse = class extends storage.LegacyEvalsStorage {
           output_format_json_quote_64bit_integers: 0
         }
       });
-      const countData = await countResult.json();
-      const total = Number(countData.data?.[0]?.count ?? 0);
-      const currentOffset = page * perPage;
-      const hasMore = currentOffset + perPage < total;
-      if (total === 0) {
-        return {
-          evals: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
-        };
+      const rows = await result.json();
+      const paginatedMessages = transformRows(rows.data);
+      const paginatedCount = paginatedMessages.length;
+      let countQuery = `SELECT count() as total FROM ${storage.TABLE_MESSAGES} WHERE ${threadCondition}`;
+      const countParams = {};
+      threadIds.forEach((tid, i) => {
+        countParams[`threadId${i}`] = tid;
+      });
+      if (resourceId) {
+        countQuery += ` AND resourceId = {resourceId:String}`;
+        countParams.resourceId = resourceId;
       }
-      const dataResult = await this.client.query({
-        query: `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${storage.TABLE_EVALS} ${whereClause} ORDER BY created_at DESC LIMIT {var_limit:UInt32} OFFSET {var_offset:UInt32}`,
-        query_params: {
-          ...agentName ? { var_agent_name: agentName } : {},
-          ...fromDate ? { var_from_date: fromDate.toISOString() } : {},
-          ...toDate ? { var_to_date: toDate.toISOString() } : {},
-          var_limit: perPage || 100,
-          var_offset: currentOffset || 0
-        },
+      if (filter?.dateRange?.start) {
+        const startDate = filter.dateRange.start instanceof Date ? filter.dateRange.start.toISOString() : new Date(filter.dateRange.start).toISOString();
+        countQuery += ` AND createdAt >= parseDateTime64BestEffort({fromDate:String}, 3)`;
+        countParams.fromDate = startDate;
+      }
+      if (filter?.dateRange?.end) {
+        const endDate = filter.dateRange.end instanceof Date ? filter.dateRange.end.toISOString() : new Date(filter.dateRange.end).toISOString();
+        countQuery += ` AND createdAt <= parseDateTime64BestEffort({toDate:String}, 3)`;
+        countParams.toDate = endDate;
+      }
+      const countResult = await this.client.query({
+        query: countQuery,
+        query_params: countParams,
         clickhouse_settings: {
           date_time_input_format: "best_effort",
           date_time_output_format: "iso",
@@ -212,62 +235,39 @@ var LegacyEvalsStorageClickhouse = class extends storage.LegacyEvalsStorage {
           output_format_json_quote_64bit_integers: 0
         }
       });
-      const rows = await dataResult.json();
-      return {
-        evals: rows.data.map((row) => this.transformEvalRow(row)),
-        total,
-        page,
-        perPage,
-        hasMore
-      };
-    } catch (error$1) {
-      if (error$1?.message?.includes("no such table") || error$1?.message?.includes("does not exist")) {
+      const countData = await countResult.json();
+      const total = countData.data[0].total;
+      if (total === 0 && paginatedCount === 0 && (!include || include.length === 0)) {
         return {
-          evals: [],
+          messages: [],
           total: 0,
           page,
-          perPage,
+          perPage: perPageForResponse,
           hasMore: false
         };
       }
-      throw new error.MastraError(
-        {
-          id: "CLICKHOUSE_STORAGE_GET_EVALS_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { agentName: agentName ?? "all", type: type ?? "all" }
-        },
-        error$1
-      );
-    }
-  }
-};
-var MemoryStorageClickhouse = class extends storage.MemoryStorage {
-  client;
-  operations;
-  constructor({ client, operations }) {
-    super();
-    this.client = client;
-    this.operations = operations;
-  }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      const messages = [];
-      const limit = storage.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
-      const include = selectBy?.include || [];
-      if (include.length) {
+      const messageIds = new Set(paginatedMessages.map((m) => m.id));
+      let includeMessages = [];
+      if (include && include.length > 0) {
+        const includesNeedingThread = include.filter((inc) => !inc.threadId);
+        const threadByMessageId = /* @__PURE__ */ new Map();
+        if (includesNeedingThread.length > 0) {
+          const { messages: includeLookup } = await this.listMessagesById({
+            messageIds: includesNeedingThread.map((inc) => inc.id)
+          });
+          for (const msg of includeLookup) {
+            if (msg.threadId) {
+              threadByMessageId.set(msg.id, msg.threadId);
+            }
+          }
+        }
         const unionQueries = [];
         const params = [];
         let paramIdx = 1;
         for (const inc of include) {
           const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-          const searchId = inc.threadId || threadId;
+          const searchThreadId = inc.threadId ?? threadByMessageId.get(id);
+          if (!searchThreadId) continue;
           unionQueries.push(`
             SELECT * FROM (
               WITH numbered_messages AS (
@@ -282,155 +282,97 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
                 FROM numbered_messages
                 WHERE id = {var_include_id_${paramIdx}:String}
               )
-              SELECT DISTINCT m.id, m.content, m.role, m.type, m."createdAt", m.thread_id AS "threadId"
+              SELECT DISTINCT m.id, m.content, m.role, m.type, m."createdAt", m.thread_id AS "threadId", m."resourceId"
               FROM numbered_messages m
               CROSS JOIN target_positions t
               WHERE m.row_num BETWEEN (t.target_pos - {var_withPreviousMessages_${paramIdx}:Int64}) AND (t.target_pos + {var_withNextMessages_${paramIdx}:Int64})
             ) AS query_${paramIdx}
           `);
           params.push(
-            { [`var_thread_id_${paramIdx}`]: searchId },
+            { [`var_thread_id_${paramIdx}`]: searchThreadId },
             { [`var_include_id_${paramIdx}`]: id },
             { [`var_withPreviousMessages_${paramIdx}`]: withPreviousMessages },
             { [`var_withNextMessages_${paramIdx}`]: withNextMessages }
           );
           paramIdx++;
         }
-        const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" DESC';
-        const mergedParams = params.reduce((acc, paramObj) => ({ ...acc, ...paramObj }), {});
-        const includeResult = await this.client.query({
-          query: finalQuery,
-          query_params: mergedParams,
-          clickhouse_settings: {
-            date_time_input_format: "best_effort",
-            date_time_output_format: "iso",
-            use_client_time_zone: 1,
-            output_format_json_quote_64bit_integers: 0
+        if (unionQueries.length > 0) {
+          const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" ASC';
+          const mergedParams = params.reduce((acc, paramObj) => ({ ...acc, ...paramObj }), {});
+          const includeResult = await this.client.query({
+            query: finalQuery,
+            query_params: mergedParams,
+            clickhouse_settings: {
+              date_time_input_format: "best_effort",
+              date_time_output_format: "iso",
+              use_client_time_zone: 1,
+              output_format_json_quote_64bit_integers: 0
+            }
+          });
+          const includeRows = await includeResult.json();
+          includeMessages = transformRows(includeRows.data);
+          for (const includeMsg of includeMessages) {
+            if (!messageIds.has(includeMsg.id)) {
+              paginatedMessages.push(includeMsg);
+              messageIds.add(includeMsg.id);
+            }
           }
-        });
-        const rows2 = await includeResult.json();
-        const includedMessages = transformRows(rows2.data);
-        const seen = /* @__PURE__ */ new Set();
-        const dedupedMessages = includedMessages.filter((message) => {
-          if (seen.has(message.id)) return false;
-          seen.add(message.id);
-          return true;
-        });
-        messages.push(...dedupedMessages);
+        }
       }
-      const result = await this.client.query({
-        query: `
-        SELECT 
-            id, 
-            content, 
-            role, 
-            type,
-            toDateTime64(createdAt, 3) as createdAt,
-            thread_id AS "threadId"
-        FROM "${storage.TABLE_MESSAGES}"
-        WHERE thread_id = {threadId:String}
-        AND id NOT IN ({exclude:Array(String)})
-        ORDER BY "createdAt" DESC
-        LIMIT {limit:Int64}
-        `,
-        query_params: {
-          threadId,
-          exclude: messages.map((m) => m.id),
-          limit
-        },
-        clickhouse_settings: {
-          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
-          date_time_input_format: "best_effort",
-          date_time_output_format: "iso",
-          use_client_time_zone: 1,
-          output_format_json_quote_64bit_integers: 0
+      const list = new agent.MessageList().add(paginatedMessages, "memory");
+      let finalMessages = list.get.all.db();
+      finalMessages = finalMessages.sort((a, b) => {
+        const isDateField = field === "createdAt" || field === "updatedAt";
+        const aValue = isDateField ? new Date(a[field]).getTime() : a[field];
+        const bValue = isDateField ? new Date(b[field]).getTime() : b[field];
+        if (aValue === bValue) {
+          return a.id.localeCompare(b.id);
         }
-      });
-      const rows = await result.json();
-      messages.push(...transformRows(rows.data));
-      messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
-      messages.forEach((message) => {
-        if (typeof message.content === "string") {
-          try {
-            message.content = JSON.parse(message.content);
-          } catch {
-          }
+        if (typeof aValue === "number" && typeof bValue === "number") {
+          return direction === "ASC" ? aValue - bValue : bValue - aValue;
         }
+        return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
       });
-      const list = new agent.MessageList({ threadId, resourceId }).add(messages, "memory");
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLICKHOUSE_STORAGE_GET_MESSAGES_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { threadId, resourceId: resourceId ?? "" }
-        },
-        error$1
+      const threadIdSet = new Set(threadIds);
+      const returnedThreadMessageIds = new Set(
+        finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
       );
-    }
-  }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    if (messageIds.length === 0) return [];
-    try {
-      const result = await this.client.query({
-        query: `
-        SELECT 
-          id, 
-          content, 
-          role, 
-          type,
-          toDateTime64(createdAt, 3) as createdAt,
-          thread_id AS "threadId",
-          "resourceId"
-        FROM "${storage.TABLE_MESSAGES}"
-        WHERE id IN {messageIds:Array(String)}
-        ORDER BY "createdAt" DESC
-        `,
-        query_params: {
-          messageIds
-        },
-        clickhouse_settings: {
-          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
-          date_time_input_format: "best_effort",
-          date_time_output_format: "iso",
-          use_client_time_zone: 1,
-          output_format_json_quote_64bit_integers: 0
-        }
-      });
-      const rows = await result.json();
-      const messages = transformRows(rows.data);
-      messages.forEach((message) => {
-        if (typeof message.content === "string") {
-          try {
-            message.content = JSON.parse(message.content);
-          } catch {
-          }
-        }
-      });
-      const list = new agent.MessageList().add(messages, "memory");
-      if (format === `v1`) return list.get.all.v1();
-      return list.get.all.v2();
+      const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
+      const hasMore = perPageForResponse === false ? false : allThreadMessagesReturned ? false : offset + paginatedCount < total;
+      return {
+        messages: finalMessages,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore
+      };
     } catch (error$1) {
-      throw new error.MastraError(
+      const mastraError = new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_MESSAGES_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: { messageIds: JSON.stringify(messageIds) }
+          details: {
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+            resourceId: resourceId ?? ""
+          }
         },
         error$1
       );
+      this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
     }
   }
   async saveMessages(args) {
-    const { messages, format = "v1" } = args;
-    if (messages.length === 0) return messages;
+    const { messages } = args;
+    if (messages.length === 0) return { messages };
     for (const message of messages) {
       const resourceId = message.resourceId;
       if (!resourceId) {
@@ -554,7 +496,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
             id: thread.id,
             resourceId: thread.resourceId,
             title: thread.title,
-            metadata: thread.metadata,
+            metadata: serializeMetadata(thread.metadata),
             createdAt: thread.createdAt,
             updatedAt: (/* @__PURE__ */ new Date()).toISOString()
           })),
@@ -566,12 +508,11 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
         })
       ]);
       const list = new agent.MessageList().add(messages, "memory");
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
+      return { messages: list.get.all.db() };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_SAVE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "SAVE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -590,8 +531,9 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
           toDateTime64(createdAt, 3) as createdAt,
           toDateTime64(updatedAt, 3) as updatedAt
         FROM "${storage.TABLE_THREADS}"
-        FINAL
-        WHERE id = {var_id:String}`,
+        WHERE id = {var_id:String}
+        ORDER BY updatedAt DESC
+        LIMIT 1`,
         query_params: { var_id: threadId },
         clickhouse_settings: {
           // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
@@ -608,14 +550,14 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
       }
       return {
         ...thread,
-        metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
+        metadata: parseMetadata(thread.metadata),
         createdAt: thread.createdAt,
         updatedAt: thread.updatedAt
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_THREAD_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "GET_THREAD_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { threadId }
@@ -624,47 +566,6 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
       );
     }
   }
-  async getThreadsByResourceId({ resourceId }) {
-    try {
-      const result = await this.client.query({
-        query: `SELECT 
-          id,
-          "resourceId",
-          title,
-          metadata,
-          toDateTime64(createdAt, 3) as createdAt,
-          toDateTime64(updatedAt, 3) as updatedAt
-        FROM "${storage.TABLE_THREADS}"
-        WHERE "resourceId" = {var_resourceId:String}`,
-        query_params: { var_resourceId: resourceId },
-        clickhouse_settings: {
-          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
-          date_time_input_format: "best_effort",
-          date_time_output_format: "iso",
-          use_client_time_zone: 1,
-          output_format_json_quote_64bit_integers: 0
-        }
-      });
-      const rows = await result.json();
-      const threads = transformRows(rows.data);
-      return threads.map((thread) => ({
-        ...thread,
-        metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
-        createdAt: thread.createdAt,
-        updatedAt: thread.updatedAt
-      }));
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLICKHOUSE_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { resourceId }
-        },
-        error$1
-      );
-    }
-  }
   async saveThread({ thread }) {
     try {
       await this.client.insert({
@@ -672,6 +573,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
         values: [
           {
             ...thread,
+            metadata: serializeMetadata(thread.metadata),
             createdAt: thread.createdAt.toISOString(),
             updatedAt: thread.updatedAt.toISOString()
           }
@@ -688,7 +590,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_SAVE_THREAD_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "SAVE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { threadId: thread.id }
@@ -725,7 +627,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
             id: updatedThread.id,
             resourceId: updatedThread.resourceId,
             title: updatedThread.title,
-            metadata: updatedThread.metadata,
+            metadata: serializeMetadata(updatedThread.metadata),
             createdAt: updatedThread.createdAt,
             updatedAt: updatedThread.updatedAt.toISOString()
           }
@@ -740,7 +642,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_UPDATE_THREAD_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "UPDATE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { threadId: id, title }
@@ -761,177 +663,42 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
       await this.client.command({
         query: `DELETE FROM "${storage.TABLE_THREADS}" WHERE id = {var_id:String};`,
         query_params: { var_id: threadId },
-        clickhouse_settings: {
-          output_format_json_quote_64bit_integers: 0
-        }
-      });
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLICKHOUSE_STORAGE_DELETE_THREAD_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { threadId }
-        },
-        error$1
-      );
-    }
-  }
-  async getThreadsByResourceIdPaginated(args) {
-    const { resourceId, page = 0, perPage = 100 } = args;
-    try {
-      const currentOffset = page * perPage;
-      const countResult = await this.client.query({
-        query: `SELECT count() as total FROM ${storage.TABLE_THREADS} WHERE resourceId = {resourceId:String}`,
-        query_params: { resourceId },
-        clickhouse_settings: {
-          date_time_input_format: "best_effort",
-          date_time_output_format: "iso",
-          use_client_time_zone: 1,
-          output_format_json_quote_64bit_integers: 0
-        }
-      });
-      const countData = await countResult.json();
-      const total = countData.data[0].total;
-      if (total === 0) {
-        return {
-          threads: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
-        };
-      }
-      const dataResult = await this.client.query({
-        query: `
-              SELECT 
-                id,
-                resourceId,
-                title,
-                metadata,
-                toDateTime64(createdAt, 3) as createdAt,
-                toDateTime64(updatedAt, 3) as updatedAt
-              FROM ${storage.TABLE_THREADS}
-              WHERE resourceId = {resourceId:String}
-              ORDER BY createdAt DESC
-              LIMIT {limit:Int64} OFFSET {offset:Int64}
-            `,
-        query_params: {
-          resourceId,
-          limit: perPage,
-          offset: currentOffset
-        },
-        clickhouse_settings: {
-          date_time_input_format: "best_effort",
-          date_time_output_format: "iso",
-          use_client_time_zone: 1,
-          output_format_json_quote_64bit_integers: 0
-        }
-      });
-      const rows = await dataResult.json();
-      const threads = transformRows(rows.data);
-      return {
-        threads,
-        total,
-        page,
-        perPage,
-        hasMore: currentOffset + threads.length < total
-      };
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLICKHOUSE_STORAGE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { resourceId, page }
-        },
-        error$1
-      );
-    }
-  }
-  async getMessagesPaginated(args) {
-    const { threadId, resourceId, selectBy, format = "v1" } = args;
-    const page = selectBy?.pagination?.page || 0;
-    const perPageInput = selectBy?.pagination?.perPage;
-    const perPage = perPageInput !== void 0 ? perPageInput : storage.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 20 });
-    try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      const offset = page * perPage;
-      const dateRange = selectBy?.pagination?.dateRange;
-      const fromDate = dateRange?.start;
-      const toDate = dateRange?.end;
-      const messages = [];
-      if (selectBy?.include?.length) {
-        const include = selectBy.include;
-        const unionQueries = [];
-        const params = [];
-        let paramIdx = 1;
-        for (const inc of include) {
-          const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-          const searchId = inc.threadId || threadId;
-          unionQueries.push(`
-                SELECT * FROM (
-                  WITH numbered_messages AS (
-                    SELECT
-                      id, content, role, type, "createdAt", thread_id, "resourceId",
-                      ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
-                    FROM "${storage.TABLE_MESSAGES}"
-                    WHERE thread_id = {var_thread_id_${paramIdx}:String}
-                  ),
-                  target_positions AS (
-                    SELECT row_num as target_pos
-                    FROM numbered_messages
-                    WHERE id = {var_include_id_${paramIdx}:String}
-                  )
-                  SELECT DISTINCT m.id, m.content, m.role, m.type, m."createdAt", m.thread_id AS "threadId"
-                  FROM numbered_messages m
-                  CROSS JOIN target_positions t
-                  WHERE m.row_num BETWEEN (t.target_pos - {var_withPreviousMessages_${paramIdx}:Int64}) AND (t.target_pos + {var_withNextMessages_${paramIdx}:Int64})
-                ) AS query_${paramIdx}
-              `);
-          params.push(
-            { [`var_thread_id_${paramIdx}`]: searchId },
-            { [`var_include_id_${paramIdx}`]: id },
-            { [`var_withPreviousMessages_${paramIdx}`]: withPreviousMessages },
-            { [`var_withNextMessages_${paramIdx}`]: withNextMessages }
-          );
-          paramIdx++;
-        }
-        const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" DESC';
-        const mergedParams = params.reduce((acc, paramObj) => ({ ...acc, ...paramObj }), {});
-        const includeResult = await this.client.query({
-          query: finalQuery,
-          query_params: mergedParams,
-          clickhouse_settings: {
-            date_time_input_format: "best_effort",
-            date_time_output_format: "iso",
-            use_client_time_zone: 1,
-            output_format_json_quote_64bit_integers: 0
-          }
-        });
-        const rows2 = await includeResult.json();
-        const includedMessages = transformRows(rows2.data);
-        const seen = /* @__PURE__ */ new Set();
-        const dedupedMessages = includedMessages.filter((message) => {
-          if (seen.has(message.id)) return false;
-          seen.add(message.id);
-          return true;
-        });
-        messages.push(...dedupedMessages);
-      }
-      let countQuery = `SELECT count() as total FROM ${storage.TABLE_MESSAGES} WHERE thread_id = {threadId:String}`;
-      const countParams = { threadId };
-      if (fromDate) {
-        countQuery += ` AND createdAt >= parseDateTime64BestEffort({fromDate:String}, 3)`;
-        countParams.fromDate = fromDate.toISOString();
-      }
-      if (toDate) {
-        countQuery += ` AND createdAt <= parseDateTime64BestEffort({toDate:String}, 3)`;
-        countParams.toDate = toDate.toISOString();
-      }
+        clickhouse_settings: {
+          output_format_json_quote_64bit_integers: 0
+        }
+      });
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLICKHOUSE", "DELETE_THREAD", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        error$1
+      );
+    }
+  }
+  async listThreadsByResourceId(args) {
+    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+    const perPage = storage.normalizePerPage(perPageInput, 100);
+    if (page < 0) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
+      );
+    }
+    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+    const { field, direction } = this.parseOrderBy(orderBy);
+    try {
       const countResult = await this.client.query({
-        query: countQuery,
-        query_params: countParams,
+        query: `SELECT count(DISTINCT id) as total FROM ${storage.TABLE_THREADS} WHERE resourceId = {resourceId:String}`,
+        query_params: { resourceId },
         clickhouse_settings: {
           date_time_input_format: "best_effort",
           date_time_output_format: "iso",
@@ -941,58 +708,46 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
       });
       const countData = await countResult.json();
       const total = countData.data[0].total;
-      if (total === 0 && messages.length === 0) {
+      if (total === 0) {
         return {
-          messages: [],
+          threads: [],
           total: 0,
           page,
-          perPage,
+          perPage: perPageForResponse,
           hasMore: false
         };
       }
-      const excludeIds = messages.map((m) => m.id);
-      let dataQuery = `
-            SELECT 
-              id,
-              content,
-              role,
-              type,
-              toDateTime64(createdAt, 3) as createdAt,
-              thread_id AS "threadId",
-              resourceId
-            FROM ${storage.TABLE_MESSAGES}
-            WHERE thread_id = {threadId:String}
-          `;
-      const dataParams = { threadId };
-      if (fromDate) {
-        dataQuery += ` AND createdAt >= parseDateTime64BestEffort({fromDate:String}, 3)`;
-        dataParams.fromDate = fromDate.toISOString();
-      }
-      if (toDate) {
-        dataQuery += ` AND createdAt <= parseDateTime64BestEffort({toDate:String}, 3)`;
-        dataParams.toDate = toDate.toISOString();
-      }
-      if (excludeIds.length > 0) {
-        dataQuery += ` AND id NOT IN ({excludeIds:Array(String)})`;
-        dataParams.excludeIds = excludeIds;
-      }
-      if (selectBy?.last) {
-        dataQuery += `
-              ORDER BY createdAt DESC
-              LIMIT {limit:Int64}
-            `;
-        dataParams.limit = perPage;
-      } else {
-        dataQuery += `
-              ORDER BY createdAt ASC
-              LIMIT {limit:Int64} OFFSET {offset:Int64}
-            `;
-        dataParams.limit = perPage;
-        dataParams.offset = offset;
-      }
-      const result = await this.client.query({
-        query: dataQuery,
-        query_params: dataParams,
+      const dataResult = await this.client.query({
+        query: `
+              WITH ranked_threads AS (
+                SELECT
+                  id,
+                  resourceId,
+                  title,
+                  metadata,
+                  toDateTime64(createdAt, 3) as createdAt,
+                  toDateTime64(updatedAt, 3) as updatedAt,
+                  ROW_NUMBER() OVER (PARTITION BY id ORDER BY updatedAt DESC) as row_num
+                FROM ${storage.TABLE_THREADS}
+                WHERE resourceId = {resourceId:String}
+              )
+              SELECT
+                id,
+                resourceId,
+                title,
+                metadata,
+                createdAt,
+                updatedAt
+              FROM ranked_threads
+              WHERE row_num = 1
+              ORDER BY "${field}" ${direction === "DESC" ? "DESC" : "ASC"}
+              LIMIT {perPage:Int64} OFFSET {offset:Int64}
+            `,
+        query_params: {
+          resourceId,
+          perPage,
+          offset
+        },
         clickhouse_settings: {
           date_time_input_format: "best_effort",
           date_time_output_format: "iso",
@@ -1000,35 +755,28 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
           output_format_json_quote_64bit_integers: 0
         }
       });
-      const rows = await result.json();
-      const paginatedMessages = transformRows(rows.data);
-      messages.push(...paginatedMessages);
-      if (selectBy?.last) {
-        messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
-      }
+      const rows = await dataResult.json();
+      const threads = transformRows(rows.data).map((thread) => ({
+        ...thread,
+        metadata: parseMetadata(thread.metadata)
+      }));
       return {
-        messages: format === "v2" ? messages : messages,
+        threads,
         total,
         page,
-        perPage,
+        perPage: perPageForResponse,
         hasMore: offset + perPage < total
       };
     } catch (error$1) {
-      const mastraError = new error.MastraError(
+      throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_MESSAGES_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: {
-            threadId,
-            resourceId: resourceId ?? ""
-          }
+          details: { resourceId, page }
         },
         error$1
       );
-      this.logger?.trackException?.(mastraError);
-      this.logger?.error?.(mastraError.toString());
-      return { messages: [], total: 0, page, perPage: perPageInput || 40, hasMore: false };
     }
   }
   async updateMessages(args) {
@@ -1111,7 +859,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
                 UPDATE ${setClauses.join(", ")}
                 WHERE id = {var_id_${paramIdx}:String}
               `;
-          console.log("Updating message:", id, "with query:", updateQuery, "values:", values);
+          console.info("Updating message:", id, "with query:", updateQuery, "values:", values);
           updatePromises.push(
             this.client.command({
               query: updateQuery,
@@ -1170,7 +918,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
               }
             }
             if (needsRetry) {
-              console.log("Update not applied correctly, retrying with DELETE + INSERT for message:", id);
+              console.info("Update not applied correctly, retrying with DELETE + INSERT for message:", id);
               await this.client.command({
                 query: `DELETE FROM ${storage.TABLE_MESSAGES} WHERE id = {messageId:String}`,
                 query_params: { messageId: id },
@@ -1228,7 +976,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
         const now = (/* @__PURE__ */ new Date()).toISOString().replace("Z", "");
         const threadUpdatePromises = Array.from(threadIdsToUpdate).map(async (threadId) => {
           const threadResult = await this.client.query({
-            query: `SELECT id, resourceId, title, metadata, createdAt FROM ${storage.TABLE_THREADS} WHERE id = {threadId:String}`,
+            query: `SELECT id, resourceId, title, metadata, createdAt FROM ${storage.TABLE_THREADS} WHERE id = {threadId:String} ORDER BY updatedAt DESC LIMIT 1`,
             query_params: { threadId },
             clickhouse_settings: {
               date_time_input_format: "best_effort",
@@ -1257,7 +1005,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
                   id: existingThread.id,
                   resourceId: existingThread.resourceId,
                   title: existingThread.title,
-                  metadata: existingThread.metadata,
+                  metadata: typeof existingThread.metadata === "string" ? existingThread.metadata : serializeMetadata(existingThread.metadata),
                   createdAt: existingThread.createdAt,
                   updatedAt: now
                 }
@@ -1304,7 +1052,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_UPDATE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "UPDATE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { messageIds: messages.map((m) => m.id).join(",") }
@@ -1316,7 +1064,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
   async getResourceById({ resourceId }) {
     try {
       const result = await this.client.query({
-        query: `SELECT id, workingMemory, metadata, createdAt, updatedAt FROM ${storage.TABLE_RESOURCES} WHERE id = {resourceId:String}`,
+        query: `SELECT id, workingMemory, metadata, createdAt, updatedAt FROM ${storage.TABLE_RESOURCES} WHERE id = {resourceId:String} ORDER BY updatedAt DESC LIMIT 1`,
         query_params: { resourceId },
         clickhouse_settings: {
           date_time_input_format: "best_effort",
@@ -1340,7 +1088,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_RESOURCE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "GET_RESOURCE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { resourceId }
@@ -1373,7 +1121,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_SAVE_RESOURCE_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "SAVE_RESOURCE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { resourceId: resource.id }
@@ -1439,7 +1187,7 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_UPDATE_RESOURCE_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "UPDATE_RESOURCE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { resourceId }
@@ -1488,6 +1236,9 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
       const columns = Object.entries(schema).map(([name, def]) => {
         const constraints = [];
         if (!def.nullable) constraints.push("NOT NULL");
+        if (name === "metadata" && def.type === "text" && def.nullable) {
+          constraints.push("DEFAULT '{}'");
+        }
         const columnTtl = this.ttl?.[tableName]?.columns?.[name];
         return `"${name}" ${COLUMN_TYPES[def.type]} ${constraints.join(" ")} ${columnTtl ? `TTL toDateTime(${columnTtl.ttlKey ?? "createdAt"}) + INTERVAL ${columnTtl.interval} ${columnTtl.unit}` : ""}`;
       }).join(",\n");
@@ -1506,8 +1257,8 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
               ${columns}
             )
             ENGINE = ${TABLE_ENGINES[tableName] ?? "MergeTree()"}
-            PRIMARY KEY (createdAt, ${tableName === storage.TABLE_EVALS ? "run_id" : "id"})
-            ORDER BY (createdAt, ${tableName === storage.TABLE_EVALS ? "run_id" : "id"})
+            PRIMARY KEY (createdAt, ${"id"})
+            ORDER BY (createdAt, ${"id"})
             ${this.ttl?.[tableName]?.row ? `TTL toDateTime(createdAt) + INTERVAL ${this.ttl[tableName].row.interval} ${this.ttl[tableName].row.unit}` : ""}
             SETTINGS index_granularity = 8192
           `;
@@ -1524,7 +1275,7 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_CREATE_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "CREATE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1563,7 +1314,7 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_ALTER_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "ALTER_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1587,7 +1338,7 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_CLEAR_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "CLEAR_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1622,11 +1373,11 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
           use_client_time_zone: 1
         }
       });
-      console.log("INSERT RESULT", result);
+      console.info("INSERT RESULT", result);
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_INSERT_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1659,7 +1410,7 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_BATCH_INSERT_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "BATCH_INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1710,7 +1461,7 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_LOAD_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LOAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1728,30 +1479,15 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
     this.client = client;
     this.operations = operations;
   }
+  /**
+   * ClickHouse-specific score row transformation.
+   * Converts timestamps to Date objects and filters out '_null_' values.
+   */
   transformScoreRow(row) {
-    const scorer = storage.safelyParseJSON(row.scorer);
-    const preprocessStepResult = storage.safelyParseJSON(row.preprocessStepResult);
-    const analyzeStepResult = storage.safelyParseJSON(row.analyzeStepResult);
-    const metadata = storage.safelyParseJSON(row.metadata);
-    const input = storage.safelyParseJSON(row.input);
-    const output = storage.safelyParseJSON(row.output);
-    const additionalContext = storage.safelyParseJSON(row.additionalContext);
-    const runtimeContext = storage.safelyParseJSON(row.runtimeContext);
-    const entity = storage.safelyParseJSON(row.entity);
-    return {
-      ...row,
-      scorer,
-      preprocessStepResult,
-      analyzeStepResult,
-      metadata,
-      input,
-      output,
-      additionalContext,
-      runtimeContext,
-      entity,
-      createdAt: new Date(row.createdAt),
-      updatedAt: new Date(row.updatedAt)
-    };
+    return storage.transformScoreRow(row, {
+      convertTimestamps: true,
+      nullValuePattern: "_null_"
+    });
   }
   async getScoreById({ id }) {
     try {
@@ -1775,7 +1511,7 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_SCORE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "GET_SCORE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { scoreId: id }
@@ -1785,10 +1521,44 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
     }
   }
   async saveScore(score) {
+    let parsedScore;
     try {
-      const record = {
-        ...score
-      };
+      parsedScore = evals.saveScorePayloadSchema.parse(score);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLICKHOUSE", "SAVE_SCORE", "VALIDATION_FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.USER,
+          details: {
+            scorer: score.scorer?.id ?? "unknown",
+            entityId: score.entityId ?? "unknown",
+            entityType: score.entityType ?? "unknown",
+            traceId: score.traceId ?? "",
+            spanId: score.spanId ?? ""
+          }
+        },
+        error$1
+      );
+    }
+    const now = /* @__PURE__ */ new Date();
+    const id = crypto.randomUUID();
+    const createdAt = now;
+    const updatedAt = now;
+    try {
+      const record = {};
+      for (const key of Object.keys(storage.SCORERS_SCHEMA)) {
+        if (key === "id") {
+          record[key] = id;
+          continue;
+        }
+        if (key === "createdAt" || key === "updatedAt") {
+          record[key] = now.toISOString();
+          continue;
+        }
+        const value = parsedScore[key];
+        record[key] = value === void 0 || value === null ? "_null_" : value;
+      }
       await this.client.insert({
         table: storage.TABLE_SCORERS,
         values: [record],
@@ -1799,20 +1569,20 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
           output_format_json_quote_64bit_integers: 0
         }
       });
-      return { score };
+      return { score: { ...parsedScore, id, createdAt, updatedAt } };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_SAVE_SCORE_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "SAVE_SCORE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: { scoreId: score.id }
+          details: { scoreId: id }
         },
         error$1
       );
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
@@ -1828,24 +1598,28 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
         const countObj = countRows[0];
         total = Number(countObj.count);
       }
+      const { page, perPage: perPageInput } = pagination;
       if (!total) {
         return {
           pagination: {
             total: 0,
-            page: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageInput,
             hasMore: false
           },
           scores: []
         };
       }
-      const offset = pagination.page * pagination.perPage;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+      const limitValue = perPageInput === false ? total : perPage;
+      const end = perPageInput === false ? total : start + perPage;
       const result = await this.client.query({
         query: `SELECT * FROM ${storage.TABLE_SCORERS} WHERE runId = {var_runId:String} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
         query_params: {
           var_runId: runId,
-          var_limit: pagination.perPage,
-          var_offset: offset
+          var_limit: limitValue,
+          var_offset: start
         },
         format: "JSONEachRow",
         clickhouse_settings: {
@@ -1860,16 +1634,16 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: total > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_SCORES_BY_RUN_ID_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_SCORES_BY_RUN_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { runId }
@@ -1878,7 +1652,7 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     entityId,
     entityType,
@@ -1912,24 +1686,28 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
         const countObj = countRows[0];
         total = Number(countObj.count);
       }
+      const { page, perPage: perPageInput } = pagination;
       if (!total) {
         return {
           pagination: {
             total: 0,
-            page: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageInput,
             hasMore: false
           },
           scores: []
         };
       }
-      const offset = pagination.page * pagination.perPage;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+      const limitValue = perPageInput === false ? total : perPage;
+      const end = perPageInput === false ? total : start + perPage;
       const result = await this.client.query({
         query: `SELECT * FROM ${storage.TABLE_SCORERS} WHERE ${whereClause} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
         query_params: {
           var_scorerId: scorerId,
-          var_limit: pagination.perPage,
-          var_offset: offset,
+          var_limit: limitValue,
+          var_offset: start,
           var_entityId: entityId,
           var_entityType: entityType,
           var_source: source
@@ -1947,16 +1725,16 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: total > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_SCORES_BY_SCORER_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { scorerId }
@@ -1965,7 +1743,7 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
@@ -1982,25 +1760,29 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
         const countObj = countRows[0];
         total = Number(countObj.count);
       }
+      const { page, perPage: perPageInput } = pagination;
       if (!total) {
         return {
           pagination: {
             total: 0,
-            page: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageInput,
             hasMore: false
           },
           scores: []
         };
       }
-      const offset = pagination.page * pagination.perPage;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+      const limitValue = perPageInput === false ? total : perPage;
+      const end = perPageInput === false ? total : start + perPage;
       const result = await this.client.query({
         query: `SELECT * FROM ${storage.TABLE_SCORERS} WHERE entityId = {var_entityId:String} AND entityType = {var_entityType:String} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
         query_params: {
           var_entityId: entityId,
           var_entityType: entityType,
-          var_limit: pagination.perPage,
-          var_offset: offset
+          var_limit: limitValue,
+          var_offset: start
         },
         format: "JSONEachRow",
         clickhouse_settings: {
@@ -2015,16 +1797,16 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: total > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_SCORES_BY_ENTITY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { entityId, entityType }
@@ -2033,76 +1815,51 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
       );
     }
   }
-};
-var TracesStorageClickhouse = class extends storage.TracesStorage {
-  client;
-  operations;
-  constructor({ client, operations }) {
-    super();
-    this.client = client;
-    this.operations = operations;
-  }
-  async getTracesPaginated(args) {
-    const { name, scope, page = 0, perPage = 100, attributes, filters, dateRange } = args;
-    const fromDate = dateRange?.start;
-    const toDate = dateRange?.end;
-    const currentOffset = page * perPage;
-    const queryArgs = {};
-    const conditions = [];
-    if (name) {
-      conditions.push(`name LIKE CONCAT({var_name:String}, '%')`);
-      queryArgs.var_name = name;
-    }
-    if (scope) {
-      conditions.push(`scope = {var_scope:String}`);
-      queryArgs.var_scope = scope;
-    }
-    if (attributes) {
-      Object.entries(attributes).forEach(([key, value]) => {
-        conditions.push(`JSONExtractString(attributes, '${key}') = {var_attr_${key}:String}`);
-        queryArgs[`var_attr_${key}`] = value;
-      });
-    }
-    if (filters) {
-      Object.entries(filters).forEach(([key, value]) => {
-        conditions.push(`${key} = {var_col_${key}:${storage.TABLE_SCHEMAS.mastra_traces?.[key]?.type ?? "text"}}`);
-        queryArgs[`var_col_${key}`] = value;
-      });
-    }
-    if (fromDate) {
-      conditions.push(`createdAt >= parseDateTime64BestEffort({var_from_date:String})`);
-      queryArgs.var_from_date = fromDate.toISOString();
-    }
-    if (toDate) {
-      conditions.push(`createdAt <= parseDateTime64BestEffort({var_to_date:String})`);
-      queryArgs.var_to_date = toDate.toISOString();
-    }
-    const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
     try {
       const countResult = await this.client.query({
-        query: `SELECT COUNT(*) as count FROM ${storage.TABLE_TRACES} ${whereClause}`,
-        query_params: queryArgs,
-        clickhouse_settings: {
-          date_time_input_format: "best_effort",
-          date_time_output_format: "iso",
-          use_client_time_zone: 1,
-          output_format_json_quote_64bit_integers: 0
-        }
+        query: `SELECT COUNT(*) as count FROM ${storage.TABLE_SCORERS} WHERE traceId = {var_traceId:String} AND spanId = {var_spanId:String}`,
+        query_params: {
+          var_traceId: traceId,
+          var_spanId: spanId
+        },
+        format: "JSONEachRow"
       });
-      const countData = await countResult.json();
-      const total = Number(countData.data?.[0]?.count ?? 0);
-      if (total === 0) {
+      const countRows = await countResult.json();
+      let total = 0;
+      if (Array.isArray(countRows) && countRows.length > 0 && countRows[0]) {
+        const countObj = countRows[0];
+        total = Number(countObj.count);
+      }
+      const { page, perPage: perPageInput } = pagination;
+      if (!total) {
         return {
-          traces: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
+          pagination: {
+            total: 0,
+            page,
+            perPage: perPageInput,
+            hasMore: false
+          },
+          scores: []
         };
       }
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+      const limitValue = perPageInput === false ? total : perPage;
+      const end = perPageInput === false ? total : start + perPage;
       const result = await this.client.query({
-        query: `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${storage.TABLE_TRACES} ${whereClause} ORDER BY "createdAt" DESC LIMIT {var_limit:UInt32} OFFSET {var_offset:UInt32}`,
-        query_params: { ...queryArgs, var_limit: perPage, var_offset: currentOffset },
+        query: `SELECT * FROM ${storage.TABLE_SCORERS} WHERE traceId = {var_traceId:String} AND spanId = {var_spanId:String} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
+        query_params: {
+          var_traceId: traceId,
+          var_spanId: spanId,
+          var_limit: limitValue,
+          var_offset: start
+        },
+        format: "JSONEachRow",
         clickhouse_settings: {
           date_time_input_format: "best_effort",
           date_time_output_format: "iso",
@@ -2110,172 +1867,29 @@ var TracesStorageClickhouse = class extends storage.TracesStorage {
           output_format_json_quote_64bit_integers: 0
         }
       });
-      if (!result) {
-        return {
-          traces: [],
-          total,
-          page,
-          perPage,
-          hasMore: false
-        };
-      }
-      const resp = await result.json();
-      const rows = resp.data;
-      const traces = rows.map((row) => ({
-        id: row.id,
-        parentSpanId: row.parentSpanId,
-        traceId: row.traceId,
-        name: row.name,
-        scope: row.scope,
-        kind: row.kind,
-        status: storage.safelyParseJSON(row.status),
-        events: storage.safelyParseJSON(row.events),
-        links: storage.safelyParseJSON(row.links),
-        attributes: storage.safelyParseJSON(row.attributes),
-        startTime: row.startTime,
-        endTime: row.endTime,
-        other: storage.safelyParseJSON(row.other),
-        createdAt: row.createdAt
-      }));
+      const rows = await result.json();
+      const scores = Array.isArray(rows) ? rows.map((row) => this.transformScoreRow(row)) : [];
       return {
-        traces,
-        total,
-        page,
-        perPage,
-        hasMore: currentOffset + traces.length < total
-      };
-    } catch (error$1) {
-      if (error$1?.message?.includes("no such table") || error$1?.message?.includes("does not exist")) {
-        return {
-          traces: [],
-          total: 0,
+        pagination: {
+          total,
           page,
-          perPage,
-          hasMore: false
-        };
-      }
-      throw new error.MastraError(
-        {
-          id: "CLICKHOUSE_STORAGE_GET_TRACES_PAGINATED_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: {
-            name: name ?? null,
-            scope: scope ?? null,
-            page,
-            perPage,
-            attributes: attributes ? JSON.stringify(attributes) : null,
-            filters: filters ? JSON.stringify(filters) : null,
-            dateRange: dateRange ? JSON.stringify(dateRange) : null
-          }
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
-        error$1
-      );
-    }
-  }
-  async getTraces({
-    name,
-    scope,
-    page,
-    perPage,
-    attributes,
-    filters,
-    fromDate,
-    toDate
-  }) {
-    const limit = perPage;
-    const offset = page * perPage;
-    const args = {};
-    const conditions = [];
-    if (name) {
-      conditions.push(`name LIKE CONCAT({var_name:String}, '%')`);
-      args.var_name = name;
-    }
-    if (scope) {
-      conditions.push(`scope = {var_scope:String}`);
-      args.var_scope = scope;
-    }
-    if (attributes) {
-      Object.entries(attributes).forEach(([key, value]) => {
-        conditions.push(`JSONExtractString(attributes, '${key}') = {var_attr_${key}:String}`);
-        args[`var_attr_${key}`] = value;
-      });
-    }
-    if (filters) {
-      Object.entries(filters).forEach(([key, value]) => {
-        conditions.push(`${key} = {var_col_${key}:${storage.TABLE_SCHEMAS.mastra_traces?.[key]?.type ?? "text"}}`);
-        args[`var_col_${key}`] = value;
-      });
-    }
-    if (fromDate) {
-      conditions.push(`createdAt >= {var_from_date:DateTime64(3)}`);
-      args.var_from_date = fromDate.getTime() / 1e3;
-    }
-    if (toDate) {
-      conditions.push(`createdAt <= {var_to_date:DateTime64(3)}`);
-      args.var_to_date = toDate.getTime() / 1e3;
-    }
-    const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-    try {
-      const result = await this.client.query({
-        query: `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${storage.TABLE_TRACES} ${whereClause} ORDER BY "createdAt" DESC LIMIT ${limit} OFFSET ${offset}`,
-        query_params: args,
-        clickhouse_settings: {
-          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
-          date_time_input_format: "best_effort",
-          date_time_output_format: "iso",
-          use_client_time_zone: 1,
-          output_format_json_quote_64bit_integers: 0
-        }
-      });
-      if (!result) {
-        return [];
-      }
-      const resp = await result.json();
-      const rows = resp.data;
-      return rows.map((row) => ({
-        id: row.id,
-        parentSpanId: row.parentSpanId,
-        traceId: row.traceId,
-        name: row.name,
-        scope: row.scope,
-        kind: row.kind,
-        status: storage.safelyParseJSON(row.status),
-        events: storage.safelyParseJSON(row.events),
-        links: storage.safelyParseJSON(row.links),
-        attributes: storage.safelyParseJSON(row.attributes),
-        startTime: row.startTime,
-        endTime: row.endTime,
-        other: storage.safelyParseJSON(row.other),
-        createdAt: row.createdAt
-      }));
+        scores
+      };
     } catch (error$1) {
-      if (error$1?.message?.includes("no such table") || error$1?.message?.includes("does not exist")) {
-        return [];
-      }
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_TRACES_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_SCORES_BY_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: {
-            name: name ?? null,
-            scope: scope ?? null,
-            page,
-            perPage,
-            attributes: attributes ? JSON.stringify(attributes) : null,
-            filters: filters ? JSON.stringify(filters) : null,
-            fromDate: fromDate?.toISOString() ?? null,
-            toDate: toDate?.toISOString() ?? null
-          }
+          details: { traceId, spanId }
         },
         error$1
       );
     }
   }
-  async batchTraceInsert(args) {
-    await this.operations.batchInsert({ tableName: storage.TABLE_TRACES, records: args.records });
-  }
 };
 var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
   client;
@@ -2290,16 +1904,26 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
     // runId,
     // stepId,
     // result,
-    // runtimeContext,
+    // requestContext,
   }) {
-    throw new Error("Method not implemented.");
+    throw new error.MastraError({
+      id: storage.createStorageErrorId("CLICKHOUSE", "UPDATE_WORKFLOW_RESULTS", "NOT_IMPLEMENTED"),
+      domain: error.ErrorDomain.STORAGE,
+      category: error.ErrorCategory.SYSTEM,
+      text: "Method not implemented."
+    });
   }
   updateWorkflowState({
     // workflowName,
     // runId,
     // opts,
   }) {
-    throw new Error("Method not implemented.");
+    throw new error.MastraError({
+      id: storage.createStorageErrorId("CLICKHOUSE", "UPDATE_WORKFLOW_STATE", "NOT_IMPLEMENTED"),
+      domain: error.ErrorDomain.STORAGE,
+      category: error.ErrorCategory.SYSTEM,
+      text: "Method not implemented."
+    });
   }
   async persistWorkflowSnapshot({
     workflowName,
@@ -2340,7 +1964,7 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { workflowName, runId }
@@ -2368,7 +1992,7 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { workflowName, runId }
@@ -2395,13 +2019,14 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
       resourceId: row.resourceId
     };
   }
-  async getWorkflowRuns({
+  async listWorkflowRuns({
     workflowName,
     fromDate,
     toDate,
-    limit,
-    offset,
-    resourceId
+    page,
+    perPage,
+    resourceId,
+    status
   } = {}) {
     try {
       const conditions = [];
@@ -2410,6 +2035,10 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
         conditions.push(`workflow_name = {var_workflow_name:String}`);
         values.var_workflow_name = workflowName;
       }
+      if (status) {
+        conditions.push(`JSONExtractString(snapshot, 'status') = {var_status:String}`);
+        values.var_status = status;
+      }
       if (resourceId) {
         const hasResourceId = await this.operations.hasColumn(storage.TABLE_WORKFLOW_SNAPSHOT, "resourceId");
         if (hasResourceId) {
@@ -2428,10 +2057,13 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
         values.var_to_date = toDate.getTime() / 1e3;
       }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-      const limitClause = limit !== void 0 ? `LIMIT ${limit}` : "";
-      const offsetClause = offset !== void 0 ? `OFFSET ${offset}` : "";
+      const usePagination = perPage !== void 0 && page !== void 0;
+      const normalizedPerPage = usePagination ? storage.normalizePerPage(perPage, Number.MAX_SAFE_INTEGER) : 0;
+      const offset = usePagination ? page * normalizedPerPage : 0;
+      const limitClause = usePagination ? `LIMIT ${normalizedPerPage}` : "";
+      const offsetClause = usePagination ? `OFFSET ${offset}` : "";
       let total = 0;
-      if (limit !== void 0 && offset !== void 0) {
+      if (usePagination) {
         const countResult = await this.client.query({
           query: `SELECT COUNT(*) as count FROM ${storage.TABLE_WORKFLOW_SNAPSHOT} ${TABLE_ENGINES[storage.TABLE_WORKFLOW_SNAPSHOT].startsWith("ReplacingMergeTree") ? "FINAL" : ""} ${whereClause}`,
           query_params: values,
@@ -2467,7 +2099,7 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_WORKFLOW_RUNS_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { workflowName: workflowName ?? "", resourceId: resourceId ?? "" }
@@ -2516,7 +2148,7 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { runId: runId ?? "", workflowName: workflowName ?? "" }
@@ -2525,6 +2157,28 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
       );
     }
   }
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    try {
+      const values = {
+        var_runId: runId,
+        var_workflow_name: workflowName
+      };
+      await this.client.command({
+        query: `DELETE FROM ${storage.TABLE_WORKFLOW_SNAPSHOT} WHERE run_id = {var_runId:String} AND workflow_name = {var_workflow_name:String}`,
+        query_params: values
+      });
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLICKHOUSE", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { runId, workflowName }
+        },
+        error$1
+      );
+    }
+  }
 };
 
 // src/storage/index.ts
@@ -2533,7 +2187,7 @@ var ClickhouseStore = class extends storage.MastraStorage {
   ttl = {};
   stores;
   constructor(config) {
-    super({ name: "ClickhouseStore" });
+    super({ id: config.id, name: "ClickhouseStore", disableInit: config.disableInit });
     this.db = client.createClient({
       url: config.url,
       username: config.username,
@@ -2550,15 +2204,11 @@ var ClickhouseStore = class extends storage.MastraStorage {
     const operations = new StoreOperationsClickhouse({ client: this.db, ttl: this.ttl });
     const workflows = new WorkflowsStorageClickhouse({ client: this.db, operations });
     const scores = new ScoresStorageClickhouse({ client: this.db, operations });
-    const legacyEvals = new LegacyEvalsStorageClickhouse({ client: this.db, operations });
-    const traces = new TracesStorageClickhouse({ client: this.db, operations });
     const memory = new MemoryStorageClickhouse({ client: this.db, operations });
     this.stores = {
       operations,
       workflows,
       scores,
-      legacyEvals,
-      traces,
       memory
     };
   }
@@ -2568,15 +2218,10 @@ var ClickhouseStore = class extends storage.MastraStorage {
       resourceWorkingMemory: true,
       hasColumn: true,
       createTable: true,
-      deleteMessages: false
+      deleteMessages: false,
+      listScoresBySpan: true
     };
   }
-  async getEvalsByAgentName(agentName, type) {
-    return this.stores.legacyEvals.getEvalsByAgentName(agentName, type);
-  }
-  async getEvals(options) {
-    return this.stores.legacyEvals.getEvals(options);
-  }
   async batchInsert({ tableName, records }) {
     await this.stores.operations.batchInsert({ tableName, records });
   }
@@ -2588,7 +2233,7 @@ var ClickhouseStore = class extends storage.MastraStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_OPTIMIZE_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "OPTIMIZE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2605,7 +2250,7 @@ var ClickhouseStore = class extends storage.MastraStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLICKHOUSE_STORAGE_MATERIALIZE_TTL_FAILED",
+          id: storage.createStorageErrorId("CLICKHOUSE", "MATERIALIZE_TTL", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2644,9 +2289,9 @@ var ClickhouseStore = class extends storage.MastraStorage {
     runId,
     stepId,
     result,
-    runtimeContext
+    requestContext
   }) {
-    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
   }
   async updateWorkflowState({
     workflowName,
@@ -2669,15 +2314,8 @@ var ClickhouseStore = class extends storage.MastraStorage {
   }) {
     return this.stores.workflows.loadWorkflowSnapshot({ workflowName, runId });
   }
-  async getWorkflowRuns({
-    workflowName,
-    fromDate,
-    toDate,
-    limit,
-    offset,
-    resourceId
-  } = {}) {
-    return this.stores.workflows.getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId });
+  async listWorkflowRuns(args = {}) {
+    return this.stores.workflows.listWorkflowRuns(args);
   }
   async getWorkflowRunById({
     runId,
@@ -2685,21 +2323,12 @@ var ClickhouseStore = class extends storage.MastraStorage {
   }) {
     return this.stores.workflows.getWorkflowRunById({ runId, workflowName });
   }
-  async getTraces(args) {
-    return this.stores.traces.getTraces(args);
-  }
-  async getTracesPaginated(args) {
-    return this.stores.traces.getTracesPaginated(args);
-  }
-  async batchTraceInsert(args) {
-    return this.stores.traces.batchTraceInsert(args);
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    return this.stores.workflows.deleteWorkflowRunById({ runId, workflowName });
   }
   async getThreadById({ threadId }) {
     return this.stores.memory.getThreadById({ threadId });
   }
-  async getThreadsByResourceId({ resourceId }) {
-    return this.stores.memory.getThreadsByResourceId({ resourceId });
-  }
   async saveThread({ thread }) {
     return this.stores.memory.saveThread({ thread });
   }
@@ -2713,29 +2342,9 @@ var ClickhouseStore = class extends storage.MastraStorage {
   async deleteThread({ threadId }) {
     return this.stores.memory.deleteThread({ threadId });
   }
-  async getThreadsByResourceIdPaginated(args) {
-    return this.stores.memory.getThreadsByResourceIdPaginated(args);
-  }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    return this.stores.memory.getMessages({ threadId, resourceId, selectBy, format });
-  }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    return this.stores.memory.getMessagesById({ messageIds, format });
-  }
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
   }
-  async getMessagesPaginated(args) {
-    return this.stores.memory.getMessagesPaginated(args);
-  }
   async updateMessages(args) {
     return this.stores.memory.updateMessages(args);
   }
@@ -2755,30 +2364,37 @@ var ClickhouseStore = class extends storage.MastraStorage {
   async getScoreById({ id }) {
     return this.stores.scores.getScoreById({ id });
   }
-  async saveScore(_score) {
-    return this.stores.scores.saveScore(_score);
+  async saveScore(score) {
+    return this.stores.scores.saveScore(score);
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
-    return this.stores.scores.getScoresByRunId({ runId, pagination });
+    return this.stores.scores.listScoresByRunId({ runId, pagination });
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
   }) {
-    return this.stores.scores.getScoresByEntityId({ entityId, entityType, pagination });
+    return this.stores.scores.listScoresByEntityId({ entityId, entityType, pagination });
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     pagination,
     entityId,
     entityType,
     source
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
+    return this.stores.scores.listScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
+  }
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination });
   }
   async close() {
     await this.db.close();