Make setup-gh-aw install idempotent when gh-aw is already available

pkg/workflow/agentic_workflow_test.go

@@ -158,8 +158,10 @@ func TestAgenticWorkflowsInstallStepIncludesGHToken(t *testing.T) {
 	// Verify the install commands are present
 	assert.Contains(t, result, "gh extension install github/gh-aw",
 		"install step should include command to install gh-aw extension")
-	assert.Contains(t, result, "if gh extension list | grep -qE '(^|[[:space:]]|/)gh-aw($|[[:space:]]|$)'; then",
-		"install step should detect both github/gh-aw and local gh-aw extension registrations")
+	assert.Contains(t, result, "if gh aw --version >/dev/null 2>&1; then",
+		"install step should detect when the gh-aw command is already available")
+	assert.Contains(t, result, "if gh extension list | grep -qE '(^|[[:space:]]|/)gh-aw($|[[:space:]])'; then",
+		"install step should detect managed gh-aw extension registrations for best-effort upgrades")
 	assert.Contains(t, result, "gh aw --version",
 		"install step should include command to verify gh-aw installation")
 

pkg/workflow/mcp_setup_generator.go

@@ -196,10 +196,13 @@ func generateAgenticWorkflowsInstallStep(yaml *strings.Builder, hasAgenticWorkfl
 	yaml.WriteString("        env:\n")
 	fmt.Fprintf(yaml, "          GH_TOKEN: %s\n", effectiveToken)
 	yaml.WriteString("        run: |\n")
-	yaml.WriteString("          # Check if gh-aw extension is already installed\n")
-	yaml.WriteString("          if gh extension list | grep -qE '(^|[[:space:]]|/)gh-aw($|[[:space:]]|$)'; then\n")
-	yaml.WriteString("            echo \"gh-aw extension already installed, upgrading...\"\n")
-	yaml.WriteString("            gh extension upgrade gh-aw || true\n")
+	yaml.WriteString("          # Check if gh-aw command is already available (extension or standalone binary)\n")
+	yaml.WriteString("          if gh aw --version >/dev/null 2>&1; then\n")
+	yaml.WriteString("            echo \"gh-aw command already available, using existing install\"\n")
+	yaml.WriteString("            # If installed as a managed extension, attempt best-effort upgrade\n")
+	yaml.WriteString("            if gh extension list | grep -qE '(^|[[:space:]]|/)gh-aw($|[[:space:]])'; then\n")
+	yaml.WriteString("              gh extension upgrade gh-aw || true\n")
+	yaml.WriteString("            fi\n")
 	yaml.WriteString("          else\n")
 	yaml.WriteString("            echo \"Installing gh-aw extension...\"\n")
 	yaml.WriteString("            gh extension install github/gh-aw\n")

pkg/workflow/testdata/TestWasmGolden_CompileFixtures/smoke-copilot.golden

@@ -520,10 +520,13 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
         run: |
-          # Check if gh-aw extension is already installed
-          if gh extension list | grep -qE '(^|[[:space:]]|/)gh-aw($|[[:space:]]|$)'; then
-            echo "gh-aw extension already installed, upgrading..."
-            gh extension upgrade gh-aw || true
+          # Check if gh-aw command is already available (extension or standalone binary)
+          if gh aw --version >/dev/null 2>&1; then
+            echo "gh-aw command already available, using existing install"
+            # If installed as a managed extension, attempt best-effort upgrade
+            if gh extension list | grep -qE '(^|[[:space:]]|/)gh-aw($|[[:space:]])'; then
+              gh extension upgrade gh-aw || true
+            fi
           else
             echo "Installing gh-aw extension..."
             gh extension install github/gh-aw