@mastra/pg 1.10.1-alpha.0 → 1.10.1-alpha.2

package/dist/index.js

@@ -2013,7 +2013,6 @@ var PoolAdapter = class {
   constructor($pool) {
     this.$pool = $pool;
   }
-  $pool;
   connect() {
     return this.$pool.connect();
   }
@@ -2082,7 +2081,6 @@ var TransactionClient = class {
   constructor(client) {
     this.client = client;
   }
-  client;
   async none(query, values) {
     await this.client.query(query, values);
     return null;
@@ -3426,6 +3424,15 @@ function getTableName2({ indexName, schemaName }) {
   const quotedSchemaName = schemaName;
   return quotedSchemaName ? `${quotedSchemaName}.${quotedIndexName}` : quotedIndexName;
 }
+function parseJsonResilient(value, _fieldName) {
+  if (value == null) return void 0;
+  if (typeof value !== "string") return value;
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value;
+  }
+}
 function transformFromSqlRow({
   tableName,
   sqlRow
@@ -3687,38 +3694,13 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
     await this.#db.clearTable({ tableName: TABLE_AGENT_VERSIONS });
     await this.#db.clearTable({ tableName: TABLE_AGENTS });
   }
-  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
-      );
-    }
-  }
   parseRow(row) {
     return {
       id: row.id,
       status: row.status,
       activeVersionId: row.activeVersionId,
       authorId: row.authorId,
-      metadata: this.parseJson(row.metadata, "metadata"),
+      metadata: parseJsonResilient(row.metadata),
       createdAt: row.createdAtZ || row.createdAt,
       updatedAt: row.updatedAtZ || row.updatedAt
     };
@@ -3947,7 +3929,14 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
         `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
         [...queryParams, limitValue, offset]
       );
-      const agents = (dataResult || []).map((row) => this.parseRow(row));
+      const agents = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map agent row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         agents,
         total,
@@ -4135,7 +4124,14 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
         `SELECT * FROM ${tableName} WHERE "agentId" = $1 ORDER BY "${field}" ${direction} LIMIT $2 OFFSET $3`,
         [agentId, limitValue, offset]
       );
-      const versions = (dataResult || []).map((row) => this.parseVersionRow(row));
+      const versions = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseVersionRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map agent version row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         versions,
         total,
@@ -4234,22 +4230,22 @@ var AgentsPG = class _AgentsPG extends AgentsStorage {
       name: row.name,
       description: row.description,
       instructions: this.deserializeInstructions(row.instructions),
-      model: this.parseJson(row.model, "model"),
-      tools: this.parseJson(row.tools, "tools"),
-      defaultOptions: this.parseJson(row.defaultOptions, "defaultOptions"),
-      workflows: this.parseJson(row.workflows, "workflows"),
-      agents: this.parseJson(row.agents, "agents"),
-      integrationTools: this.parseJson(row.integrationTools, "integrationTools"),
-      inputProcessors: this.parseJson(row.inputProcessors, "inputProcessors"),
-      outputProcessors: this.parseJson(row.outputProcessors, "outputProcessors"),
-      memory: this.parseJson(row.memory, "memory"),
-      scorers: this.parseJson(row.scorers, "scorers"),
-      mcpClients: this.parseJson(row.mcpClients, "mcpClients"),
-      requestContextSchema: this.parseJson(row.requestContextSchema, "requestContextSchema"),
-      workspace: this.parseJson(row.workspace, "workspace"),
-      skills: this.parseJson(row.skills, "skills"),
+      model: parseJsonResilient(row.model),
+      tools: parseJsonResilient(row.tools),
+      defaultOptions: parseJsonResilient(row.defaultOptions),
+      workflows: parseJsonResilient(row.workflows),
+      agents: parseJsonResilient(row.agents),
+      integrationTools: parseJsonResilient(row.integrationTools),
+      inputProcessors: parseJsonResilient(row.inputProcessors),
+      outputProcessors: parseJsonResilient(row.outputProcessors),
+      memory: parseJsonResilient(row.memory),
+      scorers: parseJsonResilient(row.scorers),
+      mcpClients: parseJsonResilient(row.mcpClients),
+      requestContextSchema: parseJsonResilient(row.requestContextSchema),
+      workspace: parseJsonResilient(row.workspace),
+      skills: parseJsonResilient(row.skills),
       skillsFormat: row.skillsFormat,
-      changedFields: this.parseJson(row.changedFields, "changedFields"),
+      changedFields: parseJsonResilient(row.changedFields),
       changeMessage: row.changeMessage,
       createdAt: row.createdAtZ || row.createdAt
     };
@@ -6689,7 +6685,14 @@ var MCPClientsPG = class _MCPClientsPG extends MCPClientsStorage {
         `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
         [...queryParams, limitValue, offset]
       );
-      const mcpClients = (dataResult || []).map((row) => this.parseMCPClientRow(row));
+      const mcpClients = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseMCPClientRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map mcp client row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         mcpClients,
         total,
@@ -6875,7 +6878,14 @@ var MCPClientsPG = class _MCPClientsPG extends MCPClientsStorage {
         `SELECT * FROM ${tableName} WHERE "mcpClientId" = $1 ORDER BY "${field}" ${direction} LIMIT $2 OFFSET $3`,
         [mcpClientId, limitValue, offset]
       );
-      const versions = (dataResult || []).map((row) => this.parseVersionRow(row));
+      const versions = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseVersionRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map mcp client version row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         versions,
         total,
@@ -6962,38 +6972,13 @@ var MCPClientsPG = class _MCPClientsPG extends MCPClientsStorage {
   // ==========================================================================
   // 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
-      );
-    }
-  }
   parseMCPClientRow(row) {
     return {
       id: row.id,
       status: row.status,
       activeVersionId: row.activeVersionId,
       authorId: row.authorId,
-      metadata: this.parseJson(row.metadata, "metadata"),
+      metadata: parseJsonResilient(row.metadata),
       createdAt: new Date(row.createdAtZ || row.createdAt),
       updatedAt: new Date(row.updatedAtZ || row.updatedAt)
     };
@@ -7005,8 +6990,8 @@ var MCPClientsPG = class _MCPClientsPG extends MCPClientsStorage {
       versionNumber: row.versionNumber,
       name: row.name,
       description: row.description,
-      servers: this.parseJson(row.servers, "servers"),
-      changedFields: this.parseJson(row.changedFields, "changedFields"),
+      servers: parseJsonResilient(row.servers),
+      changedFields: parseJsonResilient(row.changedFields),
       changeMessage: row.changeMessage,
       createdAt: new Date(row.createdAtZ || row.createdAt)
     };
@@ -7313,7 +7298,14 @@ var MCPServersPG = class _MCPServersPG extends MCPServersStorage {
         `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
         [...queryParams, limitValue, offset]
       );
-      const mcpServers = (dataResult || []).map((row) => this.parseMCPServerRow(row));
+      const mcpServers = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseMCPServerRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map mcp server row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         mcpServers,
         total,
@@ -7509,7 +7501,14 @@ var MCPServersPG = class _MCPServersPG extends MCPServersStorage {
         `SELECT * FROM ${tableName} WHERE "mcpServerId" = $1 ORDER BY "${field}" ${direction} LIMIT $2 OFFSET $3`,
         [mcpServerId, limitValue, offset]
       );
-      const versions = (dataResult || []).map((row) => this.parseVersionRow(row));
+      const versions = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseVersionRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map mcp server version row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         versions,
         total,
@@ -7596,38 +7595,13 @@ var MCPServersPG = class _MCPServersPG extends MCPServersStorage {
   // ==========================================================================
   // 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 = {
-        valueLength: String(value.length)
-      };
-      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
-      );
-    }
-  }
   parseMCPServerRow(row) {
     return {
       id: row.id,
       status: row.status,
       activeVersionId: row.activeVersionId,
       authorId: row.authorId,
-      metadata: this.parseJson(row.metadata, "metadata"),
+      metadata: parseJsonResilient(row.metadata),
       createdAt: new Date(row.createdAtZ || row.createdAt),
       updatedAt: new Date(row.updatedAtZ || row.updatedAt)
     };
@@ -7641,14 +7615,14 @@ var MCPServersPG = class _MCPServersPG extends MCPServersStorage {
       version: row.version,
       description: row.description,
       instructions: row.instructions,
-      repository: this.parseJson(row.repository, "repository"),
+      repository: parseJsonResilient(row.repository),
       releaseDate: row.releaseDate,
       isLatest: row.isLatest,
       packageCanonical: row.packageCanonical,
-      tools: this.parseJson(row.tools, "tools"),
-      agents: this.parseJson(row.agents, "agents"),
-      workflows: this.parseJson(row.workflows, "workflows"),
-      changedFields: this.parseJson(row.changedFields, "changedFields"),
+      tools: parseJsonResilient(row.tools),
+      agents: parseJsonResilient(row.agents),
+      workflows: parseJsonResilient(row.workflows),
+      changedFields: parseJsonResilient(row.changedFields),
       changeMessage: row.changeMessage,
       createdAt: new Date(row.createdAtZ || row.createdAt)
     };
@@ -7855,12 +7829,21 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
       resourceId: row.resourceId
     };
   }
-  async getThreadById({ threadId }) {
+  async getThreadById({
+    threadId,
+    resourceId
+  }) {
     try {
       const tableName = getTableName4({ indexName: TABLE_THREADS, schemaName: getSchemaName4(this.#schema) });
+      let query = `SELECT * FROM ${tableName} WHERE id = $1`;
+      let params = [threadId];
+      if (resourceId !== void 0) {
+        query += ` AND "resourceId" = $2`;
+        params.push(resourceId);
+      }
       const thread = await this.#db.client.oneOrNone(
-        `SELECT * FROM ${tableName} WHERE id = $1`,
-        [threadId]
+        query,
+        params
       );
       if (!thread) {
         return null;
@@ -11048,7 +11031,14 @@ var PromptBlocksPG = class _PromptBlocksPG extends PromptBlocksStorage {
         `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
         [...queryParams, limitValue, offset]
       );
-      const promptBlocks = (dataResult || []).map((row) => this.parseBlockRow(row));
+      const promptBlocks = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseBlockRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map prompt block row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         promptBlocks,
         total,
@@ -11235,7 +11225,14 @@ var PromptBlocksPG = class _PromptBlocksPG extends PromptBlocksStorage {
         `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));
+      const versions = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseVersionRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map prompt block version row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         versions,
         total,
@@ -11322,37 +11319,13 @@ var PromptBlocksPG = class _PromptBlocksPG extends PromptBlocksStorage {
   // ==========================================================================
   // 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"),
+      metadata: parseJsonResilient(row.metadata),
       createdAt: new Date(row.createdAtZ || row.createdAt),
       updatedAt: new Date(row.updatedAtZ || row.updatedAt)
     };
@@ -11365,9 +11338,9 @@ var PromptBlocksPG = class _PromptBlocksPG extends PromptBlocksStorage {
       name: row.name,
       description: row.description,
       content: row.content,
-      rules: this.parseJson(row.rules, "rules"),
-      requestContextSchema: this.parseJson(row.requestContextSchema, "requestContextSchema"),
-      changedFields: this.parseJson(row.changedFields, "changedFields"),
+      rules: parseJsonResilient(row.rules),
+      requestContextSchema: parseJsonResilient(row.requestContextSchema),
+      changedFields: parseJsonResilient(row.changedFields),
       changeMessage: row.changeMessage,
       createdAt: new Date(row.createdAtZ || row.createdAt)
     };
@@ -11984,7 +11957,14 @@ var ScorerDefinitionsPG = class _ScorerDefinitionsPG extends ScorerDefinitionsSt
         `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
         [...queryParams, limitValue, offset]
       );
-      const scorerDefinitions = (dataResult || []).map((row) => this.parseScorerRow(row));
+      const scorerDefinitions = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseScorerRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map scorer definition row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         scorerDefinitions,
         total,
@@ -12175,7 +12155,17 @@ var ScorerDefinitionsPG = class _ScorerDefinitionsPG extends ScorerDefinitionsSt
         `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));
+      const versions = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseVersionRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map scorer definition version row, skipping", {
+            id: row?.id,
+            error: err
+          });
+          return [];
+        }
+      });
       return {
         versions,
         total,
@@ -12263,38 +12253,13 @@ var ScorerDefinitionsPG = class _ScorerDefinitionsPG extends ScorerDefinitionsSt
   // ==========================================================================
   // 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"),
+      metadata: parseJsonResilient(row.metadata),
       createdAt: new Date(row.createdAtZ || row.createdAt),
       updatedAt: new Date(row.updatedAtZ || row.updatedAt)
     };
@@ -12307,12 +12272,12 @@ var ScorerDefinitionsPG = class _ScorerDefinitionsPG extends ScorerDefinitionsSt
       name: row.name,
       description: row.description,
       type: row.type,
-      model: this.parseJson(row.model, "model"),
+      model: parseJsonResilient(row.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"),
+      scoreRange: parseJsonResilient(row.scoreRange),
+      presetConfig: parseJsonResilient(row.presetConfig),
+      defaultSampling: parseJsonResilient(row.defaultSampling),
+      changedFields: parseJsonResilient(row.changedFields),
       changeMessage: row.changeMessage,
       createdAt: new Date(row.createdAtZ || row.createdAt)
     };
@@ -13054,7 +13019,14 @@ var SkillsPG = class _SkillsPG extends SkillsStorage {
         `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
         [...queryParams, limitValue, offset]
       );
-      const skills = (dataResult || []).map((row) => this.parseSkillRow(row));
+      const skills = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseSkillRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map skill row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         skills,
         total,
@@ -13248,7 +13220,14 @@ var SkillsPG = class _SkillsPG extends SkillsStorage {
         `SELECT * FROM ${tableName} WHERE "skillId" = $1 ORDER BY "${field}" ${direction} LIMIT $2 OFFSET $3`,
         [skillId, limitValue, offset]
       );
-      const versions = (dataResult || []).map((row) => this.parseVersionRow(row));
+      const versions = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseVersionRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map skill version row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         versions,
         total,
@@ -13335,31 +13314,6 @@ var SkillsPG = class _SkillsPG extends SkillsStorage {
   // ==========================================================================
   // 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
-      );
-    }
-  }
   parseSkillRow(row) {
     return {
       id: row.id,
@@ -13379,14 +13333,14 @@ var SkillsPG = class _SkillsPG extends SkillsStorage {
       description: row.description,
       instructions: row.instructions,
       license: row.license,
-      compatibility: this.parseJson(row.compatibility, "compatibility"),
-      source: this.parseJson(row.source, "source"),
-      references: this.parseJson(row.references, "references"),
-      scripts: this.parseJson(row.scripts, "scripts"),
-      assets: this.parseJson(row.assets, "assets"),
-      metadata: this.parseJson(row.metadata, "metadata"),
-      tree: this.parseJson(row.tree, "tree"),
-      changedFields: this.parseJson(row.changedFields, "changedFields"),
+      compatibility: parseJsonResilient(row.compatibility),
+      source: parseJsonResilient(row.source),
+      references: parseJsonResilient(row.references),
+      scripts: parseJsonResilient(row.scripts),
+      assets: parseJsonResilient(row.assets),
+      metadata: parseJsonResilient(row.metadata),
+      tree: parseJsonResilient(row.tree),
+      changedFields: parseJsonResilient(row.changedFields),
       changeMessage: row.changeMessage,
       createdAt: new Date(row.createdAtZ || row.createdAt)
     };
@@ -14152,7 +14106,14 @@ var WorkspacesPG = class _WorkspacesPG extends WorkspacesStorage {
         `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
         [...queryParams, limitValue, offset]
       );
-      const workspaces = (dataResult || []).map((row) => this.parseWorkspaceRow(row));
+      const workspaces = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseWorkspaceRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map workspace row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         workspaces,
         total,
@@ -14346,7 +14307,14 @@ var WorkspacesPG = class _WorkspacesPG extends WorkspacesStorage {
         `SELECT * FROM ${tableName} WHERE "workspaceId" = $1 ORDER BY "${field}" ${direction} LIMIT $2 OFFSET $3`,
         [workspaceId, limitValue, offset]
       );
-      const versions = (dataResult || []).map((row) => this.parseVersionRow(row));
+      const versions = (dataResult || []).flatMap((row) => {
+        try {
+          return [this.parseVersionRow(row)];
+        } catch (err) {
+          this.logger?.warn?.("[PG] Failed to map workspace version row, skipping", { id: row?.id, error: err });
+          return [];
+        }
+      });
       return {
         versions,
         total,
@@ -14433,38 +14401,13 @@ var WorkspacesPG = class _WorkspacesPG extends WorkspacesStorage {
   // ==========================================================================
   // 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
-      );
-    }
-  }
   parseWorkspaceRow(row) {
     return {
       id: row.id,
       status: row.status,
       activeVersionId: row.activeVersionId,
       authorId: row.authorId,
-      metadata: this.parseJson(row.metadata, "metadata"),
+      metadata: parseJsonResilient(row.metadata),
       createdAt: new Date(row.createdAtZ || row.createdAt),
       updatedAt: new Date(row.updatedAtZ || row.updatedAt)
     };
@@ -14476,15 +14419,15 @@ var WorkspacesPG = class _WorkspacesPG extends WorkspacesStorage {
       versionNumber: row.versionNumber,
       name: row.name,
       description: row.description,
-      filesystem: this.parseJson(row.filesystem, "filesystem"),
-      sandbox: this.parseJson(row.sandbox, "sandbox"),
-      mounts: this.parseJson(row.mounts, "mounts"),
-      search: this.parseJson(row.search, "search"),
-      skills: this.parseJson(row.skills, "skills"),
-      tools: this.parseJson(row.tools, "tools"),
+      filesystem: parseJsonResilient(row.filesystem),
+      sandbox: parseJsonResilient(row.sandbox),
+      mounts: parseJsonResilient(row.mounts),
+      search: parseJsonResilient(row.search),
+      skills: parseJsonResilient(row.skills),
+      tools: parseJsonResilient(row.tools),
       autoSync: Boolean(row.autoSync),
       operationTimeout: row.operationTimeout != null ? Number(row.operationTimeout) : void 0,
-      changedFields: this.parseJson(row.changedFields, "changedFields"),
+      changedFields: parseJsonResilient(row.changedFields),
       changeMessage: row.changeMessage,
       createdAt: new Date(row.createdAtZ || row.createdAt)
     };