@mestreyoda/fabrica 0.2.31 → 0.2.34

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.31") {
-    return "0.2.31";
+  if ("0.2.34") {
+    return "0.2.34";
   }
   try {
     const pkgPath = path5.join(THIS_DIR, "..", "..", "package.json");
@@ -131466,6 +131466,13 @@ function detectExecutionContractViolation(messages) {
       evidence: nestedCommand
     };
   }
+  const worktreeDrift = evidenceEntries.map((entry) => matchWorktreeDriftEvidence(entry.text)).find((match) => Boolean(match));
+  if (worktreeDrift) {
+    return {
+      reason: "worktree_drift",
+      evidence: worktreeDrift
+    };
+  }
   for (const entry of assistantEntries) {
     const metaSkillUsage = matchStrongMetaSkillUsage(entry.text);
     if (metaSkillUsage) {
@@ -131491,6 +131498,19 @@ function detectExecutionContractViolation(messages) {
   }
   return null;
 }
+function matchWorktreeDriftEvidence(text) {
+  if (!text) return null;
+  const patterns = [
+    /ENOENT: .*\/home\/ubuntu\/\.openclaw\/workspace(?:\/[^\s'"`]+)?/,
+    /^\/home\/ubuntu\/\.openclaw\/workspace$/m,
+    /\/home\/ubuntu\/\.openclaw\/workspace(?:\/[^\s'"`]+)?/
+  ];
+  for (const pattern of patterns) {
+    const match = text.match(pattern);
+    if (match?.[0]) return match[0];
+  }
+  return null;
+}
 function collectWorkerTranscriptEvidence(messages) {
   const evidence = [];
   for (const message of messages) {
@@ -131914,48 +131934,49 @@ async function handleWorkerAgentEnd(opts) {
     }).catch(() => {
     });
   }
-  if (!observation.result) {
-    if (observation.executionContractViolation) {
-      if (context2) {
-        const violationPayload = {
-          sessionKey: opts.sessionKey,
-          projectSlug: context2.projectSlug,
-          issueId: context2.issueId,
-          role,
-          reason: "invalid_execution_path",
-          violationReason: observation.executionContractViolation.reason,
-          evidence: observation.executionContractViolation.evidence
-        };
-        await updateIssueRuntime(opts.workspaceDir, context2.projectSlug, context2.issueId, {
-          inconclusiveCompletionAt: (/* @__PURE__ */ new Date()).toISOString(),
-          inconclusiveCompletionReason: "invalid_execution_path"
-        }).catch(() => {
-        });
-        await log(opts.workspaceDir, "worker_execution_contract_violation", violationPayload).catch(() => {
-        });
-        await log(opts.workspaceDir, "worker_execution_recovery_started", violationPayload).catch(() => {
-        });
-        await log(opts.workspaceDir, "worker_completion_inconclusive", {
-          ...violationPayload
-        }).catch(() => {
-        });
-      } else {
-        const violationPayload = {
-          sessionKey: opts.sessionKey,
-          role,
-          reason: "invalid_execution_path",
-          violationReason: observation.executionContractViolation.reason,
-          evidence: observation.executionContractViolation.evidence
-        };
-        await log(opts.workspaceDir, "worker_execution_contract_violation", violationPayload).catch(() => {
-        });
-        await log(opts.workspaceDir, "worker_result_skipped", {
-          ...violationPayload
-        }).catch(() => {
-        });
-      }
-      return { applied: false, reason: "invalid_execution_path" };
+  if (observation.executionContractViolation && (!observation.result || observation.executionContractViolation.reason === "worktree_drift")) {
+    if (context2) {
+      const violationPayload = {
+        sessionKey: opts.sessionKey,
+        projectSlug: context2.projectSlug,
+        issueId: context2.issueId,
+        role,
+        reason: "invalid_execution_path",
+        violationReason: observation.executionContractViolation.reason,
+        evidence: observation.executionContractViolation.evidence
+      };
+      await updateIssueRuntime(opts.workspaceDir, context2.projectSlug, context2.issueId, {
+        inconclusiveCompletionAt: (/* @__PURE__ */ new Date()).toISOString(),
+        inconclusiveCompletionReason: "invalid_execution_path"
+      }).catch(() => {
+      });
+      await log(opts.workspaceDir, "worker_execution_contract_violation", violationPayload).catch(() => {
+      });
+      await log(opts.workspaceDir, "worker_execution_recovery_started", violationPayload).catch(() => {
+      });
+      await log(opts.workspaceDir, "worker_completion_inconclusive", {
+        ...violationPayload,
+        hadResultLine: Boolean(observation.result)
+      }).catch(() => {
+      });
+    } else {
+      const violationPayload = {
+        sessionKey: opts.sessionKey,
+        role,
+        reason: "invalid_execution_path",
+        violationReason: observation.executionContractViolation.reason,
+        evidence: observation.executionContractViolation.evidence
+      };
+      await log(opts.workspaceDir, "worker_execution_contract_violation", violationPayload).catch(() => {
+      });
+      await log(opts.workspaceDir, "worker_result_skipped", {
+        ...violationPayload
+      }).catch(() => {
+      });
     }
+    return { applied: false, reason: "invalid_execution_path" };
+  }
+  if (!observation.result) {
     if (context2 && observation.activityObserved) {
       await updateIssueRuntime(opts.workspaceDir, context2.projectSlug, context2.issueId, {
         inconclusiveCompletionAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -132597,15 +132618,17 @@ async function checkWorkerHealth(opts) {
         const startedAtMs = new Date(slot.startTime).getTime();
         const minutesActive = (Date.now() - startedAtMs) / 6e4;
         const hours = minutesActive / 60;
+        let reviewablePrStatus = null;
         let hasReviewableArtifact = 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;
+              hasReviewableArtifact = true;
+            }
           } catch {
           }
         }
@@ -132708,6 +132731,78 @@ 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 && hasReviewableArtifact && reviewablePrStatus?.url && minutesActive >= stallTimeoutMinutes && quietMinutes >= Math.max(8, Math.floor(stallTimeoutMinutes / 2))) {
+          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: `Open PR ${reviewablePrStatus.url} has stalled for ${Math.round(quietMinutes)} minutes without a trustworthy completion. Re-queueing to ${slotQueueLabel}.`,
+                nextState: slotQueueLabel,
+                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, slotQueueLabel);
+            if (!fix.labelRevertFailed) {
+              await deactivateSlot();
+              await updateIssueRuntime(workspaceDir, projectSlug, issueIdNum, {
+                inconclusiveCompletionAt: (/* @__PURE__ */ new Date()).toISOString(),
+                inconclusiveCompletionReason: "stalled_with_artifact",
+                progressNotifiedAt: null
+              }).catch(() => {
+              });
+              fix.fixed = true;
+              await auditHealthFixApplied(workspaceDir, fix, {
+                action: "requeue_issue",
+                fromLabel: expectedLabel,
+                toLabel: slotQueueLabel,
+                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.31",
+  "version": "0.2.34",
   "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",