Improve enhancement label handling and issue update

Refactor enhancement label check and update issue body formatting.

Author: htilly

.github/workflows/feature-request-enhance.yml

@@ -16,12 +16,8 @@ jobs:
         run: |
           set -e
 
-          if [ "${{ github.event.action }}" = "labeled" ]; then
-            if [ "${{ github.event.label.name }}" = "enhancement" ]; then
-              echo "has_enhancement=true" >> "$GITHUB_OUTPUT"
-            else
-              echo "has_enhancement=false" >> "$GITHUB_OUTPUT"
-            fi
+          if [ "${{ github.event.action }}" = "labeled" ] && [ "${{ github.event.label.name }}" = "enhancement" ]; then
+            echo "has_enhancement=true" >> "$GITHUB_OUTPUT"
           else
             LABELS="${{ join(github.event.issue.labels.*.name, ',') }}"
             if [ -n "$LABELS" ] && echo "$LABELS" | grep -q "enhancement"; then
@@ -31,6 +27,7 @@ jobs:
             fi
           fi
 
+
       - name: Check if issue already enhanced
         id: check_enhanced
         run: |
@@ -142,41 +139,55 @@ jobs:
         run: |
           set -euo pipefail
 
+          # Ensure jq exists
           if ! command -v jq >/dev/null; then
             sudo apt-get update
             sudo apt-get install -y jq
           fi
 
+          # Fetch original issue body (as-is)
           ORIGINAL=$(curl -s \
-            -H "Authorization: token $GITHUB_TOKEN" \
-            -H "Accept: application/vnd.github+json" \
-            "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}" \
-            | jq -r '.body // ""')
-
-          BODY=$(jq -n \
-            --arg enhanced "$ENHANCED" \
-            --arg original "$ORIGINAL" \
-            --arg confluence "$CONFLUENCE_URL" \
-            --arg requester "${{ github.event.issue.user.login }}" \
-            --arg created "${{ github.event.issue.created_at }}" \
-            '"## 📝 Enhanced Feature Request\n\n"
-             + $enhanced
-             + "\n\n---\n\n📄 **Requirements documented:** "
-             + $confluence
-             + "\n\n---\n\n## 📋 Original Request\n\n"
-             + $original
-             + "\n\n---\n\n**Requested by:** "
-             + $requester
-             + "\n**Created:** "
-             + $created')
+          -H "Authorization: token $GITHUB_TOKEN" \
+          -H "Accept: application/vnd.github+json" \
+          "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}" \
+          | jq -r '.body | split("## 📝 Enhanced Feature Request")[0] // ""')
+
+
+          # Build Markdown body (NO escaped \n, real newlines)
+          MARKDOWN=$(cat <<EOF
+## 📝 Enhanced Feature Request
+
+$ENHANCED
 
+---
+
+📄 **Requirements documented:** ${CONFLUENCE_URL:-_Not available_}
+
+---
+
+## 📋 Original Request
+
+$ORIGINAL
+
+---
+
+**Requested by:** ${{ github.event.issue.user.login }}
+**Created:** ${{ github.event.issue.created_at }}
+EOF
+)
+
+          # Update the issue
           curl -X PATCH \
             -H "Authorization: token $GITHUB_TOKEN" \
             -H "Accept: application/vnd.github+json" \
             -H "Content-Type: application/json" \
-            -d "$(jq -n --arg body "$BODY" '{body:$body}')" \
+            -d "$(jq -n --arg body "$MARKDOWN" '{body:$body}')" \
             "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}"
 
+          echo "✅ Issue updated with enhanced + original content"
+
+
+
   add-comment:
     runs-on: ubuntu-latest
     needs: update-issue