@mastra/libsql 1.14.0 → 1.14.1-alpha.1

package/dist/index.js

@@ -1,6 +1,6 @@
 import { createClient } from '@libsql/client';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { createVectorErrorId, AgentsStorage, AGENTS_SCHEMA, TABLE_AGENTS, AGENT_VERSIONS_SCHEMA, TABLE_AGENT_VERSIONS, createStorageErrorId, normalizePerPage, calculatePagination, BackgroundTasksStorage, TABLE_SCHEMAS, TABLE_BACKGROUND_TASKS, BlobStore, TABLE_SKILL_BLOBS, SKILL_BLOBS_SCHEMA, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, DatasetsStorage, DATASETS_SCHEMA, TABLE_DATASETS, DATASET_ITEMS_SCHEMA, TABLE_DATASET_ITEMS, DATASET_VERSIONS_SCHEMA, TABLE_DATASET_VERSIONS, ensureDate, safelyParseJSON, TABLE_EXPERIMENT_RESULTS, TABLE_EXPERIMENTS, ExperimentsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, FavoritesStorage, FAVORITES_SCHEMA, TABLE_FAVORITES, TABLE_SKILLS, HarnessStorage, TABLE_HARNESS_SESSIONS, MCPClientsStorage, MCP_CLIENTS_SCHEMA, TABLE_MCP_CLIENTS, MCP_CLIENT_VERSIONS_SCHEMA, TABLE_MCP_CLIENT_VERSIONS, MCPServersStorage, MCP_SERVERS_SCHEMA, TABLE_MCP_SERVERS, MCP_SERVER_VERSIONS_SCHEMA, TABLE_MCP_SERVER_VERSIONS, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, NotificationsStorage, TABLE_NOTIFICATIONS, ObservabilityStorage, SPAN_SCHEMA, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, PROMPT_BLOCKS_SCHEMA, TABLE_PROMPT_BLOCKS, PROMPT_BLOCK_VERSIONS_SCHEMA, TABLE_PROMPT_BLOCK_VERSIONS, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ScorerDefinitionsStorage, SCORER_DEFINITIONS_SCHEMA, TABLE_SCORER_DEFINITIONS, SCORER_DEFINITION_VERSIONS_SCHEMA, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, SCORERS_SCHEMA, TABLE_SCORERS, transformScoreRow, SkillsStorage, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, TABLE_SKILL_VERSIONS, ThreadStateStorage, THREAD_STATE_SCHEMA, TABLE_THREAD_STATE, ToolProviderConnectionsStorage, TOOL_PROVIDER_CONNECTIONS_SCHEMA, TABLE_TOOL_PROVIDER_CONNECTIONS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, WorkspacesStorage, WORKSPACES_SCHEMA, TABLE_WORKSPACES, WORKSPACE_VERSIONS_SCHEMA, TABLE_WORKSPACE_VERSIONS, MastraCompositeStore, getSqlType, TraceStatus, mergeWorkflowStepResult } from '@mastra/core/storage';
+import { createVectorErrorId, AgentsStorage, AGENTS_SCHEMA, TABLE_AGENTS, AGENT_VERSIONS_SCHEMA, TABLE_AGENT_VERSIONS, createStorageErrorId, normalizePerPage, calculatePagination, BackgroundTasksStorage, TABLE_SCHEMAS, TABLE_BACKGROUND_TASKS, BlobStore, TABLE_SKILL_BLOBS, SKILL_BLOBS_SCHEMA, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, DatasetsStorage, DATASETS_SCHEMA, TABLE_DATASETS, DATASET_ITEMS_SCHEMA, TABLE_DATASET_ITEMS, DATASET_VERSIONS_SCHEMA, TABLE_DATASET_VERSIONS, ensureDate, safelyParseJSON, TABLE_EXPERIMENT_RESULTS, TABLE_EXPERIMENTS, ExperimentsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, FavoritesStorage, FAVORITES_SCHEMA, TABLE_FAVORITES, TABLE_SKILLS, HarnessStorage, TABLE_HARNESS_SESSIONS, MCPClientsStorage, MCP_CLIENTS_SCHEMA, TABLE_MCP_CLIENTS, MCP_CLIENT_VERSIONS_SCHEMA, TABLE_MCP_CLIENT_VERSIONS, MCPServersStorage, MCP_SERVERS_SCHEMA, TABLE_MCP_SERVERS, MCP_SERVER_VERSIONS_SCHEMA, TABLE_MCP_SERVER_VERSIONS, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, NotificationsStorage, TABLE_NOTIFICATIONS, ObservabilityStorage, SPAN_SCHEMA, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, PROMPT_BLOCKS_SCHEMA, TABLE_PROMPT_BLOCKS, PROMPT_BLOCK_VERSIONS_SCHEMA, TABLE_PROMPT_BLOCK_VERSIONS, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ScorerDefinitionsStorage, SCORER_DEFINITIONS_SCHEMA, TABLE_SCORER_DEFINITIONS, SCORER_DEFINITION_VERSIONS_SCHEMA, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, SCORERS_SCHEMA, TABLE_SCORERS, transformScoreRow, SkillsStorage, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, TABLE_SKILL_VERSIONS, ThreadStateStorage, THREAD_STATE_SCHEMA, TABLE_THREAD_STATE, ToolProviderConnectionsStorage, TOOL_PROVIDER_CONNECTIONS_SCHEMA, TABLE_TOOL_PROVIDER_CONNECTIONS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, WorkspacesStorage, WORKSPACES_SCHEMA, TABLE_WORKSPACES, WORKSPACE_VERSIONS_SCHEMA, TABLE_WORKSPACE_VERSIONS, MastraCompositeStore, getSqlType, TraceStatus, mergeWorkflowStepResult } from '@mastra/core/storage';
 import { parseSqlIdentifier, parseFieldKey } from '@mastra/core/utils';
 import { MastraVector, validateTopK, validateUpsertInput } from '@mastra/core/vector';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
@@ -3620,9 +3620,16 @@ var DatasetsLibSQL = class extends DatasetsStorage {
     await this.#addColumnIfNotExists(TABLE_DATASETS, "targetType", "TEXT");
     await this.#addColumnIfNotExists(TABLE_DATASETS, "targetIds", "TEXT");
     await this.#addColumnIfNotExists(TABLE_DATASETS, "scorerIds", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASETS, "organizationId", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASETS, "projectId", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASETS, "candidateKey", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASETS, "candidateId", "TEXT");
     await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "requestContext", "TEXT");
     await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "source", "TEXT");
     await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "expectedTrajectory", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "organizationId", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "projectId", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "toolMocks", "TEXT");
     await this.#client.batch(
       [
         {
@@ -3644,6 +3651,18 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         {
           sql: `CREATE UNIQUE INDEX IF NOT EXISTS idx_dataset_versions_dataset_version_unique ON "${TABLE_DATASET_VERSIONS}" ("datasetId", "version")`,
           args: []
+        },
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_datasets_tenancy_createdat ON "${TABLE_DATASETS}" ("organizationId", "projectId", "createdAt", "id")`,
+          args: []
+        },
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_datasets_tenancy_candidate ON "${TABLE_DATASETS}" ("organizationId", "projectId", "candidateKey", "candidateId")`,
+          args: []
+        },
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_dataset_items_tenancy_list ON "${TABLE_DATASET_ITEMS}" ("organizationId", "projectId", "datasetId", "validTo", "isDeleted")`,
+          args: []
         }
       ],
       "write"
@@ -3675,6 +3694,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       targetIds: row.targetIds ? safelyParseJSON(row.targetIds) : void 0,
       scorerIds: row.scorerIds ? safelyParseJSON(row.scorerIds) : void 0,
       version: row.version,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
+      candidateKey: row.candidateKey ?? null,
+      candidateId: row.candidateId ?? null,
       createdAt: ensureDate(row.createdAt),
       updatedAt: ensureDate(row.updatedAt)
     };
@@ -3684,9 +3707,12 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
       expectedTrajectory: row.expectedTrajectory ? safelyParseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? safelyParseJSON(row.toolMocks) : void 0,
       requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
       source: row.source ? safelyParseJSON(row.source) : void 0,
@@ -3699,11 +3725,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       validTo: row.validTo,
       isDeleted: Boolean(row.isDeleted),
       input: safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
       expectedTrajectory: row.expectedTrajectory ? safelyParseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? safelyParseJSON(row.toolMocks) : void 0,
       requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
       source: row.source ? safelyParseJSON(row.source) : void 0,
@@ -3739,6 +3768,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
           targetIds: input.targetIds ? JSON.stringify(input.targetIds) : null,
           scorerIds: input.scorerIds ? JSON.stringify(input.scorerIds) : null,
           version: 0,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
+          candidateKey: input.candidateKey ?? null,
+          candidateId: input.candidateId ?? null,
           createdAt: nowIso,
           updatedAt: nowIso
         }
@@ -3755,6 +3788,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         targetIds: input.targetIds ?? void 0,
         scorerIds: input.scorerIds ?? void 0,
         version: 0,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
+        candidateKey: input.candidateKey ?? null,
+        candidateId: input.candidateId ?? null,
         createdAt: now,
         updatedAt: now
       };
@@ -3910,9 +3947,28 @@ var DatasetsLibSQL = class extends DatasetsStorage {
   async listDatasets(args) {
     try {
       const { page, perPage: perPageInput } = args.pagination;
+      const filterConditions = [];
+      const filterParams = [];
+      if (args.filters?.organizationId !== void 0) {
+        filterConditions.push("organizationId = ?");
+        filterParams.push(args.filters.organizationId);
+      }
+      if (args.filters?.projectId !== void 0) {
+        filterConditions.push("projectId = ?");
+        filterParams.push(args.filters.projectId);
+      }
+      if (args.filters?.candidateKey !== void 0) {
+        filterConditions.push("candidateKey = ?");
+        filterParams.push(args.filters.candidateKey);
+      }
+      if (args.filters?.candidateId !== void 0) {
+        filterConditions.push("candidateId = ?");
+        filterParams.push(args.filters.candidateId);
+      }
+      const whereClause = filterConditions.length > 0 ? `WHERE ${filterConditions.join(" AND ")}` : "";
       const countResult = await this.#client.execute({
-        sql: `SELECT COUNT(*) as count FROM ${TABLE_DATASETS}`,
-        args: []
+        sql: `SELECT COUNT(*) as count FROM ${TABLE_DATASETS} ${whereClause}`,
+        args: filterParams
       });
       const total = Number(countResult.rows?.[0]?.count ?? 0);
       if (total === 0) {
@@ -3926,8 +3982,8 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
       const result = await this.#client.execute({
-        sql: `SELECT ${buildSelectColumns(TABLE_DATASETS)} FROM ${TABLE_DATASETS} ORDER BY createdAt DESC, id ASC LIMIT ? OFFSET ?`,
-        args: [limitValue, start]
+        sql: `SELECT ${buildSelectColumns(TABLE_DATASETS)} FROM ${TABLE_DATASETS} ${whereClause} ORDER BY createdAt DESC, id ASC LIMIT ? OFFSET ?`,
+        args: [...filterParams, limitValue, start]
       });
       return {
         datasets: result.rows?.map((row) => this.transformDatasetRow(row)) ?? [],
@@ -3952,6 +4008,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
   // --- SCD-2 item mutations ---
   async _doAddItem(args) {
     try {
+      const dataset = await this.getDatasetById({ id: args.datasetId });
       const id = crypto.randomUUID();
       const versionId = crypto.randomUUID();
       const now = /* @__PURE__ */ new Date();
@@ -3963,14 +4020,17 @@ var DatasetsLibSQL = class extends DatasetsStorage {
             args: [args.datasetId]
           },
           {
-            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), (SELECT organizationId FROM ${TABLE_DATASETS} WHERE id = ?), (SELECT projectId FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               id,
               args.datasetId,
               args.datasetId,
+              args.datasetId,
+              args.datasetId,
               jsonbArg(args.input),
               jsonbArg(args.groundTruth),
               jsonbArg(args.expectedTrajectory),
+              jsonbArg(args.toolMocks),
               jsonbArg(args.requestContext),
               jsonbArg(args.metadata),
               jsonbArg(args.source),
@@ -3990,9 +4050,12 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId: dataset?.organizationId ?? null,
+        projectId: dataset?.projectId ?? null,
         input: args.input,
         groundTruth: args.groundTruth,
         expectedTrajectory: args.expectedTrajectory,
+        toolMocks: args.toolMocks,
         requestContext: args.requestContext,
         metadata: args.metadata,
         source: args.source,
@@ -4030,12 +4093,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
           details: { itemId: args.id, expectedDatasetId: args.datasetId, actualDatasetId: existing.datasetId }
         });
       }
+      const dataset = await this.getDatasetById({ id: args.datasetId });
       const versionId = crypto.randomUUID();
       const now = /* @__PURE__ */ new Date();
       const nowIso = now.toISOString();
       const mergedInput = args.input !== void 0 ? args.input : existing.input;
       const mergedGroundTruth = args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth;
       const mergedExpectedTrajectory = args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory;
+      const mergedToolMocks = args.toolMocks !== void 0 ? args.toolMocks : existing.toolMocks;
       const mergedRequestContext = args.requestContext !== void 0 ? args.requestContext : existing.requestContext;
       const mergedMetadata = args.metadata !== void 0 ? args.metadata : existing.metadata;
       const mergedSource = args.source !== void 0 ? args.source : existing.source;
@@ -4050,14 +4115,17 @@ var DatasetsLibSQL = class extends DatasetsStorage {
             args: [args.datasetId, args.id]
           },
           {
-            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), (SELECT organizationId FROM ${TABLE_DATASETS} WHERE id = ?), (SELECT projectId FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               args.id,
               args.datasetId,
               args.datasetId,
+              args.datasetId,
+              args.datasetId,
               jsonbArg(mergedInput),
               jsonbArg(mergedGroundTruth),
               jsonbArg(mergedExpectedTrajectory),
+              jsonbArg(mergedToolMocks),
               jsonbArg(mergedRequestContext),
               jsonbArg(mergedMetadata),
               jsonbArg(mergedSource),
@@ -4076,9 +4144,12 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       return {
         ...existing,
         datasetVersion: newVersion,
+        organizationId: dataset?.organizationId ?? null,
+        projectId: dataset?.projectId ?? null,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
         expectedTrajectory: mergedExpectedTrajectory,
+        toolMocks: mergedToolMocks,
         requestContext: mergedRequestContext,
         metadata: mergedMetadata,
         source: mergedSource,
@@ -4121,13 +4192,17 @@ var DatasetsLibSQL = class extends DatasetsStorage {
             args: [datasetId, id]
           },
           {
-            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), (SELECT organizationId FROM ${TABLE_DATASETS} WHERE id = ?), (SELECT projectId FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               id,
               datasetId,
               datasetId,
+              datasetId,
+              datasetId,
               jsonbArg(existing.input),
               jsonbArg(existing.groundTruth),
+              jsonbArg(existing.expectedTrajectory),
+              jsonbArg(existing.toolMocks),
               jsonbArg(existing.requestContext),
               jsonbArg(existing.metadata),
               jsonbArg(existing.source),
@@ -4228,6 +4303,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
           "isDeleted = 0"
         ];
         const queryParams2 = [args.datasetId, args.version, args.version];
+        if (args.filters?.organizationId !== void 0) {
+          conditions2.push("organizationId = ?");
+          queryParams2.push(args.filters.organizationId);
+        }
+        if (args.filters?.projectId !== void 0) {
+          conditions2.push("projectId = ?");
+          queryParams2.push(args.filters.projectId);
+        }
         if (args.search) {
           conditions2.push(`(LOWER(json(input)) LIKE ? OR LOWER(COALESCE(json(groundTruth), '')) LIKE ?)`);
           const searchPattern = `%${args.search.toLowerCase()}%`;
@@ -4265,6 +4348,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       }
       const conditions = ["datasetId = ?", "validTo IS NULL", "isDeleted = 0"];
       const queryParams = [args.datasetId];
+      if (args.filters?.organizationId !== void 0) {
+        conditions.push("organizationId = ?");
+        queryParams.push(args.filters.organizationId);
+      }
+      if (args.filters?.projectId !== void 0) {
+        conditions.push("projectId = ?");
+        queryParams.push(args.filters.projectId);
+      }
       if (args.search) {
         conditions.push(`(LOWER(json(input)) LIKE ? OR LOWER(COALESCE(json(groundTruth), '')) LIKE ?)`);
         const searchPattern = `%${args.search.toLowerCase()}%`;
@@ -4410,14 +4501,17 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         const id = crypto.randomUUID();
         items.push({ id, input: itemInput });
         statements.push({
-          sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+          sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), ?, ?, NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
           args: [
             id,
             input.datasetId,
             input.datasetId,
+            dataset.organizationId ?? null,
+            dataset.projectId ?? null,
             jsonbArg(itemInput.input),
             jsonbArg(itemInput.groundTruth),
             jsonbArg(itemInput.expectedTrajectory),
+            jsonbArg(itemInput.toolMocks),
             jsonbArg(itemInput.requestContext),
             jsonbArg(itemInput.metadata),
             jsonbArg(itemInput.source),
@@ -4436,9 +4530,12 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         id,
         datasetId: input.datasetId,
         datasetVersion: newVersion,
+        organizationId: dataset.organizationId ?? null,
+        projectId: dataset.projectId ?? null,
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
         expectedTrajectory: itemInput.expectedTrajectory,
+        toolMocks: itemInput.toolMocks,
         requestContext: itemInput.requestContext,
         metadata: itemInput.metadata,
         source: itemInput.source,
@@ -4490,13 +4587,17 @@ var DatasetsLibSQL = class extends DatasetsStorage {
           args: [input.datasetId, item.id]
         });
         statements.push({
-          sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+          sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), ?, ?, NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
           args: [
             item.id,
             input.datasetId,
             input.datasetId,
+            dataset.organizationId ?? null,
+            dataset.projectId ?? null,
             jsonbArg(item.input),
             jsonbArg(item.groundTruth),
+            jsonbArg(item.expectedTrajectory),
+            jsonbArg(item.toolMocks),
             jsonbArg(item.requestContext),
             jsonbArg(item.metadata),
             jsonbArg(item.source),
@@ -4541,12 +4642,12 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
     await this.#db.alterTable({
       tableName: TABLE_EXPERIMENTS,
       schema: EXPERIMENTS_SCHEMA,
-      ifNotExists: ["agentVersion"]
+      ifNotExists: ["agentVersion", "organizationId", "projectId"]
     });
     await this.#db.alterTable({
       tableName: TABLE_EXPERIMENT_RESULTS,
       schema: EXPERIMENT_RESULTS_SCHEMA,
-      ifNotExists: ["status", "tags"]
+      ifNotExists: ["status", "tags", "toolMockReport", "organizationId", "projectId"]
     });
     await this.#client.batch(
       [
@@ -4561,6 +4662,15 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         {
           sql: `CREATE UNIQUE INDEX IF NOT EXISTS idx_experiment_results_exp_item ON "${TABLE_EXPERIMENT_RESULTS}" ("experimentId", "itemId")`,
           args: []
+        },
+        // Tenancy: leading-tenant indexes for multi-tenant scans (parity with datasets domain).
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_experiments_org_project ON "${TABLE_EXPERIMENTS}" ("organizationId", "projectId")`,
+          args: []
+        },
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_experiment_results_org_project ON "${TABLE_EXPERIMENT_RESULTS}" ("organizationId", "projectId")`,
+          args: []
         }
       ],
       "write"
@@ -4577,6 +4687,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
       datasetId: row.datasetId ?? null,
       datasetVersion: row.datasetVersion != null ? row.datasetVersion : null,
       agentVersion: row.agentVersion ?? null,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       targetType: row.targetType,
       targetId: row.targetId,
       name: row.name ?? void 0,
@@ -4600,6 +4712,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
       experimentId: row.experimentId,
       itemId: row.itemId,
       itemDatasetVersion: row.itemDatasetVersion != null ? row.itemDatasetVersion : null,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: safelyParseJSON(row.input),
       output: row.output ? safelyParseJSON(row.output) : null,
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : null,
@@ -4610,6 +4724,7 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
       traceId: row.traceId ?? null,
       status: row.status ?? null,
       tags: row.tags ? safelyParseJSON(row.tags) : null,
+      toolMockReport: row.toolMockReport ? safelyParseJSON(row.toolMockReport) : null,
       createdAt: ensureDate(row.createdAt)
     };
   }
@@ -4626,6 +4741,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
           datasetId: input.datasetId ?? null,
           datasetVersion: input.datasetVersion ?? null,
           agentVersion: input.agentVersion ?? null,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
           targetType: input.targetType,
           targetId: input.targetId,
           name: input.name ?? null,
@@ -4647,6 +4764,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         datasetId: input.datasetId,
         datasetVersion: input.datasetVersion,
         agentVersion: input.agentVersion ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         targetType: input.targetType,
         targetId: input.targetId,
         name: input.name,
@@ -4789,6 +4908,17 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         conditions.push("status = ?");
         queryParams.push(args.status);
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push("organizationId = ?");
+          queryParams.push(organizationId);
+        }
+        if (projectId !== void 0) {
+          conditions.push("projectId = ?");
+          queryParams.push(projectId);
+        }
+      }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const countResult = await this.#client.execute({
         sql: `SELECT COUNT(*) as count FROM ${TABLE_EXPERIMENTS} ${whereClause}`,
@@ -4863,6 +4993,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
           experimentId: input.experimentId,
           itemId: input.itemId,
           itemDatasetVersion: input.itemDatasetVersion ?? null,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
           input: input.input,
           output: input.output,
           groundTruth: input.groundTruth,
@@ -4873,6 +5005,7 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
           traceId: input.traceId ?? null,
           status: input.status ?? null,
           tags: input.tags !== void 0 && input.tags !== null ? JSON.stringify(input.tags) : null,
+          toolMockReport: input.toolMockReport ?? null,
           createdAt: nowIso
         }
       });
@@ -4881,6 +5014,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         experimentId: input.experimentId,
         itemId: input.itemId,
         itemDatasetVersion: input.itemDatasetVersion,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         input: input.input,
         output: input.output,
         groundTruth: input.groundTruth,
@@ -4891,6 +5026,7 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         traceId: input.traceId ?? null,
         status: input.status ?? null,
         tags: input.tags ?? null,
+        toolMockReport: input.toolMockReport ?? null,
         createdAt: now
       };
     } catch (error) {
@@ -4999,6 +5135,17 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         conditions.push("status = ?");
         queryParams.push(args.status);
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push("organizationId = ?");
+          queryParams.push(organizationId);
+        }
+        if (projectId !== void 0) {
+          conditions.push("projectId = ?");
+          queryParams.push(projectId);
+        }
+      }
       const whereClause = `WHERE ${conditions.join(" AND ")}`;
       const countResult = await this.#client.execute({
         sql: `SELECT COUNT(*) as count FROM ${TABLE_EXPERIMENT_RESULTS} ${whereClause}`,
@@ -6435,12 +6582,7 @@ var MemoryLibSQL = class extends MemoryStorage {
     await this.#db.createTable({ tableName: TABLE_THREADS, schema: TABLE_SCHEMAS[TABLE_THREADS] });
     await this.#db.createTable({ tableName: TABLE_MESSAGES, schema: TABLE_SCHEMAS[TABLE_MESSAGES] });
     await this.#db.createTable({ tableName: TABLE_RESOURCES, schema: TABLE_SCHEMAS[TABLE_RESOURCES] });
-    let omSchema;
-    try {
-      const { OBSERVATIONAL_MEMORY_TABLE_SCHEMA } = await import('@mastra/core/storage');
-      omSchema = OBSERVATIONAL_MEMORY_TABLE_SCHEMA?.[OM_TABLE];
-    } catch {
-    }
+    const omSchema = OBSERVATIONAL_MEMORY_TABLE_SCHEMA?.[OM_TABLE];
     if (omSchema) {
       await this.#db.createTable({
         tableName: OM_TABLE,