@mastra/pg 1.2.0 → 1.3.0-alpha.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { createVectorErrorId, TABLE_SCHEMAS, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, createStorageErrorId, normalizePerPage, calculatePagination, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ObservabilityStorage, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, TraceStatus, getDefaultValue, transformScoreRow as transformScoreRow$1, getSqlType } from '@mastra/core/storage';
+import { createVectorErrorId, TABLE_SCHEMAS, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, createStorageErrorId, normalizePerPage, calculatePagination, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ObservabilityStorage, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, TraceStatus, getDefaultValue, transformScoreRow as transformScoreRow$1, getSqlType } from '@mastra/core/storage';
 import { parseSqlIdentifier, parseFieldKey } from '@mastra/core/utils';
 import { MastraVector, validateTopK, validateUpsertInput } from '@mastra/core/vector';
 import { Mutex } from 'async-mutex';
@@ -8,6 +8,7 @@ import { Pool } from 'pg';
 import xxhash from 'xxhash-wasm';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
 import { MastraBase } from '@mastra/core/base';
+import { randomUUID } from 'crypto';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/evals';
 
@@ -1882,6 +1883,32 @@ var TransactionClient = class {
     return Promise.all(promises);
   }
 };
+
+// src/storage/db/constraint-utils.ts
+var POSTGRES_IDENTIFIER_MAX_LENGTH = 63;
+function truncateIdentifier(value, maxLength = POSTGRES_IDENTIFIER_MAX_LENGTH) {
+  if (maxLength <= 0) return "";
+  if (Buffer.byteLength(value, "utf-8") <= maxLength) return value;
+  let bytes = 0;
+  let end = 0;
+  for (const ch of value) {
+    const chBytes = Buffer.byteLength(ch, "utf-8");
+    if (bytes + chBytes > maxLength) break;
+    bytes += chBytes;
+    end += ch.length;
+  }
+  return value.slice(0, end);
+}
+function buildConstraintName({
+  baseName,
+  schemaName,
+  maxLength = POSTGRES_IDENTIFIER_MAX_LENGTH
+}) {
+  const prefix = schemaName ? `${schemaName}_` : "";
+  return truncateIdentifier(`${prefix}${baseName}`.toLowerCase(), maxLength);
+}
+
+// src/storage/db/index.ts
 function resolvePgConfig(config) {
   if ("client" in config) {
     return {
@@ -1960,8 +1987,16 @@ function generateTableSQL({
   });
   const finalColumns = [...columns, ...timeZColumns].join(",\n");
   const parsedSchemaName = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
-  const constraintPrefix = parsedSchemaName ? `${parsedSchemaName}_` : "";
+  const workflowSnapshotConstraint = buildConstraintName({
+    baseName: "mastra_workflow_snapshot_workflow_name_run_id_key",
+    schemaName: parsedSchemaName || void 0
+  });
+  const spansPrimaryKeyConstraint = buildConstraintName({
+    baseName: "mastra_ai_spans_traceid_spanid_pk",
+    schemaName: parsedSchemaName || void 0
+  });
   const quotedSchemaName = getSchemaName(schemaName);
+  const schemaFilter = parsedSchemaName || "public";
   const sql = `
             CREATE TABLE IF NOT EXISTS ${getTableName({ indexName: tableName, schemaName: quotedSchemaName })} (
               ${finalColumns}
@@ -1969,12 +2004,12 @@ function generateTableSQL({
             ${tableName === TABLE_WORKFLOW_SNAPSHOT ? `
             DO $$ BEGIN
               IF NOT EXISTS (
-                SELECT 1 FROM pg_constraint WHERE conname = lower('${constraintPrefix}mastra_workflow_snapshot_workflow_name_run_id_key')
+                SELECT 1 FROM pg_constraint WHERE conname = lower('${workflowSnapshotConstraint}') AND connamespace = (SELECT oid FROM pg_namespace WHERE nspname = '${schemaFilter}')
               ) AND NOT EXISTS (
-                SELECT 1 FROM pg_indexes WHERE indexname = lower('${constraintPrefix}mastra_workflow_snapshot_workflow_name_run_id_key')
+                SELECT 1 FROM pg_indexes WHERE indexname = lower('${workflowSnapshotConstraint}') AND schemaname = '${schemaFilter}'
               ) THEN
                 ALTER TABLE ${getTableName({ indexName: tableName, schemaName: quotedSchemaName })}
-                ADD CONSTRAINT ${constraintPrefix}mastra_workflow_snapshot_workflow_name_run_id_key
+                ADD CONSTRAINT ${workflowSnapshotConstraint}
                 UNIQUE (workflow_name, run_id);
               END IF;
             END $$;
@@ -1983,10 +2018,10 @@ function generateTableSQL({
   tableName === TABLE_SPANS && includeAllConstraints ? `
             DO $$ BEGIN
               IF NOT EXISTS (
-                SELECT 1 FROM pg_constraint WHERE conname = lower('${constraintPrefix}mastra_ai_spans_traceid_spanid_pk')
+                SELECT 1 FROM pg_constraint WHERE conname = lower('${spansPrimaryKeyConstraint}') AND connamespace = (SELECT oid FROM pg_namespace WHERE nspname = '${schemaFilter}')
               ) THEN
                 ALTER TABLE ${getTableName({ indexName: tableName, schemaName: quotedSchemaName })}
-                ADD CONSTRAINT ${constraintPrefix}mastra_ai_spans_traceid_spanid_pk
+                ADD CONSTRAINT ${spansPrimaryKeyConstraint}
                 PRIMARY KEY ("traceId", "spanId");
               END IF;
             END $$;
@@ -2472,11 +2507,14 @@ Note: This migration may take some time for large tables.
    */
   async spansPrimaryKeyExists() {
     const parsedSchemaName = this.schemaName ? parseSqlIdentifier(this.schemaName, "schema name") : "";
-    const constraintPrefix = parsedSchemaName ? `${parsedSchemaName}_` : "";
-    const constraintName = `${constraintPrefix}mastra_ai_spans_traceid_spanid_pk`;
+    const constraintName = buildConstraintName({
+      baseName: "mastra_ai_spans_traceid_spanid_pk",
+      schemaName: parsedSchemaName || void 0
+    });
+    const schemaFilter = this.schemaName || "public";
     const result = await this.client.oneOrNone(
-      `SELECT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = $1) as exists`,
-      [constraintName]
+      `SELECT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = lower($1) AND connamespace = (SELECT oid FROM pg_namespace WHERE nspname = $2)) as exists`,
+      [constraintName, schemaFilter]
     );
     return result?.exists ?? false;
   }
@@ -2487,16 +2525,19 @@ Note: This migration may take some time for large tables.
   async addSpansPrimaryKey() {
     const fullTableName = getTableName({ indexName: TABLE_SPANS, schemaName: getSchemaName(this.schemaName) });
     const parsedSchemaName = this.schemaName ? parseSqlIdentifier(this.schemaName, "schema name") : "";
-    const constraintPrefix = parsedSchemaName ? `${parsedSchemaName}_` : "";
-    const constraintName = `${constraintPrefix}mastra_ai_spans_traceid_spanid_pk`;
+    const constraintName = buildConstraintName({
+      baseName: "mastra_ai_spans_traceid_spanid_pk",
+      schemaName: parsedSchemaName || void 0
+    });
+    const schemaFilter = this.schemaName || "public";
     try {
       const constraintExists = await this.client.oneOrNone(
         `
         SELECT EXISTS (
-          SELECT 1 FROM pg_constraint WHERE conname = $1
+          SELECT 1 FROM pg_constraint WHERE conname = lower($1) AND connamespace = (SELECT oid FROM pg_namespace WHERE nspname = $2)
         ) as exists
       `,
-        [constraintName]
+        [constraintName, schemaFilter]
       );
       if (constraintExists?.exists) {
         this.logger?.debug?.(`PRIMARY KEY constraint ${constraintName} already exists on ${fullTableName}`);
@@ -3128,6 +3169,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       schema: TABLE_SCHEMAS[TABLE_AGENTS],
       ifNotExists: ["status", "authorId"]
     });
+    await this.#migrateToolsToJsonbFormat();
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
     await this.#cleanupStaleDrafts();
@@ -3188,7 +3230,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
           1,
           row.name ?? agentId,
           row.description ?? null,
-          row.instructions ?? "",
+          this.serializeInstructions(row.instructions ?? ""),
           row.model ? JSON.stringify(row.model) : "{}",
           row.tools ? JSON.stringify(row.tools) : null,
           row.defaultOptions ? JSON.stringify(row.defaultOptions) : null,
@@ -3226,6 +3268,45 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
     await this.#db.client.none(`DROP TABLE IF EXISTS ${fullVersionsTableName}`);
     await this.#db.client.none(`DROP TABLE IF EXISTS ${legacyTableName}`);
   }
+  /**
+   * Migrates the tools field from string[] format to JSONB format { "tool-key": { "description": "..." } }.
+   * This handles the transition from the old format where tools were stored as an array of string keys
+   * to the new format where tools can have per-agent description overrides.
+   */
+  async #migrateToolsToJsonbFormat() {
+    const fullVersionsTableName = getTableName2({
+      indexName: TABLE_AGENT_VERSIONS,
+      schemaName: getSchemaName2(this.#schema)
+    });
+    try {
+      const recordsWithArrayTools = await this.#db.client.any(
+        `SELECT id, tools FROM ${fullVersionsTableName} 
+         WHERE tools IS NOT NULL 
+         AND jsonb_typeof(tools) = 'array'`
+      );
+      if (recordsWithArrayTools.length === 0) {
+        return;
+      }
+      for (const record of recordsWithArrayTools) {
+        const toolsArray = record.tools;
+        const toolsObject = {};
+        for (const toolKey of toolsArray) {
+          toolsObject[toolKey] = {};
+        }
+        await this.#db.client.none(
+          `UPDATE ${fullVersionsTableName} 
+           SET tools = $1::jsonb 
+           WHERE id = $2`,
+          [JSON.stringify(toolsObject), record.id]
+        );
+      }
+      this.logger?.info?.(
+        `Migrated ${recordsWithArrayTools.length} agent version(s) tools from array to object format`
+      );
+    } catch (error) {
+      this.logger?.warn?.("Failed to migrate tools to JSONB format:", error);
+    }
+  }
   /**
    * Removes stale draft agent records that have no activeVersionId.
    * These are left behind when createAgent partially fails (inserts thin record
@@ -3263,6 +3344,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
     try {
       return JSON.parse(value);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       const details = {
         value: value.length > 100 ? value.substring(0, 100) + "..." : value
       };
@@ -3292,7 +3374,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       updatedAt: row.updatedAtZ || row.updatedAt
     };
   }
-  async getAgentById({ id }) {
+  async getById(id) {
     try {
       const tableName = getTableName2({ indexName: TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
       const result = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [id]);
@@ -3301,6 +3383,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       }
       return this.parseRow(result);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "GET_AGENT_BY_ID", "FAILED"),
@@ -3312,7 +3395,8 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       );
     }
   }
-  async createAgent({ agent }) {
+  async create(input) {
+    const { agent } = input;
     try {
       const agentsTable = getTableName2({ indexName: TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
       const now = /* @__PURE__ */ new Date();
@@ -3356,6 +3440,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
         updatedAt: now
       };
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       try {
         const agentsTable = getTableName2({ indexName: TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
         await this.#db.client.none(
@@ -3375,10 +3460,11 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       );
     }
   }
-  async updateAgent({ id, ...updates }) {
+  async update(input) {
+    const { id, ...updates } = input;
     try {
       const tableName = getTableName2({ indexName: TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
-      const existingAgent = await this.getAgentById({ id });
+      const existingAgent = await this.getById(id);
       if (!existingAgent) {
         throw new MastraError({
           id: createStorageErrorId("PG", "UPDATE_AGENT", "NOT_FOUND"),
@@ -3425,12 +3511,15 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
           createdAt: _createdAt,
           ...latestConfig
         } = latestVersion;
+        const sanitizedConfigFields = Object.fromEntries(
+          Object.entries(configFields).map(([key, value]) => [key, value === null ? void 0 : value])
+        );
         const newConfig = {
           ...latestConfig,
-          ...configFields
+          ...sanitizedConfigFields
         };
         const changedFields = configFieldNames.filter(
-          (field) => field in configFields && configFields[field] !== latestConfig[field]
+          (field) => field in configFields && JSON.stringify(configFields[field]) !== JSON.stringify(latestConfig[field])
         );
         if (changedFields.length > 0) {
           const newVersionId = crypto.randomUUID();
@@ -3472,7 +3561,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
           values
         );
       }
-      const updatedAgent = await this.getAgentById({ id });
+      const updatedAgent = await this.getById(id);
       if (!updatedAgent) {
         throw new MastraError({
           id: createStorageErrorId("PG", "UPDATE_AGENT", "NOT_FOUND_AFTER_UPDATE"),
@@ -3498,12 +3587,13 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       );
     }
   }
-  async deleteAgent({ id }) {
+  async delete(id) {
     try {
       const tableName = getTableName2({ indexName: TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
-      await this.deleteVersionsByAgentId(id);
+      await this.deleteVersionsByParentId(id);
       await this.#db.client.none(`DELETE FROM ${tableName} WHERE id = $1`, [id]);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "DELETE_AGENT", "FAILED"),
@@ -3515,7 +3605,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       );
     }
   }
-  async listAgents(args) {
+  async list(args) {
     const { page = 0, perPage: perPageInput, orderBy } = args || {};
     const { field, direction } = this.parseOrderBy(orderBy);
     if (page < 0) {
@@ -3558,6 +3648,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
         hasMore: perPageInput === false ? false : offset + perPage < total
       };
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "LIST_AGENTS", "FAILED"),
@@ -3568,124 +3659,6 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       );
     }
   }
-  async listAgentsResolved(args) {
-    const { page = 0, perPage: perPageInput, orderBy } = args || {};
-    const { field, direction } = this.parseOrderBy(orderBy);
-    if (page < 0) {
-      throw new MastraError(
-        {
-          id: createStorageErrorId("PG", "LIST_AGENTS_RESOLVED", "INVALID_PAGE"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          details: { page }
-        },
-        new Error("page must be >= 0")
-      );
-    }
-    const perPage = normalizePerPage(perPageInput, 100);
-    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
-    try {
-      const agentsTableName = getTableName2({ indexName: TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
-      const versionsTableName = getTableName2({
-        indexName: TABLE_AGENT_VERSIONS,
-        schemaName: getSchemaName2(this.#schema)
-      });
-      const countResult = await this.#db.client.one(`SELECT COUNT(*) as count FROM ${agentsTableName}`);
-      const total = parseInt(countResult.count, 10);
-      if (total === 0) {
-        return {
-          agents: [],
-          total: 0,
-          page,
-          perPage: perPageForResponse,
-          hasMore: false
-        };
-      }
-      const limitValue = perPageInput === false ? total : perPage;
-      const query = `
-        WITH latest_versions AS (
-          SELECT v.*
-          FROM ${versionsTableName} v
-          INNER JOIN (
-            SELECT "agentId", MAX("versionNumber") as max_version
-            FROM ${versionsTableName}
-            GROUP BY "agentId"
-          ) lv ON v."agentId" = lv."agentId" AND v."versionNumber" = lv.max_version
-        )
-        SELECT 
-          a.*,
-          COALESCE(av.id, lv.id) as version_id,
-          COALESCE(av."versionNumber", lv."versionNumber") as version_number,
-          COALESCE(av.name, lv.name) as version_name,
-          COALESCE(av.description, lv.description) as version_description,
-          COALESCE(av.instructions, lv.instructions) as version_instructions,
-          COALESCE(av.model, lv.model) as version_model,
-          COALESCE(av.tools, lv.tools) as version_tools,
-          COALESCE(av."defaultOptions", lv."defaultOptions") as version_defaultOptions,
-          COALESCE(av.workflows, lv.workflows) as version_workflows,
-          COALESCE(av.agents, lv.agents) as version_agents,
-          COALESCE(av."integrationTools", lv."integrationTools") as version_integrationTools,
-          COALESCE(av."inputProcessors", lv."inputProcessors") as version_inputProcessors,
-          COALESCE(av."outputProcessors", lv."outputProcessors") as version_outputProcessors,
-          COALESCE(av.memory, lv.memory) as version_memory,
-          COALESCE(av.scorers, lv.scorers) as version_scorers
-        FROM ${agentsTableName} a
-        LEFT JOIN ${versionsTableName} av ON a."activeVersionId" = av.id
-        LEFT JOIN latest_versions lv ON a.id = lv."agentId"
-        ORDER BY a."${field}" ${direction}
-        LIMIT $1 OFFSET $2
-      `;
-      const dataResult = await this.#db.client.manyOrNone(query, [limitValue, offset]);
-      const resolvedAgents = (dataResult || []).map((row) => {
-        const agent = this.parseRow({
-          id: row.id,
-          status: row.status,
-          activeVersionId: row.activeVersionId,
-          authorId: row.authorId,
-          metadata: row.metadata,
-          createdAt: row.createdAt,
-          createdAtZ: row.createdAtZ,
-          updatedAt: row.updatedAt,
-          updatedAtZ: row.updatedAtZ
-        });
-        if (row.version_id) {
-          return {
-            ...agent,
-            name: row.version_name,
-            description: row.version_description,
-            instructions: row.version_instructions,
-            model: this.parseJson(row.version_model, "model"),
-            tools: this.parseJson(row.version_tools, "tools"),
-            defaultOptions: this.parseJson(row.version_defaultOptions, "defaultOptions"),
-            workflows: this.parseJson(row.version_workflows, "workflows"),
-            agents: this.parseJson(row.version_agents, "agents"),
-            integrationTools: this.parseJson(row.version_integrationTools, "integrationTools"),
-            inputProcessors: this.parseJson(row.version_inputProcessors, "inputProcessors"),
-            outputProcessors: this.parseJson(row.version_outputProcessors, "outputProcessors"),
-            memory: this.parseJson(row.version_memory, "memory"),
-            scorers: this.parseJson(row.version_scorers, "scorers")
-          };
-        }
-        return agent;
-      });
-      return {
-        agents: resolvedAgents,
-        total,
-        page,
-        perPage: perPageForResponse,
-        hasMore: perPageInput === false ? false : offset + perPage < total
-      };
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: createStorageErrorId("PG", "LIST_AGENTS_RESOLVED", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
-        },
-        error
-      );
-    }
-  }
   // ==========================================================================
   // Agent Version Methods
   // ==========================================================================
@@ -3709,7 +3682,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
           input.versionNumber,
           input.name,
           input.description ?? null,
-          input.instructions,
+          this.serializeInstructions(input.instructions),
           JSON.stringify(input.model),
           input.tools ? JSON.stringify(input.tools) : null,
           input.defaultOptions ? JSON.stringify(input.defaultOptions) : null,
@@ -3731,6 +3704,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
         createdAt: now
       };
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "CREATE_VERSION", "FAILED"),
@@ -3751,6 +3725,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       }
       return this.parseVersionRow(result);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "GET_VERSION", "FAILED"),
@@ -3774,6 +3749,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       }
       return this.parseVersionRow(result);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "GET_VERSION_BY_NUMBER", "FAILED"),
@@ -3797,6 +3773,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       }
       return this.parseVersionRow(result);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "GET_LATEST_VERSION", "FAILED"),
@@ -3853,6 +3830,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
         hasMore: perPageInput === false ? false : offset + perPage < total
       };
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "LIST_VERSIONS", "FAILED"),
@@ -3869,6 +3847,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       const tableName = getTableName2({ indexName: TABLE_AGENT_VERSIONS, schemaName: getSchemaName2(this.#schema) });
       await this.#db.client.none(`DELETE FROM ${tableName} WHERE id = $1`, [id]);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "DELETE_VERSION", "FAILED"),
@@ -3880,17 +3859,18 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       );
     }
   }
-  async deleteVersionsByAgentId(agentId) {
+  async deleteVersionsByParentId(entityId) {
     try {
       const tableName = getTableName2({ indexName: TABLE_AGENT_VERSIONS, schemaName: getSchemaName2(this.#schema) });
-      await this.#db.client.none(`DELETE FROM ${tableName} WHERE "agentId" = $1`, [agentId]);
+      await this.#db.client.none(`DELETE FROM ${tableName} WHERE "agentId" = $1`, [entityId]);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "DELETE_VERSIONS_BY_AGENT_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { agentId }
+          details: { agentId: entityId }
         },
         error
       );
@@ -3904,6 +3884,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       ]);
       return parseInt(result.count, 10);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: createStorageErrorId("PG", "COUNT_VERSIONS", "FAILED"),
@@ -3918,6 +3899,19 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
   // ==========================================================================
   // Private Helper Methods
   // ==========================================================================
+  serializeInstructions(instructions) {
+    if (instructions == null) return void 0;
+    return Array.isArray(instructions) ? JSON.stringify(instructions) : instructions;
+  }
+  deserializeInstructions(raw) {
+    if (!raw) return "";
+    try {
+      const parsed = JSON.parse(raw);
+      if (Array.isArray(parsed)) return parsed;
+    } catch {
+    }
+    return raw;
+  }
   parseVersionRow(row) {
     return {
       id: row.id,
@@ -3925,7 +3919,7 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       versionNumber: row.versionNumber,
       name: row.name,
       description: row.description,
-      instructions: row.instructions,
+      instructions: this.deserializeInstructions(row.instructions),
       model: this.parseJson(row.model, "model"),
       tools: this.parseJson(row.tools, "tools"),
       defaultOptions: this.parseJson(row.defaultOptions, "defaultOptions"),
@@ -3984,6 +3978,25 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
         tableName: OM_TABLE,
         schema: omSchema
       });
+      await this.#db.alterTable({
+        tableName: OM_TABLE,
+        schema: omSchema,
+        ifNotExists: [
+          "observedMessageIds",
+          "observedTimezone",
+          "bufferedObservations",
+          "bufferedObservationTokens",
+          "bufferedMessageIds",
+          "bufferedReflection",
+          "bufferedReflectionTokens",
+          "bufferedReflectionInputTokens",
+          "bufferedObservationChunks",
+          "isBufferingObservation",
+          "isBufferingReflection",
+          "lastBufferedAtTokens",
+          "lastBufferedAtTime"
+        ]
+      });
     }
     await this.#db.alterTable({
       tableName: TABLE_MESSAGES,
@@ -5179,12 +5192,26 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
       originType: row.originType || "initial",
       generationCount: Number(row.generationCount || 0),
       activeObservations: row.activeObservations || "",
+      // Handle new chunk-based structure
+      bufferedObservationChunks: row.bufferedObservationChunks ? typeof row.bufferedObservationChunks === "string" ? JSON.parse(row.bufferedObservationChunks) : row.bufferedObservationChunks : void 0,
+      // Deprecated fields (for backward compatibility)
       bufferedObservations: row.activeObservationsPendingUpdate || void 0,
+      bufferedObservationTokens: row.bufferedObservationTokens ? Number(row.bufferedObservationTokens) : void 0,
+      bufferedMessageIds: void 0,
+      // Use bufferedObservationChunks instead
+      bufferedReflection: row.bufferedReflection || void 0,
+      bufferedReflectionTokens: row.bufferedReflectionTokens ? Number(row.bufferedReflectionTokens) : void 0,
+      bufferedReflectionInputTokens: row.bufferedReflectionInputTokens ? Number(row.bufferedReflectionInputTokens) : void 0,
+      reflectedObservationLineCount: row.reflectedObservationLineCount ? Number(row.reflectedObservationLineCount) : void 0,
       totalTokensObserved: Number(row.totalTokensObserved || 0),
       observationTokenCount: Number(row.observationTokenCount || 0),
       pendingMessageTokens: Number(row.pendingMessageTokens || 0),
       isReflecting: Boolean(row.isReflecting),
       isObserving: Boolean(row.isObserving),
+      isBufferingObservation: row.isBufferingObservation === true || row.isBufferingObservation === "true",
+      isBufferingReflection: row.isBufferingReflection === true || row.isBufferingReflection === "true",
+      lastBufferedAtTokens: typeof row.lastBufferedAtTokens === "number" ? row.lastBufferedAtTokens : parseInt(String(row.lastBufferedAtTokens ?? "0"), 10) || 0,
+      lastBufferedAtTime: row.lastBufferedAtTime ? new Date(String(row.lastBufferedAtTime)) : null,
       config: row.config ? typeof row.config === "string" ? JSON.parse(row.config) : row.config : {},
       metadata: row.metadata ? typeof row.metadata === "string" ? JSON.parse(row.metadata) : row.metadata : void 0,
       observedMessageIds: row.observedMessageIds ? typeof row.observedMessageIds === "string" ? JSON.parse(row.observedMessageIds) : row.observedMessageIds : void 0,
@@ -5262,6 +5289,10 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
         pendingMessageTokens: 0,
         isReflecting: false,
         isObserving: false,
+        isBufferingObservation: false,
+        isBufferingReflection: false,
+        lastBufferedAtTokens: 0,
+        lastBufferedAtTime: null,
         config: input.config,
         observedTimezone: input.observedTimezone
       };
@@ -5276,8 +5307,9 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
           "activeObservations", "activeObservationsPendingUpdate",
           "originType", config, "generationCount", "lastObservedAt", "lastObservedAtZ", "lastReflectionAt", "lastReflectionAtZ",
           "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
-          "isObserving", "isReflecting", "observedTimezone", "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24)`,
+          "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
+          "observedTimezone", "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28)`,
         [
           id,
           lookupKey,
@@ -5302,6 +5334,14 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
           0,
           false,
           false,
+          false,
+          // isBufferingObservation
+          false,
+          // isBufferingReflection
+          0,
+          // lastBufferedAtTokens
+          null,
+          // lastBufferedAtTime
           input.observedTimezone || null,
           nowStr,
           // createdAt
@@ -5405,6 +5445,10 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
         pendingMessageTokens: 0,
         isReflecting: false,
         isObserving: false,
+        isBufferingObservation: false,
+        isBufferingReflection: false,
+        lastBufferedAtTokens: 0,
+        lastBufferedAtTime: null,
         config: input.currentRecord.config,
         metadata: input.currentRecord.metadata,
         observedTimezone: input.currentRecord.observedTimezone
@@ -5421,8 +5465,9 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
           "activeObservations", "activeObservationsPendingUpdate",
           "originType", config, "generationCount", "lastObservedAt", "lastObservedAtZ", "lastReflectionAt", "lastReflectionAtZ",
           "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
-          "isObserving", "isReflecting", "observedTimezone", "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24)`,
+          "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
+          "observedTimezone", "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28)`,
         [
           id,
           lookupKey,
@@ -5446,7 +5491,17 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
           record.totalTokensObserved,
           record.observationTokenCount,
           false,
+          // isObserving
           false,
+          // isReflecting
+          false,
+          // isBufferingObservation
+          false,
+          // isBufferingReflection
+          0,
+          // lastBufferedAtTokens
+          null,
+          // lastBufferedAtTime
           record.observedTimezone || null,
           nowStr,
           // createdAt
@@ -5541,6 +5596,82 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
       );
     }
   }
+  async setBufferingObservationFlag(id, isBuffering, lastBufferedAtTokens) {
+    try {
+      const tableName = getTableName3({
+        indexName: OM_TABLE,
+        schemaName: getSchemaName3(this.#schema)
+      });
+      const nowStr = (/* @__PURE__ */ new Date()).toISOString();
+      let query;
+      let values;
+      if (lastBufferedAtTokens !== void 0) {
+        query = `UPDATE ${tableName} SET "isBufferingObservation" = $1, "lastBufferedAtTokens" = $2, "updatedAt" = $3, "updatedAtZ" = $4 WHERE id = $5`;
+        values = [isBuffering, lastBufferedAtTokens, nowStr, nowStr, id];
+      } else {
+        query = `UPDATE ${tableName} SET "isBufferingObservation" = $1, "updatedAt" = $2, "updatedAtZ" = $3 WHERE id = $4`;
+        values = [isBuffering, nowStr, nowStr, id];
+      }
+      const result = await this.#db.client.query(query, values);
+      if (result.rowCount === 0) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "SET_BUFFERING_OBSERVATION_FLAG", "NOT_FOUND"),
+          text: `Observational memory record not found: ${id}`,
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id, isBuffering, lastBufferedAtTokens: lastBufferedAtTokens ?? null }
+        });
+      }
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "SET_BUFFERING_OBSERVATION_FLAG", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id, isBuffering, lastBufferedAtTokens: lastBufferedAtTokens ?? null }
+        },
+        error
+      );
+    }
+  }
+  async setBufferingReflectionFlag(id, isBuffering) {
+    try {
+      const tableName = getTableName3({
+        indexName: OM_TABLE,
+        schemaName: getSchemaName3(this.#schema)
+      });
+      const nowStr = (/* @__PURE__ */ new Date()).toISOString();
+      const result = await this.#db.client.query(
+        `UPDATE ${tableName} SET "isBufferingReflection" = $1, "updatedAt" = $2, "updatedAtZ" = $3 WHERE id = $4`,
+        [isBuffering, nowStr, nowStr, id]
+      );
+      if (result.rowCount === 0) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "SET_BUFFERING_REFLECTION_FLAG", "NOT_FOUND"),
+          text: `Observational memory record not found: ${id}`,
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id, isBuffering }
+        });
+      }
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "SET_BUFFERING_REFLECTION_FLAG", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id, isBuffering }
+        },
+        error
+      );
+    }
+  }
   async clearObservationalMemory(threadId, resourceId) {
     try {
       const lookupKey = this.getOMKey(threadId, resourceId);
@@ -5600,71 +5731,385 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
       );
     }
   }
-};
-var ObservabilityPG = class _ObservabilityPG extends ObservabilityStorage {
-  #db;
-  #schema;
-  #skipDefaultIndexes;
-  #indexes;
-  /** Tables managed by this domain */
-  static MANAGED_TABLES = [TABLE_SPANS];
-  constructor(config) {
-    super();
-    const { client, schemaName, skipDefaultIndexes, indexes } = resolvePgConfig(config);
-    this.#db = new PgDB({ client, schemaName, skipDefaultIndexes });
-    this.#schema = schemaName || "public";
-    this.#skipDefaultIndexes = skipDefaultIndexes;
-    this.#indexes = indexes?.filter((idx) => _ObservabilityPG.MANAGED_TABLES.includes(idx.table));
-  }
-  async init() {
-    await this.#db.createTable({ tableName: TABLE_SPANS, schema: TABLE_SCHEMAS[TABLE_SPANS] });
-    await this.createDefaultIndexes();
-    await this.createCustomIndexes();
+  // ============================================
+  // Async Buffering Methods
+  // ============================================
+  async updateBufferedObservations(input) {
+    try {
+      const tableName = getTableName3({
+        indexName: OM_TABLE,
+        schemaName: getSchemaName3(this.#schema)
+      });
+      const nowStr = (/* @__PURE__ */ new Date()).toISOString();
+      const newChunk = {
+        id: `ombuf-${randomUUID()}`,
+        cycleId: input.chunk.cycleId,
+        observations: input.chunk.observations,
+        tokenCount: input.chunk.tokenCount,
+        messageIds: input.chunk.messageIds,
+        messageTokens: input.chunk.messageTokens,
+        lastObservedAt: input.chunk.lastObservedAt,
+        createdAt: /* @__PURE__ */ new Date(),
+        suggestedContinuation: input.chunk.suggestedContinuation,
+        currentTask: input.chunk.currentTask
+      };
+      const lastBufferedAtTime = input.lastBufferedAtTime ? input.lastBufferedAtTime.toISOString() : null;
+      const result = await this.#db.client.query(
+        `UPDATE ${tableName} SET
+          "bufferedObservationChunks" = COALESCE("bufferedObservationChunks", '[]'::jsonb) || $1::jsonb,
+          "lastBufferedAtTime" = COALESCE($2, "lastBufferedAtTime"),
+          "updatedAt" = $3,
+          "updatedAtZ" = $4
+        WHERE id = $5`,
+        [JSON.stringify([newChunk]), lastBufferedAtTime, nowStr, nowStr, input.id]
+      );
+      if (result.rowCount === 0) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "UPDATE_BUFFERED_OBSERVATIONS", "NOT_FOUND"),
+          text: `Observational memory record not found: ${input.id}`,
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.id }
+        });
+      }
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "UPDATE_BUFFERED_OBSERVATIONS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.id }
+        },
+        error
+      );
+    }
   }
-  /**
-   * Returns default index definitions for the observability domain tables.
-   */
-  getDefaultIndexDefinitions() {
-    const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
-    return [
-      {
-        name: `${schemaPrefix}mastra_ai_spans_traceid_startedat_idx`,
-        table: TABLE_SPANS,
-        columns: ["traceId", "startedAt DESC"]
-      },
-      {
-        name: `${schemaPrefix}mastra_ai_spans_parentspanid_startedat_idx`,
-        table: TABLE_SPANS,
-        columns: ["parentSpanId", "startedAt DESC"]
-      },
-      {
-        name: `${schemaPrefix}mastra_ai_spans_name_idx`,
-        table: TABLE_SPANS,
-        columns: ["name"]
-      },
-      {
-        name: `${schemaPrefix}mastra_ai_spans_spantype_startedat_idx`,
-        table: TABLE_SPANS,
-        columns: ["spanType", "startedAt DESC"]
-      },
-      // Root spans partial index - every listTraces query filters parentSpanId IS NULL
-      {
-        name: `${schemaPrefix}mastra_ai_spans_root_spans_idx`,
-        table: TABLE_SPANS,
-        columns: ["startedAt DESC"],
-        where: '"parentSpanId" IS NULL'
-      },
-      // Entity identification indexes - common filtering patterns
-      {
-        name: `${schemaPrefix}mastra_ai_spans_entitytype_entityid_idx`,
-        table: TABLE_SPANS,
-        columns: ["entityType", "entityId"]
-      },
-      {
-        name: `${schemaPrefix}mastra_ai_spans_entitytype_entityname_idx`,
-        table: TABLE_SPANS,
-        columns: ["entityType", "entityName"]
-      },
+  async swapBufferedToActive(input) {
+    try {
+      const tableName = getTableName3({
+        indexName: OM_TABLE,
+        schemaName: getSchemaName3(this.#schema)
+      });
+      const nowStr = (/* @__PURE__ */ new Date()).toISOString();
+      const record = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [input.id]);
+      if (!record) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "SWAP_BUFFERED_TO_ACTIVE", "NOT_FOUND"),
+          text: `Observational memory record not found: ${input.id}`,
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.id }
+        });
+      }
+      let chunks = [];
+      if (record.bufferedObservationChunks) {
+        try {
+          const parsed = typeof record.bufferedObservationChunks === "string" ? JSON.parse(record.bufferedObservationChunks) : record.bufferedObservationChunks;
+          chunks = Array.isArray(parsed) ? parsed : [];
+        } catch {
+          chunks = [];
+        }
+      }
+      if (chunks.length === 0) {
+        return {
+          chunksActivated: 0,
+          messageTokensActivated: 0,
+          observationTokensActivated: 0,
+          messagesActivated: 0,
+          activatedCycleIds: [],
+          activatedMessageIds: []
+        };
+      }
+      const retentionFloor = input.messageTokensThreshold * (1 - input.activationRatio);
+      const targetMessageTokens = Math.max(0, input.currentPendingTokens - retentionFloor);
+      let cumulativeMessageTokens = 0;
+      let chunksToActivate = 0;
+      let bestBoundary = 0;
+      let bestBoundaryMessageTokens = 0;
+      for (let i = 0; i < chunks.length; i++) {
+        cumulativeMessageTokens += chunks[i].messageTokens ?? 0;
+        const boundary = i + 1;
+        const isUnder = cumulativeMessageTokens <= targetMessageTokens;
+        const bestIsUnder = bestBoundaryMessageTokens <= targetMessageTokens;
+        if (bestBoundary === 0) {
+          bestBoundary = boundary;
+          bestBoundaryMessageTokens = cumulativeMessageTokens;
+        } else if (isUnder && !bestIsUnder) {
+          bestBoundary = boundary;
+          bestBoundaryMessageTokens = cumulativeMessageTokens;
+        } else if (isUnder && bestIsUnder) {
+          if (cumulativeMessageTokens > bestBoundaryMessageTokens) {
+            bestBoundary = boundary;
+            bestBoundaryMessageTokens = cumulativeMessageTokens;
+          }
+        } else if (!isUnder && !bestIsUnder) {
+          if (cumulativeMessageTokens < bestBoundaryMessageTokens) {
+            bestBoundary = boundary;
+            bestBoundaryMessageTokens = cumulativeMessageTokens;
+          }
+        }
+      }
+      chunksToActivate = bestBoundary === 0 ? 1 : bestBoundary;
+      const activatedChunks = chunks.slice(0, chunksToActivate);
+      const remainingChunks = chunks.slice(chunksToActivate);
+      const activatedContent = activatedChunks.map((c) => c.observations).join("\n\n");
+      const activatedTokens = activatedChunks.reduce((sum, c) => sum + c.tokenCount, 0);
+      const activatedMessageTokens = activatedChunks.reduce((sum, c) => sum + (c.messageTokens ?? 0), 0);
+      const activatedMessageCount = activatedChunks.reduce((sum, c) => sum + c.messageIds.length, 0);
+      const activatedCycleIds = activatedChunks.map((c) => c.cycleId).filter((id) => !!id);
+      const activatedMessageIds = activatedChunks.flatMap((c) => c.messageIds ?? []);
+      const latestChunk = activatedChunks[activatedChunks.length - 1];
+      const lastObservedAt = input.lastObservedAt ?? (latestChunk?.lastObservedAt ? new Date(latestChunk.lastObservedAt) : /* @__PURE__ */ new Date());
+      const lastObservedAtStr = lastObservedAt.toISOString();
+      await this.#db.client.query(
+        `UPDATE ${tableName} SET
+          "activeObservations" = CASE 
+            WHEN "activeObservations" IS NOT NULL AND "activeObservations" != '' 
+            THEN "activeObservations" || E'\\n\\n' || $1
+            ELSE $1
+          END,
+          "observationTokenCount" = COALESCE("observationTokenCount", 0) + $2,
+          "pendingMessageTokens" = GREATEST(0, COALESCE("pendingMessageTokens", 0) - $3),
+          "bufferedObservationChunks" = $4,
+          "lastObservedAt" = $5,
+          "lastObservedAtZ" = $6,
+          "updatedAt" = $7,
+          "updatedAtZ" = $8
+        WHERE id = $9`,
+        [
+          activatedContent,
+          activatedTokens,
+          activatedMessageTokens,
+          remainingChunks.length > 0 ? JSON.stringify(remainingChunks) : null,
+          lastObservedAtStr,
+          lastObservedAtStr,
+          nowStr,
+          nowStr,
+          input.id
+        ]
+      );
+      return {
+        chunksActivated: activatedChunks.length,
+        messageTokensActivated: activatedMessageTokens,
+        observationTokensActivated: activatedTokens,
+        messagesActivated: activatedMessageCount,
+        activatedCycleIds,
+        activatedMessageIds,
+        observations: activatedContent,
+        perChunk: activatedChunks.map((c) => ({
+          cycleId: c.cycleId ?? "",
+          messageTokens: c.messageTokens ?? 0,
+          observationTokens: c.tokenCount,
+          messageCount: c.messageIds.length,
+          observations: c.observations
+        }))
+      };
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "SWAP_BUFFERED_TO_ACTIVE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.id }
+        },
+        error
+      );
+    }
+  }
+  async updateBufferedReflection(input) {
+    try {
+      const tableName = getTableName3({
+        indexName: OM_TABLE,
+        schemaName: getSchemaName3(this.#schema)
+      });
+      const nowStr = (/* @__PURE__ */ new Date()).toISOString();
+      const result = await this.#db.client.query(
+        `UPDATE ${tableName} SET
+          "bufferedReflection" = CASE 
+            WHEN "bufferedReflection" IS NOT NULL AND "bufferedReflection" != '' 
+            THEN "bufferedReflection" || E'\\n\\n' || $1
+            ELSE $1
+          END,
+          "bufferedReflectionTokens" = COALESCE("bufferedReflectionTokens", 0) + $2,
+          "bufferedReflectionInputTokens" = COALESCE("bufferedReflectionInputTokens", 0) + $3,
+          "reflectedObservationLineCount" = $4,
+          "updatedAt" = $5,
+          "updatedAtZ" = $6
+        WHERE id = $7`,
+        [
+          input.reflection,
+          input.tokenCount,
+          input.inputTokenCount,
+          input.reflectedObservationLineCount,
+          nowStr,
+          nowStr,
+          input.id
+        ]
+      );
+      if (result.rowCount === 0) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "UPDATE_BUFFERED_REFLECTION", "NOT_FOUND"),
+          text: `Observational memory record not found: ${input.id}`,
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.id }
+        });
+      }
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "UPDATE_BUFFERED_REFLECTION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.id }
+        },
+        error
+      );
+    }
+  }
+  async swapBufferedReflectionToActive(input) {
+    try {
+      const tableName = getTableName3({
+        indexName: OM_TABLE,
+        schemaName: getSchemaName3(this.#schema)
+      });
+      const record = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [
+        input.currentRecord.id
+      ]);
+      if (!record) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NOT_FOUND"),
+          text: `Observational memory record not found: ${input.currentRecord.id}`,
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.currentRecord.id }
+        });
+      }
+      const bufferedReflection = record.bufferedReflection || "";
+      const reflectedLineCount = Number(record.reflectedObservationLineCount || 0);
+      if (!bufferedReflection) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NO_CONTENT"),
+          text: "No buffered reflection to swap",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { id: input.currentRecord.id }
+        });
+      }
+      const currentObservations = record.activeObservations || "";
+      const allLines = currentObservations.split("\n");
+      const unreflectedLines = allLines.slice(reflectedLineCount);
+      const unreflectedContent = unreflectedLines.join("\n").trim();
+      const newObservations = unreflectedContent ? `${bufferedReflection}
+
+${unreflectedContent}` : bufferedReflection;
+      const newRecord = await this.createReflectionGeneration({
+        currentRecord: input.currentRecord,
+        reflection: newObservations,
+        tokenCount: input.tokenCount
+      });
+      const nowStr = (/* @__PURE__ */ new Date()).toISOString();
+      await this.#db.client.query(
+        `UPDATE ${tableName} SET
+          "bufferedReflection" = NULL,
+          "bufferedReflectionTokens" = NULL,
+          "bufferedReflectionInputTokens" = NULL,
+          "reflectedObservationLineCount" = NULL,
+          "updatedAt" = $1,
+          "updatedAtZ" = $2
+        WHERE id = $3`,
+        [nowStr, nowStr, input.currentRecord.id]
+      );
+      return newRecord;
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.currentRecord.id }
+        },
+        error
+      );
+    }
+  }
+};
+var ObservabilityPG = class _ObservabilityPG extends ObservabilityStorage {
+  #db;
+  #schema;
+  #skipDefaultIndexes;
+  #indexes;
+  /** Tables managed by this domain */
+  static MANAGED_TABLES = [TABLE_SPANS];
+  constructor(config) {
+    super();
+    const { client, schemaName, skipDefaultIndexes, indexes } = resolvePgConfig(config);
+    this.#db = new PgDB({ client, schemaName, skipDefaultIndexes });
+    this.#schema = schemaName || "public";
+    this.#skipDefaultIndexes = skipDefaultIndexes;
+    this.#indexes = indexes?.filter((idx) => _ObservabilityPG.MANAGED_TABLES.includes(idx.table));
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_SPANS, schema: TABLE_SCHEMAS[TABLE_SPANS] });
+    await this.createDefaultIndexes();
+    await this.createCustomIndexes();
+  }
+  /**
+   * Returns default index definitions for the observability domain tables.
+   */
+  getDefaultIndexDefinitions() {
+    const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+    return [
+      {
+        name: `${schemaPrefix}mastra_ai_spans_traceid_startedat_idx`,
+        table: TABLE_SPANS,
+        columns: ["traceId", "startedAt DESC"]
+      },
+      {
+        name: `${schemaPrefix}mastra_ai_spans_parentspanid_startedat_idx`,
+        table: TABLE_SPANS,
+        columns: ["parentSpanId", "startedAt DESC"]
+      },
+      {
+        name: `${schemaPrefix}mastra_ai_spans_name_idx`,
+        table: TABLE_SPANS,
+        columns: ["name"]
+      },
+      {
+        name: `${schemaPrefix}mastra_ai_spans_spantype_startedat_idx`,
+        table: TABLE_SPANS,
+        columns: ["spanType", "startedAt DESC"]
+      },
+      // Root spans partial index - every listTraces query filters parentSpanId IS NULL
+      {
+        name: `${schemaPrefix}mastra_ai_spans_root_spans_idx`,
+        table: TABLE_SPANS,
+        columns: ["startedAt DESC"],
+        where: '"parentSpanId" IS NULL'
+      },
+      // Entity identification indexes - common filtering patterns
+      {
+        name: `${schemaPrefix}mastra_ai_spans_entitytype_entityid_idx`,
+        table: TABLE_SPANS,
+        columns: ["entityType", "entityId"]
+      },
+      {
+        name: `${schemaPrefix}mastra_ai_spans_entitytype_entityname_idx`,
+        table: TABLE_SPANS,
+        columns: ["entityType", "entityName"]
+      },
       // Multi-tenant filtering - organizationId + userId
       {
         name: `${schemaPrefix}mastra_ai_spans_orgid_userid_idx`,
@@ -6215,6 +6660,1338 @@ var ObservabilityPG = class _ObservabilityPG extends ObservabilityStorage {
     }
   }
 };
+var SNAPSHOT_FIELDS = ["name", "description", "content", "rules"];
+var PromptBlocksPG = class _PromptBlocksPG extends PromptBlocksStorage {
+  #db;
+  #schema;
+  #skipDefaultIndexes;
+  #indexes;
+  static MANAGED_TABLES = [TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS];
+  constructor(config) {
+    super();
+    const { client, schemaName, skipDefaultIndexes, indexes } = resolvePgConfig(config);
+    this.#db = new PgDB({ client, schemaName, skipDefaultIndexes });
+    this.#schema = schemaName || "public";
+    this.#skipDefaultIndexes = skipDefaultIndexes;
+    this.#indexes = indexes?.filter((idx) => _PromptBlocksPG.MANAGED_TABLES.includes(idx.table));
+  }
+  getDefaultIndexDefinitions() {
+    return [
+      {
+        name: "idx_prompt_block_versions_block_version",
+        table: TABLE_PROMPT_BLOCK_VERSIONS,
+        columns: ["blockId", "versionNumber"],
+        unique: true
+      }
+    ];
+  }
+  async createDefaultIndexes() {
+    if (this.#skipDefaultIndexes) {
+      return;
+    }
+    for (const indexDef of this.getDefaultIndexDefinitions()) {
+      try {
+        await this.#db.createIndex(indexDef);
+      } catch {
+      }
+    }
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_PROMPT_BLOCKS, schema: TABLE_SCHEMAS[TABLE_PROMPT_BLOCKS] });
+    await this.#db.createTable({
+      tableName: TABLE_PROMPT_BLOCK_VERSIONS,
+      schema: TABLE_SCHEMAS[TABLE_PROMPT_BLOCK_VERSIONS]
+    });
+    await this.createDefaultIndexes();
+    await this.createCustomIndexes();
+  }
+  async createCustomIndexes() {
+    if (!this.#indexes || this.#indexes.length === 0) {
+      return;
+    }
+    for (const indexDef of this.#indexes) {
+      try {
+        await this.#db.createIndex(indexDef);
+      } catch (error) {
+        this.logger?.warn?.(`Failed to create custom index ${indexDef.name}:`, error);
+      }
+    }
+  }
+  async dangerouslyClearAll() {
+    await this.#db.clearTable({ tableName: TABLE_PROMPT_BLOCK_VERSIONS });
+    await this.#db.clearTable({ tableName: TABLE_PROMPT_BLOCKS });
+  }
+  // ==========================================================================
+  // Prompt Block CRUD Methods
+  // ==========================================================================
+  async getById(id) {
+    try {
+      const tableName = getTableName2({ indexName: TABLE_PROMPT_BLOCKS, schemaName: getSchemaName2(this.#schema) });
+      const result = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [id]);
+      if (!result) {
+        return null;
+      }
+      return this.parseBlockRow(result);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "GET_PROMPT_BLOCK_BY_ID", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId: id }
+        },
+        error
+      );
+    }
+  }
+  async create(input) {
+    const { promptBlock } = input;
+    try {
+      const tableName = getTableName2({ indexName: TABLE_PROMPT_BLOCKS, schemaName: getSchemaName2(this.#schema) });
+      const now = /* @__PURE__ */ new Date();
+      const nowIso = now.toISOString();
+      await this.#db.client.none(
+        `INSERT INTO ${tableName} (
+          id, status, "activeVersionId", "authorId", metadata,
+          "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
+        [
+          promptBlock.id,
+          "draft",
+          null,
+          promptBlock.authorId ?? null,
+          promptBlock.metadata ? JSON.stringify(promptBlock.metadata) : null,
+          nowIso,
+          nowIso,
+          nowIso,
+          nowIso
+        ]
+      );
+      const { id: _id, authorId: _authorId, metadata: _metadata, ...snapshotConfig } = promptBlock;
+      const versionId = crypto.randomUUID();
+      await this.createVersion({
+        id: versionId,
+        blockId: promptBlock.id,
+        versionNumber: 1,
+        ...snapshotConfig,
+        changedFields: [...SNAPSHOT_FIELDS],
+        changeMessage: "Initial version"
+      });
+      return {
+        id: promptBlock.id,
+        status: "draft",
+        activeVersionId: void 0,
+        authorId: promptBlock.authorId,
+        metadata: promptBlock.metadata,
+        createdAt: now,
+        updatedAt: now
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      try {
+        const tableName = getTableName2({ indexName: TABLE_PROMPT_BLOCKS, schemaName: getSchemaName2(this.#schema) });
+        await this.#db.client.none(
+          `DELETE FROM ${tableName} WHERE id = $1 AND status = 'draft' AND "activeVersionId" IS NULL`,
+          [promptBlock.id]
+        );
+      } catch {
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "CREATE_PROMPT_BLOCK", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId: promptBlock.id }
+        },
+        error
+      );
+    }
+  }
+  async update(input) {
+    const { id, ...updates } = input;
+    try {
+      const tableName = getTableName2({ indexName: TABLE_PROMPT_BLOCKS, schemaName: getSchemaName2(this.#schema) });
+      const existingBlock = await this.getById(id);
+      if (!existingBlock) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "UPDATE_PROMPT_BLOCK", "NOT_FOUND"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          text: `Prompt block ${id} not found`,
+          details: { blockId: id }
+        });
+      }
+      const { authorId, activeVersionId, metadata, status, ...configFields } = updates;
+      let versionCreated = false;
+      const hasConfigUpdate = SNAPSHOT_FIELDS.some((field) => field in configFields);
+      if (hasConfigUpdate) {
+        const latestVersion = await this.getLatestVersion(id);
+        if (!latestVersion) {
+          throw new MastraError({
+            id: createStorageErrorId("PG", "UPDATE_PROMPT_BLOCK", "NO_VERSIONS"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.SYSTEM,
+            text: `No versions found for prompt block ${id}`,
+            details: { blockId: id }
+          });
+        }
+        const {
+          id: _versionId,
+          blockId: _blockId,
+          versionNumber: _versionNumber,
+          changedFields: _changedFields,
+          changeMessage: _changeMessage,
+          createdAt: _createdAt,
+          ...latestConfig
+        } = latestVersion;
+        const newConfig = { ...latestConfig, ...configFields };
+        const changedFields = SNAPSHOT_FIELDS.filter(
+          (field) => field in configFields && JSON.stringify(configFields[field]) !== JSON.stringify(latestConfig[field])
+        );
+        if (changedFields.length > 0) {
+          versionCreated = true;
+          const newVersionId = crypto.randomUUID();
+          await this.createVersion({
+            id: newVersionId,
+            blockId: id,
+            versionNumber: latestVersion.versionNumber + 1,
+            ...newConfig,
+            changedFields: [...changedFields],
+            changeMessage: `Updated ${changedFields.join(", ")}`
+          });
+        }
+      }
+      const setClauses = [];
+      const values = [];
+      let paramIndex = 1;
+      if (authorId !== void 0) {
+        setClauses.push(`"authorId" = $${paramIndex++}`);
+        values.push(authorId);
+      }
+      if (activeVersionId !== void 0) {
+        setClauses.push(`"activeVersionId" = $${paramIndex++}`);
+        values.push(activeVersionId);
+        if (status === void 0) {
+          setClauses.push(`status = $${paramIndex++}`);
+          values.push("published");
+        }
+      }
+      if (status !== void 0) {
+        setClauses.push(`status = $${paramIndex++}`);
+        values.push(status);
+      }
+      if (metadata !== void 0) {
+        const mergedMetadata = { ...existingBlock.metadata || {}, ...metadata };
+        setClauses.push(`metadata = $${paramIndex++}`);
+        values.push(JSON.stringify(mergedMetadata));
+      }
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      setClauses.push(`"updatedAt" = $${paramIndex++}`);
+      values.push(now);
+      setClauses.push(`"updatedAtZ" = $${paramIndex++}`);
+      values.push(now);
+      values.push(id);
+      if (setClauses.length > 2 || versionCreated) {
+        await this.#db.client.none(
+          `UPDATE ${tableName} SET ${setClauses.join(", ")} WHERE id = $${paramIndex}`,
+          values
+        );
+      }
+      const updatedBlock = await this.getById(id);
+      if (!updatedBlock) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "UPDATE_PROMPT_BLOCK", "NOT_FOUND_AFTER_UPDATE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.SYSTEM,
+          text: `Prompt block ${id} not found after update`,
+          details: { blockId: id }
+        });
+      }
+      return updatedBlock;
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "UPDATE_PROMPT_BLOCK", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId: id }
+        },
+        error
+      );
+    }
+  }
+  async delete(id) {
+    try {
+      const tableName = getTableName2({ indexName: TABLE_PROMPT_BLOCKS, schemaName: getSchemaName2(this.#schema) });
+      await this.deleteVersionsByParentId(id);
+      await this.#db.client.none(`DELETE FROM ${tableName} WHERE id = $1`, [id]);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "DELETE_PROMPT_BLOCK", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId: id }
+        },
+        error
+      );
+    }
+  }
+  async list(args) {
+    const { page = 0, perPage: perPageInput, orderBy, authorId, metadata } = args || {};
+    const { field, direction } = this.parseOrderBy(orderBy);
+    if (page < 0) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "LIST_PROMPT_BLOCKS", "INVALID_PAGE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
+      );
+    }
+    const perPage = normalizePerPage(perPageInput, 100);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    try {
+      const tableName = getTableName2({ indexName: TABLE_PROMPT_BLOCKS, schemaName: getSchemaName2(this.#schema) });
+      const conditions = [];
+      const queryParams = [];
+      let paramIdx = 1;
+      if (authorId !== void 0) {
+        conditions.push(`"authorId" = $${paramIdx++}`);
+        queryParams.push(authorId);
+      }
+      if (metadata && Object.keys(metadata).length > 0) {
+        conditions.push(`metadata @> $${paramIdx++}::jsonb`);
+        queryParams.push(JSON.stringify(metadata));
+      }
+      const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+      const countResult = await this.#db.client.one(
+        `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
+        queryParams
+      );
+      const total = parseInt(countResult.count, 10);
+      if (total === 0) {
+        return {
+          promptBlocks: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
+      const limitValue = perPageInput === false ? total : perPage;
+      const dataResult = await this.#db.client.manyOrNone(
+        `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
+        [...queryParams, limitValue, offset]
+      );
+      const promptBlocks = (dataResult || []).map((row) => this.parseBlockRow(row));
+      return {
+        promptBlocks,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "LIST_PROMPT_BLOCKS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  // ==========================================================================
+  // Prompt Block Version Methods
+  // ==========================================================================
+  async createVersion(input) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_PROMPT_BLOCK_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const now = /* @__PURE__ */ new Date();
+      const nowIso = now.toISOString();
+      await this.#db.client.none(
+        `INSERT INTO ${tableName} (
+          id, "blockId", "versionNumber",
+          name, description, content, rules,
+          "changedFields", "changeMessage",
+          "createdAt", "createdAtZ"
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)`,
+        [
+          input.id,
+          input.blockId,
+          input.versionNumber,
+          input.name,
+          input.description ?? null,
+          input.content,
+          input.rules ? JSON.stringify(input.rules) : null,
+          input.changedFields ? JSON.stringify(input.changedFields) : null,
+          input.changeMessage ?? null,
+          nowIso,
+          nowIso
+        ]
+      );
+      return {
+        ...input,
+        createdAt: now
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "CREATE_PROMPT_BLOCK_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { versionId: input.id, blockId: input.blockId }
+        },
+        error
+      );
+    }
+  }
+  async getVersion(id) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_PROMPT_BLOCK_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const result = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [id]);
+      if (!result) {
+        return null;
+      }
+      return this.parseVersionRow(result);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "GET_PROMPT_BLOCK_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { versionId: id }
+        },
+        error
+      );
+    }
+  }
+  async getVersionByNumber(blockId, versionNumber) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_PROMPT_BLOCK_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const result = await this.#db.client.oneOrNone(
+        `SELECT * FROM ${tableName} WHERE "blockId" = $1 AND "versionNumber" = $2`,
+        [blockId, versionNumber]
+      );
+      if (!result) {
+        return null;
+      }
+      return this.parseVersionRow(result);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "GET_PROMPT_BLOCK_VERSION_BY_NUMBER", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId, versionNumber }
+        },
+        error
+      );
+    }
+  }
+  async getLatestVersion(blockId) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_PROMPT_BLOCK_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const result = await this.#db.client.oneOrNone(
+        `SELECT * FROM ${tableName} WHERE "blockId" = $1 ORDER BY "versionNumber" DESC LIMIT 1`,
+        [blockId]
+      );
+      if (!result) {
+        return null;
+      }
+      return this.parseVersionRow(result);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "GET_LATEST_PROMPT_BLOCK_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId }
+        },
+        error
+      );
+    }
+  }
+  async listVersions(input) {
+    const { blockId, page = 0, perPage: perPageInput, orderBy } = input;
+    if (page < 0) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "LIST_PROMPT_BLOCK_VERSIONS", "INVALID_PAGE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
+      );
+    }
+    const perPage = normalizePerPage(perPageInput, 20);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    try {
+      const { field, direction } = this.parseVersionOrderBy(orderBy);
+      const tableName = getTableName2({
+        indexName: TABLE_PROMPT_BLOCK_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const countResult = await this.#db.client.one(`SELECT COUNT(*) as count FROM ${tableName} WHERE "blockId" = $1`, [
+        blockId
+      ]);
+      const total = parseInt(countResult.count, 10);
+      if (total === 0) {
+        return {
+          versions: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
+      const limitValue = perPageInput === false ? total : perPage;
+      const dataResult = await this.#db.client.manyOrNone(
+        `SELECT * FROM ${tableName} WHERE "blockId" = $1 ORDER BY "${field}" ${direction} LIMIT $2 OFFSET $3`,
+        [blockId, limitValue, offset]
+      );
+      const versions = (dataResult || []).map((row) => this.parseVersionRow(row));
+      return {
+        versions,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "LIST_PROMPT_BLOCK_VERSIONS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId }
+        },
+        error
+      );
+    }
+  }
+  async deleteVersion(id) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_PROMPT_BLOCK_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      await this.#db.client.none(`DELETE FROM ${tableName} WHERE id = $1`, [id]);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "DELETE_PROMPT_BLOCK_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { versionId: id }
+        },
+        error
+      );
+    }
+  }
+  async deleteVersionsByParentId(entityId) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_PROMPT_BLOCK_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      await this.#db.client.none(`DELETE FROM ${tableName} WHERE "blockId" = $1`, [entityId]);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "DELETE_PROMPT_BLOCK_VERSIONS_BY_BLOCK_ID", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId: entityId }
+        },
+        error
+      );
+    }
+  }
+  async countVersions(blockId) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_PROMPT_BLOCK_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const result = await this.#db.client.one(`SELECT COUNT(*) as count FROM ${tableName} WHERE "blockId" = $1`, [
+        blockId
+      ]);
+      return parseInt(result.count, 10);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "COUNT_PROMPT_BLOCK_VERSIONS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { blockId }
+        },
+        error
+      );
+    }
+  }
+  // ==========================================================================
+  // Private Helper Methods
+  // ==========================================================================
+  parseJson(value, fieldName) {
+    if (!value) return void 0;
+    if (typeof value !== "string") return value;
+    try {
+      return JSON.parse(value);
+    } catch (error) {
+      const details = {
+        value: value.length > 100 ? value.substring(0, 100) + "..." : value
+      };
+      if (fieldName) {
+        details.field = fieldName;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "PARSE_JSON", "INVALID_JSON"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.SYSTEM,
+          text: `Failed to parse JSON${fieldName ? ` for field "${fieldName}"` : ""}: ${error instanceof Error ? error.message : "Unknown error"}`,
+          details
+        },
+        error
+      );
+    }
+  }
+  parseBlockRow(row) {
+    return {
+      id: row.id,
+      status: row.status,
+      activeVersionId: row.activeVersionId,
+      authorId: row.authorId,
+      metadata: this.parseJson(row.metadata, "metadata"),
+      createdAt: new Date(row.createdAtZ || row.createdAt),
+      updatedAt: new Date(row.updatedAtZ || row.updatedAt)
+    };
+  }
+  parseVersionRow(row) {
+    return {
+      id: row.id,
+      blockId: row.blockId,
+      versionNumber: row.versionNumber,
+      name: row.name,
+      description: row.description,
+      content: row.content,
+      rules: this.parseJson(row.rules, "rules"),
+      changedFields: this.parseJson(row.changedFields, "changedFields"),
+      changeMessage: row.changeMessage,
+      createdAt: new Date(row.createdAtZ || row.createdAt)
+    };
+  }
+};
+var SNAPSHOT_FIELDS2 = [
+  "name",
+  "description",
+  "type",
+  "model",
+  "instructions",
+  "scoreRange",
+  "presetConfig",
+  "defaultSampling"
+];
+var ScorerDefinitionsPG = class _ScorerDefinitionsPG extends ScorerDefinitionsStorage {
+  #db;
+  #schema;
+  #skipDefaultIndexes;
+  #indexes;
+  static MANAGED_TABLES = [TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS];
+  constructor(config) {
+    super();
+    const { client, schemaName, skipDefaultIndexes, indexes } = resolvePgConfig(config);
+    this.#db = new PgDB({ client, schemaName, skipDefaultIndexes });
+    this.#schema = schemaName || "public";
+    this.#skipDefaultIndexes = skipDefaultIndexes;
+    this.#indexes = indexes?.filter(
+      (idx) => _ScorerDefinitionsPG.MANAGED_TABLES.includes(idx.table)
+    );
+  }
+  getDefaultIndexDefinitions() {
+    return [
+      {
+        name: "idx_scorer_definition_versions_def_version",
+        table: TABLE_SCORER_DEFINITION_VERSIONS,
+        columns: ["scorerDefinitionId", "versionNumber"],
+        unique: true
+      }
+    ];
+  }
+  async createDefaultIndexes() {
+    if (this.#skipDefaultIndexes) {
+      return;
+    }
+    for (const indexDef of this.getDefaultIndexDefinitions()) {
+      try {
+        await this.#db.createIndex(indexDef);
+      } catch {
+      }
+    }
+  }
+  async init() {
+    await this.#db.createTable({
+      tableName: TABLE_SCORER_DEFINITIONS,
+      schema: TABLE_SCHEMAS[TABLE_SCORER_DEFINITIONS]
+    });
+    await this.#db.createTable({
+      tableName: TABLE_SCORER_DEFINITION_VERSIONS,
+      schema: TABLE_SCHEMAS[TABLE_SCORER_DEFINITION_VERSIONS]
+    });
+    await this.createDefaultIndexes();
+    await this.createCustomIndexes();
+  }
+  async createCustomIndexes() {
+    if (!this.#indexes || this.#indexes.length === 0) {
+      return;
+    }
+    for (const indexDef of this.#indexes) {
+      try {
+        await this.#db.createIndex(indexDef);
+      } catch (error) {
+        this.logger?.warn?.(`Failed to create custom index ${indexDef.name}:`, error);
+      }
+    }
+  }
+  async dangerouslyClearAll() {
+    await this.#db.clearTable({ tableName: TABLE_SCORER_DEFINITION_VERSIONS });
+    await this.#db.clearTable({ tableName: TABLE_SCORER_DEFINITIONS });
+  }
+  // ==========================================================================
+  // Scorer Definition CRUD Methods
+  // ==========================================================================
+  async getById(id) {
+    try {
+      const tableName = getTableName2({ indexName: TABLE_SCORER_DEFINITIONS, schemaName: getSchemaName2(this.#schema) });
+      const result = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [id]);
+      if (!result) {
+        return null;
+      }
+      return this.parseScorerRow(result);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "GET_SCORER_DEFINITION_BY_ID", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId: id }
+        },
+        error
+      );
+    }
+  }
+  async create(input) {
+    const { scorerDefinition } = input;
+    try {
+      const tableName = getTableName2({ indexName: TABLE_SCORER_DEFINITIONS, schemaName: getSchemaName2(this.#schema) });
+      const now = /* @__PURE__ */ new Date();
+      const nowIso = now.toISOString();
+      await this.#db.client.none(
+        `INSERT INTO ${tableName} (
+          id, status, "activeVersionId", "authorId", metadata,
+          "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
+        [
+          scorerDefinition.id,
+          "draft",
+          null,
+          scorerDefinition.authorId ?? null,
+          scorerDefinition.metadata ? JSON.stringify(scorerDefinition.metadata) : null,
+          nowIso,
+          nowIso,
+          nowIso,
+          nowIso
+        ]
+      );
+      const { id: _id, authorId: _authorId, metadata: _metadata, ...snapshotConfig } = scorerDefinition;
+      const versionId = crypto.randomUUID();
+      await this.createVersion({
+        id: versionId,
+        scorerDefinitionId: scorerDefinition.id,
+        versionNumber: 1,
+        ...snapshotConfig,
+        changedFields: [...SNAPSHOT_FIELDS2],
+        changeMessage: "Initial version"
+      });
+      return {
+        id: scorerDefinition.id,
+        status: "draft",
+        activeVersionId: void 0,
+        authorId: scorerDefinition.authorId,
+        metadata: scorerDefinition.metadata,
+        createdAt: now,
+        updatedAt: now
+      };
+    } catch (error) {
+      try {
+        const tableName = getTableName2({
+          indexName: TABLE_SCORER_DEFINITIONS,
+          schemaName: getSchemaName2(this.#schema)
+        });
+        await this.#db.client.none(
+          `DELETE FROM ${tableName} WHERE id = $1 AND status = 'draft' AND "activeVersionId" IS NULL`,
+          [scorerDefinition.id]
+        );
+      } catch {
+      }
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "CREATE_SCORER_DEFINITION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId: scorerDefinition.id }
+        },
+        error
+      );
+    }
+  }
+  async update(input) {
+    const { id, ...updates } = input;
+    try {
+      const tableName = getTableName2({ indexName: TABLE_SCORER_DEFINITIONS, schemaName: getSchemaName2(this.#schema) });
+      const existingScorer = await this.getById(id);
+      if (!existingScorer) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "UPDATE_SCORER_DEFINITION", "NOT_FOUND"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          text: `Scorer definition ${id} not found`,
+          details: { scorerDefinitionId: id }
+        });
+      }
+      const { authorId, activeVersionId, metadata, status, ...configFields } = updates;
+      let versionCreated = false;
+      const hasConfigUpdate = SNAPSHOT_FIELDS2.some((field) => field in configFields);
+      if (hasConfigUpdate) {
+        const latestVersion = await this.getLatestVersion(id);
+        if (!latestVersion) {
+          throw new MastraError({
+            id: createStorageErrorId("PG", "UPDATE_SCORER_DEFINITION", "NO_VERSIONS"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.SYSTEM,
+            text: `No versions found for scorer definition ${id}`,
+            details: { scorerDefinitionId: id }
+          });
+        }
+        const {
+          id: _versionId,
+          scorerDefinitionId: _scorerDefinitionId,
+          versionNumber: _versionNumber,
+          changedFields: _changedFields,
+          changeMessage: _changeMessage,
+          createdAt: _createdAt,
+          ...latestConfig
+        } = latestVersion;
+        const newConfig = { ...latestConfig, ...configFields };
+        const changedFields = SNAPSHOT_FIELDS2.filter(
+          (field) => field in configFields && JSON.stringify(configFields[field]) !== JSON.stringify(latestConfig[field])
+        );
+        if (changedFields.length > 0) {
+          versionCreated = true;
+          const newVersionId = crypto.randomUUID();
+          await this.createVersion({
+            id: newVersionId,
+            scorerDefinitionId: id,
+            versionNumber: latestVersion.versionNumber + 1,
+            ...newConfig,
+            changedFields: [...changedFields],
+            changeMessage: `Updated ${changedFields.join(", ")}`
+          });
+        }
+      }
+      const setClauses = [];
+      const values = [];
+      let paramIndex = 1;
+      if (authorId !== void 0) {
+        setClauses.push(`"authorId" = $${paramIndex++}`);
+        values.push(authorId);
+      }
+      if (activeVersionId !== void 0) {
+        setClauses.push(`"activeVersionId" = $${paramIndex++}`);
+        values.push(activeVersionId);
+        if (status === void 0) {
+          setClauses.push(`status = $${paramIndex++}`);
+          values.push("published");
+        }
+      }
+      if (status !== void 0) {
+        setClauses.push(`status = $${paramIndex++}`);
+        values.push(status);
+      }
+      if (metadata !== void 0) {
+        const mergedMetadata = { ...existingScorer.metadata || {}, ...metadata };
+        setClauses.push(`metadata = $${paramIndex++}`);
+        values.push(JSON.stringify(mergedMetadata));
+      }
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      setClauses.push(`"updatedAt" = $${paramIndex++}`);
+      values.push(now);
+      setClauses.push(`"updatedAtZ" = $${paramIndex++}`);
+      values.push(now);
+      values.push(id);
+      if (setClauses.length > 2 || versionCreated) {
+        await this.#db.client.none(
+          `UPDATE ${tableName} SET ${setClauses.join(", ")} WHERE id = $${paramIndex}`,
+          values
+        );
+      }
+      const updatedScorer = await this.getById(id);
+      if (!updatedScorer) {
+        throw new MastraError({
+          id: createStorageErrorId("PG", "UPDATE_SCORER_DEFINITION", "NOT_FOUND_AFTER_UPDATE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.SYSTEM,
+          text: `Scorer definition ${id} not found after update`,
+          details: { scorerDefinitionId: id }
+        });
+      }
+      return updatedScorer;
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "UPDATE_SCORER_DEFINITION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId: id }
+        },
+        error
+      );
+    }
+  }
+  async delete(id) {
+    try {
+      const tableName = getTableName2({ indexName: TABLE_SCORER_DEFINITIONS, schemaName: getSchemaName2(this.#schema) });
+      await this.deleteVersionsByParentId(id);
+      await this.#db.client.none(`DELETE FROM ${tableName} WHERE id = $1`, [id]);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "DELETE_SCORER_DEFINITION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId: id }
+        },
+        error
+      );
+    }
+  }
+  async list(args) {
+    const { page = 0, perPage: perPageInput, orderBy, authorId, metadata } = args || {};
+    const { field, direction } = this.parseOrderBy(orderBy);
+    if (page < 0) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "LIST_SCORER_DEFINITIONS", "INVALID_PAGE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
+      );
+    }
+    const perPage = normalizePerPage(perPageInput, 100);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    try {
+      const tableName = getTableName2({ indexName: TABLE_SCORER_DEFINITIONS, schemaName: getSchemaName2(this.#schema) });
+      const conditions = [];
+      const queryParams = [];
+      let paramIdx = 1;
+      if (authorId !== void 0) {
+        conditions.push(`"authorId" = $${paramIdx++}`);
+        queryParams.push(authorId);
+      }
+      if (metadata && Object.keys(metadata).length > 0) {
+        conditions.push(`metadata @> $${paramIdx++}::jsonb`);
+        queryParams.push(JSON.stringify(metadata));
+      }
+      const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+      const countResult = await this.#db.client.one(
+        `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
+        queryParams
+      );
+      const total = parseInt(countResult.count, 10);
+      if (total === 0) {
+        return {
+          scorerDefinitions: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
+      const limitValue = perPageInput === false ? total : perPage;
+      const dataResult = await this.#db.client.manyOrNone(
+        `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
+        [...queryParams, limitValue, offset]
+      );
+      const scorerDefinitions = (dataResult || []).map((row) => this.parseScorerRow(row));
+      return {
+        scorerDefinitions,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "LIST_SCORER_DEFINITIONS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  // ==========================================================================
+  // Scorer Definition Version Methods
+  // ==========================================================================
+  async createVersion(input) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_SCORER_DEFINITION_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const now = /* @__PURE__ */ new Date();
+      const nowIso = now.toISOString();
+      await this.#db.client.none(
+        `INSERT INTO ${tableName} (
+          id, "scorerDefinitionId", "versionNumber",
+          name, description, type, model, instructions, "scoreRange", "presetConfig", "defaultSampling",
+          "changedFields", "changeMessage",
+          "createdAt", "createdAtZ"
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)`,
+        [
+          input.id,
+          input.scorerDefinitionId,
+          input.versionNumber,
+          input.name,
+          input.description ?? null,
+          input.type,
+          input.model ? JSON.stringify(input.model) : null,
+          input.instructions ?? null,
+          input.scoreRange ? JSON.stringify(input.scoreRange) : null,
+          input.presetConfig ? JSON.stringify(input.presetConfig) : null,
+          input.defaultSampling ? JSON.stringify(input.defaultSampling) : null,
+          input.changedFields ? JSON.stringify(input.changedFields) : null,
+          input.changeMessage ?? null,
+          nowIso,
+          nowIso
+        ]
+      );
+      return {
+        ...input,
+        createdAt: now
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "CREATE_SCORER_DEFINITION_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { versionId: input.id, scorerDefinitionId: input.scorerDefinitionId }
+        },
+        error
+      );
+    }
+  }
+  async getVersion(id) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_SCORER_DEFINITION_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const result = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [id]);
+      if (!result) {
+        return null;
+      }
+      return this.parseVersionRow(result);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "GET_SCORER_DEFINITION_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { versionId: id }
+        },
+        error
+      );
+    }
+  }
+  async getVersionByNumber(scorerDefinitionId, versionNumber) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_SCORER_DEFINITION_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const result = await this.#db.client.oneOrNone(
+        `SELECT * FROM ${tableName} WHERE "scorerDefinitionId" = $1 AND "versionNumber" = $2`,
+        [scorerDefinitionId, versionNumber]
+      );
+      if (!result) {
+        return null;
+      }
+      return this.parseVersionRow(result);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "GET_SCORER_DEFINITION_VERSION_BY_NUMBER", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId, versionNumber }
+        },
+        error
+      );
+    }
+  }
+  async getLatestVersion(scorerDefinitionId) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_SCORER_DEFINITION_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const result = await this.#db.client.oneOrNone(
+        `SELECT * FROM ${tableName} WHERE "scorerDefinitionId" = $1 ORDER BY "versionNumber" DESC LIMIT 1`,
+        [scorerDefinitionId]
+      );
+      if (!result) {
+        return null;
+      }
+      return this.parseVersionRow(result);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "GET_LATEST_SCORER_DEFINITION_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId }
+        },
+        error
+      );
+    }
+  }
+  async listVersions(input) {
+    const { scorerDefinitionId, page = 0, perPage: perPageInput, orderBy } = input;
+    if (page < 0) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "LIST_SCORER_DEFINITION_VERSIONS", "INVALID_PAGE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
+      );
+    }
+    const perPage = normalizePerPage(perPageInput, 20);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    try {
+      const { field, direction } = this.parseVersionOrderBy(orderBy);
+      const tableName = getTableName2({
+        indexName: TABLE_SCORER_DEFINITION_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const countResult = await this.#db.client.one(
+        `SELECT COUNT(*) as count FROM ${tableName} WHERE "scorerDefinitionId" = $1`,
+        [scorerDefinitionId]
+      );
+      const total = parseInt(countResult.count, 10);
+      if (total === 0) {
+        return {
+          versions: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
+      const limitValue = perPageInput === false ? total : perPage;
+      const dataResult = await this.#db.client.manyOrNone(
+        `SELECT * FROM ${tableName} WHERE "scorerDefinitionId" = $1 ORDER BY "${field}" ${direction} LIMIT $2 OFFSET $3`,
+        [scorerDefinitionId, limitValue, offset]
+      );
+      const versions = (dataResult || []).map((row) => this.parseVersionRow(row));
+      return {
+        versions,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "LIST_SCORER_DEFINITION_VERSIONS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId }
+        },
+        error
+      );
+    }
+  }
+  async deleteVersion(id) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_SCORER_DEFINITION_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      await this.#db.client.none(`DELETE FROM ${tableName} WHERE id = $1`, [id]);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "DELETE_SCORER_DEFINITION_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { versionId: id }
+        },
+        error
+      );
+    }
+  }
+  async deleteVersionsByParentId(entityId) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_SCORER_DEFINITION_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      await this.#db.client.none(`DELETE FROM ${tableName} WHERE "scorerDefinitionId" = $1`, [entityId]);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "DELETE_SCORER_DEFINITION_VERSIONS_BY_SCORER_DEFINITION_ID", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId: entityId }
+        },
+        error
+      );
+    }
+  }
+  async countVersions(scorerDefinitionId) {
+    try {
+      const tableName = getTableName2({
+        indexName: TABLE_SCORER_DEFINITION_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      const result = await this.#db.client.one(
+        `SELECT COUNT(*) as count FROM ${tableName} WHERE "scorerDefinitionId" = $1`,
+        [scorerDefinitionId]
+      );
+      return parseInt(result.count, 10);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "COUNT_SCORER_DEFINITION_VERSIONS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { scorerDefinitionId }
+        },
+        error
+      );
+    }
+  }
+  // ==========================================================================
+  // Private Helper Methods
+  // ==========================================================================
+  parseJson(value, fieldName) {
+    if (!value) return void 0;
+    if (typeof value !== "string") return value;
+    try {
+      return JSON.parse(value);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      const details = {
+        value: value.length > 100 ? value.substring(0, 100) + "..." : value
+      };
+      if (fieldName) {
+        details.field = fieldName;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("PG", "PARSE_JSON", "INVALID_JSON"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.SYSTEM,
+          text: `Failed to parse JSON${fieldName ? ` for field "${fieldName}"` : ""}: ${error instanceof Error ? error.message : "Unknown error"}`,
+          details
+        },
+        error
+      );
+    }
+  }
+  parseScorerRow(row) {
+    return {
+      id: row.id,
+      status: row.status,
+      activeVersionId: row.activeVersionId,
+      authorId: row.authorId,
+      metadata: this.parseJson(row.metadata, "metadata"),
+      createdAt: new Date(row.createdAtZ || row.createdAt),
+      updatedAt: new Date(row.updatedAtZ || row.updatedAt)
+    };
+  }
+  parseVersionRow(row) {
+    return {
+      id: row.id,
+      scorerDefinitionId: row.scorerDefinitionId,
+      versionNumber: row.versionNumber,
+      name: row.name,
+      description: row.description,
+      type: row.type,
+      model: this.parseJson(row.model, "model"),
+      instructions: row.instructions,
+      scoreRange: this.parseJson(row.scoreRange, "scoreRange"),
+      presetConfig: this.parseJson(row.presetConfig, "presetConfig"),
+      defaultSampling: this.parseJson(row.defaultSampling, "defaultSampling"),
+      changedFields: this.parseJson(row.changedFields, "changedFields"),
+      changeMessage: row.changeMessage,
+      createdAt: new Date(row.createdAtZ || row.createdAt)
+    };
+  }
+};
 function getSchemaName4(schema) {
   return schema ? `"${schema}"` : '"public"';
 }
@@ -6936,7 +8713,9 @@ var PostgresStore = class extends MastraCompositeStore {
         workflows: new WorkflowsPG(domainConfig),
         memory: new MemoryPG(domainConfig),
         observability: new ObservabilityPG(domainConfig),
-        agents: new AgentsPG(domainConfig)
+        agents: new AgentsPG(domainConfig),
+        promptBlocks: new PromptBlocksPG(domainConfig),
+        scorerDefinitions: new ScorerDefinitionsPG(domainConfig)
       };
     } catch (e) {
       throw new MastraError(
@@ -7125,6 +8904,6 @@ Example Complex Query:
   ]
 }`;
 
-export { AgentsPG, MemoryPG, ObservabilityPG, PGVECTOR_PROMPT, PgVector, PoolAdapter, PostgresStore, ScoresPG, WorkflowsPG, exportSchemas };
+export { AgentsPG, MemoryPG, ObservabilityPG, PGVECTOR_PROMPT, PgVector, PoolAdapter, PostgresStore, PromptBlocksPG, ScorerDefinitionsPG, ScoresPG, WorkflowsPG, exportSchemas };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map