@mastra/editor 0.11.2 → 0.12.1-alpha.0

package/dist/index.d.cts

@@ -4,7 +4,7 @@ import { GetByIdOptions, IEditorFavoritesNamespace, EditorFavoriteTargetInput, E
 export { BrowserProvider, MastraEditorConfig } from '@mastra/core/editor';
 import { IMastraLogger } from '@mastra/core/logger';
 import { ProcessorProvider } from '@mastra/core/processor-provider';
-import { StorageCreateAgentInput, StorageUpdateAgentInput, StorageListAgentsInput, StorageListAgentsOutput, StorageListAgentsResolvedOutput, StorageResolvedAgentType, StorageCreateMCPClientInput, StorageUpdateMCPClientInput, StorageListMCPClientsInput, StorageListMCPClientsOutput, StorageListMCPClientsResolvedOutput, StorageResolvedMCPClientType, StorageMCPServerConfig, StorageCreateMCPServerInput, StorageUpdateMCPServerInput, StorageListMCPServersInput, StorageListMCPServersOutput, StorageListMCPServersResolvedOutput, StorageResolvedMCPServerType, StorageCreatePromptBlockInput, StorageUpdatePromptBlockInput, StorageListPromptBlocksInput, StorageListPromptBlocksOutput, StorageListPromptBlocksResolvedOutput, StorageResolvedPromptBlockType, AgentInstructionBlock, StorageCreateScorerDefinitionInput, StorageUpdateScorerDefinitionInput, StorageListScorerDefinitionsInput, StorageListScorerDefinitionsOutput, StorageListScorerDefinitionsResolvedOutput, StorageResolvedScorerDefinitionType, StorageCreateWorkspaceInput, StorageUpdateWorkspaceInput, StorageListWorkspacesInput, StorageListWorkspacesOutput, StorageListWorkspacesResolvedOutput, StorageResolvedWorkspaceType, StorageWorkspaceSnapshotType, StorageCreateSkillInput, StorageUpdateSkillInput, StorageListSkillsInput, StorageListSkillsOutput, StorageListSkillsResolvedOutput, StorageResolvedSkillType, RuleGroup, PromptBlocksStorage, BlobStore } from '@mastra/core/storage';
+import { StorageCreateAgentInput, StorageUpdateAgentInput, StorageListAgentsInput, StorageListAgentsOutput, StorageListAgentsResolvedOutput, StorageResolvedAgentType, StorageCreateMCPClientInput, StorageUpdateMCPClientInput, StorageListMCPClientsInput, StorageListMCPClientsOutput, StorageListMCPClientsResolvedOutput, StorageResolvedMCPClientType, StorageMCPServerConfig, StorageCreateMCPServerInput, StorageUpdateMCPServerInput, StorageListMCPServersInput, StorageListMCPServersOutput, StorageListMCPServersResolvedOutput, StorageResolvedMCPServerType, StorageCreatePromptBlockInput, StorageUpdatePromptBlockInput, StorageListPromptBlocksInput, StorageListPromptBlocksOutput, StorageListPromptBlocksResolvedOutput, StorageResolvedPromptBlockType, AgentInstructionBlock, StorageCreateScorerDefinitionInput, StorageUpdateScorerDefinitionInput, StorageListScorerDefinitionsInput, StorageListScorerDefinitionsOutput, StorageListScorerDefinitionsResolvedOutput, StorageResolvedScorerDefinitionType, StorageCreateWorkspaceInput, StorageUpdateWorkspaceInput, StorageListWorkspacesInput, StorageListWorkspacesOutput, StorageListWorkspacesResolvedOutput, StorageResolvedWorkspaceType, StorageWorkspaceSnapshotType, StorageCreateSkillInput, StorageUpdateSkillInput, StorageListSkillsInput, StorageListSkillsOutput, StorageListSkillsResolvedOutput, StorageResolvedSkillType, RuleGroup, PromptBlocksStorage, SourceControlProvider, BlobStore } from '@mastra/core/storage';
 import { ToolProvider } from '@mastra/core/tool-provider';
 import { Agent } from '@mastra/core/agent';
 import { RequestContext } from '@mastra/core/request-context';
@@ -101,6 +101,7 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
      * Also ensures the referenced workspace (if any) is persisted as a stored workspace.
      */
     create(input: StorageCreateAgentInput): Promise<Agent>;
+    private getCodeDefinedAgent;
     /**
      * Ensure a workspace reference is persisted in the DB.
      *
@@ -445,6 +446,7 @@ declare class MastraEditor implements IMastraEditor {
     private __processorProviders;
     private __source?;
     private __codePath;
+    private __sourceControlProvider?;
     private readonly __builderConfig?;
     private __builderInstance?;
     private __builderResolved;
@@ -526,6 +528,8 @@ declare class MastraEditor implements IMastraEditor {
     private assertAgentBuilderLicensed;
     /** Returns the editor's configured source, or undefined if unset. */
     getSource(): 'code' | 'db' | undefined;
+    /** Returns the configured source control provider, if any. */
+    getSourceControlProvider(): SourceControlProvider | undefined;
     /** Registered tool providers */
     getToolProvider(id: string): ToolProvider | undefined;
     /**

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { GetByIdOptions, IEditorFavoritesNamespace, EditorFavoriteTargetInput, E
 export { BrowserProvider, MastraEditorConfig } from '@mastra/core/editor';
 import { IMastraLogger } from '@mastra/core/logger';
 import { ProcessorProvider } from '@mastra/core/processor-provider';
-import { StorageCreateAgentInput, StorageUpdateAgentInput, StorageListAgentsInput, StorageListAgentsOutput, StorageListAgentsResolvedOutput, StorageResolvedAgentType, StorageCreateMCPClientInput, StorageUpdateMCPClientInput, StorageListMCPClientsInput, StorageListMCPClientsOutput, StorageListMCPClientsResolvedOutput, StorageResolvedMCPClientType, StorageMCPServerConfig, StorageCreateMCPServerInput, StorageUpdateMCPServerInput, StorageListMCPServersInput, StorageListMCPServersOutput, StorageListMCPServersResolvedOutput, StorageResolvedMCPServerType, StorageCreatePromptBlockInput, StorageUpdatePromptBlockInput, StorageListPromptBlocksInput, StorageListPromptBlocksOutput, StorageListPromptBlocksResolvedOutput, StorageResolvedPromptBlockType, AgentInstructionBlock, StorageCreateScorerDefinitionInput, StorageUpdateScorerDefinitionInput, StorageListScorerDefinitionsInput, StorageListScorerDefinitionsOutput, StorageListScorerDefinitionsResolvedOutput, StorageResolvedScorerDefinitionType, StorageCreateWorkspaceInput, StorageUpdateWorkspaceInput, StorageListWorkspacesInput, StorageListWorkspacesOutput, StorageListWorkspacesResolvedOutput, StorageResolvedWorkspaceType, StorageWorkspaceSnapshotType, StorageCreateSkillInput, StorageUpdateSkillInput, StorageListSkillsInput, StorageListSkillsOutput, StorageListSkillsResolvedOutput, StorageResolvedSkillType, RuleGroup, PromptBlocksStorage, BlobStore } from '@mastra/core/storage';
+import { StorageCreateAgentInput, StorageUpdateAgentInput, StorageListAgentsInput, StorageListAgentsOutput, StorageListAgentsResolvedOutput, StorageResolvedAgentType, StorageCreateMCPClientInput, StorageUpdateMCPClientInput, StorageListMCPClientsInput, StorageListMCPClientsOutput, StorageListMCPClientsResolvedOutput, StorageResolvedMCPClientType, StorageMCPServerConfig, StorageCreateMCPServerInput, StorageUpdateMCPServerInput, StorageListMCPServersInput, StorageListMCPServersOutput, StorageListMCPServersResolvedOutput, StorageResolvedMCPServerType, StorageCreatePromptBlockInput, StorageUpdatePromptBlockInput, StorageListPromptBlocksInput, StorageListPromptBlocksOutput, StorageListPromptBlocksResolvedOutput, StorageResolvedPromptBlockType, AgentInstructionBlock, StorageCreateScorerDefinitionInput, StorageUpdateScorerDefinitionInput, StorageListScorerDefinitionsInput, StorageListScorerDefinitionsOutput, StorageListScorerDefinitionsResolvedOutput, StorageResolvedScorerDefinitionType, StorageCreateWorkspaceInput, StorageUpdateWorkspaceInput, StorageListWorkspacesInput, StorageListWorkspacesOutput, StorageListWorkspacesResolvedOutput, StorageResolvedWorkspaceType, StorageWorkspaceSnapshotType, StorageCreateSkillInput, StorageUpdateSkillInput, StorageListSkillsInput, StorageListSkillsOutput, StorageListSkillsResolvedOutput, StorageResolvedSkillType, RuleGroup, PromptBlocksStorage, SourceControlProvider, BlobStore } from '@mastra/core/storage';
 import { ToolProvider } from '@mastra/core/tool-provider';
 import { Agent } from '@mastra/core/agent';
 import { RequestContext } from '@mastra/core/request-context';
@@ -101,6 +101,7 @@ declare class EditorAgentNamespace extends CrudEditorNamespace<StorageCreateAgen
      * Also ensures the referenced workspace (if any) is persisted as a stored workspace.
      */
     create(input: StorageCreateAgentInput): Promise<Agent>;
+    private getCodeDefinedAgent;
     /**
      * Ensure a workspace reference is persisted in the DB.
      *
@@ -445,6 +446,7 @@ declare class MastraEditor implements IMastraEditor {
     private __processorProviders;
     private __source?;
     private __codePath;
+    private __sourceControlProvider?;
     private readonly __builderConfig?;
     private __builderInstance?;
     private __builderResolved;
@@ -526,6 +528,8 @@ declare class MastraEditor implements IMastraEditor {
     private assertAgentBuilderLicensed;
     /** Returns the editor's configured source, or undefined if unset. */
     getSource(): 'code' | 'db' | undefined;
+    /** Returns the configured source control provider, if any. */
+    getSourceControlProvider(): SourceControlProvider | undefined;
     /** Registered tool providers */
     getToolProvider(id: string): ToolProvider | undefined;
     /**

package/dist/index.js

@@ -1,6 +1,11 @@
 // src/index.ts
 import { BUILT_IN_PROCESSOR_PROVIDERS } from "@mastra/core/processor-provider";
-import { FilesystemStore, MastraCompositeStore } from "@mastra/core/storage";
+import {
+  createGitHubSourceControlProviderFromEnv,
+  FilesystemStore,
+  MastraCompositeStore,
+  SourceAgentsSourceControl
+} from "@mastra/core/storage";
 import { UnknownToolProviderError } from "@mastra/core/tool-provider";
 
 // src/namespaces/base.ts
@@ -605,8 +610,24 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       finalInput = applyBuilderDefaults(input, agentConfig);
     }
     await this.ensureStoredWorkspace(finalInput.workspace);
+    const existingCodeAgent = this.getCodeDefinedAgent(finalInput.id);
+    if (existingCodeAgent) {
+      const adapter = await this.getStorageAdapter();
+      await adapter.create(finalInput);
+      this._cache.set(finalInput.id, existingCodeAgent);
+      return existingCodeAgent;
+    }
     return super.create(finalInput);
   }
+  getCodeDefinedAgent(id) {
+    let agent;
+    try {
+      agent = this.mastra?.getAgentById(id);
+    } catch {
+      return void 0;
+    }
+    return agent?.source === "code" ? agent : void 0;
+  }
   /**
    * Ensure a workspace reference is persisted in the DB.
    *
@@ -1098,14 +1119,7 @@ var EditorAgentNamespace = class extends CrudEditorNamespace {
       browser,
       ...skillsFormat && { skillsFormat }
     });
-    const existingCodeAgent = (() => {
-      try {
-        return this.mastra?.getAgentById(storedAgent.id);
-      } catch {
-        return void 0;
-      }
-    })();
-    if (!existingCodeAgent || existingCodeAgent.source !== "code") {
+    if (!this.getCodeDefinedAgent(storedAgent.id)) {
       this.mastra?.addAgent(agent, storedAgent.id, { source: "stored" });
     }
     this.logger?.debug(`[createAgentFromStoredConfig] Successfully created agent "${storedAgent.id}"`);
@@ -2254,6 +2268,7 @@ var MastraEditor = class {
     this.__processorProviders = { ...BUILT_IN_PROCESSOR_PROVIDERS, ...config?.processorProviders };
     this.__source = config?.source;
     this.__codePath = config?.codePath ?? "./mastra/editor";
+    this.__sourceControlProvider = config?.sourceControlProvider ?? createGitHubSourceControlProviderFromEnv(process.env, { pathPrefix: this.__codePath });
     this.__filesystems = /* @__PURE__ */ new Map();
     this.__filesystems.set(localFilesystemProvider.id, localFilesystemProvider);
     for (const [id, provider] of Object.entries(config?.filesystems ?? {})) {
@@ -2292,18 +2307,33 @@ var MastraEditor = class {
       this.__logger = mastra.getLogger();
     }
     if (this.__source === "code") {
-      const filesystemStore = new FilesystemStore({ dir: this.__codePath });
       const existingStorage = mastra.getStorage();
-      if (existingStorage) {
+      if (this.__sourceControlProvider) {
+        const sourceAgentsStore = new SourceAgentsSourceControl({
+          provider: this.__sourceControlProvider
+        });
+        const filesystemStore = new FilesystemStore({ dir: this.__codePath });
         mastra.setStorage(
           new MastraCompositeStore({
-            id: `${existingStorage.id}-with-editor-filesystem`,
-            default: existingStorage,
-            editor: filesystemStore
+            id: `${existingStorage?.id ?? "mastra"}-with-editor-source-control`,
+            ...existingStorage ? { default: existingStorage } : {},
+            editor: filesystemStore,
+            domains: { agents: sourceAgentsStore }
           })
         );
       } else {
-        mastra.setStorage(filesystemStore);
+        const filesystemStore = new FilesystemStore({ dir: this.__codePath });
+        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) => {
@@ -2458,6 +2488,10 @@ var MastraEditor = class {
   getSource() {
     return this.__source;
   }
+  /** Returns the configured source control provider, if any. */
+  getSourceControlProvider() {
+    return this.__sourceControlProvider;
+  }
   /** Registered tool providers */
   getToolProvider(id) {
     return this.__toolProviders[id];