@mastra/editor 0.7.16-alpha.0 → 0.7.16-alpha.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @mastra/editor
 
+## 0.7.16-alpha.2
+
+### Patch Changes
+
+- Resolving stored agent versions no longer mutates the shared singleton agent instance. Instruction and tool overrides are now applied to an isolated clone, making concurrent version resolution safe and preventing overrides from leaking onto the global agent. ([#15314](https://github.com/mastra-ai/mastra/pull/15314))
+
+- Updated dependencies [[`cbdf3e1`](https://github.com/mastra-ai/mastra/commit/cbdf3e12b3d0c30a6e5347be658e2009648c130a), [`8fe46d3`](https://github.com/mastra-ai/mastra/commit/8fe46d354027f3f0f0846e64219772348de106dd), [`18c67db`](https://github.com/mastra-ai/mastra/commit/18c67dbb9c9ebc26f26f65f7d3ff836e5691ef46), [`8dcc77e`](https://github.com/mastra-ai/mastra/commit/8dcc77e78a5340f5848f74b9e9f1b3da3513c1f5), [`aa67fc5`](https://github.com/mastra-ai/mastra/commit/aa67fc59ee8a5eeff1f23eb05970b8d7a536c8ff), [`fa8140b`](https://github.com/mastra-ai/mastra/commit/fa8140bcd4251d2e3ac85fdc5547dfc4f372b5be), [`190f452`](https://github.com/mastra-ai/mastra/commit/190f45258b0640e2adfc8219fa3258cdc5b8f071), [`7e7bf60`](https://github.com/mastra-ai/mastra/commit/7e7bf606886bf374a6f9d4ca9b09dd83d0533372), [`184907d`](https://github.com/mastra-ai/mastra/commit/184907d775d8609c03c26e78ccaf37315f3aa287), [`5f3d4dd`](https://github.com/mastra-ai/mastra/commit/5f3d4ddf237241f4b238ac062ac61eadabed0770), [`0c4cd13`](https://github.com/mastra-ai/mastra/commit/0c4cd131931c04ac5405373c932a242dbe88edd6), [`b16a753`](https://github.com/mastra-ai/mastra/commit/b16a753d5748440248d7df82e29bb987a9c8386c)]:
+  - @mastra/core@1.25.0-alpha.3
+  - @mastra/mcp@1.5.0-alpha.0
+
+## 0.7.16-alpha.1
+
+### Patch Changes
+
+- Updated dependencies [[`4ba3bb1`](https://github.com/mastra-ai/mastra/commit/4ba3bb1e465ad2ddaba3bbf2bc47e0faec32985e), [`2a69802`](https://github.com/mastra-ai/mastra/commit/2a69802a0fc6d8a25a77fa6a42276e9d59a83914)]:
+  - @mastra/core@1.25.0-alpha.2
+  - @mastra/schema-compat@1.2.8-alpha.0
+  - @mastra/mcp@1.4.2
+  - @mastra/memory@1.15.1-alpha.1
+
 ## 0.7.16-alpha.0
 
 ### Patch Changes

package/dist/index.cjs

@@ -565,7 +565,6 @@ var EditorMCPNamespace = class _EditorMCPNamespace extends CrudEditorNamespace {
 };
 
 // src/namespaces/agent.ts
-var codeDefaults = /* @__PURE__ */ new WeakMap();
 var EditorAgentNamespace = class extends CrudEditorNamespace {
   async getStorageAdapter() {
     const storage = this.mastra?.getStorage();
@@ -657,12 +656,6 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
    * they may contain SDK instances or dynamic functions that cannot be safely serialized.
    * Returns the (possibly mutated) agent.
    */
-  clearResolvedVersionId(agent) {
-    const raw = agent.toRawConfig();
-    if (!raw || !("resolvedVersionId" in raw)) return;
-    const { resolvedVersionId: _removed, ...rest } = raw;
-    agent.__setRawConfig(rest);
-  }
   async applyStoredOverrides(agent, options) {
     let storedConfig = null;
     try {
@@ -674,29 +667,21 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       if (options && "versionId" in options) {
         throw error;
       }
-      this.restoreCodeDefaults(agent);
-      this.clearResolvedVersionId(agent);
       return agent;
     }
     if (!storedConfig) {
-      this.restoreCodeDefaults(agent);
-      this.clearResolvedVersionId(agent);
       return agent;
     }
     const requestedPublished = options && !("versionId" in options) && options.status === "published";
     if (requestedPublished && !storedConfig.activeVersionId) {
-      this.restoreCodeDefaults(agent);
-      this.clearResolvedVersionId(agent);
       return agent;
     }
-    this.saveCodeDefaults(agent);
-    this.restoreCodeDefaults(agent);
-    this.saveCodeDefaults(agent);
+    const fork = agent.__fork();
     this.logger?.debug(`[applyStoredOverrides] Applying stored overrides to code agent "${agent.id}"`);
     if (storedConfig.instructions !== void 0 && storedConfig.instructions !== null) {
       const resolved = this.resolveStoredInstructions(storedConfig.instructions);
       if (resolved !== void 0) {
-        agent.__updateInstructions(resolved);
+        fork.__updateInstructions(resolved);
       }
     }
     const hasStoredTools = storedConfig.tools != null;
@@ -708,7 +693,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       const hasConditionalIntegrationTools = storedConfig.integrationTools != null && this.isConditionalVariants(storedConfig.integrationTools);
       const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
       if (isDynamicTools) {
-        const originalTools = agent.listTools.bind(agent);
+        const originalTools = fork.listTools.bind(fork);
         const toolsFn = async ({ requestContext }) => {
           const codeTools = await originalTools({ requestContext });
           const ctx = requestContext.toJSON();
@@ -729,9 +714,9 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           const integrationTools = await this.resolveStoredIntegrationTools(resolvedIntegrationToolsConfig, ctx);
           return { ...codeTools, ...registryTools, ...mcpTools, ...integrationTools };
         };
-        agent.__setTools(toolsFn);
+        fork.__setTools(toolsFn);
       } else {
-        const codeTools = await agent.listTools();
+        const codeTools = await fork.listTools();
         const registryTools = this.resolveStoredTools(
           storedConfig.tools
         );
@@ -741,43 +726,14 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
         const integrationTools = await this.resolveStoredIntegrationTools(
           storedConfig.integrationTools
         );
-        agent.__setTools({ ...codeTools, ...registryTools, ...mcpTools, ...integrationTools });
+        fork.__setTools({ ...codeTools, ...registryTools, ...mcpTools, ...integrationTools });
       }
     }
     if (storedConfig.resolvedVersionId) {
-      const existing = agent.toRawConfig() ?? {};
-      agent.__setRawConfig({ ...existing, resolvedVersionId: storedConfig.resolvedVersionId });
-    } else {
-      this.clearResolvedVersionId(agent);
+      const existing = fork.toRawConfig() ?? {};
+      fork.__setRawConfig({ ...existing, resolvedVersionId: storedConfig.resolvedVersionId });
     }
-    return agent;
-  }
-  /**
-   * Save the agent's current field values to the module-level WeakMap
-   * so they can be restored if the stored config is later removed.
-   * Only saves on the first call (guards against overwriting originals with overridden values).
-   *
-   * Only instructions and tools are saved — these are the only fields
-   * that `applyStoredOverrides` mutates.
-   */
-  saveCodeDefaults(agent) {
-    if (codeDefaults.has(agent)) return;
-    const fields = agent.__getOverridableFields();
-    codeDefaults.set(agent, {
-      instructions: fields.instructions,
-      tools: fields.tools
-    });
-  }
-  /**
-   * Restore the agent's original code-defined field values from the WeakMap.
-   * Clears the saved snapshot afterward.
-   */
-  restoreCodeDefaults(agent) {
-    const saved = codeDefaults.get(agent);
-    if (!saved) return;
-    agent.__updateInstructions(saved.instructions);
-    agent.__setTools(saved.tools);
-    codeDefaults.delete(agent);
+    return fork;
   }
   // ============================================================================
   // Private helpers

package/dist/index.d.cts

@@ -115,26 +115,11 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
      * they may contain SDK instances or dynamic functions that cannot be safely serialized.
      * Returns the (possibly mutated) agent.
      */
-    private clearResolvedVersionId;
     applyStoredOverrides(agent: Agent, options?: {
         status?: 'draft' | 'published';
     } | {
         versionId: string;
     }): Promise<Agent>;
-    /**
-     * Save the agent's current field values to the module-level WeakMap
-     * so they can be restored if the stored config is later removed.
-     * Only saves on the first call (guards against overwriting originals with overridden values).
-     *
-     * Only instructions and tools are saved — these are the only fields
-     * that `applyStoredOverrides` mutates.
-     */
-    private saveCodeDefaults;
-    /**
-     * Restore the agent's original code-defined field values from the WeakMap.
-     * Clears the saved snapshot afterward.
-     */
-    private restoreCodeDefaults;
     /**
      * Detect whether a StorageConditionalField value is a conditional variant array
      * (as opposed to the plain static value T).

package/dist/index.d.ts

@@ -115,26 +115,11 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
      * they may contain SDK instances or dynamic functions that cannot be safely serialized.
      * Returns the (possibly mutated) agent.
      */
-    private clearResolvedVersionId;
     applyStoredOverrides(agent: Agent, options?: {
         status?: 'draft' | 'published';
     } | {
         versionId: string;
     }): Promise<Agent>;
-    /**
-     * Save the agent's current field values to the module-level WeakMap
-     * so they can be restored if the stored config is later removed.
-     * Only saves on the first call (guards against overwriting originals with overridden values).
-     *
-     * Only instructions and tools are saved — these are the only fields
-     * that `applyStoredOverrides` mutates.
-     */
-    private saveCodeDefaults;
-    /**
-     * Restore the agent's original code-defined field values from the WeakMap.
-     * Clears the saved snapshot afterward.
-     */
-    private restoreCodeDefaults;
     /**
      * Detect whether a StorageConditionalField value is a conditional variant array
      * (as opposed to the plain static value T).

package/dist/index.js

@@ -517,7 +517,6 @@ var EditorMCPNamespace = class _EditorMCPNamespace extends CrudEditorNamespace {
 };
 
 // src/namespaces/agent.ts
-var codeDefaults = /* @__PURE__ */ new WeakMap();
 var EditorAgentNamespace = class extends CrudEditorNamespace {
   async getStorageAdapter() {
     const storage = this.mastra?.getStorage();
@@ -609,12 +608,6 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
    * they may contain SDK instances or dynamic functions that cannot be safely serialized.
    * Returns the (possibly mutated) agent.
    */
-  clearResolvedVersionId(agent) {
-    const raw = agent.toRawConfig();
-    if (!raw || !("resolvedVersionId" in raw)) return;
-    const { resolvedVersionId: _removed, ...rest } = raw;
-    agent.__setRawConfig(rest);
-  }
   async applyStoredOverrides(agent, options) {
     let storedConfig = null;
     try {
@@ -626,29 +619,21 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       if (options && "versionId" in options) {
         throw error;
       }
-      this.restoreCodeDefaults(agent);
-      this.clearResolvedVersionId(agent);
       return agent;
     }
     if (!storedConfig) {
-      this.restoreCodeDefaults(agent);
-      this.clearResolvedVersionId(agent);
       return agent;
     }
     const requestedPublished = options && !("versionId" in options) && options.status === "published";
     if (requestedPublished && !storedConfig.activeVersionId) {
-      this.restoreCodeDefaults(agent);
-      this.clearResolvedVersionId(agent);
       return agent;
     }
-    this.saveCodeDefaults(agent);
-    this.restoreCodeDefaults(agent);
-    this.saveCodeDefaults(agent);
+    const fork = agent.__fork();
     this.logger?.debug(`[applyStoredOverrides] Applying stored overrides to code agent "${agent.id}"`);
     if (storedConfig.instructions !== void 0 && storedConfig.instructions !== null) {
       const resolved = this.resolveStoredInstructions(storedConfig.instructions);
       if (resolved !== void 0) {
-        agent.__updateInstructions(resolved);
+        fork.__updateInstructions(resolved);
       }
     }
     const hasStoredTools = storedConfig.tools != null;
@@ -660,7 +645,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       const hasConditionalIntegrationTools = storedConfig.integrationTools != null && this.isConditionalVariants(storedConfig.integrationTools);
       const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
       if (isDynamicTools) {
-        const originalTools = agent.listTools.bind(agent);
+        const originalTools = fork.listTools.bind(fork);
         const toolsFn = async ({ requestContext }) => {
           const codeTools = await originalTools({ requestContext });
           const ctx = requestContext.toJSON();
@@ -681,9 +666,9 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           const integrationTools = await this.resolveStoredIntegrationTools(resolvedIntegrationToolsConfig, ctx);
           return { ...codeTools, ...registryTools, ...mcpTools, ...integrationTools };
         };
-        agent.__setTools(toolsFn);
+        fork.__setTools(toolsFn);
       } else {
-        const codeTools = await agent.listTools();
+        const codeTools = await fork.listTools();
         const registryTools = this.resolveStoredTools(
           storedConfig.tools
         );
@@ -693,43 +678,14 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
         const integrationTools = await this.resolveStoredIntegrationTools(
           storedConfig.integrationTools
         );
-        agent.__setTools({ ...codeTools, ...registryTools, ...mcpTools, ...integrationTools });
+        fork.__setTools({ ...codeTools, ...registryTools, ...mcpTools, ...integrationTools });
       }
     }
     if (storedConfig.resolvedVersionId) {
-      const existing = agent.toRawConfig() ?? {};
-      agent.__setRawConfig({ ...existing, resolvedVersionId: storedConfig.resolvedVersionId });
-    } else {
-      this.clearResolvedVersionId(agent);
+      const existing = fork.toRawConfig() ?? {};
+      fork.__setRawConfig({ ...existing, resolvedVersionId: storedConfig.resolvedVersionId });
     }
-    return agent;
-  }
-  /**
-   * Save the agent's current field values to the module-level WeakMap
-   * so they can be restored if the stored config is later removed.
-   * Only saves on the first call (guards against overwriting originals with overridden values).
-   *
-   * Only instructions and tools are saved — these are the only fields
-   * that `applyStoredOverrides` mutates.
-   */
-  saveCodeDefaults(agent) {
-    if (codeDefaults.has(agent)) return;
-    const fields = agent.__getOverridableFields();
-    codeDefaults.set(agent, {
-      instructions: fields.instructions,
-      tools: fields.tools
-    });
-  }
-  /**
-   * Restore the agent's original code-defined field values from the WeakMap.
-   * Clears the saved snapshot afterward.
-   */
-  restoreCodeDefaults(agent) {
-    const saved = codeDefaults.get(agent);
-    if (!saved) return;
-    agent.__updateInstructions(saved.instructions);
-    agent.__setTools(saved.tools);
-    codeDefaults.delete(agent);
+    return fork;
   }
   // ============================================================================
   // Private helpers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/editor",
-  "version": "0.7.16-alpha.0",
+  "version": "0.7.16-alpha.2",
   "description": "Mastra Editor for agent management and instantiation",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -65,8 +65,8 @@
     "@arcadeai/arcadejs": "^2.3.0",
     "@composio/core": "^0.6.5",
     "@composio/mastra": "^0.6.5",
-    "@mastra/memory": "1.15.1-alpha.0",
-    "@mastra/schema-compat": "1.2.7"
+    "@mastra/memory": "1.15.1-alpha.1",
+    "@mastra/schema-compat": "1.2.8-alpha.0"
   },
   "devDependencies": {
     "@hono/node-server": "^1.19.11",
@@ -76,12 +76,12 @@
     "vitest": "4.0.18",
     "zod": "^3.25.76",
     "@internal/ai-sdk-v4": "0.0.29",
+    "@internal/ai-sdk-v5": "0.0.29",
     "@internal/ai-v6": "0.0.29",
-    "@mastra/hono": "1.4.4-alpha.0",
-    "@mastra/core": "1.24.2-alpha.0",
-    "@mastra/libsql": "1.8.0",
-    "@mastra/mcp": "1.4.2",
-    "@internal/ai-sdk-v5": "0.0.29"
+    "@mastra/hono": "1.4.4-alpha.3",
+    "@mastra/libsql": "1.8.1-alpha.1",
+    "@mastra/core": "1.25.0-alpha.3",
+    "@mastra/mcp": "1.5.0-alpha.0"
   },
   "peerDependencies": {
     "@mastra/core": ">=1.7.1-0 <2.0.0-0",