edsger 0.35.1 → 0.35.2

package/dist/phases/app-store-generation/agent.js

@@ -1,3 +1,5 @@
+import { readFileSync, readdirSync } from 'node:fs';
+import { join } from 'node:path';
 import { query } from '@anthropic-ai/claude-agent-sdk';
 import { DEFAULT_MODEL } from '../../constants.js';
 import { logDebug, logError, logInfo } from '../../utils/logger.js';
@@ -8,12 +10,33 @@ function parseAppStoreResult(responseText) {
     try {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let jsonResult = null;
-        // Try to extract JSON from markdown code block
-        const jsonBlockMatch = responseText.match(/```json\s*\n([\s\S]*?)\n\s*```/);
-        if (jsonBlockMatch) {
-            jsonResult = JSON.parse(jsonBlockMatch[1]);
+        // Try to extract JSON from markdown code block (check all occurrences, prefer last)
+        const jsonBlockMatches = [...responseText.matchAll(/```json\s*\n([\s\S]*?)\n\s*```/g)];
+        for (let i = jsonBlockMatches.length - 1; i >= 0; i--) {
+            try {
+                const candidate = JSON.parse(jsonBlockMatches[i][1]);
+                if (candidate && candidate.app_store) {
+                    jsonResult = candidate;
+                    break;
+                }
+            }
+            catch {
+                // Try next match
+            }
         }
-        else {
+        if (!jsonResult) {
+            // Try to find a JSON object containing "app_store" anywhere in the text
+            const appStoreMatch = responseText.match(/\{[\s\S]*"app_store"\s*:\s*\{[\s\S]*\}/);
+            if (appStoreMatch) {
+                try {
+                    jsonResult = JSON.parse(appStoreMatch[0]);
+                }
+                catch {
+                    // Not valid JSON
+                }
+            }
+        }
+        if (!jsonResult) {
             // Try to parse the entire response as JSON
             jsonResult = JSON.parse(responseText);
         }
@@ -80,8 +103,22 @@ export async function executeAppStoreQuery(currentPrompt, systemPrompt, config,
                 const responseText = message.result || lastAssistantResponse;
                 const parsed = parseAppStoreResult(responseText);
                 if (parsed.error) {
-                    logError(`Failed to parse result: ${parsed.error}`);
-                    structuredResult = null;
+                    // Fallback: try accumulated assistant responses (may contain JSON code blocks)
+                    if (lastAssistantResponse && responseText !== lastAssistantResponse) {
+                        const fallback = parseAppStoreResult(lastAssistantResponse);
+                        if (!fallback.error) {
+                            logInfo('Parsed result from accumulated responses');
+                            structuredResult = fallback.appStore;
+                        }
+                        else {
+                            logError(`Failed to parse result: ${parsed.error}`);
+                            structuredResult = null;
+                        }
+                    }
+                    else {
+                        logError(`Failed to parse result: ${parsed.error}`);
+                        structuredResult = null;
+                    }
                 }
                 else {
                     structuredResult = parsed.appStore;
@@ -98,5 +135,36 @@ export async function executeAppStoreQuery(currentPrompt, systemPrompt, config,
             }
         }
     }
+    // File-based fallback: the agent may have written JSON to a file in the cwd
+    if (!structuredResult && cwd) {
+        structuredResult = tryParseJsonFilesInDir(cwd);
+        if (structuredResult) {
+            logInfo('Parsed result from JSON file written by agent');
+        }
+    }
     return structuredResult;
 }
+/**
+ * Search for JSON files in the given directory that contain an app_store key.
+ */
+function tryParseJsonFilesInDir(dir) {
+    try {
+        const files = readdirSync(dir).filter((f) => f.endsWith('.json'));
+        for (const file of files) {
+            try {
+                const content = readFileSync(join(dir, file), 'utf-8');
+                const parsed = parseAppStoreResult(content);
+                if (!parsed.error && parsed.appStore) {
+                    return parsed.appStore;
+                }
+            }
+            catch {
+                // Skip unreadable files
+            }
+        }
+    }
+    catch {
+        // Directory not readable
+    }
+    return null;
+}

package/package.json

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