[AI Agents Extension] Cobo Fixes

cli/azd/extensions/azure.ai.agents/go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/mark3labs/mcp-go v0.41.1
 	github.com/spf13/cobra v1.10.1
+	github.com/spf13/pflag v1.0.10
 	go.yaml.in/yaml/v3 v3.0.4
 	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
@@ -75,7 +76,6 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sethvargo/go-retry v0.3.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
-	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/stretchr/testify v1.11.1 // indirect
 	github.com/theckman/yacspin v0.13.12 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect

cli/azd/extensions/azure.ai.agents/go.sum

@@ -15,8 +15,6 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontai
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers v1.1.0/go.mod h1:qV+BWew22CAalRTwJEAHs+aSLP49k/csNlspqhMIDRU=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2 v2.3.0 h1:JI8PcWOImyvIUEZ0Bbmfe05FOlWkMi2KhjG+cAKaUms=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2 v2.3.0/go.mod h1:nJLFPGJkyKfDDyJiPuHIXsCi/gpJkm07EvRgiX7SGlI=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0 h1:Hp+EScFOu9HeCbeW8WU2yQPJd4gGwhMgKxWe+G6jNzw=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0/go.mod h1:/pz8dyNQe+Ey3yBp/XuYz7oqX8YDNWVpPB0hH3XWfbc=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v3 v3.0.0-beta.2 h1:qiir/pptnHqp6hV8QwV+IExYIf6cPsXBfUDUXQ27t2Y=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v3 v3.0.0-beta.2/go.mod h1:jVRrRDLCOuif95HDYC23ADTMlvahB7tMdl519m9Iyjc=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cognitiveservices/armcognitiveservices v1.8.0 h1:ZMGAqCZov8+7iFUPWKVcTaLgNXUeTlz20sIuWkQWNfg=

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

@@ -67,7 +67,9 @@ func newListenCommand() *cobra.Command {
 				WithProjectEventHandler("predeploy", func(ctx context.Context, args *azdext.ProjectEventArgs) error {
 					return predeployHandler(ctx, azdClient, projectParser, args)
 				}).
-				WithProjectEventHandler("postdeploy", projectParser.CoboPostDeploy)
+				WithProjectEventHandler("postdeploy", func(ctx context.Context, args *azdext.ProjectEventArgs) error {
+					return postdeployHandler(ctx, projectParser, args)
+				})
 
 			// Start listening for events
 			// This is a blocking call and will not return until the server connection is closed.
@@ -81,10 +83,6 @@ func newListenCommand() *cobra.Command {
 }
 
 func preprovisionHandler(ctx context.Context, azdClient *azdext.AzdClient, projectParser *project.FoundryParser, args *azdext.ProjectEventArgs) error {
-	if err := projectParser.SetIdentity(ctx, args); err != nil {
-		return fmt.Errorf("failed to set identity: %w", err)
-	}
-
 	for _, svc := range args.Project.Services {
 		switch svc.Host {
 		case AiAgentHost:
@@ -95,7 +93,7 @@ func preprovisionHandler(ctx context.Context, azdClient *azdext.AzdClient, proje
 				return fmt.Errorf("failed to update environment for service %q: %w", svc.Name, err)
 			}
 		case ContainerAppHost:
-			if err := containerAgentHandling(ctx, azdClient, args.Project, svc); err != nil {
+			if err := containerAgentHandling(ctx, azdClient, projectParser, svc, args.Project.Path); err != nil {
 				return fmt.Errorf("failed to handle container agent for service %q: %w", svc.Name, err)
 			}
 		}
@@ -105,10 +103,6 @@ func preprovisionHandler(ctx context.Context, azdClient *azdext.AzdClient, proje
 }
 
 func predeployHandler(ctx context.Context, azdClient *azdext.AzdClient, projectParser *project.FoundryParser, args *azdext.ProjectEventArgs) error {
-	if err := projectParser.SetIdentity(ctx, args); err != nil {
-		return fmt.Errorf("failed to set identity: %w", err)
-	}
-
 	for _, svc := range args.Project.Services {
 		switch svc.Host {
 		case AiAgentHost:
@@ -118,6 +112,29 @@ func predeployHandler(ctx context.Context, azdClient *azdext.AzdClient, projectP
 			if err := envUpdate(ctx, azdClient, args.Project, svc); err != nil {
 				return fmt.Errorf("failed to update environment for service %q: %w", svc.Name, err)
 			}
+		case ContainerAppHost:
+			if err := containerAgentHandling(ctx, azdClient, projectParser, svc, args.Project.Path); err != nil {
+				return fmt.Errorf("failed to handle container agent for service %q: %w", svc.Name, err)
+			}
+		}
+	}
+
+	return nil
+}
+
+func postdeployHandler(ctx context.Context, projectParser *project.FoundryParser, args *azdext.ProjectEventArgs) error {
+	for _, svc := range args.Project.Services {
+		switch svc.Host {
+		case ContainerAppHost:
+			isContainerAgent, err := projectParser.IsContainerAgent(svc, args.Project.Path)
+			if err != nil {
+				return fmt.Errorf("failed to determine if extension should attach: %w", err)
+			}
+			if !isContainerAgent {
+				return nil
+			}
+
+			return projectParser.CoboPostDeploy(ctx, args)
 		}
 	}
 
@@ -219,19 +236,13 @@ func resourcesEnvUpdate(ctx context.Context, resources []project.Resource, azdCl
 	return setEnvVar(ctx, azdClient, envName, "AI_PROJECT_DEPENDENT_RESOURCES", escapedJsonString)
 }
 
-func containerAgentHandling(ctx context.Context, azdClient *azdext.AzdClient, project *azdext.ProjectConfig, svc *azdext.ServiceConfig) error {
-	servicePath := svc.RelativePath
-	fullPath := filepath.Join(project.Path, servicePath)
-	agentYamlPath := filepath.Join(fullPath, "agent.yaml")
-
-	data, err := os.ReadFile(agentYamlPath)
+func containerAgentHandling(ctx context.Context, azdClient *azdext.AzdClient, projectParser *project.FoundryParser, service *azdext.ServiceConfig, projectPath string) error {
+	isContainerAgent, err := projectParser.IsContainerAgent(service, projectPath)
 	if err != nil {
-		return nil
+		return fmt.Errorf("failed to determine if extension should attach: %w", err)
 	}
-
-	var agentDef agent_yaml.AgentDefinition
-	if err := yaml.Unmarshal(data, &agentDef); err != nil {
-		return fmt.Errorf("YAML content is not valid: %w", err)
+	if !isContainerAgent {
+		return nil
 	}
 
 	// If there is an agent.yaml in the project, and it can be properly parsed into an agent definition, add the env var to enable container agents