From 23c5e161c168ea0656da92010a8d4342cb01abdc Mon Sep 17 00:00:00 2001
From: Jeffrey Chen <jeffreychen@microsoft.com>
Date: Tue, 2 Dec 2025 19:12:13 +0000
Subject: [PATCH 1/2] Print template gallery links in `azd init` and `azd
 template list`

---
 cli/azd/cmd/templates.go                  |  6 ++++++
 cli/azd/pkg/templates/template_manager.go | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/cli/azd/cmd/templates.go b/cli/azd/cmd/templates.go
index 90a253627cb..3a3e66b198f 100644
--- a/cli/azd/cmd/templates.go
+++ b/cli/azd/cmd/templates.go
@@ -131,6 +131,12 @@ func (tl *templateListAction) Run(ctx context.Context) (*actions.ActionResult, e
 		err = tl.formatter.Format(listedTemplates, tl.writer, output.TableFormatterOptions{
 			Columns: columns,
 		})
+
+		if err == nil {
+			templates.PrintGalleryLinks(tl.writer)
+			fmt.Fprintf(tl.writer, "Select a template from the gallery, then run %s\n",
+				output.WithHighLightFormat("azd init -t <template name>"))
+		}
 	} else {
 		err = tl.formatter.Format(listedTemplates, tl.writer, nil)
 	}
diff --git a/cli/azd/pkg/templates/template_manager.go b/cli/azd/pkg/templates/template_manager.go
index d7596b232cd..7fb42d3c402 100644
--- a/cli/azd/pkg/templates/template_manager.go
+++ b/cli/azd/pkg/templates/template_manager.go
@@ -6,11 +6,13 @@ package templates
 import (
 	"context"
 	"fmt"
+	"io"
 	"log"
 	"slices"
 	"strings"
 
 	"github.com/azure/azure-dev/cli/azd/pkg/input"
+	"github.com/azure/azure-dev/cli/azd/pkg/output"
 )
 
 var (
@@ -196,6 +198,9 @@ func PromptTemplate(
 		return Template{}, fmt.Errorf("prompting for template: %w", err)
 	}
 
+	// Display gallery links before template selection
+	PrintGalleryLinks(console.Handles().Stdout)
+
 	templateChoices := []*Template{}
 	duplicateNames := []string{}
 
@@ -251,3 +256,11 @@ func PromptTemplate(
 
 	return *template, nil
 }
+
+// PrintGalleryLinks prints the template gallery banner message to the given writer.
+func PrintGalleryLinks(w io.Writer) {
+	fmt.Fprintln(w)
+	fmt.Fprintln(w, "For Microsoft AI Gallery visit", output.WithLinkFormat("https://azure.github.io/ai-app-templates"))
+	fmt.Fprintln(w, "For azd community gallery (awesome-azd) visit", output.WithLinkFormat("https://azure.github.io/awesome-azd"))
+	fmt.Fprintln(w)
+}

From 36ee458a7850163e1aa4c25efaf557885b01874d Mon Sep 17 00:00:00 2001
From: Jeffrey Chen <jeffreychen@microsoft.com>
Date: Tue, 2 Dec 2025 19:29:12 +0000
Subject: [PATCH 2/2] Fix lint issues

---
 cli/azd/pkg/templates/template_manager.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cli/azd/pkg/templates/template_manager.go b/cli/azd/pkg/templates/template_manager.go
index 7fb42d3c402..ae116c080ce 100644
--- a/cli/azd/pkg/templates/template_manager.go
+++ b/cli/azd/pkg/templates/template_manager.go
@@ -260,7 +260,9 @@ func PromptTemplate(
 // PrintGalleryLinks prints the template gallery banner message to the given writer.
 func PrintGalleryLinks(w io.Writer) {
 	fmt.Fprintln(w)
-	fmt.Fprintln(w, "For Microsoft AI Gallery visit", output.WithLinkFormat("https://azure.github.io/ai-app-templates"))
-	fmt.Fprintln(w, "For azd community gallery (awesome-azd) visit", output.WithLinkFormat("https://azure.github.io/awesome-azd"))
+	fmt.Fprintln(w, "For Microsoft AI Gallery visit",
+		output.WithLinkFormat("https://azure.github.io/ai-app-templates"))
+	fmt.Fprintln(w, "For azd community gallery (awesome-azd) visit",
+		output.WithLinkFormat("https://azure.github.io/awesome-azd"))
 	fmt.Fprintln(w)
 }