refac: split detect-aspire into presence and gather-info scripts

Separate Aspire detection into two purpose-built scripts:
- detect-aspire.{sh,ps1}: presence-only (isAspire + appHostPath) for
  detection/routing points (scan.md, recipe-selection.md, generate.md,
  recipes/azd/README.md)
- gather-aspire-info.{sh,ps1}: full facts (appHostDir, hasExcludeFromManifest,
  hasFunctions, secretStorageConfigured) for Aspire-specific reference files
  (aspire.md, recipes/azd/aspire.md, services/functions/aspire-containerapps.md)

Add gather-aspire-info invocations to the two Aspire-specific files that
previously referenced no detection script. Update the integration test regex
to accept either script name.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: tmeschter

plugin/skills/azure-prepare/references/aspire.md

@@ -19,16 +19,16 @@ Guidance for preparing .NET Aspire applications for Azure deployment.
 
 ### Step 1: Detection
 
-When scanning the codebase (per [scan.md](scan.md)), run the detection script ([detect-aspire.sh](scripts/detect-aspire.sh) / [detect-aspire.ps1](scripts/detect-aspire.ps1)). It performs the full deterministic detection sequence in one pass and prints `key=value` lines plus a human-readable summary, so you can branch on the result instead of parsing raw `find`/`grep` output.
+When scanning the codebase (per [scan.md](scan.md)), Aspire presence is established with `detect-aspire`. Once confirmed, gather the full set of facts by running [gather-aspire-info.sh](scripts/gather-aspire-info.sh) / [gather-aspire-info.ps1](scripts/gather-aspire-info.ps1). It performs the full deterministic detection sequence in one pass and prints `key=value` lines plus a human-readable summary, so you can branch on the result instead of parsing raw `find`/`grep` output.
 
 **bash:**
 ```bash
-./scripts/detect-aspire.sh [workspace-root]
+./scripts/gather-aspire-info.sh [workspace-root]
 ```
 
 **PowerShell:**
 ```powershell
-./scripts/detect-aspire.ps1 -WorkspaceRoot <workspace-root>
+./scripts/gather-aspire-info.ps1 -WorkspaceRoot <workspace-root>
 ```
 
 `workspace-root` defaults to the current directory. The script reports these fields:
@@ -56,7 +56,7 @@ If `isAspire=false`, this is not an Aspire app — continue with the normal reci
 
 ### ⛔ Step 1a: Pre-Check for Custom/Non-Deployable Resources (MANDATORY)
 
-**Before running `azd init --from-code`, understand whether the app may contain local-only custom resources.** The detection script from Step 1 already reports this as the `hasExcludeFromManifest` field — no separate scan is needed.
+**Before running `azd init --from-code`, understand whether the app may contain local-only custom resources.** The `gather-aspire-info` run from Step 1 already reports this as the `hasExcludeFromManifest` field — no separate scan is needed.
 
 - `hasExcludeFromManifest=true` → the AppHost source uses `.ExcludeFromManifest()`.
 - `hasExcludeFromManifest=false` → no such usage was found.
@@ -177,16 +177,16 @@ This step **MUST** run BEFORE `azd up` or `azd provision`. Skipping it causes a
 
 **1. Detect Azure Functions in the AppHost:**
 
-Use the `hasFunctions` field from the Step 1 detection script. If you have not run it yet (or the workspace changed), re-run it:
+Use the `hasFunctions` field from the Step 1 `gather-aspire-info` run. If you have not run it yet (or the workspace changed), re-run it:
 
 **bash:**
 ```bash
-./scripts/detect-aspire.sh [workspace-root]
+./scripts/gather-aspire-info.sh [workspace-root]
 ```
 
 **PowerShell:**
 ```powershell
-./scripts/detect-aspire.ps1 -WorkspaceRoot <workspace-root>
+./scripts/gather-aspire-info.ps1 -WorkspaceRoot <workspace-root>
 ```
 
 **If `hasFunctions=false` → skip this step.**

plugin/skills/azure-prepare/references/generate.md

@@ -4,7 +4,7 @@ Generate infrastructure and configuration files based on selected recipe.
 
 ## ⛔ CRITICAL: Check for .NET Aspire Projects FIRST
 
-**MANDATORY: Before generating any files, always check for .NET Aspire projects** using the detection script ([detect-aspire.sh](scripts/detect-aspire.sh) / [detect-aspire.ps1](scripts/detect-aspire.ps1)). It runs the full detection sequence and prints `key=value` fields plus a summary:
+**MANDATORY: Before generating any files, always check for .NET Aspire projects** using the presence script ([detect-aspire.sh](scripts/detect-aspire.sh) / [detect-aspire.ps1](scripts/detect-aspire.ps1)). It reports `isAspire` and `appHostPath`:
 
 **bash:**
 ```bash
@@ -16,7 +16,7 @@ Generate infrastructure and configuration files based on selected recipe.
 ./scripts/detect-aspire.ps1 -WorkspaceRoot <workspace-root>
 ```
 
-If the result includes `isAspire=true`, treat the project as Aspire. See [aspire.md](aspire.md) Step 1 for the full list of fields the script reports.
+If the result includes `isAspire=true`, treat the project as Aspire. See [aspire.md](aspire.md) Step 1 for gathering the full set of Aspire facts with `gather-aspire-info`.
 
 **If Aspire is detected:**
 1. ⛔ **STOP** - Do NOT manually create `azure.yaml`

plugin/skills/azure-prepare/references/recipes/azd/aspire.md

@@ -2,6 +2,8 @@
 
 **⛔ MANDATORY: For .NET Aspire projects, NEVER manually create azure.yaml. Use `azd init --from-code` instead.**
 
+> 📋 **Gather facts first:** Run [gather-aspire-info.sh](../../scripts/gather-aspire-info.sh) / [gather-aspire-info.ps1](../../scripts/gather-aspire-info.ps1) to capture the `appHostPath`, `hasExcludeFromManifest`, and Azure Functions signals before generating anything. See [aspire.md](../../aspire.md) Step 1 for the full field list.
+
 ## Workflow
 
 ### ⛔ DO NOT (Wrong Approach)

plugin/skills/azure-prepare/references/scan.md

@@ -56,7 +56,7 @@ Before classifying components, grep dependency files for SDKs that require a spe
 
 ### .NET Aspire Detection
 
-Always check **.NET Aspire projects** by running the detection script ([detect-aspire.sh](scripts/detect-aspire.sh) / [detect-aspire.ps1](scripts/detect-aspire.ps1)), which reports `isAspire` along with AppHost path, `ExcludeFromManifest`, and Azure Functions signals:
+Always check **.NET Aspire projects** by running the presence script ([detect-aspire.sh](scripts/detect-aspire.sh) / [detect-aspire.ps1](scripts/detect-aspire.ps1)), which reports just `isAspire` and `appHostPath` so you can branch quickly. Once Aspire is confirmed, [aspire.md](aspire.md) gathers the deeper facts (`ExcludeFromManifest`, Azure Functions signals) via `gather-aspire-info`:
 
 **bash:**
 ```bash
@@ -68,13 +68,13 @@ Always check **.NET Aspire projects** by running the detection script ([detect-a
 ./scripts/detect-aspire.ps1 -WorkspaceRoot <workspace-root>
 ```
 
-A project is Aspire when the script returns `isAspire=true` (a `*.AppHost.csproj` or an `Aspire.Hosting` / `Aspire.Hosting.AppHost` / `Aspire.AppHost.Sdk` package reference was found). See [aspire.md](aspire.md) Step 1 for the full field list.
+A project is Aspire when the script returns `isAspire=true` (a `*.AppHost.csproj` or an `Aspire.Hosting` / `Aspire.Hosting.AppHost` / `Aspire.AppHost.Sdk` package reference was found). See [aspire.md](aspire.md) Step 1 for the full field list gathered by `gather-aspire-info`.
 
 **When Aspire is detected:**
 - Use `azd init --from-code -e <environment-name>` instead of manual azure.yaml creation
 - The `--from-code` flag automatically detects the AppHost and generates appropriate configuration
 - The `-e` flag is **required** for non-interactive environments (agents, CI/CD)
-- ⚠️ **CRITICAL:** If the script reports `hasFunctions=true` and `secretStorageConfigured=false`, you **MUST** add `.WithEnvironment("AzureWebJobsSecretStorageType", "Files")` to the Functions builder chain BEFORE deployment. Without this, Functions will fail at startup with `Secret initialization from Blob storage failed`. See [aspire.md](aspire.md) Step 4b for the complete fix procedure.
+- ⚠️ **CRITICAL:** Run `gather-aspire-info` (per [aspire.md](aspire.md) Step 1). If it reports `hasFunctions=true` and `secretStorageConfigured=false`, you **MUST** add `.WithEnvironment("AzureWebJobsSecretStorageType", "Files")` to the Functions builder chain BEFORE deployment. Without this, Functions will fail at startup with `Secret initialization from Blob storage failed`. See [aspire.md](aspire.md) Step 4b for the complete fix procedure.
 - See [aspire.md](aspire.md) for detailed Aspire-specific guidance
 
 ## Output

plugin/skills/azure-prepare/references/scripts/detect-aspire.ps1

@@ -1,20 +1,17 @@
 <#
 .SYNOPSIS
-    Detects whether a workspace is a .NET Aspire application and gathers the
-    facts the azure-prepare skill needs to plan deployment.
+    Presence check: determines whether a workspace is a .NET Aspire application.
+    Use this at detection/routing points where you only need a yes/no answer.
+    To gather the deeper deployment facts (ExcludeFromManifest, Azure Functions,
+    secret storage, AppHost source dir), use gather-aspire-info.ps1 instead.
 
 .DESCRIPTION
-    Runs the full deterministic detection sequence in one pass:
+    Runs the minimal deterministic presence sequence:
       1. Find the AppHost project (*.AppHost.csproj)
       2. Confirm Aspire.Hosting or Aspire.AppHost.Sdk package references
-      3. Derive the AppHost source directory
-      4. Scan the AppHost *.cs for ExcludeFromManifest (informational)
-      5. Scan for AddAzureFunctionsProject, and if present, check whether
-         AzureWebJobsSecretStorageType is already configured
 
-    Output: key=value lines the agent can branch on, followed by a
-    human-readable summary. The remediation decision (whether/how to add
-    .WithEnvironment("AzureWebJobsSecretStorageType", "Files")) stays with the agent.
+    Output: key=value lines (isAspire, appHostPath) followed by a short
+    human-readable summary.
 
 .PARAMETER WorkspaceRoot
     Workspace root directory to scan. Defaults to the current directory.
@@ -42,10 +39,6 @@ if (-not (Test-Path -LiteralPath $WorkspaceRoot -PathType Container)) {
 # Defaults (emitted when the workspace is not an Aspire app)
 $isAspire = $false
 $appHostPath = ""
-$appHostDir = ""
-$hasExcludeFromManifest = $false
-$hasFunctions = $false
-$secretStorageConfigured = $false
 
 # Step 1: Find the AppHost project (sorted for deterministic selection)
 $appHostProject = @(Get-ChildItem -LiteralPath $WorkspaceRoot -Recurse -Filter "*.AppHost.csproj" -File -ErrorAction SilentlyContinue |
@@ -72,27 +65,6 @@ if ($appHostProject) {
     } finally {
         Pop-Location
     }
-
-    # Step 3: Derive the AppHost source directory
-    $appHostDir = $appHostPath -replace '/[^/]+$', ''
-    $appHostDirFull = $appHostProject.DirectoryName
-
-    # Scan AppHost *.cs, excluding bin/ and obj/ build output
-    $appHostCs = Get-ChildItem -LiteralPath $appHostDirFull -Recurse -Filter "*.cs" -File -ErrorAction SilentlyContinue |
-        Where-Object { $_.FullName -notmatch '[\\/](bin|obj)[\\/]' }
-
-    # Step 4: Scan the AppHost source for ExcludeFromManifest (informational)
-    if ($appHostCs -and ($appHostCs | Select-String -Pattern "ExcludeFromManifest" -SimpleMatch -List -ErrorAction SilentlyContinue)) {
-        $hasExcludeFromManifest = $true
-    }
-
-    # Step 5: Detect Azure Functions and secret-storage configuration
-    if ($appHostCs -and ($appHostCs | Select-String -Pattern "AddAzureFunctionsProject" -SimpleMatch -List -ErrorAction SilentlyContinue)) {
-        $hasFunctions = $true
-        if ($appHostCs | Select-String -Pattern "AzureWebJobsSecretStorageType" -SimpleMatch -List -ErrorAction SilentlyContinue) {
-            $secretStorageConfigured = $true
-        }
-    }
 }
 
 function ConvertTo-Lower([bool]$value) {
@@ -102,10 +74,6 @@ function ConvertTo-Lower([bool]$value) {
 # Machine-readable result
 Write-Output "isAspire=$(ConvertTo-Lower $isAspire)"
 Write-Output "appHostPath=$appHostPath"
-Write-Output "appHostDir=$appHostDir"
-Write-Output "hasExcludeFromManifest=$(ConvertTo-Lower $hasExcludeFromManifest)"
-Write-Output "hasFunctions=$(ConvertTo-Lower $hasFunctions)"
-Write-Output "secretStorageConfigured=$(ConvertTo-Lower $secretStorageConfigured)"
 
 # Human-readable summary
 Write-Output ""
@@ -117,23 +85,7 @@ if (-not $isAspire) {
 
 if ($appHostPath) {
     Write-Output "- .NET Aspire app detected. AppHost project: $appHostPath"
-    Write-Output "- AppHost source directory: $appHostDir"
 } else {
     Write-Output "- Aspire.Hosting / Aspire.AppHost.Sdk package reference found, but no *.AppHost.csproj was located."
 }
-
-if ($hasExcludeFromManifest) {
-    Write-Output "- ExcludeFromManifest found in AppHost source (informational): the app may contain local-only resources."
-} else {
-    Write-Output "- No ExcludeFromManifest usage found in AppHost source."
-}
-
-if ($hasFunctions) {
-    if ($secretStorageConfigured) {
-        Write-Output "- AddAzureFunctionsProject found; AzureWebJobsSecretStorageType is configured in the AppHost source."
-    } else {
-        Write-Output "- AddAzureFunctionsProject found; AzureWebJobsSecretStorageType is not configured in the AppHost source."
-    }
-} else {
-    Write-Output "- AddAzureFunctionsProject not found in AppHost source."
-}
+Write-Output "- Run gather-aspire-info.ps1 for AppHost source dir, ExcludeFromManifest, and Azure Functions details."

plugin/skills/azure-prepare/references/scripts/detect-aspire.sh

@@ -1,19 +1,16 @@
 #!/usr/bin/env bash
 # detect-aspire.sh
-# Detects whether a workspace is a .NET Aspire application and gathers the
-# facts the azure-prepare skill needs to plan deployment.
+# Presence check: determines whether a workspace is a .NET Aspire application.
+# Use this at detection/routing points where you only need a yes/no answer.
+# To gather the deeper deployment facts (ExcludeFromManifest, Azure Functions,
+# secret storage, AppHost source dir), use gather-aspire-info.sh instead.
 #
-# It runs the full deterministic detection sequence in one pass:
+# It runs the minimal deterministic presence sequence:
 #   1. Find the AppHost project (*.AppHost.csproj)
 #   2. Confirm Aspire.Hosting or Aspire.AppHost.Sdk package references
-#   3. Derive the AppHost source directory
-#   4. Scan the AppHost *.cs for ExcludeFromManifest (informational)
-#   5. Scan for AddAzureFunctionsProject, and if present, check whether
-#      AzureWebJobsSecretStorageType is already configured
 #
-# Output: key=value lines the agent can branch on, followed by a human-readable
-# summary. The remediation decision (whether/how to add
-# .WithEnvironment("AzureWebJobsSecretStorageType", "Files")) stays with the agent.
+# Output: key=value lines (isAspire, appHostPath) followed by a short
+# human-readable summary.
 #
 # Usage:
 #   ./detect-aspire.sh [workspace-root]
@@ -49,21 +46,9 @@ csproj_match() {
     [ -n "$(find "$dir" -type f -name '*.csproj' -exec grep -lE "$pattern" {} + 2>/dev/null)" ]
 }
 
-# Portable recursive match over *.cs files, pruning bin/ and obj/ build output.
-# Returns 0 if the extended-regex pattern is found in any *.cs under the directory.
-cs_match() {
-    local dir="$1" pattern="$2"
-    [ -n "$(find "$dir" -type d \( -name bin -o -name obj \) -prune -o \
-        -type f -name '*.cs' -exec grep -lE "$pattern" {} + 2>/dev/null)" ]
-}
-
 # Defaults (emitted when the workspace is not an Aspire app)
 IS_ASPIRE="false"
 APPHOST_PATH=""
-APPHOST_DIR=""
-HAS_EXCLUDE_FROM_MANIFEST="false"
-HAS_FUNCTIONS="false"
-SECRET_STORAGE_CONFIGURED="false"
 
 # Step 1: Find the AppHost project (case-insensitive sort for deterministic,
 # cross-shell-consistent selection)
@@ -81,32 +66,11 @@ fi
 
 if [ -n "$APPHOST_RAW" ]; then
     APPHOST_PATH=$(to_relative "$APPHOST_RAW")
-
-    # Step 3: Derive the AppHost source directory (scan the real path on disk)
-    APPHOST_DIR=$(dirname "$APPHOST_PATH")
-    APPHOST_DIR_RAW=$(dirname "$APPHOST_RAW")
-
-    # Step 4: Scan the AppHost source for ExcludeFromManifest (informational)
-    if cs_match "$APPHOST_DIR_RAW" "ExcludeFromManifest"; then
-        HAS_EXCLUDE_FROM_MANIFEST="true"
-    fi
-
-    # Step 5: Detect Azure Functions and secret-storage configuration
-    if cs_match "$APPHOST_DIR_RAW" "AddAzureFunctionsProject"; then
-        HAS_FUNCTIONS="true"
-        if cs_match "$APPHOST_DIR_RAW" "AzureWebJobsSecretStorageType"; then
-            SECRET_STORAGE_CONFIGURED="true"
-        fi
-    fi
 fi
 
 # Machine-readable result
 echo "isAspire=$IS_ASPIRE"
 echo "appHostPath=$APPHOST_PATH"
-echo "appHostDir=$APPHOST_DIR"
-echo "hasExcludeFromManifest=$HAS_EXCLUDE_FROM_MANIFEST"
-echo "hasFunctions=$HAS_FUNCTIONS"
-echo "secretStorageConfigured=$SECRET_STORAGE_CONFIGURED"
 
 # Human-readable summary
 echo ""
@@ -118,23 +82,7 @@ fi
 
 if [ -n "$APPHOST_PATH" ]; then
     echo "- .NET Aspire app detected. AppHost project: $APPHOST_PATH"
-    echo "- AppHost source directory: $APPHOST_DIR"
 else
     echo "- Aspire.Hosting / Aspire.AppHost.Sdk package reference found, but no *.AppHost.csproj was located."
 fi
-
-if [ "$HAS_EXCLUDE_FROM_MANIFEST" = "true" ]; then
-    echo "- ExcludeFromManifest found in AppHost source (informational): the app may contain local-only resources."
-else
-    echo "- No ExcludeFromManifest usage found in AppHost source."
-fi
-
-if [ "$HAS_FUNCTIONS" = "true" ]; then
-    if [ "$SECRET_STORAGE_CONFIGURED" = "true" ]; then
-        echo "- AddAzureFunctionsProject found; AzureWebJobsSecretStorageType is configured in the AppHost source."
-    else
-        echo "- AddAzureFunctionsProject found; AzureWebJobsSecretStorageType is not configured in the AppHost source."
-    fi
-else
-    echo "- AddAzureFunctionsProject not found in AppHost source."
-fi
+echo "- Run gather-aspire-info.sh for AppHost source dir, ExcludeFromManifest, and Azure Functions details."