@workermill/agent 0.7.10 → 0.7.12

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
 // ============================================================================
@@ -138,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/dist/spawner.js

@@ -280,6 +280,7 @@ export async function spawnWorker(task, config, orgConfig, credentials) {
         process: proc,
         startedAt: new Date(),
         status: "running",
+        resultEmitted: false,
     };
     activeContainers.set(task.id, container);
     // Stream stdout/stderr to console (logs go to cloud via container's own HTTP calls)
@@ -287,6 +288,10 @@ export async function spawnWorker(task, config, orgConfig, credentials) {
         const lines = data.toString().split("\n").filter((l) => l.trim());
         for (const line of lines) {
             console.log(`${ts()} ${taskLabel} ${chalk.dim(line)}`);
+            // Track if worker emitted ::result:: marker (means it called worker-complete itself)
+            if (line.includes("::result::")) {
+                container.resultEmitted = true;
+            }
         }
     });
     proc.stderr?.on("data", (data) => {
@@ -302,8 +307,41 @@ export async function spawnWorker(task, config, orgConfig, credentials) {
         const icon = code === 0 ? chalk.green("✓") : chalk.red("✗");
         const status = code === 0 ? chalk.green("completed") : chalk.red(`failed (exit ${code})`);
         console.log(`${ts()} ${taskLabel} ${icon} Container ${status} ${chalk.dim(`(${duration}s)`)}`);
-        // Clean up after delay
-        setTimeout(() => activeContainers.delete(task.id), 60_000);
+        // Safety net: if worker didn't emit ::result::, it may have died without calling worker-complete.
+        // Wait briefly for any in-flight API calls, then POST a fallback completion.
+        if (!container.resultEmitted) {
+            console.log(`${ts()} ${taskLabel} ${chalk.yellow("⚠")} No ::result:: marker seen — posting fallback completion in 15s`);
+            setTimeout(async () => {
+                try {
+                    const fallbackResult = code === 0 ? "completed" : "failed";
+                    const errorMsg = code !== 0 ? `Worker container exited with code ${code} without reporting completion` : undefined;
+                    const resp = await fetch(`${config.apiUrl}/api/tasks/${task.id}/worker-complete`, {
+                        method: "POST",
+                        headers: {
+                            "Content-Type": "application/json",
+                            "x-api-key": config.apiKey,
+                        },
+                        body: JSON.stringify({
+                            exitCode: code ?? 1,
+                            result: fallbackResult,
+                            errorMessage: errorMsg,
+                        }),
+                    });
+                    const data = await resp.json();
+                    if (data.status === "ignored") {
+                        console.log(`${ts()} ${taskLabel} ${chalk.dim("Fallback completion ignored (task already transitioned)")}`);
+                    }
+                    else {
+                        console.log(`${ts()} ${taskLabel} ${chalk.yellow("⚠")} Fallback completion applied: ${fallbackResult}`);
+                    }
+                }
+                catch (err) {
+                    console.error(`${ts()} ${taskLabel} ${chalk.red("✗")} Fallback completion failed:`, err instanceof Error ? err.message : err);
+                }
+            }, 15_000);
+        }
+        // Clean up after delay (extended to allow fallback completion to finish)
+        setTimeout(() => activeContainers.delete(task.id), 90_000);
     });
     proc.on("error", (err) => {
         container.status = "failed";
@@ -444,6 +482,7 @@ export async function spawnManagerWorker(task, config, credentials) {
         process: proc,
         startedAt: new Date(),
         status: "running",
+        resultEmitted: false,
     };
     activeContainers.set(managerKey, container);
     proc.stdout?.on("data", (data) => {

package/package.json

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