edsger 0.26.3 → 0.26.4

package/dist/phases/branch-planning/prompts.js

@@ -25,9 +25,11 @@ The \`dev/\` prefix indicates this is a development branch. A PR will be created
 
 Feature ID for this feature: ${featureId}
 
-## Output Format
+## CRITICAL - Output Format
 
-You MUST respond with a valid JSON object in this exact format:
+You MUST return ONLY a JSON object with your branch planning results.
+Do NOT include any explanatory text, summary, or commentary before or after the JSON.
+Return ONLY the JSON in this EXACT format:
 
 \`\`\`json
 {

package/dist/phases/pr-splitting/index.js

@@ -269,78 +269,48 @@ async function executeAgentQuery(userPrompt, systemPrompt, config, verbose) {
     };
 }
 /**
- * Parse JSON response from Claude
+ * Extract a balanced JSON object starting from a given index using brace counting.
+ * Handles nested braces and strings with escaped characters correctly.
  */
-function parseJsonResponse(responseText, verbose) {
-    // Try to extract JSON from markdown code block
-    const jsonBlockMatch = responseText.match(/```json\s*\n([\s\S]*?)\n\s*```/);
-    if (jsonBlockMatch) {
-        try {
-            const parsed = JSON.parse(jsonBlockMatch[1]);
-            if (parsed.pr_splitting_result) {
-                return {
-                    pullRequests: parsed.pr_splitting_result.pull_requests || [],
-                    summary: parsed.pr_splitting_result.summary,
-                    rationale: parsed.pr_splitting_result.rationale,
-                };
-            }
-            if (parsed.pull_requests) {
-                return {
-                    pullRequests: parsed.pull_requests,
-                    summary: parsed.summary,
-                    rationale: parsed.rationale,
-                };
-            }
-            return parsed;
+function extractBalancedJson(text, startIndex) {
+    if (text[startIndex] !== '{')
+        return null;
+    let braceCount = 0;
+    let inString = false;
+    let escape = false;
+    for (let i = startIndex; i < text.length; i++) {
+        const ch = text[i];
+        if (escape) {
+            escape = false;
+            continue;
         }
-        catch (e) {
-            if (verbose) {
-                logError(`Failed to parse JSON from code block: ${e}`);
-            }
+        if (ch === '\\' && inString) {
+            escape = true;
+            continue;
         }
-    }
-    // Try to find JSON object containing "pr_splitting_result"
-    const resultMatch = responseText.match(/\{[\s\S]*"pr_splitting_result"[\s\S]*\}/);
-    if (resultMatch) {
-        try {
-            let braceCount = 0;
-            let startIndex = -1;
-            let endIndex = -1;
-            for (let i = 0; i < responseText.length; i++) {
-                if (responseText[i] === '{') {
-                    if (startIndex === -1)
-                        startIndex = i;
-                    braceCount++;
-                }
-                else if (responseText[i] === '}') {
-                    braceCount--;
-                    if (braceCount === 0 && startIndex !== -1) {
-                        endIndex = i;
-                        break;
-                    }
-                }
-            }
-            if (startIndex !== -1 && endIndex !== -1) {
-                const jsonStr = responseText.substring(startIndex, endIndex + 1);
-                const parsed = JSON.parse(jsonStr);
-                if (parsed.pr_splitting_result) {
-                    return {
-                        pullRequests: parsed.pr_splitting_result.pull_requests || [],
-                        summary: parsed.pr_splitting_result.summary,
-                        rationale: parsed.pr_splitting_result.rationale,
-                    };
-                }
-            }
+        if (ch === '"') {
+            inString = !inString;
+            continue;
         }
-        catch (e) {
-            if (verbose) {
-                logError(`Failed to extract JSON from response: ${e}`);
+        if (inString)
+            continue;
+        if (ch === '{')
+            braceCount++;
+        else if (ch === '}') {
+            braceCount--;
+            if (braceCount === 0) {
+                return text.substring(startIndex, i + 1);
             }
         }
     }
-    // Try to parse the entire response as JSON
+    return null;
+}
+/**
+ * Try to parse a JSON string and extract PR splitting result
+ */
+function tryParsePRResult(jsonStr) {
     try {
-        const parsed = JSON.parse(responseText);
+        const parsed = JSON.parse(jsonStr);
         if (parsed.pr_splitting_result) {
             return {
                 pullRequests: parsed.pr_splitting_result.pull_requests || [],
@@ -355,12 +325,73 @@ function parseJsonResponse(responseText, verbose) {
                 rationale: parsed.rationale,
             };
         }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Parse JSON response from Claude
+ * Handles: JSON in code blocks, raw JSON mixed with markdown, pure JSON
+ */
+function parseJsonResponse(responseText, verbose) {
+    // Strategy 1: Find JSON code blocks and try each one (handles multiple code blocks)
+    const codeBlockRegex = /```(?:json)?\s*\n([\s\S]*?)\n\s*```/g;
+    let match;
+    while ((match = codeBlockRegex.exec(responseText)) !== null) {
+        const content = match[1].trim();
+        if (content.startsWith('{')) {
+            const result = tryParsePRResult(content);
+            if (result && result.pullRequests.length > 0) {
+                return result;
+            }
+        }
     }
-    catch (e) {
-        if (verbose) {
-            logError(`Failed to parse response as JSON: ${e}`);
+    // Strategy 2: Find "pr_splitting_result" and extract the enclosing JSON object
+    // Walk backwards from the keyword to find the outermost opening brace
+    const keyword = '"pr_splitting_result"';
+    const keywordIndex = responseText.indexOf(keyword);
+    if (keywordIndex !== -1) {
+        // Find the opening { before the keyword
+        for (let i = keywordIndex - 1; i >= 0; i--) {
+            if (responseText[i] === '{') {
+                const jsonStr = extractBalancedJson(responseText, i);
+                if (jsonStr) {
+                    const result = tryParsePRResult(jsonStr);
+                    if (result && result.pullRequests.length > 0) {
+                        return result;
+                    }
+                }
+                break;
+            }
         }
     }
+    // Strategy 3: Find any { that starts a JSON object with "pull_requests" key
+    const pullRequestsKeyword = '"pull_requests"';
+    const prIndex = responseText.indexOf(pullRequestsKeyword);
+    if (prIndex !== -1) {
+        for (let i = prIndex - 1; i >= 0; i--) {
+            if (responseText[i] === '{') {
+                const jsonStr = extractBalancedJson(responseText, i);
+                if (jsonStr) {
+                    const result = tryParsePRResult(jsonStr);
+                    if (result && result.pullRequests.length > 0) {
+                        return result;
+                    }
+                }
+                break;
+            }
+        }
+    }
+    // Strategy 4: Try to parse the entire response as JSON
+    const result = tryParsePRResult(responseText.trim());
+    if (result) {
+        return result;
+    }
+    if (verbose) {
+        logError(`Failed to extract PR splitting JSON from response (length: ${responseText.length})`);
+    }
     return null;
 }
 // Re-export types and functions for external use

package/dist/phases/pr-splitting/prompts.js

@@ -30,9 +30,11 @@ Branch names MUST follow this pattern:
 - \`pr/${featureId}/2-{short-description}\`
 - etc.
 
-## Output Format
+## CRITICAL - Output Format
 
-You MUST respond with a valid JSON object in this exact format:
+You MUST return ONLY a JSON object with your PR splitting results.
+Do NOT include any explanatory text, summary, or commentary before or after the JSON.
+Return ONLY the JSON in this EXACT format:
 
 \`\`\`json
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edsger",
-  "version": "0.26.3",
+  "version": "0.26.4",
   "type": "module",
   "bin": {
     "edsger": "dist/index.js"