@mastra/editor 0.6.3 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,61 @@
 # @mastra/editor
 
+## 0.7.0
+
+### Minor Changes
+
+- Added `FilesystemStore`, a file-based storage adapter for editor domains. Stores agent configurations, prompt blocks, scorer definitions, MCP clients, MCP servers, workspaces, and skills as JSON files in a local directory (default: `.mastra-storage/`). Only published snapshots are written to disk — version history is kept in memory. Use with `MastraCompositeStore`'s `editor` shorthand to enable Git-friendly editor configurations. ([#13727](https://github.com/mastra-ai/mastra/pull/13727))
+
+  ```typescript
+  import { FilesystemStore, MastraCompositeStore } from '@mastra/core/storage';
+  import { PostgresStore } from '@mastra/pg';
+
+  export const mastra = new Mastra({
+    storage: new MastraCompositeStore({
+      id: 'composite',
+      default: new PostgresStore({ id: 'pg', connectionString: process.env.DATABASE_URL }),
+      editor: new FilesystemStore({ dir: '.mastra-storage' }),
+    }),
+  });
+  ```
+
+  Added `applyStoredOverrides` to the editor agent namespace. When a stored configuration exists for a code-defined agent, the editor merges the stored **instructions** and **tools** on top of the code agent's values at runtime. Model, memory, workspace, and other code-defined fields are never overridden — they may contain SDK instances or dynamic functions that cannot be safely serialized. Original code-defined values are preserved via a WeakMap and restored if the stored override is deleted.
+
+### Patch Changes
+
+- Updated dependencies [[`41e48c1`](https://github.com/mastra-ai/mastra/commit/41e48c198eee846478e60c02ec432c19d322a517), [`82469d3`](https://github.com/mastra-ai/mastra/commit/82469d3135d5a49dd8dc8feec0ff398b4e0225a0), [`33e2fd5`](https://github.com/mastra-ai/mastra/commit/33e2fd5088f83666df17401e2da68c943dbc0448), [`7ef6e2c`](https://github.com/mastra-ai/mastra/commit/7ef6e2c61be5a42e26f55d15b5902866fc76634f), [`08072ec`](https://github.com/mastra-ai/mastra/commit/08072ec54b5dfe810ed66c0d583ae9d1a9103c11), [`ef9d0f0`](https://github.com/mastra-ai/mastra/commit/ef9d0f0fa98ff225b17afe071f5b84a9258dc142), [`b12d2a5`](https://github.com/mastra-ai/mastra/commit/b12d2a59a48be0477cabae66eb6cf0fc94a7d40d), [`9e21667`](https://github.com/mastra-ai/mastra/commit/9e2166746df81da8f1f933a918741fc52f922c70), [`fa37d39`](https://github.com/mastra-ai/mastra/commit/fa37d39910421feaf8847716292e3d65dd4f30c2), [`b12d2a5`](https://github.com/mastra-ai/mastra/commit/b12d2a59a48be0477cabae66eb6cf0fc94a7d40d), [`1391f22`](https://github.com/mastra-ai/mastra/commit/1391f227ff197080de185ac1073c1d1568c0631f), [`71c38bf`](https://github.com/mastra-ai/mastra/commit/71c38bf905905148ecd0e75c07c1f9825d299b76), [`f993c38`](https://github.com/mastra-ai/mastra/commit/f993c3848c97479b813231be872443bedeced6ab), [`f51849a`](https://github.com/mastra-ai/mastra/commit/f51849a568935122b5100b7ee69704e6d680cf7b), [`3ceb231`](https://github.com/mastra-ai/mastra/commit/3ceb2317aad7da36df5053e7c84f9381eeb68d11), [`9bf3a0d`](https://github.com/mastra-ai/mastra/commit/9bf3a0dac602787925f1762f1f0387d7b4a59620), [`cafa045`](https://github.com/mastra-ai/mastra/commit/cafa0453c9de141ad50c09a13894622dffdd9978), [`1fd9ddb`](https://github.com/mastra-ai/mastra/commit/1fd9ddbb3fe83b281b12bd2e27e426ae86288266), [`1391f22`](https://github.com/mastra-ai/mastra/commit/1391f227ff197080de185ac1073c1d1568c0631f), [`ef888d2`](https://github.com/mastra-ai/mastra/commit/ef888d23c77f85f4c202228b63f8fd9b6d9361af), [`e7a567c`](https://github.com/mastra-ai/mastra/commit/e7a567cfb3e65c955a07d0167cb1b4141f5bda01), [`3626623`](https://github.com/mastra-ai/mastra/commit/36266238eb7db78fce2ac34187194613f6f53733), [`6135ef4`](https://github.com/mastra-ai/mastra/commit/6135ef4f5288652bf45f616ec590607e4c95f443), [`d9d228c`](https://github.com/mastra-ai/mastra/commit/d9d228c0c6ae82ae6ce3b540a3a56b2b1c2b8d98), [`5576507`](https://github.com/mastra-ai/mastra/commit/55765071e360fb97e443aa0a91ccf7e1cd8d92aa), [`79d69c9`](https://github.com/mastra-ai/mastra/commit/79d69c9d5f842ff1c31352fb6026f04c1f6190f3), [`94f44b8`](https://github.com/mastra-ai/mastra/commit/94f44b827ce57b179e50f4916a84c0fa6e7f3b8c), [`13187db`](https://github.com/mastra-ai/mastra/commit/13187dbac880174232dedc5a501ff6c5d0fe59bc), [`2ae5311`](https://github.com/mastra-ai/mastra/commit/2ae531185fff66a80fa165c0999e3d801900e89d), [`6135ef4`](https://github.com/mastra-ai/mastra/commit/6135ef4f5288652bf45f616ec590607e4c95f443)]:
+  - @mastra/core@1.10.0
+  - @mastra/memory@1.6.1
+  - @mastra/mcp@1.1.0
+
+## 0.7.0-alpha.0
+
+### Minor Changes
+
+- Added `FilesystemStore`, a file-based storage adapter for editor domains. Stores agent configurations, prompt blocks, scorer definitions, MCP clients, MCP servers, workspaces, and skills as JSON files in a local directory (default: `.mastra-storage/`). Only published snapshots are written to disk — version history is kept in memory. Use with `MastraCompositeStore`'s `editor` shorthand to enable Git-friendly editor configurations. ([#13727](https://github.com/mastra-ai/mastra/pull/13727))
+
+  ```typescript
+  import { FilesystemStore, MastraCompositeStore } from '@mastra/core/storage';
+  import { PostgresStore } from '@mastra/pg';
+
+  export const mastra = new Mastra({
+    storage: new MastraCompositeStore({
+      id: 'composite',
+      default: new PostgresStore({ id: 'pg', connectionString: process.env.DATABASE_URL }),
+      editor: new FilesystemStore({ dir: '.mastra-storage' }),
+    }),
+  });
+  ```
+
+  Added `applyStoredOverrides` to the editor agent namespace. When a stored configuration exists for a code-defined agent, the editor merges the stored **instructions** and **tools** on top of the code agent's values at runtime. Model, memory, workspace, and other code-defined fields are never overridden — they may contain SDK instances or dynamic functions that cannot be safely serialized. Original code-defined values are preserved via a WeakMap and restored if the stored override is deleted.
+
+### Patch Changes
+
+- Updated dependencies [[`41e48c1`](https://github.com/mastra-ai/mastra/commit/41e48c198eee846478e60c02ec432c19d322a517), [`82469d3`](https://github.com/mastra-ai/mastra/commit/82469d3135d5a49dd8dc8feec0ff398b4e0225a0), [`33e2fd5`](https://github.com/mastra-ai/mastra/commit/33e2fd5088f83666df17401e2da68c943dbc0448), [`7ef6e2c`](https://github.com/mastra-ai/mastra/commit/7ef6e2c61be5a42e26f55d15b5902866fc76634f), [`08072ec`](https://github.com/mastra-ai/mastra/commit/08072ec54b5dfe810ed66c0d583ae9d1a9103c11), [`ef9d0f0`](https://github.com/mastra-ai/mastra/commit/ef9d0f0fa98ff225b17afe071f5b84a9258dc142), [`b12d2a5`](https://github.com/mastra-ai/mastra/commit/b12d2a59a48be0477cabae66eb6cf0fc94a7d40d), [`9e21667`](https://github.com/mastra-ai/mastra/commit/9e2166746df81da8f1f933a918741fc52f922c70), [`fa37d39`](https://github.com/mastra-ai/mastra/commit/fa37d39910421feaf8847716292e3d65dd4f30c2), [`b12d2a5`](https://github.com/mastra-ai/mastra/commit/b12d2a59a48be0477cabae66eb6cf0fc94a7d40d), [`1391f22`](https://github.com/mastra-ai/mastra/commit/1391f227ff197080de185ac1073c1d1568c0631f), [`71c38bf`](https://github.com/mastra-ai/mastra/commit/71c38bf905905148ecd0e75c07c1f9825d299b76), [`f993c38`](https://github.com/mastra-ai/mastra/commit/f993c3848c97479b813231be872443bedeced6ab), [`f51849a`](https://github.com/mastra-ai/mastra/commit/f51849a568935122b5100b7ee69704e6d680cf7b), [`3ceb231`](https://github.com/mastra-ai/mastra/commit/3ceb2317aad7da36df5053e7c84f9381eeb68d11), [`9bf3a0d`](https://github.com/mastra-ai/mastra/commit/9bf3a0dac602787925f1762f1f0387d7b4a59620), [`cafa045`](https://github.com/mastra-ai/mastra/commit/cafa0453c9de141ad50c09a13894622dffdd9978), [`1fd9ddb`](https://github.com/mastra-ai/mastra/commit/1fd9ddbb3fe83b281b12bd2e27e426ae86288266), [`1391f22`](https://github.com/mastra-ai/mastra/commit/1391f227ff197080de185ac1073c1d1568c0631f), [`ef888d2`](https://github.com/mastra-ai/mastra/commit/ef888d23c77f85f4c202228b63f8fd9b6d9361af), [`e7a567c`](https://github.com/mastra-ai/mastra/commit/e7a567cfb3e65c955a07d0167cb1b4141f5bda01), [`3626623`](https://github.com/mastra-ai/mastra/commit/36266238eb7db78fce2ac34187194613f6f53733), [`6135ef4`](https://github.com/mastra-ai/mastra/commit/6135ef4f5288652bf45f616ec590607e4c95f443), [`d9d228c`](https://github.com/mastra-ai/mastra/commit/d9d228c0c6ae82ae6ce3b540a3a56b2b1c2b8d98), [`5576507`](https://github.com/mastra-ai/mastra/commit/55765071e360fb97e443aa0a91ccf7e1cd8d92aa), [`79d69c9`](https://github.com/mastra-ai/mastra/commit/79d69c9d5f842ff1c31352fb6026f04c1f6190f3), [`94f44b8`](https://github.com/mastra-ai/mastra/commit/94f44b827ce57b179e50f4916a84c0fa6e7f3b8c), [`13187db`](https://github.com/mastra-ai/mastra/commit/13187dbac880174232dedc5a501ff6c5d0fe59bc), [`2ae5311`](https://github.com/mastra-ai/mastra/commit/2ae531185fff66a80fa165c0999e3d801900e89d), [`6135ef4`](https://github.com/mastra-ai/mastra/commit/6135ef4f5288652bf45f616ec590607e4c95f443)]:
+  - @mastra/core@1.10.0-alpha.0
+  - @mastra/memory@1.6.1-alpha.0
+  - @mastra/mcp@1.1.0-alpha.0
+
 ## 0.6.3
 
 ### Patch Changes

package/dist/index.cjs

@@ -154,8 +154,11 @@ var CrudEditorNamespace = class extends EditorNamespace {
    */
   clearCache(id) {
     if (id) {
+      const wasCached = this._cache.has(id);
       this._cache.delete(id);
-      this.onCacheEvict(id);
+      if (wasCached) {
+        this.onCacheEvict(id);
+      }
       this.logger?.debug(`[clearCache] Cleared cache for "${id}"`);
     } else {
       for (const cachedId of Array.from(this._cache.keys())) {
@@ -559,6 +562,7 @@ 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();
@@ -599,7 +603,13 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
     return this.createAgentFromStoredConfig(storedAgent);
   }
   onCacheEvict(id) {
-    this.mastra?.removeAgent(id);
+    try {
+      const existing = this.mastra?.getAgentById(id);
+      if (existing?.source === "stored") {
+        this.mastra?.removeAgent(id);
+      }
+    } catch {
+    }
   }
   /**
    * Evict all cached agents that reference a given skill ID.
@@ -628,6 +638,117 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       }
     }
   }
+  /**
+   * Apply stored configuration overrides to a code-defined agent.
+   *
+   * When a stored config exists for the given agent's ID, the following fields
+   * from the stored config override the code agent's values (if explicitly set):
+   * - `instructions` — system prompt
+   * - `tools` — tool selection with description overrides (merged on top of code tools)
+   *
+   * Fields that are absent or undefined in the stored config are left untouched.
+   * Model, workspace, memory, and other code-defined fields are never overridden —
+   * they may contain SDK instances or dynamic functions that cannot be safely serialized.
+   * Returns the (possibly mutated) agent.
+   */
+  async applyStoredOverrides(agent) {
+    let storedConfig = null;
+    try {
+      this.ensureRegistered();
+      const adapter = await this.getStorageAdapter();
+      storedConfig = await adapter.getByIdResolved(agent.id, { status: "draft" });
+    } catch {
+      this.restoreCodeDefaults(agent);
+      return agent;
+    }
+    if (!storedConfig) {
+      this.restoreCodeDefaults(agent);
+      return agent;
+    }
+    this.saveCodeDefaults(agent);
+    this.restoreCodeDefaults(agent);
+    this.saveCodeDefaults(agent);
+    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);
+      }
+    }
+    const hasStoredTools = storedConfig.tools != null;
+    const hasStoredMCPClients = storedConfig.mcpClients != null;
+    const hasStoredIntegrationTools = storedConfig.integrationTools != null;
+    if (hasStoredTools || hasStoredMCPClients || hasStoredIntegrationTools) {
+      const hasConditionalTools = this.isConditionalVariants(storedConfig.tools);
+      const hasConditionalMCPClients = storedConfig.mcpClients != null && this.isConditionalVariants(storedConfig.mcpClients);
+      const hasConditionalIntegrationTools = storedConfig.integrationTools != null && this.isConditionalVariants(storedConfig.integrationTools);
+      const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
+      if (isDynamicTools) {
+        const originalTools = agent.listTools.bind(agent);
+        const toolsFn = async ({ requestContext }) => {
+          const codeTools = await originalTools({ requestContext });
+          const ctx = requestContext.toJSON();
+          const resolvedToolsConfig = hasConditionalTools ? this.accumulateObjectVariants(
+            storedConfig.tools,
+            ctx
+          ) : storedConfig.tools;
+          const registryTools = this.resolveStoredTools(resolvedToolsConfig);
+          const resolvedMCPClientsConfig = hasConditionalMCPClients ? this.accumulateObjectVariants(
+            storedConfig.mcpClients,
+            ctx
+          ) : storedConfig.mcpClients;
+          const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig);
+          const resolvedIntegrationToolsConfig = hasConditionalIntegrationTools ? this.accumulateObjectVariants(
+            storedConfig.integrationTools,
+            ctx
+          ) : storedConfig.integrationTools;
+          const integrationTools = await this.resolveStoredIntegrationTools(resolvedIntegrationToolsConfig, ctx);
+          return { ...codeTools, ...registryTools, ...mcpTools, ...integrationTools };
+        };
+        agent.__setTools(toolsFn);
+      } else {
+        const codeTools = await agent.listTools();
+        const registryTools = this.resolveStoredTools(
+          storedConfig.tools
+        );
+        const mcpTools = await this.resolveStoredMCPTools(
+          storedConfig.mcpClients
+        );
+        const integrationTools = await this.resolveStoredIntegrationTools(
+          storedConfig.integrationTools
+        );
+        agent.__setTools({ ...codeTools, ...registryTools, ...mcpTools, ...integrationTools });
+      }
+    }
+    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);
+  }
   // ============================================================================
   // Private helpers
   // ============================================================================
@@ -868,7 +989,16 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       workspace,
       ...skillsFormat && { skillsFormat }
     });
-    this.mastra?.addAgent(agent, storedAgent.id, { source: "stored" });
+    const existingCodeAgent = (() => {
+      try {
+        return this.mastra?.getAgentById(storedAgent.id);
+      } catch {
+        return void 0;
+      }
+    })();
+    if (!existingCodeAgent || existingCodeAgent.source !== "code") {
+      this.mastra?.addAgent(agent, storedAgent.id, { source: "stored" });
+    }
     this.logger?.debug(`[createAgentFromStoredConfig] Successfully created agent "${storedAgent.id}"`);
     return agent;
   }

package/dist/index.d.cts

@@ -102,6 +102,34 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
      * subsequent agent.getById() calls re-hydrate with the updated skill version.
      */
     invalidateAgentsReferencingSkill(skillId: string): void;
+    /**
+     * Apply stored configuration overrides to a code-defined agent.
+     *
+     * When a stored config exists for the given agent's ID, the following fields
+     * from the stored config override the code agent's values (if explicitly set):
+     * - `instructions` — system prompt
+     * - `tools` — tool selection with description overrides (merged on top of code tools)
+     *
+     * Fields that are absent or undefined in the stored config are left untouched.
+     * Model, workspace, memory, and other code-defined fields are never overridden —
+     * they may contain SDK instances or dynamic functions that cannot be safely serialized.
+     * Returns the (possibly mutated) agent.
+     */
+    applyStoredOverrides(agent: Agent): 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

@@ -102,6 +102,34 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
      * subsequent agent.getById() calls re-hydrate with the updated skill version.
      */
     invalidateAgentsReferencingSkill(skillId: string): void;
+    /**
+     * Apply stored configuration overrides to a code-defined agent.
+     *
+     * When a stored config exists for the given agent's ID, the following fields
+     * from the stored config override the code agent's values (if explicitly set):
+     * - `instructions` — system prompt
+     * - `tools` — tool selection with description overrides (merged on top of code tools)
+     *
+     * Fields that are absent or undefined in the stored config are left untouched.
+     * Model, workspace, memory, and other code-defined fields are never overridden —
+     * they may contain SDK instances or dynamic functions that cannot be safely serialized.
+     * Returns the (possibly mutated) agent.
+     */
+    applyStoredOverrides(agent: Agent): 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

@@ -106,8 +106,11 @@ var CrudEditorNamespace = class extends EditorNamespace {
    */
   clearCache(id) {
     if (id) {
+      const wasCached = this._cache.has(id);
       this._cache.delete(id);
-      this.onCacheEvict(id);
+      if (wasCached) {
+        this.onCacheEvict(id);
+      }
       this.logger?.debug(`[clearCache] Cleared cache for "${id}"`);
     } else {
       for (const cachedId of Array.from(this._cache.keys())) {
@@ -511,6 +514,7 @@ 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();
@@ -551,7 +555,13 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
     return this.createAgentFromStoredConfig(storedAgent);
   }
   onCacheEvict(id) {
-    this.mastra?.removeAgent(id);
+    try {
+      const existing = this.mastra?.getAgentById(id);
+      if (existing?.source === "stored") {
+        this.mastra?.removeAgent(id);
+      }
+    } catch {
+    }
   }
   /**
    * Evict all cached agents that reference a given skill ID.
@@ -580,6 +590,117 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       }
     }
   }
+  /**
+   * Apply stored configuration overrides to a code-defined agent.
+   *
+   * When a stored config exists for the given agent's ID, the following fields
+   * from the stored config override the code agent's values (if explicitly set):
+   * - `instructions` — system prompt
+   * - `tools` — tool selection with description overrides (merged on top of code tools)
+   *
+   * Fields that are absent or undefined in the stored config are left untouched.
+   * Model, workspace, memory, and other code-defined fields are never overridden —
+   * they may contain SDK instances or dynamic functions that cannot be safely serialized.
+   * Returns the (possibly mutated) agent.
+   */
+  async applyStoredOverrides(agent) {
+    let storedConfig = null;
+    try {
+      this.ensureRegistered();
+      const adapter = await this.getStorageAdapter();
+      storedConfig = await adapter.getByIdResolved(agent.id, { status: "draft" });
+    } catch {
+      this.restoreCodeDefaults(agent);
+      return agent;
+    }
+    if (!storedConfig) {
+      this.restoreCodeDefaults(agent);
+      return agent;
+    }
+    this.saveCodeDefaults(agent);
+    this.restoreCodeDefaults(agent);
+    this.saveCodeDefaults(agent);
+    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);
+      }
+    }
+    const hasStoredTools = storedConfig.tools != null;
+    const hasStoredMCPClients = storedConfig.mcpClients != null;
+    const hasStoredIntegrationTools = storedConfig.integrationTools != null;
+    if (hasStoredTools || hasStoredMCPClients || hasStoredIntegrationTools) {
+      const hasConditionalTools = this.isConditionalVariants(storedConfig.tools);
+      const hasConditionalMCPClients = storedConfig.mcpClients != null && this.isConditionalVariants(storedConfig.mcpClients);
+      const hasConditionalIntegrationTools = storedConfig.integrationTools != null && this.isConditionalVariants(storedConfig.integrationTools);
+      const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools;
+      if (isDynamicTools) {
+        const originalTools = agent.listTools.bind(agent);
+        const toolsFn = async ({ requestContext }) => {
+          const codeTools = await originalTools({ requestContext });
+          const ctx = requestContext.toJSON();
+          const resolvedToolsConfig = hasConditionalTools ? this.accumulateObjectVariants(
+            storedConfig.tools,
+            ctx
+          ) : storedConfig.tools;
+          const registryTools = this.resolveStoredTools(resolvedToolsConfig);
+          const resolvedMCPClientsConfig = hasConditionalMCPClients ? this.accumulateObjectVariants(
+            storedConfig.mcpClients,
+            ctx
+          ) : storedConfig.mcpClients;
+          const mcpTools = await this.resolveStoredMCPTools(resolvedMCPClientsConfig);
+          const resolvedIntegrationToolsConfig = hasConditionalIntegrationTools ? this.accumulateObjectVariants(
+            storedConfig.integrationTools,
+            ctx
+          ) : storedConfig.integrationTools;
+          const integrationTools = await this.resolveStoredIntegrationTools(resolvedIntegrationToolsConfig, ctx);
+          return { ...codeTools, ...registryTools, ...mcpTools, ...integrationTools };
+        };
+        agent.__setTools(toolsFn);
+      } else {
+        const codeTools = await agent.listTools();
+        const registryTools = this.resolveStoredTools(
+          storedConfig.tools
+        );
+        const mcpTools = await this.resolveStoredMCPTools(
+          storedConfig.mcpClients
+        );
+        const integrationTools = await this.resolveStoredIntegrationTools(
+          storedConfig.integrationTools
+        );
+        agent.__setTools({ ...codeTools, ...registryTools, ...mcpTools, ...integrationTools });
+      }
+    }
+    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);
+  }
   // ============================================================================
   // Private helpers
   // ============================================================================
@@ -820,7 +941,16 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       workspace,
       ...skillsFormat && { skillsFormat }
     });
-    this.mastra?.addAgent(agent, storedAgent.id, { source: "stored" });
+    const existingCodeAgent = (() => {
+      try {
+        return this.mastra?.getAgentById(storedAgent.id);
+      } catch {
+        return void 0;
+      }
+    })();
+    if (!existingCodeAgent || existingCodeAgent.source !== "code") {
+      this.mastra?.addAgent(agent, storedAgent.id, { source: "stored" });
+    }
     this.logger?.debug(`[createAgentFromStoredConfig] Successfully created agent "${storedAgent.id}"`);
     return agent;
   }

package/dist/storage/index.cjs

@@ -0,0 +1,36 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/storage/index.ts
+var storage_exports = {};
+__export(storage_exports, {
+  FilesystemDB: () => import_storage.FilesystemDB,
+  FilesystemStore: () => import_storage.FilesystemStore,
+  FilesystemVersionedHelpers: () => import_storage.FilesystemVersionedHelpers,
+  GitHistory: () => import_storage.GitHistory
+});
+module.exports = __toCommonJS(storage_exports);
+var import_storage = require("@mastra/core/storage");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FilesystemDB,
+  FilesystemStore,
+  FilesystemVersionedHelpers,
+  GitHistory
+});

package/dist/storage/index.d.cts

@@ -0,0 +1 @@
+export { FilesystemDB, FilesystemStore, FilesystemStoreConfig, FilesystemVersionedHelpers, GitHistory } from '@mastra/core/storage';

package/dist/storage/index.d.ts

@@ -0,0 +1 @@
+export { FilesystemDB, FilesystemStore, FilesystemStoreConfig, FilesystemVersionedHelpers, GitHistory } from '@mastra/core/storage';

package/dist/storage/index.js

@@ -0,0 +1,13 @@
+// src/storage/index.ts
+import {
+  FilesystemStore,
+  FilesystemDB,
+  FilesystemVersionedHelpers,
+  GitHistory
+} from "@mastra/core/storage";
+export {
+  FilesystemDB,
+  FilesystemStore,
+  FilesystemVersionedHelpers,
+  GitHistory
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/editor",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "Mastra Editor for agent management and instantiation",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -36,6 +36,16 @@
         "types": "./dist/arcade.d.ts",
         "default": "./dist/arcade.cjs"
       }
+    },
+    "./storage": {
+      "import": {
+        "types": "./dist/storage/index.d.ts",
+        "default": "./dist/storage/index.js"
+      },
+      "require": {
+        "types": "./dist/storage/index.d.ts",
+        "default": "./dist/storage/index.cjs"
+      }
     }
   },
   "files": [
@@ -55,26 +65,26 @@
     "@arcadeai/arcadejs": "^2.2.0",
     "@composio/core": "^0.6.3",
     "@composio/mastra": "^0.6.3",
-    "@mastra/schema-compat": "1.1.3",
-    "@mastra/memory": "1.6.0"
+    "@mastra/memory": "1.6.1",
+    "@mastra/schema-compat": "1.1.3"
   },
   "devDependencies": {
-    "@hono/node-server": "^1.14.1",
+    "@hono/node-server": "^1.19.9",
     "hono": "^4.7.10",
     "tsup": "^8.0.2",
     "typescript": "^5.9.3",
     "vitest": "4.0.18",
     "zod": "^3.25.76",
-    "@internal/ai-sdk-v4": "0.0.11",
-    "@internal/ai-v6": "0.0.11",
-    "@mastra/core": "1.9.0",
-    "@internal/ai-sdk-v5": "0.0.11",
-    "@mastra/hono": "1.1.8",
-    "@mastra/libsql": "1.6.3",
-    "@mastra/mcp": "1.0.3"
+    "@internal/ai-sdk-v4": "0.0.13",
+    "@internal/ai-sdk-v5": "0.0.13",
+    "@mastra/core": "1.10.0",
+    "@internal/ai-v6": "0.0.13",
+    "@mastra/hono": "1.1.9",
+    "@mastra/libsql": "1.6.4",
+    "@mastra/mcp": "1.1.0"
   },
   "peerDependencies": {
-    "@mastra/core": ">=1.0.0-0 <2.0.0-0",
+    "@mastra/core": ">=1.7.1-0 <2.0.0-0",
     "@mastra/mcp": ">=1.0.0-0 <2.0.0-0",
     "zod": "^3.25.0 || ^4.0.0"
   },
@@ -87,8 +97,8 @@
     "node": ">=22.13.0"
   },
   "scripts": {
-    "build": "tsup src/index.ts src/composio.ts src/arcade.ts --format cjs,esm --dts",
-    "dev": "tsup src/index.ts src/composio.ts src/arcade.ts --format cjs,esm --dts --watch",
+    "build": "tsup src/index.ts src/composio.ts src/arcade.ts src/storage/index.ts --format cjs,esm --dts",
+    "dev": "tsup src/index.ts src/composio.ts src/arcade.ts src/storage/index.ts --format cjs,esm --dts --watch",
     "clean": "rm -rf dist",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",