@mestreyoda/fabrica 0.2.33 → 0.2.35

package/dist/index.js

@@ -113905,8 +113905,8 @@ import fsSync from "node:fs";
 import path5 from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function getCurrentVersion() {
-  if ("0.2.33") {
-    return "0.2.33";
+  if ("0.2.35") {
+    return "0.2.35";
   }
   try {
     const pkgPath = path5.join(THIS_DIR, "..", "..", "package.json");
@@ -127254,12 +127254,17 @@ function createWorkFinishTool(ctx) {
       if (role === "tester" && issueRuntime?.infraFailCount) {
         await updateIssueRuntime(workspaceDir, project.slug, issueId, { infraFailCount: 0 });
       }
-      if (issueRuntime && (issueRuntime.dispatchAttemptCount || issueRuntime.lastFailureReason || issueRuntime.lastDiagnosticResult || issueRuntime.lastDispatchedLevel)) {
+      if (issueRuntime && (issueRuntime.dispatchAttemptCount || issueRuntime.lastFailureReason || issueRuntime.lastDiagnosticResult || issueRuntime.lastDispatchedLevel || issueRuntime.lastConvergenceCause || issueRuntime.lastConvergenceAction || issueRuntime.lastConvergenceRetryCount || issueRuntime.lastConvergenceReason || issueRuntime.lastConvergenceAt)) {
         await updateIssueRuntime(workspaceDir, project.slug, issueId, {
           dispatchAttemptCount: 0,
           lastFailureReason: null,
           lastDiagnosticResult: null,
-          lastDispatchedLevel: null
+          lastDispatchedLevel: null,
+          lastConvergenceCause: null,
+          lastConvergenceAction: null,
+          lastConvergenceRetryCount: 0,
+          lastConvergenceReason: null,
+          lastConvergenceAt: null
         });
       }
       return jsonResult({
@@ -131234,6 +131239,74 @@ init_workflow();
 init_context3();
 init_labels();
 
+// lib/services/post-pr-convergence.ts
+init_types3();
+function classifyConvergenceCause(reason) {
+  const text = String(reason ?? "").toLowerCase();
+  if (!text) return "other";
+  if (text.includes("qa_gate_missing_") || text.includes("invalid qa evidence")) return "invalid_qa_evidence";
+  if (text.includes("merge conflict") || text.includes("pr_still_conflicting")) return "merge_conflict";
+  if (text.includes("stalled_with_artifact")) return "stalled_with_artifact";
+  if (text.includes("stalled_without_artifact")) return "stalled_without_artifact";
+  if (text.includes("invalid_execution_path")) return "invalid_execution_path";
+  if (text.includes("missing_result_line")) return "missing_result_line";
+  if (text.includes("missing_pr")) return "missing_pr";
+  if (text.includes("no longer targets issue") || text.includes("stale_pr_target")) return "stale_pr_target";
+  if (text.includes("new_pr_required")) return "new_pr_required";
+  if (text.includes("changes requested") || text.includes("review_feedback")) return "review_feedback";
+  if (text.includes("developer_validation_failed")) return "developer_validation_failed";
+  return "other";
+}
+function hasReviewableArtifact(issueRuntime) {
+  return Boolean(
+    issueRuntime?.currentPrUrl || issueRuntime?.currentPrNumber || issueRuntime?.artifactOfRecord?.prNumber
+  );
+}
+function getConvergenceRetryBudget(cause) {
+  switch (cause) {
+    case "invalid_qa_evidence":
+      return 2;
+    case "merge_conflict":
+    case "stalled_with_artifact":
+    case "stale_pr_target":
+    case "new_pr_required":
+      return 1;
+    case "invalid_execution_path":
+    case "missing_result_line":
+    case "stalled_without_artifact":
+    case "missing_pr":
+    case "review_feedback":
+    case "developer_validation_failed":
+    case "other":
+    default:
+      return 2;
+  }
+}
+function getPreferredHoldLabel(workflow) {
+  const holds = Object.values(workflow.states).filter((state) => state.type === StateType.HOLD);
+  if (holds.length === 0) return null;
+  return holds.find((state) => state.label === "Refining")?.label ?? holds[0]?.label ?? null;
+}
+function decidePostPrConvergence(params) {
+  const { workflow, issueRuntime, reason, feedbackQueueLabel } = params;
+  const cause = classifyConvergenceCause(reason);
+  const hasArtifact = hasReviewableArtifact(issueRuntime);
+  const previousCause = issueRuntime?.lastConvergenceCause ?? null;
+  const previousCount = issueRuntime?.lastConvergenceRetryCount ?? 0;
+  const retryCount = previousCause === cause ? previousCount + 1 : 1;
+  const maxRetries = getConvergenceRetryBudget(cause);
+  const holdLabel = getPreferredHoldLabel(workflow);
+  const shouldEscalate = hasArtifact && retryCount > maxRetries && Boolean(holdLabel);
+  return {
+    cause,
+    action: shouldEscalate ? "escalate_human" : "retry_feedback",
+    targetLabel: shouldEscalate ? holdLabel ?? feedbackQueueLabel : feedbackQueueLabel,
+    retryCount,
+    maxRetries,
+    hasArtifact
+  };
+}
+
 // lib/services/worker-completion.ts
 init_audit();
 import fs25 from "node:fs/promises";
@@ -131763,18 +131836,42 @@ async function applyWorkerResult(opts) {
     if (!validation.ok) {
       const validationReason = validation.reason ?? "developer_validation_failed";
       const feedbackQueueLabel = getQueueLabels(workflow, "developer").find((label) => isFeedbackState(workflow, label)) ?? "To Improve";
+      const convergence = decidePostPrConvergence({
+        workflow,
+        issueRuntime: context2.issueRuntime,
+        reason: validationReason,
+        feedbackQueueLabel
+      });
+      const blockedSummary = convergence.action === "escalate_human" ? [
+        "Automatic recovery escalated for human decision.",
+        "",
+        `Dominant cause: ${convergence.cause}`,
+        `Retry budget exceeded: ${convergence.retryCount}/${convergence.maxRetries}`,
+        "",
+        validationReason
+      ].join("\n") : `Automatic recovery: developer reported DONE but completion validation failed.
+
+${validationReason}`;
       await log(opts.workspaceDir, "worker_completion_skipped", {
         sessionKey: context2.project.workers[context2.parsed.role]?.levels?.[context2.slotLevel]?.[context2.slotIndex]?.sessionKey ?? null,
         projectSlug: context2.projectSlug,
         issueId: context2.issueId,
         role: context2.parsed.role,
         result: opts.result.value,
-        reason: validationReason
+        reason: validationReason,
+        convergenceCause: convergence.cause,
+        convergenceAction: convergence.action,
+        convergenceRetryCount: convergence.retryCount
       }).catch(() => {
       });
       await updateIssueRuntime(opts.workspaceDir, context2.projectSlug, context2.issueId, {
         inconclusiveCompletionAt: (/* @__PURE__ */ new Date()).toISOString(),
-        inconclusiveCompletionReason: validationReason
+        inconclusiveCompletionReason: validationReason,
+        lastConvergenceCause: convergence.cause,
+        lastConvergenceAction: convergence.action,
+        lastConvergenceRetryCount: convergence.retryCount,
+        lastConvergenceReason: validationReason,
+        lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString()
       }).catch(() => {
       });
       await executeCompletion({
@@ -131783,9 +131880,7 @@ async function applyWorkerResult(opts) {
         role: context2.parsed.role,
         result: "blocked",
         issueId: context2.issueId,
-        summary: `Automatic recovery: developer reported DONE but completion validation failed.
-
-${validationReason}`,
+        summary: blockedSummary,
         provider,
         repoPath,
         projectName: context2.project.name,
@@ -131794,7 +131889,7 @@ ${validationReason}`,
         workflow,
         level: context2.slotLevel,
         slotIndex: context2.slotIndex,
-        overrideToLabel: feedbackQueueLabel,
+        overrideToLabel: convergence.targetLabel,
         overrideReason: validationReason,
         runCommand: opts.runCommand
       });
@@ -131897,13 +131992,23 @@ ${validationReason}`,
     await updateIssueRuntime(opts.workspaceDir, context2.projectSlug, context2.issueId, {
       infraFailCount: 0,
       inconclusiveCompletionAt: null,
-      inconclusiveCompletionReason: null
+      inconclusiveCompletionReason: null,
+      lastConvergenceCause: null,
+      lastConvergenceAction: null,
+      lastConvergenceRetryCount: 0,
+      lastConvergenceReason: null,
+      lastConvergenceAt: null
     }).catch(() => {
     });
   } else {
     await updateIssueRuntime(opts.workspaceDir, context2.projectSlug, context2.issueId, {
       inconclusiveCompletionAt: null,
-      inconclusiveCompletionReason: null
+      inconclusiveCompletionReason: null,
+      lastConvergenceCause: null,
+      lastConvergenceAction: null,
+      lastConvergenceRetryCount: 0,
+      lastConvergenceReason: null,
+      lastConvergenceAt: null
     }).catch(() => {
     });
   }
@@ -132365,6 +132470,12 @@ async function checkWorkerHealth(opts) {
           }).catch(() => {
           });
         }
+        const convergence = decidePostPrConvergence({
+          workflow,
+          issueRuntime,
+          reason: inconclusiveReason,
+          feedbackQueueLabel: slotQueueLabel
+        });
         const fix = {
           issue: {
             type: executionContractRecovery ? "execution_contract_recovery_exhausted" : "completion_recovery_exhausted",
@@ -132392,8 +132503,8 @@ async function checkWorkerHealth(opts) {
               issueUrl: issue2.web_url,
               issueTitle: issue2.title,
               role,
-              detail: executionContractRecovery ? "Execution contract violation did not recover with a canonical completion result" : "No canonical completion result was produced after observable activity",
-              nextState: slotQueueLabel,
+              detail: convergence.action === "escalate_human" ? `Repeated post-PR recovery cause ${convergence.cause} exceeded retry budget (${convergence.retryCount}/${convergence.maxRetries}). Escalating for human decision.` : executionContractRecovery ? "Execution contract violation did not recover with a canonical completion result" : "No canonical completion result was produced after observable activity",
+              nextState: convergence.targetLabel,
               dispatchCycleId: slot.dispatchCycleId ?? issueRuntime?.lastDispatchCycleId ?? null,
               dispatchRunId: slot.dispatchRunId ?? issueRuntime?.dispatchRunId ?? null
             },
@@ -132410,12 +132521,17 @@ async function checkWorkerHealth(opts) {
             }
           ).catch(() => {
           });
-          await revertLabel(fix, expectedLabel, slotQueueLabel);
+          await revertLabel(fix, expectedLabel, convergence.targetLabel);
           if (!fix.labelRevertFailed) {
             await deactivateSlot();
             await updateIssueRuntime(workspaceDir, projectSlug, issueIdNum, {
               inconclusiveCompletionAt: null,
-              inconclusiveCompletionReason: null
+              inconclusiveCompletionReason: null,
+              lastConvergenceCause: convergence.cause,
+              lastConvergenceAction: convergence.action,
+              lastConvergenceRetryCount: convergence.retryCount,
+              lastConvergenceReason: inconclusiveReason,
+              lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString()
             }).catch(() => {
             });
             fix.fixed = true;
@@ -132430,16 +132546,16 @@ async function checkWorkerHealth(opts) {
                 slotIndex,
                 reason: inconclusiveReason,
                 fromLabel: expectedLabel,
-                toLabel: slotQueueLabel,
+                toLabel: convergence.targetLabel,
                 dispatchCycleId: slot.dispatchCycleId ?? issueRuntime?.lastDispatchCycleId ?? null,
                 dispatchRunId: slot.dispatchRunId ?? issueRuntime?.dispatchRunId ?? null
               }).catch(() => {
               });
             }
             await auditHealthFixApplied(workspaceDir, fix, {
-              action: "requeue_issue",
+              action: convergence.action === "escalate_human" ? "escalate_human" : "requeue_issue",
               fromLabel: expectedLabel,
-              toLabel: slotQueueLabel,
+              toLabel: convergence.targetLabel,
               deliveryState
             });
           }
@@ -132618,19 +132734,21 @@ async function checkWorkerHealth(opts) {
         const startedAtMs = new Date(slot.startTime).getTime();
         const minutesActive = (Date.now() - startedAtMs) / 6e4;
         const hours = minutesActive / 60;
-        let hasReviewableArtifact = Boolean(
+        let reviewablePrStatus = null;
+        let hasReviewableArtifact2 = Boolean(
           issueRuntime?.currentPrNumber || issueRuntime?.currentPrUrl || issueRuntime?.artifactOfRecord?.prNumber
         );
-        if (!hasReviewableArtifact && issueIdNum) {
+        if (issueIdNum) {
           try {
             const prStatus = await provider.getPrStatus(issueIdNum);
-            hasReviewableArtifact = Boolean(
-              prStatus.url && prStatus.state !== PrState.MERGED && prStatus.state !== PrState.CLOSED && prStatus.currentIssueMatch !== false
-            );
+            if (prStatus.url && prStatus.state !== PrState.MERGED && prStatus.state !== PrState.CLOSED && prStatus.currentIssueMatch !== false) {
+              reviewablePrStatus = prStatus;
+              hasReviewableArtifact2 = true;
+            }
           } catch {
           }
         }
-        if (role === "developer" && issue2 && issueIdNum && !hasReviewableArtifact && minutesActive >= Math.max(5, Math.floor(stallTimeoutMinutes / 2)) && !issueRuntime?.progressNotifiedAt) {
+        if (role === "developer" && issue2 && issueIdNum && !hasReviewableArtifact2 && minutesActive >= Math.max(5, Math.floor(stallTimeoutMinutes / 2)) && !issueRuntime?.progressNotifiedAt) {
           const channel = project.channels?.[0];
           await notify(
             {
@@ -132665,7 +132783,7 @@ async function checkWorkerHealth(opts) {
           }).catch(() => {
           });
         }
-        if (role === "developer" && issue2 && issueIdNum && !hasReviewableArtifact && minutesActive >= stallTimeoutMinutes) {
+        if (role === "developer" && issue2 && issueIdNum && !hasReviewableArtifact2 && minutesActive >= stallTimeoutMinutes) {
           const fix = {
             issue: {
               type: "completion_recovery_exhausted",
@@ -132729,6 +132847,89 @@ async function checkWorkerHealth(opts) {
           fixes.push(fix);
           continue;
         }
+        const quietMinutes = (() => {
+          const lastObservableAt = sessionKey ? getLastObservableSessionActivityAt(sessionKey, sessions) : null;
+          const referenceAt = lastObservableAt ?? agentAcceptedAt ?? dispatchRequestedAt ?? startedAtMs;
+          if (!referenceAt || Number.isNaN(referenceAt)) return minutesActive;
+          return (Date.now() - referenceAt) / 6e4;
+        })();
+        if (role === "developer" && issue2 && issueIdNum && hasReviewableArtifact2 && reviewablePrStatus?.url && minutesActive >= stallTimeoutMinutes && quietMinutes >= Math.max(8, Math.floor(stallTimeoutMinutes / 2))) {
+          const convergence = decidePostPrConvergence({
+            workflow,
+            issueRuntime,
+            reason: "stalled_with_artifact",
+            feedbackQueueLabel: slotQueueLabel
+          });
+          const fix = {
+            issue: {
+              type: "stalled_with_artifact",
+              severity: "critical",
+              project: project.name,
+              projectSlug,
+              role,
+              level,
+              sessionKey,
+              issueId: slot.issueId,
+              slotIndex,
+              message: `${role.toUpperCase()} ${level}[${slotIndex}] has an open PR but stayed idle for ${Math.round(quietMinutes)}m without converging`
+            },
+            fixed: false
+          };
+          if (autoFix) {
+            const channel = project.channels?.[0];
+            await notify(
+              {
+                type: "workerRecoveryExhausted",
+                project: project.name,
+                issueId: issueIdNum,
+                issueUrl: issue2.web_url,
+                issueTitle: issue2.title,
+                role,
+                detail: convergence.action === "escalate_human" ? `Open PR ${reviewablePrStatus.url} exceeded the retry budget for ${convergence.cause} (${convergence.retryCount}/${convergence.maxRetries}). Escalating for human decision.` : `Open PR ${reviewablePrStatus.url} has stalled for ${Math.round(quietMinutes)} minutes without a trustworthy completion. Re-queueing to ${slotQueueLabel}.`,
+                nextState: convergence.targetLabel,
+                dispatchCycleId: slot.dispatchCycleId ?? issueRuntime?.lastDispatchCycleId ?? null,
+                dispatchRunId: slot.dispatchRunId ?? issueRuntime?.dispatchRunId ?? null
+              },
+              {
+                workspaceDir,
+                config: notificationConfig,
+                target: channel ? {
+                  channelId: channel.channelId,
+                  channel: channel.channel,
+                  accountId: channel.accountId,
+                  messageThreadId: channel.messageThreadId
+                } : void 0,
+                runCommand
+              }
+            ).catch(() => {
+            });
+            await revertLabel(fix, expectedLabel, convergence.targetLabel);
+            if (!fix.labelRevertFailed) {
+              await deactivateSlot();
+              await updateIssueRuntime(workspaceDir, projectSlug, issueIdNum, {
+                inconclusiveCompletionAt: (/* @__PURE__ */ new Date()).toISOString(),
+                inconclusiveCompletionReason: "stalled_with_artifact",
+                progressNotifiedAt: null,
+                lastConvergenceCause: convergence.cause,
+                lastConvergenceAction: convergence.action,
+                lastConvergenceRetryCount: convergence.retryCount,
+                lastConvergenceReason: "stalled_with_artifact",
+                lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString()
+              }).catch(() => {
+              });
+              fix.fixed = true;
+              await auditHealthFixApplied(workspaceDir, fix, {
+                action: convergence.action === "escalate_human" ? "escalate_human" : "requeue_issue",
+                fromLabel: expectedLabel,
+                toLabel: convergence.targetLabel,
+                idleMinutes: Math.round(quietMinutes),
+                deliveryState
+              });
+            }
+          }
+          fixes.push(fix);
+          continue;
+        }
         if (hours > staleWorkerHours) {
           const fix = {
             issue: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mestreyoda/fabrica",
-  "version": "0.2.33",
+  "version": "0.2.35",
   "description": "Autonomous software engineering pipeline for OpenClaw. Turns ideas into deployed code via intake, dispatch, review, test, and merge.",
   "type": "module",
   "main": "./dist/index.js",