@mastra/editor 0.10.2-alpha.1 → 0.11.0-alpha.3

package/dist/index.d.cts

@@ -156,6 +156,7 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
     private accumulateObjectVariants;
     private createAgentFromStoredConfig;
     private resolveStoredInstructions;
+    private applyStoredToolDescriptions;
     /**
      * Resolve stored tool IDs to actual tool instances from Mastra's registry.
      * Applies description overrides from per-tool config when present.
@@ -442,6 +443,8 @@ declare class MastraEditor implements IMastraEditor {
     __logger?: IMastraLogger;
     private __toolProviders;
     private __processorProviders;
+    private __source?;
+    private __codePath;
     private readonly __builderConfig?;
     private __builderInstance?;
     private __builderResolved;
@@ -521,6 +524,8 @@ declare class MastraEditor implements IMastraEditor {
      * valid EE license. Dev environments bypass via `isEEEnabled()`.
      */
     private assertAgentBuilderLicensed;
+    /** Returns the editor's configured source, or undefined if unset. */
+    getSource(): 'code' | 'db' | undefined;
     /** Registered tool providers */
     getToolProvider(id: string): ToolProvider | undefined;
     /**

package/dist/index.d.ts

@@ -156,6 +156,7 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
     private accumulateObjectVariants;
     private createAgentFromStoredConfig;
     private resolveStoredInstructions;
+    private applyStoredToolDescriptions;
     /**
      * Resolve stored tool IDs to actual tool instances from Mastra's registry.
      * Applies description overrides from per-tool config when present.
@@ -442,6 +443,8 @@ declare class MastraEditor implements IMastraEditor {
     __logger?: IMastraLogger;
     private __toolProviders;
     private __processorProviders;
+    private __source?;
+    private __codePath;
     private readonly __builderConfig?;
     private __builderInstance?;
     private __builderResolved;
@@ -521,6 +524,8 @@ declare class MastraEditor implements IMastraEditor {
      * valid EE license. Dev environments bypass via `isEEEnabled()`.
      */
     private assertAgentBuilderLicensed;
+    /** Returns the editor's configured source, or undefined if unset. */
+    getSource(): 'code' | 'db' | undefined;
     /** Registered tool providers */
     getToolProvider(id: string): ToolProvider | undefined;
     /**

package/dist/index.js

@@ -1,5 +1,7 @@
 // src/index.ts
 import { BUILT_IN_PROCESSOR_PROVIDERS } from "@mastra/core/processor-provider";
+import { FilesystemStore, MastraCompositeStore } from "@mastra/core/storage";
+import { UnknownToolProviderError } from "@mastra/core/tool-provider";
 
 // src/namespaces/base.ts
 var EditorNamespace = class {
@@ -126,6 +128,7 @@ import { Agent } from "@mastra/core/agent";
 import { CompositeVersionedSkillSource } from "@mastra/core/workspace";
 import { convertSchemaToZod } from "@mastra/schema-compat";
 import { RequestContext } from "@mastra/core/request-context";
+import { resolveStoredToolProviders } from "@mastra/core/tool-provider";
 
 // src/rule-evaluator.ts
 function resolvePath(context, path) {
@@ -701,6 +704,14 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
    * Returns the (possibly mutated) agent.
    */
   async applyStoredOverrides(agent, options, requestContext) {
+    const editorConfig = agent.__getEditorConfig?.();
+    if (editorConfig === false) {
+      return agent;
+    }
+    const instructionsEditable = editorConfig === void 0 ? true : editorConfig.instructions === true;
+    const toolsConfig = editorConfig === void 0 ? true : editorConfig.tools;
+    const toolsEditable = toolsConfig === true;
+    const toolDescriptionsEditable = typeof toolsConfig === "object" && toolsConfig !== null && toolsConfig.description === true;
     let storedConfig = null;
     try {
       this.ensureRegistered();
@@ -722,7 +733,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
     }
     const fork = agent.__fork();
     this.logger?.debug(`[applyStoredOverrides] Applying stored overrides to code agent "${agent.id}"`);
-    if (storedConfig.instructions !== void 0 && storedConfig.instructions !== null) {
+    if (instructionsEditable && storedConfig.instructions !== void 0 && storedConfig.instructions !== null) {
       const resolved = this.resolveStoredInstructions(storedConfig.instructions);
       if (resolved !== void 0) {
         fork.__updateInstructions(resolved);
@@ -731,11 +742,13 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
     const hasStoredTools = storedConfig.tools != null;
     const hasStoredMCPClients = storedConfig.mcpClients != null;
     const hasStoredIntegrationTools = storedConfig.integrationTools != null;
-    if (hasStoredTools || hasStoredMCPClients || hasStoredIntegrationTools) {
+    const hasStoredToolProviders = storedConfig.toolProviders != null && Object.keys(storedConfig.toolProviders).length > 0;
+    if (toolsEditable && (hasStoredTools || hasStoredMCPClients || hasStoredIntegrationTools || hasStoredToolProviders)) {
       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 || hasStoredIntegrationTools;
+      const hasConditionalToolProviders = storedConfig.toolProviders != null && this.isConditionalVariants(storedConfig.toolProviders);
+      const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools || hasStoredIntegrationTools || hasConditionalToolProviders || hasStoredToolProviders;
       if (isDynamicTools) {
         const originalTools = agent.listTools.bind(agent);
         const toolsFn = async ({ requestContext: requestContext2 }) => {
@@ -759,7 +772,20 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
             resolvedIntegrationToolsConfig,
             requestContext2
           );
-          return { ...codeTools, ...registryTools, ...mcpTools, ...integrationTools };
+          const resolvedToolProvidersConfig = hasConditionalToolProviders ? this.accumulateObjectVariants(
+            storedConfig.toolProviders,
+            ctx
+          ) : storedConfig.toolProviders;
+          const providerTools = await resolveStoredToolProviders(
+            resolvedToolProvidersConfig,
+            (providerId) => this.editor.getToolProviderOrThrow(providerId),
+            {
+              requestContext: ctx,
+              authorId: storedConfig.authorId,
+              logger: this.logger
+            }
+          );
+          return { ...codeTools, ...registryTools, ...mcpTools, ...integrationTools, ...providerTools };
         };
         fork.__setTools(toolsFn);
       } else {
@@ -776,6 +802,28 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
         );
         fork.__setTools({ ...codeTools, ...registryTools, ...mcpTools, ...integrationTools });
       }
+    } else if (toolDescriptionsEditable && hasStoredTools) {
+      const hasConditionalTools = this.isConditionalVariants(storedConfig.tools);
+      if (hasConditionalTools) {
+        const originalTools = agent.listTools.bind(agent);
+        const toolsFn = async ({ requestContext: requestContext2 }) => {
+          const codeTools = await originalTools({ requestContext: requestContext2 });
+          const resolvedToolsConfig = this.accumulateObjectVariants(
+            storedConfig.tools,
+            requestContext2.toJSON()
+          );
+          return this.applyStoredToolDescriptions(codeTools, resolvedToolsConfig);
+        };
+        fork.__setTools(toolsFn);
+      } else {
+        const codeTools = await fork.listTools();
+        fork.__setTools(
+          this.applyStoredToolDescriptions(
+            codeTools,
+            storedConfig.tools
+          )
+        );
+      }
     }
     if (storedConfig.resolvedVersionId) {
       const existing = fork.toRawConfig() ?? {};
@@ -831,6 +879,8 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
     const hasConditionalTools = storedAgent.tools != null && this.isConditionalVariants(storedAgent.tools);
     const hasConditionalMCPClients = storedAgent.mcpClients != null && this.isConditionalVariants(storedAgent.mcpClients);
     const hasConditionalIntegrationTools = storedAgent.integrationTools != null && this.isConditionalVariants(storedAgent.integrationTools);
+    const hasToolProviders = storedAgent.toolProviders != null && Object.keys(storedAgent.toolProviders).length > 0;
+    const hasConditionalToolProviders = storedAgent.toolProviders != null && this.isConditionalVariants(storedAgent.toolProviders);
     const hasConditionalWorkflows = storedAgent.workflows != null && this.isConditionalVariants(storedAgent.workflows);
     const hasConditionalAgents = storedAgent.agents != null && this.isConditionalVariants(storedAgent.agents);
     const hasConditionalMemory = storedAgent.memory != null && this.isConditionalVariants(storedAgent.memory);
@@ -842,7 +892,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
     const hasConditionalWorkspace = storedAgent.workspace != null && this.isConditionalVariants(storedAgent.workspace);
     const hasConditionalBrowser = storedAgent.browser != null && this.isConditionalVariants(storedAgent.browser);
     const hasIntegrationTools = storedAgent.integrationTools != null;
-    const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools || hasIntegrationTools;
+    const isDynamicTools = hasConditionalTools || hasConditionalMCPClients || hasConditionalIntegrationTools || hasIntegrationTools || hasConditionalToolProviders || hasToolProviders;
     let tools;
     if (isDynamicTools) {
       tools = async ({ requestContext }) => {
@@ -865,7 +915,17 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
           resolvedIntegrationToolsConfig,
           requestContext
         );
-        return { ...registryTools, ...mcpTools, ...integrationTools };
+        const resolvedToolProvidersConfig = hasConditionalToolProviders ? this.accumulateObjectVariants(storedAgent.toolProviders, ctx) : storedAgent.toolProviders;
+        const providerTools = await resolveStoredToolProviders(
+          resolvedToolProvidersConfig,
+          (providerId) => this.editor.getToolProviderOrThrow(providerId),
+          {
+            requestContext: ctx,
+            authorId: storedAgent.authorId,
+            logger: this.logger
+          }
+        );
+        return { ...registryTools, ...mcpTools, ...integrationTools, ...providerTools };
       };
     } else {
       const registryTools = this.resolveStoredTools(storedAgent.tools);
@@ -1064,6 +1124,20 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       return resolveInstructionBlocks(blocks, context, { promptBlocksStorage: promptBlocksStore });
     };
   }
+  applyStoredToolDescriptions(codeTools, storedTools) {
+    if (!storedTools || Array.isArray(storedTools)) {
+      return codeTools;
+    }
+    let nextTools;
+    for (const [toolKey, toolConfig] of Object.entries(storedTools)) {
+      if (!toolConfig.description || !(toolKey in codeTools)) {
+        continue;
+      }
+      nextTools ?? (nextTools = { ...codeTools });
+      nextTools[toolKey] = { ...codeTools[toolKey], description: toolConfig.description };
+    }
+    return nextTools ?? codeTools;
+  }
   /**
    * Resolve stored tool IDs to actual tool instances from Mastra's registry.
    * Applies description overrides from per-tool config when present.
@@ -2178,6 +2252,8 @@ var MastraEditor = class {
     this.__logger = config?.logger;
     this.__toolProviders = config?.toolProviders ?? {};
     this.__processorProviders = { ...BUILT_IN_PROCESSOR_PROVIDERS, ...config?.processorProviders };
+    this.__source = config?.source;
+    this.__codePath = config?.codePath ?? "./mastra/editor";
     this.__filesystems = /* @__PURE__ */ new Map();
     this.__filesystems.set(localFilesystemProvider.id, localFilesystemProvider);
     for (const [id, provider] of Object.entries(config?.filesystems ?? {})) {
@@ -2215,6 +2291,21 @@ var MastraEditor = class {
     if (!this.__logger) {
       this.__logger = mastra.getLogger();
     }
+    if (this.__source === "code") {
+      const filesystemStore = new FilesystemStore({ dir: this.__codePath });
+      const existingStorage = mastra.getStorage();
+      if (existingStorage) {
+        mastra.setStorage(
+          new MastraCompositeStore({
+            id: `${existingStorage.id}-with-editor-filesystem`,
+            default: existingStorage,
+            editor: filesystemStore
+          })
+        );
+      } else {
+        mastra.setStorage(filesystemStore);
+      }
+    }
     this.ensureBuilderWorkspaces().then(() => this.reconcileBuilderWorkspaces()).catch((err) => {
       this.__logger?.warn("[MastraEditor] Failed to persist/reconcile builder workspaces on startup", {
         error: err
@@ -2363,6 +2454,10 @@ var MastraEditor = class {
       );
     }
   }
+  /** Returns the editor's configured source, or undefined if unset. */
+  getSource() {
+    return this.__source;
+  }
   /** Registered tool providers */
   getToolProvider(id) {
     return this.__toolProviders[id];
@@ -2374,9 +2469,7 @@ var MastraEditor = class {
   getToolProviderOrThrow(id) {
     const provider = this.__toolProviders[id];
     if (!provider) {
-      throw new Error(
-        `Unknown tool provider "${id}". Available: ${Object.keys(this.__toolProviders).join(", ") || "(none)"}`
-      );
+      throw new UnknownToolProviderError(id, Object.keys(this.__toolProviders));
     }
     return provider;
   }