@workermill/agent 0.7.9 → 0.7.11

package/dist/plan-validator.d.ts

@@ -39,7 +39,7 @@ export interface CriticResult {
         suggestedChanges?: string[];
     }>;
 }
-declare const AUTO_APPROVAL_THRESHOLD = 80;
+declare const AUTO_APPROVAL_THRESHOLD = 85;
 /**
  * Parse execution plan JSON from raw Claude CLI output.
  * Mirrors server-side parseExecutionPlan() in planning-agent-local.ts.
@@ -61,6 +61,18 @@ export declare function applyStoryCap(plan: ExecutionPlan, maxStories: number):
     droppedCount: number;
     details: string[];
 };
+/**
+ * Resolve file overlaps by assigning each shared file to exactly one story.
+ * When multiple stories list the same targetFile, the first story keeps it
+ * and it's removed from subsequent stories. This prevents parallel merge
+ * conflicts during consolidation — same auto-fix pattern as applyFileCap.
+ *
+ * Returns details about resolved overlaps for logging.
+ */
+export declare function resolveFileOverlaps(plan: ExecutionPlan): {
+    resolvedCount: number;
+    details: string[];
+};
 /**
  * Re-serialize plan as a JSON code block for posting to the API.
  * The server-side parseExecutionPlan() expects ```json ... ``` blocks.

package/dist/plan-validator.js

@@ -16,7 +16,7 @@ import { generateText } from "./providers.js";
 // CONSTANTS
 // ============================================================================
 const MAX_TARGET_FILES = 5;
-const AUTO_APPROVAL_THRESHOLD = 80;
+const AUTO_APPROVAL_THRESHOLD = 85;
 // ============================================================================
 // PLAN PARSING
 // ============================================================================
@@ -25,16 +25,73 @@ const AUTO_APPROVAL_THRESHOLD = 80;
  * Mirrors server-side parseExecutionPlan() in planning-agent-local.ts.
  */
 export function parseExecutionPlan(output) {
-    const jsonMatch = output.match(/```json\s*([\s\S]*?)\s*```/);
-    if (jsonMatch) {
-        return JSON.parse(jsonMatch[1]);
+    // Strategy 1: Find ```json ... ``` block using bracket-matching instead of regex.
+    // The lazy regex ([\s\S]*?) fails when JSON string values contain ``` (e.g., code
+    // blocks in story descriptions from PRDs with CI/CD YAML examples).
+    const jsonFenceStart = output.indexOf("```json");
+    if (jsonFenceStart !== -1) {
+        // Find the opening { after ```json
+        const searchFrom = jsonFenceStart + 7; // length of "```json"
+        const braceStart = output.indexOf("{", searchFrom);
+        if (braceStart !== -1) {
+            const extracted = extractBalancedJson(output, braceStart);
+            if (extracted) {
+                return JSON.parse(extracted);
+            }
+        }
     }
-    const rawJsonMatch = output.match(/\{[\s\S]*"stories"[\s\S]*\}/);
-    if (rawJsonMatch) {
-        return JSON.parse(rawJsonMatch[0]);
+    // Strategy 2: Find raw JSON with "stories" key using bracket-matching
+    const storiesIdx = output.indexOf('"stories"');
+    if (storiesIdx !== -1) {
+        // Walk backwards to find the opening {
+        const before = output.substring(0, storiesIdx);
+        const braceStart = before.lastIndexOf("{");
+        if (braceStart !== -1) {
+            const extracted = extractBalancedJson(output, braceStart);
+            if (extracted) {
+                return JSON.parse(extracted);
+            }
+        }
     }
     throw new Error("Could not find JSON execution plan in output");
 }
+/**
+ * Extract a balanced JSON object from a string starting at the given position.
+ * Properly handles nested braces, strings with escaped characters, and code
+ * blocks embedded in JSON string values (which contain triple backticks).
+ */
+function extractBalancedJson(text, start) {
+    let depth = 0;
+    let inString = false;
+    let escape = false;
+    for (let i = start; i < text.length; i++) {
+        const ch = text[i];
+        if (escape) {
+            escape = false;
+            continue;
+        }
+        if (ch === "\\") {
+            if (inString)
+                escape = true;
+            continue;
+        }
+        if (ch === '"') {
+            inString = !inString;
+            continue;
+        }
+        if (inString)
+            continue;
+        if (ch === "{")
+            depth++;
+        else if (ch === "}") {
+            depth--;
+            if (depth === 0) {
+                return text.substring(start, i + 1);
+            }
+        }
+    }
+    return null; // Unbalanced
+}
 // ============================================================================
 // FILE CAP
 // ============================================================================
@@ -81,6 +138,45 @@ export function applyStoryCap(plan, maxStories) {
     return { droppedCount, details };
 }
 // ============================================================================
+// FILE OVERLAP VALIDATION
+// ============================================================================
+/**
+ * Resolve file overlaps by assigning each shared file to exactly one story.
+ * When multiple stories list the same targetFile, the first story keeps it
+ * and it's removed from subsequent stories. This prevents parallel merge
+ * conflicts during consolidation — same auto-fix pattern as applyFileCap.
+ *
+ * Returns details about resolved overlaps for logging.
+ */
+export function resolveFileOverlaps(plan) {
+    const fileOwner = new Map(); // file → first story that claims it
+    let resolvedCount = 0;
+    const details = [];
+    for (const story of plan.stories) {
+        if (!story.targetFiles || story.targetFiles.length === 0)
+            continue;
+        const kept = [];
+        const removed = [];
+        for (const file of story.targetFiles) {
+            const owner = fileOwner.get(file);
+            if (owner) {
+                // File already claimed by an earlier story — remove from this one
+                removed.push(file);
+            }
+            else {
+                fileOwner.set(file, story.id);
+                kept.push(file);
+            }
+        }
+        if (removed.length > 0) {
+            story.targetFiles = kept;
+            resolvedCount += removed.length;
+            details.push(`${story.id}: removed ${removed.join(", ")} (owned by ${removed.map((f) => fileOwner.get(f)).join(", ")})`);
+        }
+    }
+    return { resolvedCount, details };
+}
+// ============================================================================
 // PLAN SERIALIZATION
 // ============================================================================
 /**

package/dist/planner.js

@@ -19,7 +19,7 @@ import ora from "ora";
 import { spawn, execSync } from "child_process";
 import { findClaudePath } from "./config.js";
 import { api } from "./api.js";
-import { parseExecutionPlan, applyFileCap, applyStoryCap, serializePlan, runCriticValidation, formatCriticFeedback, AUTO_APPROVAL_THRESHOLD, } from "./plan-validator.js";
+import { parseExecutionPlan, applyFileCap, applyStoryCap, resolveFileOverlaps, serializePlan, runCriticValidation, formatCriticFeedback, AUTO_APPROVAL_THRESHOLD, } from "./plan-validator.js";
 import { generateTextWithTools } from "./ai-sdk-generate.js";
 /** Max Planner-Critic iterations before giving up */
 const MAX_ITERATIONS = 3;
@@ -881,6 +881,16 @@ export async function planTask(task, config, credentials) {
                     console.log(`${ts()} ${taskLabel}   ${chalk.dim(detail)}`);
                 }
             }
+            // 2c3. Resolve file overlaps (assign each shared file to first story only)
+            const { resolvedCount: overlapCount, details: overlapDetails } = resolveFileOverlaps(plan);
+            if (overlapCount > 0) {
+                const msg = `${PREFIX} File overlap resolved: ${overlapCount} shared file(s) de-duped across stories`;
+                console.log(`${ts()} ${taskLabel} ${chalk.yellow("⚠")} ${msg}`);
+                await postLog(task.id, msg);
+                for (const detail of overlapDetails) {
+                    console.log(`${ts()} ${taskLabel}   ${chalk.dim(detail)}`);
+                }
+            }
             console.log(`${ts()} ${taskLabel} Plan: ${chalk.bold(plan.stories.length)} stories (max ${maxStories})`);
             await postLog(task.id, `${PREFIX} Plan generated: ${plan.stories.length} stories (${formatElapsed(elapsed)}). Running critic validation...`);
             // 2d. Run critic validation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workermill/agent",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "description": "WorkerMill Remote Agent - Run AI workers locally with your Claude Max subscription",
   "type": "module",
   "main": "./dist/index.js",