@mastra/libsql 1.5.0-alpha.0 → 1.6.0-alpha.0

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, BlobStore, TABLE_SKILL_BLOBS, SKILL_BLOBS_SCHEMA, 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, MCPClientsStorage, MCP_CLIENTS_SCHEMA, TABLE_MCP_CLIENTS, MCP_CLIENT_VERSIONS_SCHEMA, TABLE_MCP_CLIENT_VERSIONS, MemoryStorage, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ObservabilityStorage, SPAN_SCHEMA, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, PROMPT_BLOCKS_SCHEMA, TABLE_PROMPT_BLOCKS, PROMPT_BLOCK_VERSIONS_SCHEMA, TABLE_PROMPT_BLOCK_VERSIONS, ScorerDefinitionsStorage, SCORER_DEFINITIONS_SCHEMA, TABLE_SCORER_DEFINITIONS, SCORER_DEFINITION_VERSIONS_SCHEMA, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, SCORERS_SCHEMA, TABLE_SCORERS, transformScoreRow, SkillsStorage, SKILLS_SCHEMA, TABLE_SKILLS, SKILL_VERSIONS_SCHEMA, TABLE_SKILL_VERSIONS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, WorkspacesStorage, WORKSPACES_SCHEMA, TABLE_WORKSPACES, WORKSPACE_VERSIONS_SCHEMA, TABLE_WORKSPACE_VERSIONS, MastraCompositeStore, TraceStatus, getSqlType } from '@mastra/core/storage';
+import { createVectorErrorId, AgentsStorage, AGENTS_SCHEMA, TABLE_AGENTS, AGENT_VERSIONS_SCHEMA, TABLE_AGENT_VERSIONS, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, TABLE_SKILL_BLOBS, SKILL_BLOBS_SCHEMA, 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, 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_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ObservabilityStorage, SPAN_SCHEMA, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, PROMPT_BLOCKS_SCHEMA, TABLE_PROMPT_BLOCKS, PROMPT_BLOCK_VERSIONS_SCHEMA, TABLE_PROMPT_BLOCK_VERSIONS, ScorerDefinitionsStorage, SCORER_DEFINITIONS_SCHEMA, TABLE_SCORER_DEFINITIONS, SCORER_DEFINITION_VERSIONS_SCHEMA, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, SCORERS_SCHEMA, TABLE_SCORERS, transformScoreRow, SkillsStorage, SKILLS_SCHEMA, TABLE_SKILLS, SKILL_VERSIONS_SCHEMA, TABLE_SKILL_VERSIONS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, WorkspacesStorage, WORKSPACES_SCHEMA, TABLE_WORKSPACES, WORKSPACE_VERSIONS_SCHEMA, TABLE_WORKSPACE_VERSIONS, MastraCompositeStore, TraceStatus, getSqlType } 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';
@@ -4630,6 +4630,490 @@ var MCPClientsLibSQL = class extends MCPClientsStorage {
     };
   }
 };
+var MCPServersLibSQL = class extends MCPServersStorage {
+  #db;
+  #client;
+  constructor(config) {
+    super();
+    const client = resolveClient(config);
+    this.#client = client;
+    this.#db = new LibSQLDB({ client, maxRetries: config.maxRetries, initialBackoffMs: config.initialBackoffMs });
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_MCP_SERVERS, schema: MCP_SERVERS_SCHEMA });
+    await this.#db.createTable({
+      tableName: TABLE_MCP_SERVER_VERSIONS,
+      schema: MCP_SERVER_VERSIONS_SCHEMA
+    });
+    await this.#client.execute(
+      `CREATE UNIQUE INDEX IF NOT EXISTS idx_mcp_server_versions_server_version ON "${TABLE_MCP_SERVER_VERSIONS}" ("mcpServerId", "versionNumber")`
+    );
+  }
+  async dangerouslyClearAll() {
+    await this.#db.deleteData({ tableName: TABLE_MCP_SERVERS });
+    await this.#db.deleteData({ tableName: TABLE_MCP_SERVER_VERSIONS });
+  }
+  // ==========================================================================
+  // MCP Server CRUD
+  // ==========================================================================
+  async getById(id) {
+    try {
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_MCP_SERVERS)} FROM "${TABLE_MCP_SERVERS}" WHERE id = ?`,
+        args: [id]
+      });
+      const row = result.rows?.[0];
+      return row ? this.#parseMCPServerRow(row) : null;
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "GET_MCP_SERVER", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async create(input) {
+    const { mcpServer } = input;
+    try {
+      const now = /* @__PURE__ */ new Date();
+      await this.#db.insert({
+        tableName: TABLE_MCP_SERVERS,
+        record: {
+          id: mcpServer.id,
+          status: "draft",
+          activeVersionId: null,
+          authorId: mcpServer.authorId ?? null,
+          metadata: mcpServer.metadata ?? null,
+          createdAt: now.toISOString(),
+          updatedAt: now.toISOString()
+        }
+      });
+      const { id: _id, authorId: _authorId, metadata: _metadata, ...snapshotConfig } = mcpServer;
+      const versionId = crypto.randomUUID();
+      try {
+        await this.createVersion({
+          id: versionId,
+          mcpServerId: mcpServer.id,
+          versionNumber: 1,
+          ...snapshotConfig,
+          changedFields: Object.keys(snapshotConfig),
+          changeMessage: "Initial version"
+        });
+      } catch (versionError) {
+        await this.#db.delete({ tableName: TABLE_MCP_SERVERS, keys: { id: mcpServer.id } });
+        throw versionError;
+      }
+      return {
+        id: mcpServer.id,
+        status: "draft",
+        activeVersionId: void 0,
+        authorId: mcpServer.authorId,
+        metadata: mcpServer.metadata,
+        createdAt: now,
+        updatedAt: now
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "CREATE_MCP_SERVER", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async update(input) {
+    const { id, ...updates } = input;
+    try {
+      const existing = await this.getById(id);
+      if (!existing) {
+        throw new Error(`MCP server with id ${id} not found`);
+      }
+      const { authorId, activeVersionId, metadata, status } = updates;
+      const updateData = {
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      if (authorId !== void 0) updateData.authorId = authorId;
+      if (activeVersionId !== void 0) updateData.activeVersionId = activeVersionId;
+      if (status !== void 0) updateData.status = status;
+      if (metadata !== void 0) {
+        updateData.metadata = { ...existing.metadata, ...metadata };
+      }
+      await this.#db.update({
+        tableName: TABLE_MCP_SERVERS,
+        keys: { id },
+        data: updateData
+      });
+      const updated = await this.getById(id);
+      if (!updated) {
+        throw new MastraError({
+          id: createStorageErrorId("LIBSQL", "UPDATE_MCP_SERVER", "NOT_FOUND_AFTER_UPDATE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.SYSTEM,
+          text: `MCP server ${id} not found after update`,
+          details: { id }
+        });
+      }
+      return updated;
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "UPDATE_MCP_SERVER", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async delete(id) {
+    try {
+      await this.deleteVersionsByParentId(id);
+      await this.#client.execute({
+        sql: `DELETE FROM "${TABLE_MCP_SERVERS}" WHERE "id" = ?`,
+        args: [id]
+      });
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "DELETE_MCP_SERVER", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async list(args) {
+    try {
+      const { page = 0, perPage: perPageInput, orderBy, authorId, metadata, status = "published" } = args || {};
+      const { field, direction } = this.parseOrderBy(orderBy);
+      const conditions = [];
+      const queryParams = [];
+      conditions.push("status = ?");
+      queryParams.push(status);
+      if (authorId !== void 0) {
+        conditions.push("authorId = ?");
+        queryParams.push(authorId);
+      }
+      if (metadata && Object.keys(metadata).length > 0) {
+        for (const [key, value] of Object.entries(metadata)) {
+          if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) {
+            throw new MastraError({
+              id: createStorageErrorId("LIBSQL", "LIST_MCP_SERVERS", "INVALID_METADATA_KEY"),
+              domain: ErrorDomain.STORAGE,
+              category: ErrorCategory.USER,
+              text: `Invalid metadata key: ${key}. Keys must be alphanumeric with underscores.`,
+              details: { key }
+            });
+          }
+          conditions.push(`json_extract(metadata, '$.${key}') = ?`);
+          queryParams.push(typeof value === "string" ? value : JSON.stringify(value));
+        }
+      }
+      const whereClause = `WHERE ${conditions.join(" AND ")}`;
+      const countResult = await this.#client.execute({
+        sql: `SELECT COUNT(*) as count FROM "${TABLE_MCP_SERVERS}" ${whereClause}`,
+        args: queryParams
+      });
+      const total = Number(countResult.rows?.[0]?.count ?? 0);
+      if (total === 0) {
+        return {
+          mcpServers: [],
+          total: 0,
+          page,
+          perPage: perPageInput ?? 100,
+          hasMore: false
+        };
+      }
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const limitValue = perPageInput === false ? total : perPage;
+      const end = perPageInput === false ? total : start + perPage;
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_MCP_SERVERS)} FROM "${TABLE_MCP_SERVERS}" ${whereClause} ORDER BY ${field} ${direction} LIMIT ? OFFSET ?`,
+        args: [...queryParams, limitValue, start]
+      });
+      const mcpServers = result.rows?.map((row) => this.#parseMCPServerRow(row)) ?? [];
+      return {
+        mcpServers,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: end < total
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "LIST_MCP_SERVERS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  // ==========================================================================
+  // MCP Server Version Methods
+  // ==========================================================================
+  async createVersion(input) {
+    try {
+      const now = /* @__PURE__ */ new Date();
+      await this.#db.insert({
+        tableName: TABLE_MCP_SERVER_VERSIONS,
+        record: {
+          id: input.id,
+          mcpServerId: input.mcpServerId,
+          versionNumber: input.versionNumber,
+          name: input.name,
+          version: input.version,
+          description: input.description ?? null,
+          instructions: input.instructions ?? null,
+          repository: input.repository ?? null,
+          releaseDate: input.releaseDate ?? null,
+          isLatest: input.isLatest ?? null,
+          packageCanonical: input.packageCanonical ?? null,
+          tools: input.tools ?? null,
+          agents: input.agents ?? null,
+          workflows: input.workflows ?? null,
+          changedFields: input.changedFields ?? null,
+          changeMessage: input.changeMessage ?? null,
+          createdAt: now.toISOString()
+        }
+      });
+      return {
+        ...input,
+        createdAt: now
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "CREATE_MCP_SERVER_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async getVersion(id) {
+    try {
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_MCP_SERVER_VERSIONS)} FROM "${TABLE_MCP_SERVER_VERSIONS}" WHERE id = ?`,
+        args: [id]
+      });
+      const row = result.rows?.[0];
+      return row ? this.#parseVersionRow(row) : null;
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "GET_MCP_SERVER_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async getVersionByNumber(mcpServerId, versionNumber) {
+    try {
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_MCP_SERVER_VERSIONS)} FROM "${TABLE_MCP_SERVER_VERSIONS}" WHERE mcpServerId = ? AND versionNumber = ?`,
+        args: [mcpServerId, versionNumber]
+      });
+      const row = result.rows?.[0];
+      return row ? this.#parseVersionRow(row) : null;
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "GET_MCP_SERVER_VERSION_BY_NUMBER", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async getLatestVersion(mcpServerId) {
+    try {
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_MCP_SERVER_VERSIONS)} FROM "${TABLE_MCP_SERVER_VERSIONS}" WHERE mcpServerId = ? ORDER BY versionNumber DESC LIMIT 1`,
+        args: [mcpServerId]
+      });
+      const row = result.rows?.[0];
+      return row ? this.#parseVersionRow(row) : null;
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "GET_LATEST_MCP_SERVER_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async listVersions(input) {
+    try {
+      const { mcpServerId, page = 0, perPage: perPageInput, orderBy } = input;
+      const { field, direction } = this.parseVersionOrderBy(orderBy);
+      const countResult = await this.#client.execute({
+        sql: `SELECT COUNT(*) as count FROM "${TABLE_MCP_SERVER_VERSIONS}" WHERE mcpServerId = ?`,
+        args: [mcpServerId]
+      });
+      const total = Number(countResult.rows?.[0]?.count ?? 0);
+      if (total === 0) {
+        return {
+          versions: [],
+          total: 0,
+          page,
+          perPage: perPageInput ?? 20,
+          hasMore: false
+        };
+      }
+      const perPage = normalizePerPage(perPageInput, 20);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const limitValue = perPageInput === false ? total : perPage;
+      const end = perPageInput === false ? total : start + perPage;
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_MCP_SERVER_VERSIONS)} FROM "${TABLE_MCP_SERVER_VERSIONS}" WHERE mcpServerId = ? ORDER BY ${field} ${direction} LIMIT ? OFFSET ?`,
+        args: [mcpServerId, limitValue, start]
+      });
+      const versions = result.rows?.map((row) => this.#parseVersionRow(row)) ?? [];
+      return {
+        versions,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: end < total
+      };
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "LIST_MCP_SERVER_VERSIONS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async deleteVersion(id) {
+    try {
+      await this.#client.execute({
+        sql: `DELETE FROM "${TABLE_MCP_SERVER_VERSIONS}" WHERE "id" = ?`,
+        args: [id]
+      });
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "DELETE_MCP_SERVER_VERSION", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async deleteVersionsByParentId(entityId) {
+    try {
+      await this.#client.execute({
+        sql: `DELETE FROM "${TABLE_MCP_SERVER_VERSIONS}" WHERE "mcpServerId" = ?`,
+        args: [entityId]
+      });
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "DELETE_MCP_SERVER_VERSIONS_BY_SERVER", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async countVersions(mcpServerId) {
+    try {
+      const result = await this.#client.execute({
+        sql: `SELECT COUNT(*) as count FROM "${TABLE_MCP_SERVER_VERSIONS}" WHERE mcpServerId = ?`,
+        args: [mcpServerId]
+      });
+      return Number(result.rows?.[0]?.count ?? 0);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "COUNT_MCP_SERVER_VERSIONS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  // ==========================================================================
+  // Private Helpers
+  // ==========================================================================
+  #safeParseJSON(val) {
+    if (val === null || val === void 0) return void 0;
+    if (typeof val === "string") {
+      try {
+        return JSON.parse(val);
+      } catch {
+        return val;
+      }
+    }
+    return val;
+  }
+  #parseMCPServerRow(row) {
+    return {
+      id: row.id,
+      status: row.status ?? "draft",
+      activeVersionId: row.activeVersionId ?? void 0,
+      authorId: row.authorId ?? void 0,
+      metadata: this.#safeParseJSON(row.metadata),
+      createdAt: new Date(row.createdAt),
+      updatedAt: new Date(row.updatedAt)
+    };
+  }
+  #parseVersionRow(row) {
+    return {
+      id: row.id,
+      mcpServerId: row.mcpServerId,
+      versionNumber: Number(row.versionNumber),
+      name: row.name,
+      version: row.version,
+      description: row.description ?? void 0,
+      instructions: row.instructions ?? void 0,
+      repository: this.#safeParseJSON(row.repository),
+      releaseDate: row.releaseDate ?? void 0,
+      isLatest: row.isLatest === null || row.isLatest === void 0 ? void 0 : Boolean(row.isLatest),
+      packageCanonical: row.packageCanonical ?? void 0,
+      tools: this.#safeParseJSON(row.tools),
+      agents: this.#safeParseJSON(row.agents),
+      workflows: this.#safeParseJSON(row.workflows),
+      changedFields: this.#safeParseJSON(row.changedFields),
+      changeMessage: row.changeMessage ?? void 0,
+      createdAt: new Date(row.createdAt)
+    };
+  }
+};
 var OM_TABLE = "mastra_observational_memory";
 var MemoryLibSQL = class extends MemoryStorage {
   supportsObservationalMemory = true;
@@ -6294,32 +6778,40 @@ var MemoryLibSQL = class extends MemoryStorage {
       const retentionFloor = input.messageTokensThreshold * (1 - input.activationRatio);
       const targetMessageTokens = Math.max(0, input.currentPendingTokens - retentionFloor);
       let cumulativeMessageTokens = 0;
-      let bestBoundary = 0;
-      let bestBoundaryMessageTokens = 0;
+      let bestOverBoundary = 0;
+      let bestOverTokens = 0;
+      let bestUnderBoundary = 0;
+      let bestUnderTokens = 0;
       for (let i = 0; i < chunks.length; i++) {
         cumulativeMessageTokens += chunks[i].messageTokens ?? 0;
         const boundary = i + 1;
-        const isUnder = cumulativeMessageTokens <= targetMessageTokens;
-        const bestIsUnder = bestBoundaryMessageTokens <= targetMessageTokens;
-        if (bestBoundary === 0) {
-          bestBoundary = boundary;
-          bestBoundaryMessageTokens = cumulativeMessageTokens;
-        } else if (isUnder && !bestIsUnder) {
-          bestBoundary = boundary;
-          bestBoundaryMessageTokens = cumulativeMessageTokens;
-        } else if (isUnder && bestIsUnder) {
-          if (cumulativeMessageTokens > bestBoundaryMessageTokens) {
-            bestBoundary = boundary;
-            bestBoundaryMessageTokens = cumulativeMessageTokens;
+        if (cumulativeMessageTokens >= targetMessageTokens) {
+          if (bestOverBoundary === 0 || cumulativeMessageTokens < bestOverTokens) {
+            bestOverBoundary = boundary;
+            bestOverTokens = cumulativeMessageTokens;
           }
-        } else if (!isUnder && !bestIsUnder) {
-          if (cumulativeMessageTokens < bestBoundaryMessageTokens) {
-            bestBoundary = boundary;
-            bestBoundaryMessageTokens = cumulativeMessageTokens;
+        } else {
+          if (cumulativeMessageTokens > bestUnderTokens) {
+            bestUnderBoundary = boundary;
+            bestUnderTokens = cumulativeMessageTokens;
           }
         }
       }
-      const chunksToActivate = bestBoundary === 0 ? 1 : bestBoundary;
+      const maxOvershoot = retentionFloor * 0.95;
+      const overshoot = bestOverTokens - targetMessageTokens;
+      const remainingAfterOver = input.currentPendingTokens - bestOverTokens;
+      let chunksToActivate;
+      if (input.forceMaxActivation && bestOverBoundary > 0) {
+        chunksToActivate = bestOverBoundary;
+      } else if (bestOverBoundary > 0 && overshoot <= maxOvershoot && (remainingAfterOver >= 1e3 || retentionFloor === 0)) {
+        chunksToActivate = bestOverBoundary;
+      } else if (bestUnderBoundary > 0) {
+        chunksToActivate = bestUnderBoundary;
+      } else if (bestOverBoundary > 0) {
+        chunksToActivate = bestOverBoundary;
+      } else {
+        chunksToActivate = 1;
+      }
       const activatedChunks = chunks.slice(0, chunksToActivate);
       const remainingChunks = chunks.slice(chunksToActivate);
       const activatedContent = activatedChunks.map((c) => c.observations).join("\n\n");
@@ -6358,6 +6850,7 @@ ${activatedContent}` : activatedContent;
           input.id
         ]
       });
+      const latestChunkHints = activatedChunks[activatedChunks.length - 1];
       return {
         chunksActivated: activatedChunks.length,
         messageTokensActivated: activatedMessageTokens,
@@ -6372,7 +6865,9 @@ ${activatedContent}` : activatedContent;
           observationTokens: c.tokenCount,
           messageCount: c.messageIds.length,
           observations: c.observations
-        }))
+        })),
+        suggestedContinuation: latestChunkHints?.suggestedContinuation ?? void 0,
+        currentTask: latestChunkHints?.currentTask ?? void 0
       };
     } catch (error) {
       if (error instanceof MastraError) {
@@ -9651,6 +10146,7 @@ var LibSQLStore = class extends MastraCompositeStore {
     const promptBlocks = new PromptBlocksLibSQL(domainConfig);
     const scorerDefinitions = new ScorerDefinitionsLibSQL(domainConfig);
     const mcpClients = new MCPClientsLibSQL(domainConfig);
+    const mcpServers = new MCPServersLibSQL(domainConfig);
     const workspaces = new WorkspacesLibSQL(domainConfig);
     const skills = new SkillsLibSQL(domainConfig);
     const blobs = new BlobsLibSQL(domainConfig);
@@ -9665,6 +10161,7 @@ var LibSQLStore = class extends MastraCompositeStore {
       promptBlocks,
       scorerDefinitions,
       mcpClients,
+      mcpServers,
       workspaces,
       skills,
       blobs
@@ -9771,6 +10268,6 @@ Example Complex Query:
   ]
 }`;
 
-export { AgentsLibSQL, BlobsLibSQL, DatasetsLibSQL, LibSQLStore as DefaultStorage, ExperimentsLibSQL, LIBSQL_PROMPT, LibSQLStore, LibSQLVector, MCPClientsLibSQL, MemoryLibSQL, ObservabilityLibSQL, PromptBlocksLibSQL, ScorerDefinitionsLibSQL, ScoresLibSQL, SkillsLibSQL, WorkflowsLibSQL, WorkspacesLibSQL };
+export { AgentsLibSQL, BlobsLibSQL, DatasetsLibSQL, LibSQLStore as DefaultStorage, ExperimentsLibSQL, LIBSQL_PROMPT, LibSQLStore, LibSQLVector, MCPClientsLibSQL, MCPServersLibSQL, MemoryLibSQL, ObservabilityLibSQL, PromptBlocksLibSQL, ScorerDefinitionsLibSQL, ScoresLibSQL, SkillsLibSQL, WorkflowsLibSQL, WorkspacesLibSQL };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map