Merge branch 'Azure:main' into feature/side-panel-view

Author: spboyer

.github/copilot-instructions.md

@@ -198,3 +198,16 @@ func TestMyFunction(t *testing.T) {
 When asked to prepare a release changelog, use the appropriate custom agent instructions:
 - `.github/agents/changelog-core.agent.md` for core CLI releases
 - `.github/agents/changelog-extension.agent.md` for extension releases
+
+## Extensions Development
+
+### Building Extensions
+Extensions are located in `extensions/` directory and use the extension framework:
+```bash
+# Build and install extension (example using demo extension)
+cd extensions/microsoft.azd.demo
+azd x build
+
+# Test extension (using extension's namespace from extension.yaml)
+azd demo <command>
+```

.github/workflows/devcontainer-feature-test.yml

@@ -16,11 +16,11 @@ jobs:
       matrix:
         baseImage:
           [
-            "ubuntu:focal",
+            "ubuntu:noble",
             "ubuntu:jammy",
-            "ubuntu:bionic",
+            "debian:13",
+            "debian:12",
             "debian:11",
-            "debian:10",
             "mcr.microsoft.com/devcontainers/base:ubuntu",
             "mcr.microsoft.com/devcontainers/base:debian",
           ]

.gitignore

@@ -67,6 +67,7 @@ cli/azd/extensions/microsoft.azd.ai.builder/microsoft.azd.ai.builder
 cli/azd/extensions/microsoft.azd.ai.builder/microsoft.azd.ai.builder.exe
 cli/azd/extensions/microsoft.azd.demo/microsoft.azd.demo
 cli/azd/extensions/microsoft.azd.demo/microsoft.azd.demo.exe
-cli/azd/extensions/microsoft.azd.concurx/concurx
-cli/azd/extensions/microsoft.azd.concurx/concurx.exe
+cli/azd/extensions/microsoft.azd.concurx/microsoft.azd.concurx
+cli/azd/extensions/microsoft.azd.concurx/microsoft.azd.concurx.exe
 cli/azd/azd-test
+cli/azd/azd

.vscode/cspell-devops-ext.txt

@@ -1,4 +1,8 @@
-vsix
-tsbuildinfo
-codepaths
 azuretools
+codepaths
+LASTEXITCODE
+tmrm
+toolrunner
+TOOLSDIRECTORY
+tsbuildinfo
+vsix

cli/azd/.github/copilot-instructions.md

@@ -96,6 +96,19 @@ All Go files must include Microsoft copyright header:
 // Licensed under the MIT License.
 ```
 
+## Extensions Development
+
+### Building Extensions
+Extensions are located in `extensions/` directory and use the extension framework:
+```bash
+# Build and install extension (example using demo extension)
+cd extensions/microsoft.azd.demo
+azd x build
+
+# Test extension (using extension's namespace from extension.yaml)
+azd demo <command>
+```
+
 ## MCP Tools Development
 
 ### Tool Pattern

cli/azd/.vscode/cspell.yaml

@@ -45,6 +45,10 @@ words:
   - jsonschema
   - rustc
   - figspec
+  - finetune
+  - bubbletea
+  - lipgloss
+  - gopxl
 languageSettings:
   - languageId: go
     ignoreRegExpList:
@@ -243,6 +247,12 @@ overrides:
       - userosscache
       - docstates
       - dylib
+  - filename: docs/recording-functional-tests-guide.md
+    words:
+      - httptest
+      - Logf
+      - Getenv
+      - httptest      
 ignorePaths:
   - "**/*_test.go"
   - "**/mock*.go"

cli/azd/AGENTS.md

@@ -0,0 +1,16 @@
+# Agent Development Guide
+
+A file for [guiding coding agents](https://agents.md/).
+
+## Commands
+
+- **Build:** `go build`
+- **Test (Golang):** `go test ./... -short`
+- **Test -- include functional end-to-end tests (Golang)**: `go test ./...`
+- **Cspell check**: `cspell lint "**/*.go" --relative --config ./.vscode/cspell.yaml`
+- **Linter**: `golangci-lint run ./...`
+
+## Directory Structure
+
+- Functional tests: `test/`
+- Docs: `docs/`

cli/azd/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History
 
+## 1.23.0-beta.1 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
 ## 1.22.5 (2025-12-18)
 
 ### Bugs Fixed

cli/azd/cmd/auth.go

@@ -36,6 +36,14 @@ func authActions(root *actions.ActionDescriptor) *actions.ActionDescriptor {
 		DefaultFormat:  output.NoneFormat,
 	})
 
+	group.Add("status", &actions.ActionDescriptorOptions{
+		Command:        newAuthStatusCmd(),
+		FlagsResolver:  newAuthStatusFlags,
+		ActionResolver: newAuthStatusAction,
+		OutputFormats:  []output.Format{output.JsonFormat, output.NoneFormat},
+		DefaultFormat:  output.NoneFormat,
+	})
+
 	group.Add("logout", &actions.ActionDescriptorOptions{
 		Command:        newLogoutCmd("auth"),
 		ActionResolver: newLogoutAction,

cli/azd/cmd/auth_login.go

@@ -196,13 +196,6 @@ func (lf *loginFlags) Bind(local *pflag.FlagSet, global *internal.GlobalCommandO
 	lf.global = global
 }
 
-func newLoginFlags(cmd *cobra.Command, global *internal.GlobalCommandOptions) *loginFlags {
-	flags := &loginFlags{}
-	flags.Bind(cmd.Flags(), global)
-
-	return flags
-}
-
 func newLoginCmd(parent string) *cobra.Command {
 	return &cobra.Command{
 		Use:   "login",
@@ -237,9 +230,6 @@ type loginAction struct {
 	commandRunner     exec.CommandRunner
 }
 
-// it is important to update both newAuthLoginAction and newLoginAction at the same time
-// newAuthLoginAction is the action that is bound to `azd auth login`,
-// and newLoginAction is the action that is bound to `azd login`
 func newAuthLoginAction(
 	formatter output.Formatter,
 	writer io.Writer,
@@ -262,32 +252,36 @@ func newAuthLoginAction(
 	}
 }
 
-// it is important to update both newAuthLoginAction and newLoginAction at the same time
-// newAuthLoginAction is the action that is bound to `azd auth login`,
-// and newLoginAction is the action that is bound to `azd login`
-func newLoginAction(
-	formatter output.Formatter,
-	writer io.Writer,
-	authManager *auth.Manager,
-	accountSubManager *account.SubscriptionsManager,
-	flags *loginFlags,
-	console input.Console,
-	annotations CmdAnnotations,
-	commandRunner exec.CommandRunner,
-) actions.Action {
-	return &loginAction{
-		formatter:         formatter,
-		writer:            writer,
-		console:           console,
-		authManager:       authManager,
-		accountSubManager: accountSubManager,
-		flags:             flags,
-		annotations:       annotations,
-		commandRunner:     commandRunner,
+func (la *loginAction) Run(ctx context.Context) (*actions.ActionResult, error) {
+	loginMode, err := la.authManager.Mode()
+	if err != nil {
+		return nil, err
+	}
+	if loginMode != auth.AzdBuiltIn && !la.flags.onlyCheckStatus {
+		la.console.MessageUxItem(ctx, &ux.WarningAltMessage{
+			Message: fmt.Sprintf(
+				"azd is not using the built-in authentication mode, but rather '%s'", loginMode),
+		})
+		la.console.Message(ctx, "If you want to use 'azd auth login', you need to disable the current auth mode.")
+		response, err := la.console.Confirm(ctx, input.ConsoleOptions{
+			Message:      "Do you want to switch back to azd built-in authentication?",
+			DefaultValue: false,
+			Help: "azd supports multiple authentication modes, including " + string(auth.AzDelegated) + " and " +
+				string(auth.ExternalRequest) + " for Auth." +
+				" Switching back to azd built-in authentication will try to disable the current mode.",
+		})
+		if err != nil {
+			return nil, err
+		}
+		if !response {
+			return nil, fmt.Errorf("log in is not supported on current mode: %s", loginMode)
+		}
+		if err := la.authManager.SetBuiltInAuthMode(); err != nil {
+			return nil, fmt.Errorf("setting auth mode: %w", err)
+		}
+		la.console.Message(ctx, "Authentication mode set to azd built-in. Continuing login...")
 	}
-}
 
-func (la *loginAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 	if len(la.flags.scopes) == 0 {
 		la.flags.scopes = la.authManager.LoginScopes()
 	}