Feature/code deploy zip upload

cli/azd/extensions/azure.ai.agents/cspell.yaml

@@ -42,6 +42,7 @@ words:
   - mcpservertoolalwaysrequireapprovalmode
   - mcpservertoolneverrequireapprovalmode
   - mcpservertoolspecifyapprovalmode
+  - mypy
   - myregistry
   - normalises
   - openapitool

cli/azd/extensions/azure.ai.agents/internal/cmd/init.go

@@ -74,6 +74,7 @@ type InitAction struct {
 
 	deploymentDetails   []project.Deployment
 	containerSettings   *project.ContainerSettings
+	isCodeDeploy        bool // true when user selects code deploy mode; skips ACR config
 	httpClient          *http.Client
 	serviceNameOverride string // when set, addToProject uses this instead of the manifest name
 }
@@ -570,6 +571,37 @@ func (a *InitAction) Run(ctx context.Context) error {
 			return fmt.Errorf("downloading agent.yaml: %w", err)
 		}
 
+		// Prompt for deploy mode (code vs container) for hosted agents.
+		// Code deploy is currently only supported for Python projects.
+		if _, ok := agentManifest.Template.(agent_yaml.ContainerAgent); ok {
+			isPython := isPythonProject(targetDir)
+			deployMode, err := promptDeployMode(ctx, a.azdClient, a.flags.noPrompt, isPython)
+			if err != nil {
+				return fmt.Errorf("prompting for deploy mode: %w", err)
+			}
+			a.isCodeDeploy = (deployMode == "code")
+
+			if a.isCodeDeploy {
+				// Prompt for code configuration and update the manifest
+				codeConfig, err := promptCodeConfig(ctx, a.azdClient, targetDir, a.flags.noPrompt)
+				if err != nil {
+					return fmt.Errorf("prompting for code configuration: %w", err)
+				}
+
+				hostedAgent := agentManifest.Template.(agent_yaml.ContainerAgent)
+				hostedAgent.CodeConfiguration = codeConfig
+				agentManifest.Template = hostedAgent
+			} else {
+				// Container mode: ensure any pre-existing code_configuration is removed
+				// (e.g. when switching from code deploy back to container)
+				hostedAgent := agentManifest.Template.(agent_yaml.ContainerAgent)
+				if hostedAgent.CodeConfiguration != nil {
+					hostedAgent.CodeConfiguration = nil
+					agentManifest.Template = hostedAgent
+				}
+			}
+		}
+
 		// Model configuration: prompt user for "use existing" vs "deploy new"
 		agentManifest, err = a.configureModelChoice(ctx, agentManifest)
 		if err != nil {
@@ -792,6 +824,7 @@ func (a *InitAction) configureModelChoice(
 			selectedProject, err := selectFoundryProject(
 				ctx, a.azdClient, a.credential, a.azureContext, a.environment.Name,
 				a.azureContext.Scope.SubscriptionId, a.flags.projectResourceId,
+				a.isCodeDeploy,
 			)
 			if err != nil {
 				return nil, err
@@ -840,6 +873,7 @@ func (a *InitAction) configureModelChoice(
 				selectedProject, err := selectFoundryProject(
 					ctx, a.azdClient, a.credential, a.azureContext, a.environment.Name,
 					a.azureContext.Scope.SubscriptionId, "",
+					a.isCodeDeploy,
 				)
 				if err != nil {
 					return nil, err
@@ -932,6 +966,7 @@ func (a *InitAction) configureModelChoice(
 		selectedProject, err := selectFoundryProject(
 			ctx, a.azdClient, a.credential, a.azureContext, a.environment.Name,
 			a.azureContext.Scope.SubscriptionId, a.flags.projectResourceId,
+			a.isCodeDeploy,
 		)
 		if err != nil {
 			return nil, err
@@ -1453,6 +1488,16 @@ func writeAgentDefinitionFile(targetDir string, agentManifest *agent_yaml.AgentM
 }
 
 func (a *InitAction) addToProject(ctx context.Context, targetDir string, agentManifest *agent_yaml.AgentManifest) error {
+	// If targetDir is ".", resolve the actual relative path from the project root to cwd.
+	// This ensures azure.yaml gets the correct "project:" value when init is run from a subdirectory.
+	if targetDir == "." {
+		if cwd, err := os.Getwd(); err == nil && a.projectConfig != nil && a.projectConfig.Path != "" {
+			if relPath, err := filepath.Rel(a.projectConfig.Path, cwd); err == nil && relPath != "." {
+				targetDir = filepath.ToSlash(relPath)
+			}
+		}
+	}
+
 	// Convert the template to bytes
 	templateBytes, err := json.Marshal(agentManifest.Template)
 	if err != nil {
@@ -1558,11 +1603,16 @@ func (a *InitAction) addToProject(ctx context.Context, targetDir string, agentMa
 	}
 
 	// Detect startup command from the project source directory
-	startupCmd, err := resolveStartupCommandForInit(ctx, a.azdClient, a.projectConfig.Path, targetDir, a.flags.noPrompt)
-	if err != nil {
-		return err
+	if a.isCodeDeploy {
+		// For code deploy, auto-derive startupCommand from entry point in agent.yaml
+		agentConfig.StartupCommand = deriveStartupCommand(a.projectConfig.Path, targetDir)
+	} else {
+		startupCmd, err := resolveStartupCommandForInit(ctx, a.azdClient, a.projectConfig.Path, targetDir, a.flags.noPrompt)
+		if err != nil {
+			return err
+		}
+		agentConfig.StartupCommand = startupCmd
 	}
-	agentConfig.StartupCommand = startupCmd
 
 	var agentConfigStruct *structpb.Struct
 	if agentConfigStruct, err = project.MarshalStruct(&agentConfig); err != nil {
@@ -1577,10 +1627,14 @@ func (a *InitAction) addToProject(ctx context.Context, targetDir string, agentMa
 		Config:       agentConfigStruct,
 	}
 
-	// For hosted (container-based) agents, set remoteBuild to true by default
+	// For hosted agents, configure Docker or code deploy settings
 	if agentDef.Kind == agent_yaml.AgentKindHosted {
-		serviceConfig.Docker = &azdext.DockerProjectOptions{
-			RemoteBuild: true,
+		if a.isCodeDeploy {
+			serviceConfig.Language = "python"
+		} else {
+			serviceConfig.Docker = &azdext.DockerProjectOptions{
+				RemoteBuild: true,
+			}
 		}
 	}
 
@@ -1837,7 +1891,7 @@ func (a *InitAction) populateContainerSettings(
 
 	resp, err := a.azdClient.Prompt().Select(ctx, &azdext.SelectRequest{
 		Options: &azdext.SelectOptions{
-			Message:       "Select container resource allocation (CPU and Memory) for your agent. You can adjust these settings later in the azure.yaml file if needed.",
+			Message:       "Select resources (CPU and Memory) for your agent. You can adjust these settings later in the azure.yaml file if needed.",
 			Choices:       choices,
 			SelectedIndex: &defaultIndex,
 		},

cli/azd/extensions/azure.ai.agents/internal/cmd/init_foundry_resources_helpers.go

@@ -6,6 +6,7 @@ package cmd
 import (
 	"azureaiagent/internal/exterrors"
 	"azureaiagent/internal/pkg/azure"
+	"azureaiagent/internal/project"
 	"context"
 	"fmt"
 	"regexp"
@@ -308,13 +309,15 @@ func lookupAcrResourceId(
 
 // configureFoundryProjectEnv sets all Foundry project environment variables and discovers
 // ACR and AppInsights connections. This is the shared implementation used by both init flows.
+// When skipACR is true, ACR connection discovery and configuration is skipped (used for code deploy).
 func configureFoundryProjectEnv(
 	ctx context.Context,
 	azdClient *azdext.AzdClient,
 	credential azcore.TokenCredential,
 	envName string,
 	project FoundryProjectInfo,
 	subscriptionId string,
+	skipACR bool,
 ) error {
 	resourceId := project.ResourceId
 	if resourceId == "" {
@@ -365,7 +368,9 @@ func configureFoundryProjectEnv(
 	for _, conn := range connections {
 		switch conn.Type {
 		case azure.ConnectionTypeContainerRegistry:
-			acrConnections = append(acrConnections, conn)
+			if !skipACR {
+				acrConnections = append(acrConnections, conn)
+			}
 		case azure.ConnectionTypeAppInsights:
 			connWithCreds, err := foundryClient.GetConnectionWithCredentials(ctx, conn.Name)
 			if err != nil {
@@ -379,8 +384,10 @@ func configureFoundryProjectEnv(
 		}
 	}
 
-	if err := configureAcrConnection(ctx, azdClient, credential, envName, subscriptionId, acrConnections); err != nil {
-		return err
+	if !skipACR {
+		if err := configureAcrConnection(ctx, azdClient, credential, envName, subscriptionId, acrConnections); err != nil {
+			return err
+		}
 	}
 
 	if err := configureAppInsightsConnection(ctx, azdClient, envName, appInsightsConnections); err != nil {
@@ -999,6 +1006,7 @@ func selectFoundryProject(
 	envName string,
 	subscriptionId string,
 	projectResourceId string,
+	skipACR bool,
 ) (*FoundryProjectInfo, error) {
 	spinnerText := "Searching for Foundry projects in your subscription..."
 	if projectResourceId != "" {
@@ -1036,6 +1044,13 @@ func selectFoundryProject(
 		return nil, fmt.Errorf("failed to list Foundry projects: %w", err)
 	}
 
+	// When code deploy is selected, restrict to regions that support it.
+	if skipACR {
+		projects = slices.DeleteFunc(projects, func(p FoundryProjectInfo) bool {
+			return !locationAllowed(p.Location, project.CodeDeployRegions)
+		})
+	}
+
 	if len(projects) == 0 {
 		return nil, nil
 	}
@@ -1095,7 +1110,7 @@ func selectFoundryProject(
 	}
 
 	// Configure all Foundry project environment variables
-	if err := configureFoundryProjectEnv(ctx, azdClient, credential, envName, selectedProject, subscriptionId); err != nil {
+	if err := configureFoundryProjectEnv(ctx, azdClient, credential, envName, selectedProject, subscriptionId, skipACR); err != nil {
 		return nil, fmt.Errorf("failed to configure Foundry project environment: %w", err)
 	}