the cagent-output fence may not always be at the start of the response (#38)

Author: derekmisler

.github/workflows/pr-describe.yml

@@ -171,18 +171,26 @@ jobs:
             const prNumber = ${{ steps.validate_pr.outputs.pr_number }};
             const descriptionFile = '${{ steps.generate.outputs.output-file }}';
 
-            // Read generated description
-            const description = fs.readFileSync(descriptionFile, 'utf8');
-
-            // Update PR body
-            await github.rest.pulls.update({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: prNumber,
-              body: description
-            });
+            try {
+              // Read generated description and extract cagent-output block if present.
+              // The composite action should already clean this, but the agent may
+              // emit conversational text before the code fence that slips through.
+              const raw = fs.readFileSync(descriptionFile, 'utf8');
+              const match = raw.match(/```cagent-output[\s\S]*?\n([\s\S]*?)```/);
+              const description = match ? match[1].trim() : raw.trim();
+
+              // Update PR body
+              await github.rest.pulls.update({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: prNumber,
+                body: description
+              });
 
-            console.log(`✅ Updated PR #${prNumber} with generated description`);
+              console.log(`✅ Updated PR #${prNumber} with generated description`);
+            } catch (error) {
+              core.setFailed(`❌ Failed to update PR description: ${error.message}`);
+            }
 
       - name: Post success comment
         if: ${{ steps.generate.conclusion == 'success' }}

action.yml

@@ -594,10 +594,14 @@ runs:
         echo "🧹 Extracting clean agent output..."
 
         # Primary method: Extract from cagent-output code block (most reliable)
-        if grep -q '^```cagent-output' "$OUTPUT_FILE"; then
-          awk '/^```cagent-output$/,/^```$/ {
-            if (!/^```cagent-output$/ && !/^```$/) print
-          }' "$OUTPUT_FILE" > "${OUTPUT_FILE}.clean"
+        # Note: the code fence may not be at the start of a line if the agent
+        # emits conversational text before it, so we avoid anchoring with ^.
+        if grep -q '```cagent-output' "$OUTPUT_FILE"; then
+          awk '
+            /```cagent-output/ { capturing=1; next }
+            capturing && /^```/ { capturing=0; next }
+            capturing { print }
+          ' "$OUTPUT_FILE" > "${OUTPUT_FILE}.clean"
           echo "✅ Extracted clean output from cagent-output code block"
         else
           # Use awk to filter out thinking blocks, tool calls, and internal markers

tests/test-output-extraction.sh

@@ -31,10 +31,12 @@ Scanned 15 commits from the past 2 days. No security vulnerabilities were identi
 EOF
 
 # Extract using the primary method
-if grep -q '^```cagent-output' "$TEST_DIR/output1.log"; then
-  awk '/^```cagent-output$/,/^```$/ {
-    if (!/^```cagent-output$/ && !/^```$/) print
-  }' "$TEST_DIR/output1.log" > "$TEST_DIR/output1.clean"
+if grep -q '```cagent-output' "$TEST_DIR/output1.log"; then
+  awk '
+    /```cagent-output/ { capturing=1; next }
+    capturing && /^```/ { capturing=0; next }
+    capturing { print }
+  ' "$TEST_DIR/output1.log" > "$TEST_DIR/output1.clean"
   echo "✅ Extraction successful"
 else
   echo "❌ cagent-output block not found"
@@ -44,6 +46,52 @@ echo "Cleaned output:"
 cat "$TEST_DIR/output1.clean"
 echo ""
 
+# Test Case 1b: Code fence NOT at start of line (agent emits thoughts before it)
+echo ""
+echo "Test 1b: Extracting cagent-output when code fence is mid-line"
+echo "---"
+cat > "$TEST_DIR/output1b.log" <<'EOF'
+For any feedback, please visit: https://docker.qualtrics.com/jfe/form/SV_cNsCIg92nQemlfw
+
+time=2025-11-05T21:22:35.664Z level=WARN msg="rootSessionID not set"
+
+--- Agent: root ---
+
+I'll analyze the PR by reading the actual diff and related files to generate a comprehensive description.```cagent-output
+## Summary
+
+Implements automated PR review functionality.
+
+## Changes
+
+### Added
+- New workflow file
+```
+EOF
+
+if grep -q '```cagent-output' "$TEST_DIR/output1b.log"; then
+  awk '
+    /```cagent-output/ { capturing=1; next }
+    capturing && /^```/ { capturing=0; next }
+    capturing { print }
+  ' "$TEST_DIR/output1b.log" > "$TEST_DIR/output1b.clean"
+  echo "✅ Extraction successful"
+else
+  echo "❌ cagent-output block not found"
+fi
+
+echo "Cleaned output:"
+cat "$TEST_DIR/output1b.clean"
+echo ""
+
+# Verify no agent thoughts leaked through
+if grep -q "I'll analyze" "$TEST_DIR/output1b.clean"; then
+  echo "❌ FAIL: Agent thoughts leaked into clean output"
+  exit 1
+else
+  echo "✅ Agent thoughts correctly excluded"
+fi
+
 # Test Case 2: Fallback - Extract after agent marker
 echo ""
 echo "Test 2: Fallback extraction after agent marker"