Migrate to Copilot SDK for azd agent implementation

cli/azd/cmd/container.go

@@ -580,12 +580,12 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 
 	// AI & LLM components
 	container.MustRegisterSingleton(llm.NewManager)
-	container.MustRegisterSingleton(llm.NewModelFactory)
-	container.MustRegisterScoped(agent.NewAgentFactory)
+	container.MustRegisterSingleton(llm.NewSessionConfigBuilder)
+	container.MustRegisterSingleton(func() *llm.CopilotClientManager {
+		return llm.NewCopilotClientManager(nil)
+	})
+	container.MustRegisterScoped(agent.NewCopilotAgentFactory)
 	container.MustRegisterScoped(consent.NewConsentManager)
-	container.MustRegisterNamedSingleton("ollama", llm.NewOllamaModelProvider)
-	container.MustRegisterNamedSingleton("azure", llm.NewAzureOpenAiModelProvider)
-	registerGitHubCopilotProvider(container)
 
 	// Agent security manager
 	container.MustRegisterSingleton(func() (*security.Manager, error) {

cli/azd/cmd/init.go

@@ -18,7 +18,6 @@ import (
 	"github.com/azure/azure-dev/cli/azd/internal"
 	"github.com/azure/azure-dev/cli/azd/internal/agent"
 	"github.com/azure/azure-dev/cli/azd/internal/agent/consent"
-	"github.com/azure/azure-dev/cli/azd/internal/agent/feedback"
 	"github.com/azure/azure-dev/cli/azd/internal/repository"
 	"github.com/azure/azure-dev/cli/azd/internal/tracing"
 	"github.com/azure/azure-dev/cli/azd/internal/tracing/fields"
@@ -40,7 +39,6 @@ import (
 	"github.com/azure/azure-dev/cli/azd/pkg/workflow"
 	"github.com/fatih/color"
 	"github.com/joho/godotenv"
-	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
@@ -140,7 +138,7 @@ type initAction struct {
 	featuresManager   *alpha.FeatureManager
 	extensionsManager *extensions.Manager
 	azd               workflow.AzdCommandRunner
-	agentFactory      *agent.AgentFactory
+	agentFactory      *agent.CopilotAgentFactory
 	consentManager    consent.ConsentManager
 	configManager     config.UserConfigManager
 }
@@ -157,7 +155,7 @@ func newInitAction(
 	featuresManager *alpha.FeatureManager,
 	extensionsManager *extensions.Manager,
 	azd workflow.AzdCommandRunner,
-	agentFactory *agent.AgentFactory,
+	agentFactory *agent.CopilotAgentFactory,
 	consentManager consent.ConsentManager,
 	configManager config.UserConfigManager,
 ) actions.Action {
@@ -283,8 +281,9 @@ func (i *initAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		output.WithLinkFormat("%s", "https://aka.ms/azd-third-party-code-notice"))
 
 	if i.featuresManager.IsEnabled(llm.FeatureLlm) {
-		followUp += fmt.Sprintf("\n%s Run azd up to deploy project to the cloud.`",
-			color.HiMagentaString("Next steps:"))
+		followUp += fmt.Sprintf("\n%s Run %s to deploy project to the cloud.",
+			color.HiMagentaString("Next steps:"),
+			output.WithHighLightFormat("azd up"))
 	}
 
 	switch initTypeSelect {
@@ -401,198 +400,101 @@ func (i *initAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 }
 
 func (i *initAction) initAppWithAgent(ctx context.Context) error {
-	// Warn user that this is an alpha feature
+	// Show alpha warning
 	i.console.MessageUxItem(ctx, &ux.MessageTitle{
 		Title: fmt.Sprintf("Agentic mode init is in alpha mode. The agent will scan your repository and "+
 			"attempt to make an azd-ready template to init. You can always change permissions later "+
 			"by running `azd mcp consent`. Mistakes may occur in agent mode. "+
-			"To learn more, go to %s\n", output.WithLinkFormat("https://aka.ms/azd-feature-stages")),
+			"To learn more, go to %s", output.WithLinkFormat("https://aka.ms/azd-feature-stages")),
 		TitleNote: "CTRL C to cancel interaction \n? to pull up help text",
 	})
 
-	// Check read only tool consent
-	readOnlyRule, err := i.consentManager.CheckConsent(ctx,
-		consent.ConsentRequest{
-			ToolID:     "*/*",
-			ServerName: "*",
-			Operation:  consent.OperationTypeTool,
-			Annotations: mcp.ToolAnnotation{
-				ReadOnlyHint: new(true),
-			},
-		},
+	// Create agent
+	copilotAgent, err := i.agentFactory.Create(ctx,
+		agent.WithMode(agent.AgentModeInteractive),
+		agent.WithDebug(i.flags.global.EnableDebugLogging),
 	)
 	if err != nil {
 		return err
 	}
+	defer copilotAgent.Stop()
 
-	if !readOnlyRule.Allowed {
-		consentChecker := consent.NewConsentChecker(i.consentManager, "")
-		err = consentChecker.PromptAndGrantReadOnlyToolConsent(ctx)
-		if err != nil {
-			return err
-		}
-		i.console.Message(ctx, "")
-	}
-
-	azdAgent, err := i.agentFactory.Create(
-		ctx,
-		agent.WithDebug(i.flags.global.EnableDebugLogging),
-	)
+	// Initialize — prompts on first run, returns config on subsequent
+	initResult, err := copilotAgent.Initialize(ctx)
 	if err != nil {
 		return err
 	}
 
-	defer azdAgent.Stop()
+	// Show current config
+	modelDisplay := initResult.Model
+	if modelDisplay == "" {
+		modelDisplay = "default"
+	}
+	i.console.Message(ctx, output.WithGrayFormat("  Agent: model=%s, reasoning=%s",
+		modelDisplay, initResult.ReasoningEffort))
+	if !initResult.IsFirstRun {
+		i.console.Message(ctx, output.WithGrayFormat(
+			"  To change, run %s or %s",
+			output.WithHighLightFormat("azd config set ai.agent.model <model>"),
+			output.WithHighLightFormat("azd config set ai.agent.reasoningEffort <level>")))
+	}
+	i.console.Message(ctx, "")
 
-	type initStep struct {
-		Name         string
-		Description  string
-		SummaryTitle string
+	// Session picker — resume previous or start fresh
+	selected, err := copilotAgent.SelectSession(ctx)
+	if err != nil {
+		return err
 	}
 
-	taskInput := `Your task: %s
+	// Build send options
+	opts := []agent.SendOption{}
+	if selected != nil {
+		opts = append(opts, agent.WithSessionID(selected.SessionID))
+		i.console.Message(ctx, output.WithSuccessFormat("Session resumed"))
+		i.console.Message(ctx, "")
+	}
 
-Break this task down into smaller steps if needed.
-If new information reveals more work to be done, pursue it.
-Do not stop until all tasks are complete and fully resolved.
-`
+	// Init prompt
+	prompt := `Prepare this application for deployment to Azure.
 
-	initSteps := []initStep{
-		{
-			Name:         "Step 1: Running Discovery & Analysis",
-			Description:  "Run a deep discovery and analysis on the current working directory.",
-			SummaryTitle: "Step 1 (discovery & analysis)",
-		},
-		{
-			Name:         "Step 2: Generating Architecture Plan",
-			Description:  "Create a high-level architecture plan for the application.",
-			SummaryTitle: "Step 2 (architecture plan)",
-		},
-		{
-			Name:         "Step 3: Generating Dockerfile(s)",
-			Description:  "Generate a Dockerfile for the application components as needed.",
-			SummaryTitle: "Step 3 (dockerfile generation)",
-		},
-		{
-			Name:         "Step 4: Generating infrastructure",
-			Description:  "Generate infrastructure as code (IaC) for the application.",
-			SummaryTitle: "Step 4 (infrastructure generation)",
-		},
-		{
-			Name:         "Step 5: Generating azure.yaml file",
-			Description:  "Generate an azure.yaml file for the application.",
-			SummaryTitle: "Step 5 (azure.yaml generation)",
-		},
-		{
-			Name:         "Step 6: Validating project",
-			Description:  "Validate the project structure and configuration.",
-			SummaryTitle: "Step 6 (project validation)",
-		},
-	}
+First, check if the current directory contains application code. If the directory is empty
+or has no application code, ask the user what type of Azure application they would like to
+build (e.g., web app, API, function app, static site, containerized service) before proceeding.
 
-	var stepSummaries []string
+Then invoke the following skills in order:
 
-	for idx, step := range initSteps {
-		// Collect and apply feedback for next steps
-		if idx > 0 {
-			if err := i.collectAndApplyFeedback(
-				ctx,
-				azdAgent,
-				"Any changes before moving to the next step?",
-			); err != nil {
-				return err
-			}
-		} else if idx == len(initSteps)-1 {
-			if err := i.collectAndApplyFeedback(
-				ctx,
-				azdAgent,
-				"Any changes before moving to the next completing interaction?",
-			); err != nil {
-				return err
-			}
-		}
+1. Invoke the azure-prepare skill using the "azd" recipe to analyze the project,
+   generate infrastructure (Bicep or Terraform), Dockerfiles, and azure.yaml configuration.
 
-		// Run Step
-		i.console.Message(ctx, color.MagentaString(step.Name))
-		fullTaskInput := fmt.Sprintf(taskInput, strings.Join([]string{
-			step.Description,
-			"Provide a brief summary in around 6 bullet points format about what was scanned" +
-				" or analyzed and key actions performed:\n" +
-				"Keep it concise and focus on high-level accomplishments, not implementation details.",
-		}, "\n"))
+2. Invoke the azure-validate skill using the "azd" recipe to run pre-deployment
+   validation checks and verify everything is ready for deployment.
 
-		agentOutput, err := azdAgent.SendMessageWithRetry(ctx, fullTaskInput)
-		if err != nil {
-			if agentOutput != "" {
-				i.console.Message(ctx, output.WithMarkdown(agentOutput))
-			}
+Always select the "azd" recipe when prompted for recipe selection.
 
-			return err
-		}
+Ask the user for input when you need clarification about architecture choices,
+service selection, or configuration options.
 
-		stepSummaries = append(stepSummaries, agentOutput)
+When complete, provide a brief summary of what was accomplished.`
 
-		i.console.Message(ctx, "")
-		i.console.Message(ctx, color.HiMagentaString(fmt.Sprintf("◆ %s Summary:", step.SummaryTitle)))
-		i.console.Message(ctx, output.WithMarkdown(agentOutput))
-		i.console.Message(ctx, "")
-	}
+	i.console.Message(ctx, color.MagentaString("Preparing application for Azure deployment..."))
 
-	// Post-completion summary
-	if err := i.postCompletionSummary(ctx, azdAgent, stepSummaries); err != nil {
+	result, err := copilotAgent.SendMessageWithRetry(ctx, prompt, opts...)
+	if err != nil {
 		return err
 	}
 
-	return nil
-}
-
-// collectAndApplyFeedback prompts for user feedback and applies it using the agent in a loop
-func (i *initAction) collectAndApplyFeedback(
-	ctx context.Context,
-	azdAgent agent.Agent,
-	promptMessage string,
-) error {
-	AIDisclaimer := output.WithGrayFormat("The following content is AI-generated. AI responses may be incorrect.")
-	collector := feedback.NewFeedbackCollector(i.console, feedback.FeedbackCollectorOptions{
-		EnableLoop:      true,
-		FeedbackPrompt:  promptMessage,
-		FeedbackHint:    "Enter to skip",
-		RequireFeedback: false,
-		AIDisclaimer:    AIDisclaimer,
-	})
-
-	return collector.CollectFeedbackAndApply(ctx, azdAgent, AIDisclaimer)
-}
-
-// postCompletionSummary provides a final summary after all steps complete
-func (i *initAction) postCompletionSummary(
-	ctx context.Context,
-	azdAgent agent.Agent,
-	stepSummaries []string,
-) error {
-	i.console.Message(ctx, "")
-	i.console.Message(ctx, "🎉 All initialization steps completed!")
+	// Show summary
 	i.console.Message(ctx, "")
+	i.console.Message(ctx, color.HiMagentaString("◆ Azure Init Summary:"))
+	i.console.Message(ctx, output.WithMarkdown(result.Content))
 
-	// Combine all step summaries into a single prompt
-	combinedSummaries := strings.Join(stepSummaries, "\n\n---\n\n")
-	summaryPrompt := fmt.Sprintf(`Based on the following summaries of the azd init process, please provide
-	a comprehensive overall summary of what was accomplished in bullet point format:\n%s`, combinedSummaries)
-
-	agentOutput, err := azdAgent.SendMessageWithRetry(ctx, summaryPrompt)
-	if err != nil {
-		if agentOutput != "" {
-			i.console.Message(ctx, output.WithMarkdown(agentOutput))
-		}
-
-		return err
+	// Show usage
+	if usage := result.Usage.Format(); usage != "" {
+		i.console.Message(ctx, "")
+		i.console.Message(ctx, usage)
 	}
 
 	i.console.Message(ctx, "")
-	i.console.Message(ctx, color.HiMagentaString("◆ Agentic init Summary:"))
-	i.console.Message(ctx, output.WithMarkdown(agentOutput))
-	i.console.Message(ctx, "")
-
 	return nil
 }
 
@@ -651,7 +553,7 @@ func promptInitType(
 			console.Message(ctx, "\nThe azd agent feature has been enabled to support this new experience."+
 				" To turn off in the future run `azd config unset alpha.llm`.")
 
-			err = azdConfig.Set("ai.agent.model.type", "github-copilot")
+			err = azdConfig.Set("ai.agent.model.type", "copilot")
 			if err != nil {
 				return initUnknown, fmt.Errorf("failed to set ai.agent.model.type config: %w", err)
 			}

cli/azd/cmd/mcp.go

@@ -227,14 +227,6 @@ func (a *mcpStartAction) Run(ctx context.Context) (*actions.ActionResult, error)
 	mcpServer.EnableSampling()
 
 	azdTools := []server.ServerTool{
-		tools.NewAzdPlanInitTool(),
-		tools.NewAzdDiscoveryAnalysisTool(),
-		tools.NewAzdArchitecturePlanningTool(),
-		tools.NewAzdAzureYamlGenerationTool(),
-		tools.NewAzdDockerGenerationTool(),
-		tools.NewAzdInfrastructureGenerationTool(),
-		tools.NewAzdIacGenerationRulesTool(),
-		tools.NewAzdProjectValidationTool(),
 		tools.NewAzdYamlSchemaTool(),
 		tools.NewAzdErrorTroubleShootingTool(),
 		tools.NewAzdProvisionCommonErrorTool(),