@mastra/libsql 1.14.0 → 1.14.1-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,87 @@
 # @mastra/libsql
 
+## 1.14.1-alpha.1
+
+### Patch Changes
+
+- Added multi-tenant scoping columns (`organizationId`, `projectId`) to the experiments domain so experiment records and per-item results inherit the tenancy bucket of their parent dataset. ([#18388](https://github.com/mastra-ai/mastra/pull/18388))
+
+  `Experiment`, `ExperimentResult`, `CreateExperimentInput`, and `AddExperimentResultInput` now carry optional `organizationId` / `projectId` fields. `ListExperimentsInput` and `ListExperimentResultsInput` gain a `filters: ExperimentTenancyFilters` block (mirrors `DatasetTenancyFilters`) for scoping queries within a `(organizationId, projectId)` bucket. Tenancy is hydrated from the parent dataset on `createExperiment` and denormalized onto each `ExperimentResult` for efficient tenancy-scoped queries.
+
+  The corresponding columns are also added to the `mastra_experiments` and `mastra_experiment_results` table schemas. Existing rows backfill to `null`, matching the rest of the dataset-tenancy surface.
+
+  This release also clarifies the `targetType` contract via JSDoc:
+  - `CreateDatasetInput.targetType` remains optional. Datasets without a `TargetType` are **not experiment-eligible** — the experiment runner requires a non-null `CreateExperimentInput.targetType` to resolve an executor.
+  - `Experiment.targetType` / `CreateExperimentInput.targetType` stay required. An experiment by definition replays inputs against a specific target.
+
+  No behavior change for existing OSS-created experiments; the new fields are additive and optional.
+
+  Example:
+
+  ```ts
+  // Create an experiment scoped to a tenancy bucket. When the parent dataset
+  // already carries `organizationId` / `projectId`, `runExperiment` hydrates
+  // these fields automatically from the dataset record.
+  const experiment = await storage.createExperiment({
+    name: 'qa-regression',
+    datasetId: 'ds_123',
+    datasetVersion: 1,
+    targetType: 'agent',
+    targetId: 'agent_qa',
+    totalItems: 10,
+    organizationId: 'org_123',
+    projectId: 'proj_123',
+  });
+
+  // List experiments within a tenancy bucket.
+  const experiments = await storage.listExperiments({
+    pagination: { page: 0, perPage: 20 },
+    filters: { organizationId: 'org_123', projectId: 'proj_123' },
+  });
+
+  // List per-item results within the same bucket.
+  const results = await storage.listExperimentResults({
+    experimentId: experiment.id,
+    pagination: { page: 0, perPage: 50 },
+    filters: { organizationId: 'org_123', projectId: 'proj_123' },
+  });
+  ```
+
+- Persist and filter dataset tenancy + candidate identity in storage adapters. ([#18314](https://github.com/mastra-ai/mastra/pull/18314))
+
+  `createDataset` now persists `organizationId`, `projectId`, `candidateKey`, and `candidateId`. `listDatasets` and `listItems` accept matching tenancy filters. Dataset items inherit `organizationId` / `projectId` from their parent dataset on insert, update, delete, and batch insert/delete — items are never settable per call (item tenancy follows dataset tenancy).
+
+  All new columns are nullable and added retroactively via each adapter's existing column-migration path; no breaking DDL. Existing rows continue to read and write fine; new writes can choose to stamp tenancy.
+
+  ```ts
+  await storage.createDataset({
+    name: 'candidates/missing-tool-call/incident-123',
+    organizationId: 'org_abc',
+    projectId: 'project_xyz',
+    candidateKey: 'missing-tool-call',
+    candidateId: 'incident-123',
+  });
+
+  await storage.listDatasets({
+    pagination: { page: 0, perPage: 20 },
+    filters: { organizationId: 'org_abc', projectId: 'project_xyz' },
+  });
+  ```
+
+- Updated dependencies [[`5c4e9a4`](https://github.com/mastra-ai/mastra/commit/5c4e9a4cfb2216bb3ea7f8988ad3727f3b92bb3a), [`25961e3`](https://github.com/mastra-ai/mastra/commit/25961e3260ff3b1464637af8fcdb36210551c39f), [`7b29f33`](https://github.com/mastra-ai/mastra/commit/7b29f332a357a83e555f29e718e5f2fab9979943), [`24912b1`](https://github.com/mastra-ai/mastra/commit/24912b1f855d29ec36af4ef4bde1f7417e20cdf5), [`7686216`](https://github.com/mastra-ai/mastra/commit/7686216f37e74568feddec17cef3c3d24e10e60a), [`975c59a`](https://github.com/mastra-ai/mastra/commit/975c59ae363ee275fc55062392e1ffd2cbccbd53), [`d95f394`](https://github.com/mastra-ai/mastra/commit/d95f394fd24c8411886930d727679c4d5252aa26), [`f3f0c9d`](https://github.com/mastra-ai/mastra/commit/f3f0c9d7c878db5a13177871ce3523a14f14b311)]:
+  - @mastra/core@1.46.0-alpha.4
+
+## 1.14.1-alpha.0
+
+### Patch Changes
+
+- Fixed: `mastra build` output no longer hangs on the first storage-touching request when an app uses `LibSQLStore`, `PostgresStore`, or `MySQLStore` with observational memory. `mastra dev` was unaffected; only the bundled `mastra start` output deadlocked. No code changes or `bundler.externals` workaround required on the app side after upgrading. ([#18302](https://github.com/mastra-ai/mastra/pull/18302))
+
+- Added storage for item-level tool mocks. Dataset items persist their `toolMocks` and experiment results persist their `toolMockReport`, so mocks and run diagnostics survive across sessions. ([#18036](https://github.com/mastra-ai/mastra/pull/18036))
+
+- Updated dependencies [[`65f255a`](https://github.com/mastra-ai/mastra/commit/65f255a38667beb6ceeadabfa9eb5059bfec8298), [`4a88c6e`](https://github.com/mastra-ai/mastra/commit/4a88c6e2bdce316f8d7551b4ec3449b0b06fc71c), [`87a17ef`](https://github.com/mastra-ai/mastra/commit/87a17efbd725aca6639febdc5e69e2abb3048689), [`e11ff30`](https://github.com/mastra-ai/mastra/commit/e11ff301408bf1731dca2fb7fbfcd8c819500a35), [`9d2c946`](https://github.com/mastra-ai/mastra/commit/9d2c946d0859e90ae4bcec5beeb1da7398d2ad1e), [`f1ec385`](https://github.com/mastra-ai/mastra/commit/f1ec385386f62b1a0847ec5353ae2bb169d1c3d9), [`e14986f`](https://github.com/mastra-ai/mastra/commit/e14986f6e5478d6384d04ff9a7f9a79a46a8b529), [`0be490f`](https://github.com/mastra-ai/mastra/commit/0be490fabb538c5a7de796ea0aff7d04a0bea1f3), [`0be490f`](https://github.com/mastra-ai/mastra/commit/0be490fabb538c5a7de796ea0aff7d04a0bea1f3), [`974f614`](https://github.com/mastra-ai/mastra/commit/974f614e083bd68278536f94453f7b320b86a3c7), [`31be1cf`](https://github.com/mastra-ai/mastra/commit/31be1cf5f2a7b5eef12f6123a40653b4d8115c16)]:
+  - @mastra/core@1.46.0-alpha.3
+
 ## 1.14.0
 
 ### Minor Changes

package/dist/docs/SKILL.md

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

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.14.0",
+  "version": "1.14.1-alpha.1",
   "package": "@mastra/libsql",
   "exports": {},
   "modules": {}

package/dist/docs/references/docs-agent-builder-overview.md

@@ -2,6 +2,8 @@
 
 > **Note:** The Agent Builder is part of the Mastra Enterprise Edition. Production deployments require a valid EE license. [Contact sales](https://mastra.ai/contact) for more information.
 
+[YouTube video player](https://www.youtube-nocookie.com/embed/AbdgIu4Z07I)
+
 The Agent Builder lets you build, configure, and operate Mastra agents all within the UI. It runs inside your Mastra server, persists everything to `Mastra.storage`, and supports multi-tenant agent workflows with RBAC and channel integrations.
 
 - [**Configuration**](https://mastra.ai/docs/agent-builder/configuration): Toggle UI sections and pin admin-controlled defaults for every new agent.

package/dist/index.cjs

@@ -3622,9 +3622,16 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
     await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "targetType", "TEXT");
     await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "targetIds", "TEXT");
     await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "scorerIds", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "organizationId", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "projectId", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "candidateKey", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "candidateId", "TEXT");
     await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "requestContext", "TEXT");
     await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "source", "TEXT");
     await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "expectedTrajectory", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "organizationId", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "projectId", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "toolMocks", "TEXT");
     await this.#client.batch(
       [
         {
@@ -3646,6 +3653,18 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
         {
           sql: `CREATE UNIQUE INDEX IF NOT EXISTS idx_dataset_versions_dataset_version_unique ON "${storage.TABLE_DATASET_VERSIONS}" ("datasetId", "version")`,
           args: []
+        },
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_datasets_tenancy_createdat ON "${storage.TABLE_DATASETS}" ("organizationId", "projectId", "createdAt", "id")`,
+          args: []
+        },
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_datasets_tenancy_candidate ON "${storage.TABLE_DATASETS}" ("organizationId", "projectId", "candidateKey", "candidateId")`,
+          args: []
+        },
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_dataset_items_tenancy_list ON "${storage.TABLE_DATASET_ITEMS}" ("organizationId", "projectId", "datasetId", "validTo", "isDeleted")`,
+          args: []
         }
       ],
       "write"
@@ -3677,6 +3696,10 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
       targetIds: row.targetIds ? storage.safelyParseJSON(row.targetIds) : void 0,
       scorerIds: row.scorerIds ? storage.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: storage.ensureDate(row.createdAt),
       updatedAt: storage.ensureDate(row.updatedAt)
     };
@@ -3686,9 +3709,12 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: storage.safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? storage.safelyParseJSON(row.groundTruth) : void 0,
       expectedTrajectory: row.expectedTrajectory ? storage.safelyParseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? storage.safelyParseJSON(row.toolMocks) : void 0,
       requestContext: row.requestContext ? storage.safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? storage.safelyParseJSON(row.metadata) : void 0,
       source: row.source ? storage.safelyParseJSON(row.source) : void 0,
@@ -3701,11 +3727,14 @@ var DatasetsLibSQL = class extends storage.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: storage.safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? storage.safelyParseJSON(row.groundTruth) : void 0,
       expectedTrajectory: row.expectedTrajectory ? storage.safelyParseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? storage.safelyParseJSON(row.toolMocks) : void 0,
       requestContext: row.requestContext ? storage.safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? storage.safelyParseJSON(row.metadata) : void 0,
       source: row.source ? storage.safelyParseJSON(row.source) : void 0,
@@ -3741,6 +3770,10 @@ var DatasetsLibSQL = class extends storage.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
         }
@@ -3757,6 +3790,10 @@ var DatasetsLibSQL = class extends storage.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
       };
@@ -3912,9 +3949,28 @@ var DatasetsLibSQL = class extends storage.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 ${storage.TABLE_DATASETS}`,
-        args: []
+        sql: `SELECT COUNT(*) as count FROM ${storage.TABLE_DATASETS} ${whereClause}`,
+        args: filterParams
       });
       const total = Number(countResult.rows?.[0]?.count ?? 0);
       if (total === 0) {
@@ -3928,8 +3984,8 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
       const result = await this.#client.execute({
-        sql: `SELECT ${buildSelectColumns(storage.TABLE_DATASETS)} FROM ${storage.TABLE_DATASETS} ORDER BY createdAt DESC, id ASC LIMIT ? OFFSET ?`,
-        args: [limitValue, start]
+        sql: `SELECT ${buildSelectColumns(storage.TABLE_DATASETS)} FROM ${storage.TABLE_DATASETS} ${whereClause} ORDER BY createdAt DESC, id ASC LIMIT ? OFFSET ?`,
+        args: [...filterParams, limitValue, start]
       });
       return {
         datasets: result.rows?.map((row) => this.transformDatasetRow(row)) ?? [],
@@ -3954,6 +4010,7 @@ var DatasetsLibSQL = class extends storage.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();
@@ -3965,14 +4022,17 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
             args: [args.datasetId]
           },
           {
-            sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.TABLE_DATASETS} WHERE id = ?), (SELECT organizationId FROM ${storage.TABLE_DATASETS} WHERE id = ?), (SELECT projectId FROM ${storage.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),
@@ -3992,9 +4052,12 @@ var DatasetsLibSQL = class extends storage.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,
@@ -4032,12 +4095,14 @@ var DatasetsLibSQL = class extends storage.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;
@@ -4052,14 +4117,17 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
             args: [args.datasetId, args.id]
           },
           {
-            sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.TABLE_DATASETS} WHERE id = ?), (SELECT organizationId FROM ${storage.TABLE_DATASETS} WHERE id = ?), (SELECT projectId FROM ${storage.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),
@@ -4078,9 +4146,12 @@ var DatasetsLibSQL = class extends storage.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,
@@ -4123,13 +4194,17 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
             args: [datasetId, id]
           },
           {
-            sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.TABLE_DATASETS} WHERE id = ?), (SELECT organizationId FROM ${storage.TABLE_DATASETS} WHERE id = ?), (SELECT projectId FROM ${storage.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),
@@ -4230,6 +4305,14 @@ var DatasetsLibSQL = class extends storage.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()}%`;
@@ -4267,6 +4350,14 @@ var DatasetsLibSQL = class extends storage.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()}%`;
@@ -4412,14 +4503,17 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
         const id = crypto.randomUUID();
         items.push({ id, input: itemInput });
         statements.push({
-          sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+          sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.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),
@@ -4438,9 +4532,12 @@ var DatasetsLibSQL = class extends storage.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,
@@ -4492,13 +4589,17 @@ var DatasetsLibSQL = class extends storage.DatasetsStorage {
           args: [input.datasetId, item.id]
         });
         statements.push({
-          sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+          sql: `INSERT INTO ${storage.TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, organizationId, projectId, validTo, isDeleted, input, groundTruth, expectedTrajectory, toolMocks, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${storage.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),
@@ -4543,12 +4644,12 @@ var ExperimentsLibSQL = class extends storage.ExperimentsStorage {
     await this.#db.alterTable({
       tableName: storage.TABLE_EXPERIMENTS,
       schema: storage.EXPERIMENTS_SCHEMA,
-      ifNotExists: ["agentVersion"]
+      ifNotExists: ["agentVersion", "organizationId", "projectId"]
     });
     await this.#db.alterTable({
       tableName: storage.TABLE_EXPERIMENT_RESULTS,
       schema: storage.EXPERIMENT_RESULTS_SCHEMA,
-      ifNotExists: ["status", "tags"]
+      ifNotExists: ["status", "tags", "toolMockReport", "organizationId", "projectId"]
     });
     await this.#client.batch(
       [
@@ -4563,6 +4664,15 @@ var ExperimentsLibSQL = class extends storage.ExperimentsStorage {
         {
           sql: `CREATE UNIQUE INDEX IF NOT EXISTS idx_experiment_results_exp_item ON "${storage.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 "${storage.TABLE_EXPERIMENTS}" ("organizationId", "projectId")`,
+          args: []
+        },
+        {
+          sql: `CREATE INDEX IF NOT EXISTS idx_experiment_results_org_project ON "${storage.TABLE_EXPERIMENT_RESULTS}" ("organizationId", "projectId")`,
+          args: []
         }
       ],
       "write"
@@ -4579,6 +4689,8 @@ var ExperimentsLibSQL = class extends storage.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,
@@ -4602,6 +4714,8 @@ var ExperimentsLibSQL = class extends storage.ExperimentsStorage {
       experimentId: row.experimentId,
       itemId: row.itemId,
       itemDatasetVersion: row.itemDatasetVersion != null ? row.itemDatasetVersion : null,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: storage.safelyParseJSON(row.input),
       output: row.output ? storage.safelyParseJSON(row.output) : null,
       groundTruth: row.groundTruth ? storage.safelyParseJSON(row.groundTruth) : null,
@@ -4612,6 +4726,7 @@ var ExperimentsLibSQL = class extends storage.ExperimentsStorage {
       traceId: row.traceId ?? null,
       status: row.status ?? null,
       tags: row.tags ? storage.safelyParseJSON(row.tags) : null,
+      toolMockReport: row.toolMockReport ? storage.safelyParseJSON(row.toolMockReport) : null,
       createdAt: storage.ensureDate(row.createdAt)
     };
   }
@@ -4628,6 +4743,8 @@ var ExperimentsLibSQL = class extends storage.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,
@@ -4649,6 +4766,8 @@ var ExperimentsLibSQL = class extends storage.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,
@@ -4791,6 +4910,17 @@ var ExperimentsLibSQL = class extends storage.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 ${storage.TABLE_EXPERIMENTS} ${whereClause}`,
@@ -4865,6 +4995,8 @@ var ExperimentsLibSQL = class extends storage.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,
@@ -4875,6 +5007,7 @@ var ExperimentsLibSQL = class extends storage.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
         }
       });
@@ -4883,6 +5016,8 @@ var ExperimentsLibSQL = class extends storage.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,
@@ -4893,6 +5028,7 @@ var ExperimentsLibSQL = class extends storage.ExperimentsStorage {
         traceId: input.traceId ?? null,
         status: input.status ?? null,
         tags: input.tags ?? null,
+        toolMockReport: input.toolMockReport ?? null,
         createdAt: now
       };
     } catch (error$1) {
@@ -5001,6 +5137,17 @@ var ExperimentsLibSQL = class extends storage.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 ${storage.TABLE_EXPERIMENT_RESULTS} ${whereClause}`,
@@ -6437,12 +6584,7 @@ var MemoryLibSQL = class extends storage.MemoryStorage {
     await this.#db.createTable({ tableName: storage.TABLE_THREADS, schema: storage.TABLE_SCHEMAS[storage.TABLE_THREADS] });
     await this.#db.createTable({ tableName: storage.TABLE_MESSAGES, schema: storage.TABLE_SCHEMAS[storage.TABLE_MESSAGES] });
     await this.#db.createTable({ tableName: storage.TABLE_RESOURCES, schema: storage.TABLE_SCHEMAS[storage.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 = storage.OBSERVATIONAL_MEMORY_TABLE_SCHEMA?.[OM_TABLE];
     if (omSchema) {
       await this.#db.createTable({
         tableName: OM_TABLE,