@mastra/agent-builder 0.0.0-scorer-agentnames-conditional-20250926065249 → 0.0.0-sidebar-window-undefined-fix-20251029233656

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Agent } from '@mastra/core/agent';
+import { Agent, tryGenerateWithJsonFallback, tryStreamWithJsonFallback } from '@mastra/core/agent';
 import { Memory } from '@mastra/memory';
 import { TokenLimiter } from '@mastra/memory/processors';
 import { exec as exec$1, execFile as execFile$1, spawn as spawn$1 } from 'child_process';
@@ -10,7 +10,7 @@ import { z } from 'zod';
 import { existsSync, readFileSync } from 'fs';
 import { createRequire } from 'module';
 import { promisify } from 'util';
-import { openai as openai$1 } from '@ai-sdk/openai-v5';
+import { ModelRouterLanguageModel } from '@mastra/core/llm';
 import { MemoryProcessor } from '@mastra/core/memory';
 import { tmpdir } from 'os';
 import { openai } from '@ai-sdk/openai';
@@ -658,31 +658,9 @@ var createModelInstance = async (provider, modelId, version = "v2") => {
           const { google } = await import('@ai-sdk/google');
           return google(modelId);
         }
-      },
-      v2: {
-        openai: async () => {
-          const { openai: openai2 } = await import('@ai-sdk/openai-v5');
-          return openai2(modelId);
-        },
-        anthropic: async () => {
-          const { anthropic } = await import('@ai-sdk/anthropic-v5');
-          return anthropic(modelId);
-        },
-        groq: async () => {
-          const { groq } = await import('@ai-sdk/groq-v5');
-          return groq(modelId);
-        },
-        xai: async () => {
-          const { xai } = await import('@ai-sdk/xai-v5');
-          return xai(modelId);
-        },
-        google: async () => {
-          const { google } = await import('@ai-sdk/google-v5');
-          return google(modelId);
-        }
       }
     };
-    const providerFn = providerMap[version][provider];
+    const providerFn = version === `v1` ? providerMap[version][provider] : () => new ModelRouterLanguageModel(`${provider}/${modelId}`);
     if (!providerFn) {
       console.error(`Unsupported provider: ${provider}`);
       return null;
@@ -697,7 +675,7 @@ var createModelInstance = async (provider, modelId, version = "v2") => {
 };
 var resolveModel = async ({
   runtimeContext,
-  defaultModel = openai$1("gpt-4.1"),
+  defaultModel = "openai/gpt-4.1",
   projectPath
 }) => {
   const modelFromContext = runtimeContext.get("model");
@@ -721,7 +699,7 @@ var resolveModel = async ({
     }
   }
   console.info("Using default model");
-  return defaultModel;
+  return typeof defaultModel === `string` ? new ModelRouterLanguageModel(defaultModel) : defaultModel;
 };
 
 // src/defaults.ts
@@ -890,7 +868,7 @@ You have access to an enhanced set of tools based on production coding agent pat
 ### Task Management
 - **taskManager**: Create and track multi-step coding tasks with states (pending, in_progress, completed, blocked). Use this for complex projects that require systematic progress tracking.
 
-### Code Discovery & Analysis  
+### Code Discovery & Analysis
 - **codeAnalyzer**: Analyze codebase structure, discover definitions (functions, classes, interfaces), map dependencies, and understand architectural patterns.
 - **smartSearch**: Intelligent search with context awareness, pattern matching, and relevance scoring.
 
@@ -1100,7 +1078,7 @@ export const mastra = new Mastra({
   workflows: { weatherWorkflow },
   agents: { weatherAgent },
   storage: new LibSQLStore({
-    // stores telemetry, evals, ... into memory storage, if it needs to persist, change to file:../mastra.db
+    // stores observability, evals, ... into memory storage, if it needs to persist, change to file:../mastra.db
     url: ":memory:",
   }),
   logger: new PinoLogger({
@@ -3234,7 +3212,7 @@ ${config.instructions}` : "";
    * Enhanced generate method with AgentBuilder-specific configuration
    * Overrides the base Agent generate method to provide additional project context
    */
-  generate = async (messages, generateOptions = {}) => {
+  generateLegacy = async (messages, generateOptions = {}) => {
     const { maxSteps, ...baseOptions } = generateOptions;
     const originalInstructions = await this.getInstructions({ runtimeContext: generateOptions?.runtimeContext });
     const additionalInstructions = baseOptions.instructions;
@@ -3257,13 +3235,13 @@ ${additionalInstructions}`;
     this.logger.debug(`[AgentBuilder:${this.name}] Starting generation with enhanced context`, {
       projectPath: this.builderConfig.projectPath
     });
-    return super.generate(messages, enhancedOptions);
+    return super.generateLegacy(messages, enhancedOptions);
   };
   /**
    * Enhanced stream method with AgentBuilder-specific configuration
    * Overrides the base Agent stream method to provide additional project context
    */
-  stream = async (messages, streamOptions = {}) => {
+  streamLegacy = async (messages, streamOptions = {}) => {
     const { maxSteps, ...baseOptions } = streamOptions;
     const originalInstructions = await this.getInstructions({ runtimeContext: streamOptions?.runtimeContext });
     const additionalInstructions = baseOptions.instructions;
@@ -3286,13 +3264,13 @@ ${additionalInstructions}`;
     this.logger.debug(`[AgentBuilder:${this.name}] Starting streaming with enhanced context`, {
       projectPath: this.builderConfig.projectPath
     });
-    return super.stream(messages, enhancedOptions);
+    return super.streamLegacy(messages, enhancedOptions);
   };
   /**
    * Enhanced stream method with AgentBuilder-specific configuration
    * Overrides the base Agent stream method to provide additional project context
    */
-  async streamVNext(messages, streamOptions) {
+  async stream(messages, streamOptions) {
     const { ...baseOptions } = streamOptions || {};
     const originalInstructions = await this.getInstructions({ runtimeContext: streamOptions?.runtimeContext });
     const additionalInstructions = baseOptions.instructions;
@@ -3314,9 +3292,9 @@ ${additionalInstructions}`;
     this.logger.debug(`[AgentBuilder:${this.name}] Starting streaming with enhanced context`, {
       projectPath: this.builderConfig.projectPath
     });
-    return super.streamVNext(messages, enhancedOptions);
+    return super.stream(messages, enhancedOptions);
   }
-  async generateVNext(messages, options) {
+  async generate(messages, options) {
     const { ...baseOptions } = options || {};
     const originalInstructions = await this.getInstructions({ runtimeContext: options?.runtimeContext });
     const additionalInstructions = baseOptions.instructions;
@@ -3338,7 +3316,7 @@ ${additionalInstructions}`;
     this.logger.debug(`[AgentBuilder:${this.name}] Starting streaming with enhanced context`, {
       projectPath: this.builderConfig.projectPath
     });
-    return super.generateVNext(messages, enhancedOptions);
+    return super.generate(messages, enhancedOptions);
   }
 };
 var cloneTemplateStep = createStep({
@@ -3491,10 +3469,12 @@ Return the actual exported names of the units, as well as the file names.`,
         networks: z.array(z.object({ name: z.string(), file: z.string() })).optional(),
         other: z.array(z.object({ name: z.string(), file: z.string() })).optional()
       });
-      const result = isV2 ? await agent.generateVNext(prompt, {
-        output,
+      const result = isV2 ? await tryGenerateWithJsonFallback(agent, prompt, {
+        structuredOutput: {
+          schema: output
+        },
         maxSteps: 100
-      }) : await agent.generate(prompt, {
+      }) : await agent.generateLegacy(prompt, {
         experimental_output: output,
         maxSteps: 100
       });
@@ -4240,7 +4220,7 @@ For each task:
 Start by listing your tasks and work through them systematically!
 `;
       const isV2 = model.specificationVersion === "v2";
-      const result = isV2 ? await agentBuilder.streamVNext(prompt) : await agentBuilder.stream(prompt);
+      const result = isV2 ? await agentBuilder.stream(prompt) : await agentBuilder.streamLegacy(prompt);
       const actualResolutions = [];
       for await (const chunk of result.fullStream) {
         if (chunk.type === "step-finish" || chunk.type === "step-start") {
@@ -4482,9 +4462,11 @@ Start by running validateCode with all validation types to get a complete pictur
 Previous iterations may have fixed some issues, so start by re-running validateCode to see the current state, then fix any remaining issues.`;
         const isV2 = model.specificationVersion === "v2";
         const output = z.object({ success: z.boolean() });
-        const result = isV2 ? await validationAgent.streamVNext(iterationPrompt, {
-          output
-        }) : await validationAgent.stream(iterationPrompt, {
+        const result = isV2 ? await tryStreamWithJsonFallback(validationAgent, iterationPrompt, {
+          structuredOutput: {
+            schema: output
+          }
+        }) : await validationAgent.streamLegacy(iterationPrompt, {
           experimental_output: output
         });
         let iterationErrors = 0;
@@ -5111,8 +5093,10 @@ var planningIterationStep = createStep({
         projectStructure,
         research
       });
-      const result = await planningAgent.generateVNext(planningPrompt, {
-        output: PlanningAgentOutputSchema
+      const result = await planningAgent.generate(planningPrompt, {
+        structuredOutput: {
+          schema: PlanningAgentOutputSchema
+        }
         // maxSteps: 15,
       });
       const planResult = await result.object;
@@ -5821,8 +5805,10 @@ var workflowResearchStep = createStep({
         dependencies: inputData.dependencies,
         hasWorkflowsDir: inputData.structure.hasWorkflowsDir
       });
-      const result = await researchAgent.generateVNext(researchPrompt, {
-        output: WorkflowResearchResultSchema
+      const result = await researchAgent.generate(researchPrompt, {
+        structuredOutput: {
+          schema: WorkflowResearchResultSchema
+        }
         // stopWhen: stepCountIs(10),
       });
       const researchResult = await result.object;
@@ -5934,17 +5920,10 @@ ${workflowBuilderPrompts.validation.instructions}`
         resumeData
       });
       const originalInstructions = await executionAgent.getInstructions({ runtimeContext });
-      const additionalInstructions = executionAgent.instructions;
-      let enhancedInstructions = originalInstructions;
-      if (additionalInstructions) {
-        enhancedInstructions = `${originalInstructions}
-
-${additionalInstructions}`;
-      }
       const enhancedOptions = {
         stopWhen: stepCountIs(100),
         temperature: 0.3,
-        instructions: enhancedInstructions
+        instructions: originalInstructions
       };
       let finalResult = null;
       let allTasksCompleted = false;
@@ -5973,7 +5952,7 @@ ${additionalInstructions}`;
         })}
 
 ${workflowBuilderPrompts.validation.instructions}`;
-        const stream = await executionAgent.streamVNext(iterationPrompt, {
+        const stream = await executionAgent.stream(iterationPrompt, {
           structuredOutput: {
             schema: TaskExecutionIterationInputSchema(tasks.length),
             model