Move where startupCommand is stored. Move where we store the conversation details

Signed-off-by: trangevi <trangevi@microsoft.com>

Author: trangevi

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

@@ -14,6 +14,7 @@ import (
 	"strings"
 
 	"azureaiagent/internal/exterrors"
+	projectpkg "azureaiagent/internal/project"
 
 	"github.com/azure/azure-dev/cli/azd/pkg/azdext"
 )
@@ -34,14 +35,22 @@ type AgentLocalContext struct {
 }
 
 // resolveConfigPath returns the full path to the .foundry-agent.json file
-// in the azd project root directory.
-func resolveConfigPath(ctx context.Context, azdClient *azdext.AzdClient) string {
+// in the current azd environment directory (<project root>/.azure/<env name>/).
+func resolveConfigPath(ctx context.Context, azdClient *azdext.AzdClient) (string, error) {
 	projectResponse, err := azdClient.Project().Get(ctx, &azdext.EmptyRequest{})
 	if err != nil || projectResponse.Project == nil {
-		return ConfigFile
+		return "", fmt.Errorf("failed to get project config: %w", err)
 	}
 
-	return filepath.Join(projectResponse.Project.Path, ConfigFile)
+	envResponse, err := azdClient.Environment().GetCurrent(ctx, &azdext.EmptyRequest{})
+	if err != nil {
+		return "", fmt.Errorf("failed to get current environment: %w", err)
+	}
+	if envResponse.Environment == nil || envResponse.Environment.Name == "" {
+		return "", fmt.Errorf("no current environment set; run 'azd env select' or 'azd init' first")
+	}
+
+	return filepath.Join(projectResponse.Project.Path, ".azure", envResponse.Environment.Name, ConfigFile), nil
 }
 
 // loadLocalContext reads the .foundry-agent.json state file.
@@ -74,7 +83,10 @@ func resolveSessionID(ctx context.Context, azdClient *azdext.AzdClient, agentNam
 	if explicit != "" {
 		return explicit, nil
 	}
-	configPath := resolveConfigPath(ctx, azdClient)
+	configPath, err := resolveConfigPath(ctx, azdClient)
+	if err != nil {
+		return "", err
+	}
 	agentCtx := loadLocalContext(configPath)
 	if agentCtx.Sessions == nil {
 		agentCtx.Sessions = make(map[string]string)
@@ -93,25 +105,31 @@ func resolveSessionID(ctx context.Context, azdClient *azdext.AzdClient, agentNam
 }
 
 // resolveConversationID resolves or creates a Foundry conversation ID.
-// Returns empty string if creation fails (multi-turn memory disabled).
-func resolveConversationID(ctx context.Context, azdClient *azdext.AzdClient, agentName string, forceNew bool) string {
-	configPath := resolveConfigPath(ctx, azdClient)
+// Returns empty string if no existing conversation is found or on error.
+func resolveConversationID(ctx context.Context, azdClient *azdext.AzdClient, agentName string, forceNew bool) (string, error) {
+	configPath, err := resolveConfigPath(ctx, azdClient)
+	if err != nil {
+		return "", err
+	}
 	agentCtx := loadLocalContext(configPath)
 	if agentCtx.Conversations == nil {
 		agentCtx.Conversations = make(map[string]string)
 	}
 	if !forceNew {
 		if convID, ok := agentCtx.Conversations[agentName]; ok {
-			return convID
+			return convID, nil
 		}
 	}
 	// Conversation creation requires an API call — handled by the invoke command.
-	return ""
+	return "", nil
 }
 
 // saveConversationID persists a conversation ID for an agent.
 func saveConversationID(ctx context.Context, azdClient *azdext.AzdClient, agentName, convID string) error {
-	configPath := resolveConfigPath(ctx, azdClient)
+	configPath, err := resolveConfigPath(ctx, azdClient)
+	if err != nil {
+		return err
+	}
 	agentCtx := loadLocalContext(configPath)
 	if agentCtx.Conversations == nil {
 		agentCtx.Conversations = make(map[string]string)
@@ -348,11 +366,10 @@ func resolveServiceRunContext(ctx context.Context, azdClient *azdext.AzdClient,
 	projectDir := filepath.Join(project.Path, svc.RelativePath)
 
 	var startupCmd string
-	if svc.AdditionalProperties != nil {
-		if fields := svc.AdditionalProperties.GetFields(); fields != nil {
-			if v, ok := fields["startupCommand"]; ok && v != nil {
-				startupCmd = v.GetStringValue()
-			}
+	if svc.Config != nil {
+		var agentConfig projectpkg.ServiceTargetAgentConfig
+		if err := projectpkg.UnmarshalStruct(svc.Config, &agentConfig); err == nil {
+			startupCmd = agentConfig.StartupCommand
 		}
 	}
 

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

@@ -1465,6 +1465,13 @@ func (a *InitAction) addToProject(ctx context.Context, targetDir string, agentMa
 	agentConfig.Deployments = a.deploymentDetails
 	agentConfig.Resources = resourceDetails
 
+	// 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
+	}
+	agentConfig.StartupCommand = startupCmd
+
 	var agentConfigStruct *structpb.Struct
 	if agentConfigStruct, err = project.MarshalStruct(&agentConfig); err != nil {
 		return fmt.Errorf("failed to marshal agent config: %w", err)
@@ -1485,21 +1492,6 @@ 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 startupCmd != "" {
-		additionalProps, err := structpb.NewStruct(map[string]interface{}{
-			"startupCommand": startupCmd,
-		})
-		if err != nil {
-			return fmt.Errorf("failed to create additional properties: %w", err)
-		}
-		serviceConfig.AdditionalProperties = additionalProps
-	}
-
 	req := &azdext.AddServiceRequest{Service: serviceConfig}
 
 	if _, err := a.azdClient.Project().AddService(ctx, req); err != nil {

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

@@ -1275,8 +1275,14 @@ func (a *InitFromCodeAction) addToProject(ctx context.Context, targetDir string,
 
 	agentConfig.Deployments = a.deploymentDetails
 
+	// 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
+	}
+	agentConfig.StartupCommand = startupCmd
+
 	var agentConfigStruct *structpb.Struct
-	var err error
 	if agentConfigStruct, err = project.MarshalStruct(&agentConfig); err != nil {
 		return fmt.Errorf("failed to marshal agent config: %w", err)
 	}
@@ -1294,21 +1300,6 @@ func (a *InitFromCodeAction) addToProject(ctx context.Context, targetDir string,
 		RemoteBuild: true,
 	}
 
-	// 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 startupCmd != "" {
-		additionalProps, err := structpb.NewStruct(map[string]interface{}{
-			"startupCommand": startupCmd,
-		})
-		if err != nil {
-			return fmt.Errorf("failed to create additional properties: %w", err)
-		}
-		serviceConfig.AdditionalProperties = additionalProps
-	}
-
 	req := &azdext.AddServiceRequest{Service: serviceConfig}
 
 	if _, err := a.azdClient.Project().AddService(ctx, req); err != nil {

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

@@ -206,7 +206,10 @@ func (a *InvokeAction) invokeRemote(ctx context.Context) error {
 	body["session_id"] = sid
 
 	// Conversation ID — enables multi-turn memory via Foundry Conversations API
-	convID := resolveConversationID(ctx, azdClient, name, a.flags.newSession)
+	convID, err := resolveConversationID(ctx, azdClient, name, a.flags.newSession)
+	if err != nil {
+		return err
+	}
 	if convID == "" {
 		// Create a new conversation
 		newConvID, err := createConversation(ctx, endpoint)

cli/azd/extensions/azure.ai.agents/internal/project/config.go

@@ -21,10 +21,11 @@ const (
 
 // ServiceTargetAgentConfig provides custom configuration for the Azure AI Service target
 type ServiceTargetAgentConfig struct {
-	Environment map[string]string  `json:"env,omitempty"`
-	Container   *ContainerSettings `json:"container,omitempty"`
-	Deployments []Deployment       `json:"deployments,omitempty"`
-	Resources   []Resource         `json:"resources,omitempty"`
+	Environment    map[string]string  `json:"env,omitempty"`
+	Container      *ContainerSettings `json:"container,omitempty"`
+	Deployments    []Deployment       `json:"deployments,omitempty"`
+	Resources      []Resource         `json:"resources,omitempty"`
+	StartupCommand string             `json:"startupCommand,omitempty"`
 }
 
 // ContainerSettings provides container configuration for the Azure AI Service target

cli/azd/extensions/azure.ai.agents/schemas/azure.ai.agent.json

@@ -23,6 +23,10 @@
       "type": "array",
       "description": "List of external resources for agent execution.",
       "items": { "$ref": "#/definitions/Resource" }
+    },
+    "startupCommand": {
+      "type": "string",
+      "description": "Command to start the agent server (e.g., 'python main.py'). Used by 'azd ai agent run' for local development."
     }
   },
   "additionalProperties": false,