@mestreyoda/fabrica 0.2.37 → 0.2.39

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.37") {
-    return "0.2.37";
+  if ("0.2.39") {
+    return "0.2.39";
   }
   try {
     const pkgPath = path5.join(THIS_DIR, "..", "..", "package.json");
@@ -130477,6 +130477,157 @@ function createProjectStatusTool(ctx) {
   });
 }
 
+// lib/setup/doctor-run.ts
+async function runIssueDoctor(opts) {
+  const data = await readProjects(opts.workspacePath);
+  const project = data.projects[opts.projectSlug];
+  if (!project) throw new Error(`Project not found: ${opts.projectSlug}`);
+  const issueRuntime = getIssueRuntime(project, opts.issueId) ?? null;
+  const hasArtifact = Boolean(
+    issueRuntime?.currentPrUrl || issueRuntime?.currentPrNumber || issueRuntime?.artifactOfRecord
+  );
+  const { provider } = await createProvider({
+    repo: project.repo,
+    provider: project.provider,
+    providerProfile: project.providerProfile,
+    runCommand: opts.runCommand,
+    pluginConfig: opts.pluginConfig
+  });
+  let prStatus = null;
+  try {
+    const pr = await provider.getPrStatus(opts.issueId);
+    if (pr.url || pr.number) prStatus = pr;
+  } catch {
+    prStatus = null;
+  }
+  let issue2 = null;
+  try {
+    issue2 = await provider.getIssue(opts.issueId);
+  } catch {
+    issue2 = null;
+  }
+  const convergenceCause = issueRuntime?.lastConvergenceCause ?? null;
+  const convergenceAction = issueRuntime?.lastConvergenceAction ?? null;
+  const retryCount = issueRuntime?.lastConvergenceRetryCount ?? 0;
+  const convergenceReason = issueRuntime?.lastConvergenceReason ?? issueRuntime?.inconclusiveCompletionReason ?? null;
+  const convergenceHeadSha = issueRuntime?.lastConvergenceHeadSha ?? null;
+  const currentHeadSha = issueRuntime?.currentPrHeadSha ?? issueRuntime?.lastHeadSha ?? prStatus?.sourceBranch ?? null;
+  const headShaChangedSinceLastConvergence = convergenceHeadSha && currentHeadSha ? convergenceHeadSha !== currentHeadSha : null;
+  const progressState = issueRuntime?.sessionCompletedAt ? "completed" : issueRuntime?.firstWorkerActivityAt ? "active" : issueRuntime?.agentAcceptedAt ? "accepted_idle" : "no_dispatch";
+  const summaryParts = [
+    hasArtifact ? "artifact_present" : "artifact_missing",
+    convergenceCause ? `cause=${convergenceCause}` : "cause=none",
+    convergenceAction ? `action=${convergenceAction}` : "action=none",
+    retryCount ? `retries=${retryCount}` : "retries=0",
+    prStatus?.state ? `pr=${prStatus.state}` : "pr=unknown"
+  ];
+  const likelyNextAction = (() => {
+    if (convergenceAction === "escalate_human") return "human_intervention";
+    if (convergenceCause === "invalid_qa_evidence") return "repair_qa_evidence";
+    if (convergenceCause === "merge_conflict") return "repair_merge_conflict";
+    if (convergenceCause === "stalled_with_artifact") return "force_convergence_review";
+    if (hasArtifact) return "post_pr_convergence";
+    return "redispatch_or_investigate";
+  })();
+  return {
+    projectSlug: project.slug,
+    projectName: project.name,
+    issueId: opts.issueId,
+    issueRuntime,
+    hasArtifact,
+    lifecycle: {
+      dispatchCycleId: issueRuntime?.lastDispatchCycleId ?? null,
+      dispatchRunId: issueRuntime?.dispatchRunId ?? null,
+      agentAcceptedAt: issueRuntime?.agentAcceptedAt ?? null,
+      firstWorkerActivityAt: issueRuntime?.firstWorkerActivityAt ?? null,
+      sessionCompletedAt: issueRuntime?.sessionCompletedAt ?? null,
+      progressState
+    },
+    convergence: {
+      cause: convergenceCause,
+      action: convergenceAction,
+      retryCount,
+      reason: convergenceReason,
+      at: issueRuntime?.lastConvergenceAt ?? null,
+      headSha: convergenceHeadSha,
+      headShaChangedSinceLastConvergence
+    },
+    pr: prStatus ? {
+      url: prStatus.url ?? null,
+      state: prStatus.state ?? null,
+      number: prStatus.number ?? null,
+      mergeable: prStatus.mergeable ?? null,
+      currentIssueMatch: prStatus.currentIssueMatch ?? null,
+      sourceBranch: prStatus.sourceBranch ?? null
+    } : null,
+    issue: issue2 ? {
+      url: issue2.web_url ?? null,
+      state: issue2.state ?? null,
+      labels: issue2.labels ?? [],
+      title: issue2.title ?? null
+    } : null,
+    recommendation: {
+      summary: summaryParts.join(" | "),
+      likelyNextAction
+    }
+  };
+}
+function formatIssueDoctor(result) {
+  const lines = [
+    `Issue run doctor \u2014 ${result.projectSlug}#${result.issueId}`,
+    `  Artifact: ${result.hasArtifact ? "yes" : "no"}`,
+    `  PR: ${result.pr?.url ?? "n/a"} (${result.pr?.state ?? "unknown"})`,
+    `  Issue: ${result.issue?.url ?? "n/a"} (${result.issue?.state ?? "unknown"})`,
+    `  Labels: ${result.issue?.labels?.join(", ") ?? "n/a"}`,
+    `  Dispatch cycle: ${result.lifecycle.dispatchCycleId ?? "n/a"}`,
+    `  Dispatch run: ${result.lifecycle.dispatchRunId ?? "n/a"}`,
+    `  Progress state: ${result.lifecycle.progressState}`,
+    `  Agent accepted: ${result.lifecycle.agentAcceptedAt ?? "n/a"}`,
+    `  First worker activity: ${result.lifecycle.firstWorkerActivityAt ?? "n/a"}`,
+    `  Session completed: ${result.lifecycle.sessionCompletedAt ?? "n/a"}`,
+    `  Convergence cause: ${result.convergence.cause ?? "none"}`,
+    `  Convergence action: ${result.convergence.action ?? "none"}`,
+    `  Retry count: ${result.convergence.retryCount}`,
+    `  Convergence head SHA: ${result.convergence.headSha ?? "n/a"}`,
+    `  Head SHA changed since last convergence: ${result.convergence.headShaChangedSinceLastConvergence == null ? "unknown" : result.convergence.headShaChangedSinceLastConvergence ? "yes" : "no"}`,
+    `  Last reason: ${result.convergence.reason ?? "n/a"}`,
+    `  Suggested next action: ${result.recommendation.likelyNextAction}`
+  ];
+  return lines.join("\n");
+}
+
+// lib/tools/admin/doctor-issue.ts
+function createDoctorIssueTool(ctx) {
+  return (toolCtx) => ({
+    name: "doctor_issue",
+    label: "Doctor Issue",
+    description: "Inspect one Fabrica issue/run with convergence metadata, PR context, issue labels, and a recommended next action.",
+    parameters: {
+      type: "object",
+      required: ["projectSlug", "issueId"],
+      properties: {
+        projectSlug: { type: "string", description: "Project slug (for example: fabrica or my-project)." },
+        issueId: { type: "number", description: "Issue number to inspect." }
+      }
+    },
+    async execute(_id, params) {
+      const workspaceDir = requireWorkspaceDir(toolCtx);
+      const projectSlug = String(params.projectSlug ?? "").trim();
+      const issueId = Number(params.issueId);
+      if (!projectSlug) throw new Error("projectSlug is required");
+      if (!Number.isFinite(issueId)) throw new Error("issueId must be a number");
+      const result = await runIssueDoctor({
+        workspacePath: workspaceDir,
+        projectSlug,
+        issueId,
+        runCommand: ctx.runCommand,
+        pluginConfig: ctx.pluginConfig
+      });
+      return jsonResult(result);
+    }
+  });
+}
+
 // lib/tools/admin/project-register.ts
 import fs24 from "node:fs/promises";
 import path24 from "node:path";
@@ -131291,9 +131442,12 @@ function decidePostPrConvergence(params) {
   const { workflow, issueRuntime, reason, feedbackQueueLabel } = params;
   const cause = classifyConvergenceCause(reason);
   const hasArtifact = hasReviewableArtifact(issueRuntime);
+  const progressHeadSha = issueRuntime?.currentPrHeadSha ?? issueRuntime?.lastHeadSha ?? issueRuntime?.artifactOfRecord?.headSha ?? null;
   const previousCause = issueRuntime?.lastConvergenceCause ?? null;
   const previousCount = issueRuntime?.lastConvergenceRetryCount ?? 0;
-  const retryCount = previousCause === cause ? previousCount + 1 : 1;
+  const previousHeadSha = issueRuntime?.lastConvergenceHeadSha ?? null;
+  const sameHeadSha = !progressHeadSha || !previousHeadSha ? true : progressHeadSha === previousHeadSha;
+  const retryCount = previousCause === cause && sameHeadSha ? previousCount + 1 : 1;
   const maxRetries = getConvergenceRetryBudget(cause);
   const holdLabel = getPreferredHoldLabel(workflow);
   const shouldEscalate = hasArtifact && retryCount > maxRetries && Boolean(holdLabel);
@@ -131303,7 +131457,8 @@ function decidePostPrConvergence(params) {
     targetLabel: shouldEscalate ? holdLabel ?? feedbackQueueLabel : feedbackQueueLabel,
     retryCount,
     maxRetries,
-    hasArtifact
+    hasArtifact,
+    progressHeadSha
   };
 }
 
@@ -131895,7 +132050,8 @@ ${validationReason}`;
         lastConvergenceAction: convergence.action,
         lastConvergenceRetryCount: convergence.retryCount,
         lastConvergenceReason: validationReason,
-        lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString()
+        lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString(),
+        lastConvergenceHeadSha: convergence.progressHeadSha
       }).catch(() => {
       });
       await executeCompletion({
@@ -132021,7 +132177,8 @@ ${validationReason}`;
       lastConvergenceAction: null,
       lastConvergenceRetryCount: 0,
       lastConvergenceReason: null,
-      lastConvergenceAt: null
+      lastConvergenceAt: null,
+      lastConvergenceHeadSha: null
     }).catch(() => {
     });
   } else {
@@ -132032,7 +132189,8 @@ ${validationReason}`;
       lastConvergenceAction: null,
       lastConvergenceRetryCount: 0,
       lastConvergenceReason: null,
-      lastConvergenceAt: null
+      lastConvergenceAt: null,
+      lastConvergenceHeadSha: null
     }).catch(() => {
     });
   }
@@ -132555,7 +132713,8 @@ async function checkWorkerHealth(opts) {
               lastConvergenceAction: convergence.action,
               lastConvergenceRetryCount: convergence.retryCount,
               lastConvergenceReason: inconclusiveReason,
-              lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString()
+              lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString(),
+              lastConvergenceHeadSha: convergence.progressHeadSha
             }).catch(() => {
             });
             fix.fixed = true;
@@ -132938,7 +133097,8 @@ async function checkWorkerHealth(opts) {
                 lastConvergenceAction: convergence.action,
                 lastConvergenceRetryCount: convergence.retryCount,
                 lastConvergenceReason: "stalled_with_artifact",
-                lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString()
+                lastConvergenceAt: (/* @__PURE__ */ new Date()).toISOString(),
+                lastConvergenceHeadSha: convergence.progressHeadSha
               }).catch(() => {
               });
               fix.fixed = true;
@@ -148951,103 +149111,6 @@ async function checkProjects(dataDir) {
   return results;
 }
 
-// lib/setup/doctor-run.ts
-async function runIssueDoctor(opts) {
-  const data = await readProjects(opts.workspacePath);
-  const project = data.projects[opts.projectSlug];
-  if (!project) throw new Error(`Project not found: ${opts.projectSlug}`);
-  const issueRuntime = getIssueRuntime(project, opts.issueId) ?? null;
-  const hasArtifact = Boolean(
-    issueRuntime?.currentPrUrl || issueRuntime?.currentPrNumber || issueRuntime?.artifactOfRecord
-  );
-  const { provider } = await createProvider({
-    repo: project.repo,
-    provider: project.provider,
-    providerProfile: project.providerProfile,
-    runCommand: opts.runCommand,
-    pluginConfig: opts.pluginConfig
-  });
-  let prStatus = null;
-  try {
-    const pr = await provider.getPrStatus(opts.issueId);
-    if (pr.url || pr.number) prStatus = pr;
-  } catch {
-    prStatus = null;
-  }
-  let issue2 = null;
-  try {
-    issue2 = await provider.getIssue(opts.issueId);
-  } catch {
-    issue2 = null;
-  }
-  const convergenceCause = issueRuntime?.lastConvergenceCause ?? null;
-  const convergenceAction = issueRuntime?.lastConvergenceAction ?? null;
-  const retryCount = issueRuntime?.lastConvergenceRetryCount ?? 0;
-  const convergenceReason = issueRuntime?.lastConvergenceReason ?? issueRuntime?.inconclusiveCompletionReason ?? null;
-  const summaryParts = [
-    hasArtifact ? "artifact_present" : "artifact_missing",
-    convergenceCause ? `cause=${convergenceCause}` : "cause=none",
-    convergenceAction ? `action=${convergenceAction}` : "action=none",
-    retryCount ? `retries=${retryCount}` : "retries=0",
-    prStatus?.state ? `pr=${prStatus.state}` : "pr=unknown"
-  ];
-  const likelyNextAction = (() => {
-    if (convergenceAction === "escalate_human") return "human_intervention";
-    if (convergenceCause === "invalid_qa_evidence") return "repair_qa_evidence";
-    if (convergenceCause === "merge_conflict") return "repair_merge_conflict";
-    if (convergenceCause === "stalled_with_artifact") return "force_convergence_review";
-    if (hasArtifact) return "post_pr_convergence";
-    return "redispatch_or_investigate";
-  })();
-  return {
-    projectSlug: project.slug,
-    projectName: project.name,
-    issueId: opts.issueId,
-    issueRuntime,
-    hasArtifact,
-    convergence: {
-      cause: convergenceCause,
-      action: convergenceAction,
-      retryCount,
-      reason: convergenceReason,
-      at: issueRuntime?.lastConvergenceAt ?? null
-    },
-    pr: prStatus ? {
-      url: prStatus.url ?? null,
-      state: prStatus.state ?? null,
-      number: prStatus.number ?? null,
-      mergeable: prStatus.mergeable ?? null,
-      currentIssueMatch: prStatus.currentIssueMatch ?? null,
-      sourceBranch: prStatus.sourceBranch ?? null
-    } : null,
-    issue: issue2 ? {
-      url: issue2.web_url ?? null,
-      state: issue2.state ?? null,
-      labels: issue2.labels ?? [],
-      title: issue2.title ?? null
-    } : null,
-    recommendation: {
-      summary: summaryParts.join(" | "),
-      likelyNextAction
-    }
-  };
-}
-function formatIssueDoctor(result) {
-  const lines = [
-    `Issue run doctor \u2014 ${result.projectSlug}#${result.issueId}`,
-    `  Artifact: ${result.hasArtifact ? "yes" : "no"}`,
-    `  PR: ${result.pr?.url ?? "n/a"} (${result.pr?.state ?? "unknown"})`,
-    `  Issue: ${result.issue?.url ?? "n/a"} (${result.issue?.state ?? "unknown"})`,
-    `  Labels: ${result.issue?.labels?.join(", ") ?? "n/a"}`,
-    `  Convergence cause: ${result.convergence.cause ?? "none"}`,
-    `  Convergence action: ${result.convergence.action ?? "none"}`,
-    `  Retry count: ${result.convergence.retryCount}`,
-    `  Last reason: ${result.convergence.reason ?? "n/a"}`,
-    `  Suggested next action: ${result.recommendation.likelyNextAction}`
-  ];
-  return lines.join("\n");
-}
-
 // lib/observability/metrics.ts
 init_constants();
 import { readFile as readFile3 } from "node:fs/promises";
@@ -151020,6 +151083,7 @@ var plugin = {
     api.registerTool(createTaskListTool(ctx), { names: ["task_list"] });
     api.registerTool(createTasksStatusTool(ctx), { names: ["tasks_status"] });
     api.registerTool(createProjectStatusTool(ctx), { names: ["project_status"] });
+    api.registerTool(createDoctorIssueTool(ctx), { names: ["doctor_issue"] });
     api.registerTool(createProjectRegisterTool(ctx), { names: ["project_register"] });
     api.registerTool(createHealthTool(ctx), { names: ["health"] });
     api.registerTool(createSyncLabelsTool(ctx), { names: ["sync_labels"] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mestreyoda/fabrica",
-  "version": "0.2.37",
+  "version": "0.2.39",
   "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",