mrvn-cli 0.5.26 → 0.5.27

package/dist/marvin-serve.js

@@ -20606,6 +20606,15 @@ function analyzeLinkedIssueSignals(linkedIssues, frontmatter, jiraKey, proposedU
     });
   }
 }
+function computeBlockerProgress(linkedIssues, prerequisiteWeight) {
+  const blockerLinks = linkedIssues.filter(
+    (l) => BLOCKER_LINK_PATTERNS.some((p) => l.relationship.toLowerCase().includes(p.split(" ")[0]))
+  );
+  if (blockerLinks.length === 0) return null;
+  const resolved = blockerLinks.filter((l) => l.isDone).length;
+  const blockerProgress = Math.round(resolved / blockerLinks.length * prerequisiteWeight * 100);
+  return { blockerProgress, totalBlockers: blockerLinks.length, resolvedBlockers: resolved };
+}
 var LINKED_COMMENT_ANALYSIS_PROMPT = `You are a delivery management assistant analyzing Jira comments from linked issues for progress signals.
 
 For each linked issue below, read the comments and produce a 1-sentence summary focused on: impact on the parent issue, blockers, or decisions.
@@ -21019,6 +21028,39 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
       });
     }
   }
+  const prerequisiteWeight = options.prerequisiteWeight ?? 0.3;
+  const blockerResult = computeBlockerProgress(linkedIssues, prerequisiteWeight);
+  let blockerProgressValue = null;
+  let totalBlockersCount = 0;
+  let resolvedBlockersCount = 0;
+  if (blockerResult && !fm.progressOverride && !DONE_STATUSES6.has(fm.status)) {
+    blockerProgressValue = blockerResult.blockerProgress;
+    totalBlockersCount = blockerResult.totalBlockers;
+    resolvedBlockersCount = blockerResult.resolvedBlockers;
+    const lastProgressUpdate = findLast(proposedUpdates, (u) => u.artifactId === fm.id && u.field === "progress");
+    const implementationProgress = lastProgressUpdate ? lastProgressUpdate.proposedValue : currentProgress;
+    const combinedProgress = Math.round(
+      blockerResult.blockerProgress + implementationProgress * (1 - prerequisiteWeight)
+    );
+    const estimatedProgress = Math.max(currentProgress, combinedProgress);
+    if (estimatedProgress !== currentProgress && estimatedProgress !== implementationProgress) {
+      for (let i = proposedUpdates.length - 1; i >= 0; i--) {
+        if (proposedUpdates[i].artifactId === fm.id && proposedUpdates[i].field === "progress") {
+          proposedUpdates.splice(i, 1);
+        }
+      }
+      proposedUpdates.push({
+        artifactId: fm.id,
+        field: "progress",
+        currentValue: currentProgress,
+        proposedValue: estimatedProgress,
+        reason: `Blocker resolution (${resolvedBlockersCount}/${totalBlockersCount}) + implementation \u2192 dependency-weighted progress ${estimatedProgress}%`
+      });
+    }
+  } else if (blockerResult) {
+    totalBlockersCount = blockerResult.totalBlockers;
+    resolvedBlockersCount = blockerResult.resolvedBlockers;
+  }
   const signals = buildSignals(commentSignals, linkedIssues, statusDrift, proposedMarvinStatus);
   const appliedUpdates = [];
   if (options.applyUpdates && proposedUpdates.length > 0) {
@@ -21061,7 +21103,10 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
       commentAnalysisProgress,
       signals,
       children,
-      linkedIssues
+      linkedIssues,
+      blockerProgressValue,
+      totalBlockersCount,
+      resolvedBlockersCount
     );
     const existingHistory = Array.isArray(fm.assessmentHistory) ? fm.assessmentHistory : [];
     const legacySummary = fm.assessmentSummary;
@@ -21110,6 +21155,9 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
     commentAnalysisProgress,
     linkedIssues,
     linkedIssueSignals,
+    blockerProgress: blockerProgressValue,
+    totalBlockers: totalBlockersCount,
+    resolvedBlockers: resolvedBlockersCount,
     children,
     proposedUpdates: options.applyUpdates ? [] : proposedUpdates,
     appliedUpdates,
@@ -21289,6 +21337,9 @@ function emptyArtifactReport(artifactId, errors) {
     commentAnalysisProgress: null,
     linkedIssues: [],
     linkedIssueSignals: [],
+    blockerProgress: null,
+    totalBlockers: 0,
+    resolvedBlockers: 0,
     children: [],
     proposedUpdates: [],
     appliedUpdates: [],
@@ -21296,7 +21347,7 @@ function emptyArtifactReport(artifactId, errors) {
     errors
   };
 }
-function buildAssessmentSummary(commentSummary, commentAnalysisProgress, signals, children, linkedIssues) {
+function buildAssessmentSummary(commentSummary, commentAnalysisProgress, signals, children, linkedIssues, blockerProgress = null, totalBlockers = 0, resolvedBlockers = 0) {
   const childProgressValues = children.map((c) => {
     const updates = c.appliedUpdates.length > 0 ? c.appliedUpdates : c.proposedUpdates;
     const lastStatus = findLast(updates, (u) => u.field === "status");
@@ -21320,7 +21371,10 @@ function buildAssessmentSummary(commentSummary, commentAnalysisProgress, signals
     childCount: children.length,
     childDoneCount,
     childRollupProgress,
-    linkedIssueCount: linkedIssues.length
+    linkedIssueCount: linkedIssues.length,
+    blockerProgress,
+    totalBlockers,
+    resolvedBlockers
   };
 }
 function formatArtifactReport(report) {
@@ -21356,6 +21410,12 @@ function formatArtifactReport(report) {
     }
     parts.push("");
   }
+  if (report.totalBlockers > 0) {
+    parts.push(`## Blocker Resolution`);
+    const bpLabel = report.blockerProgress !== null ? `${report.blockerProgress}%` : "n/a (skipped)";
+    parts.push(`  ${report.resolvedBlockers}/${report.totalBlockers} blockers resolved \u2192 ${bpLabel} prerequisite progress`);
+    parts.push("");
+  }
   if (report.children.length > 0) {
     const doneCount = report.children.filter((c) => DONE_STATUSES6.has(c.marvinStatus)).length;
     const childProgress = Math.round(
@@ -22254,10 +22314,11 @@ function createJiraTools(store, projectConfig) {
     // --- Single-artifact assessment ---
     tool20(
       "assess_artifact",
-      "Deep assessment of a single Marvin artifact (task, action, or epic). Fetches live Jira status, analyzes comments with LLM, traverses all linked issues, detects drift, rolls up child progress, and extracts contextual signals (blockers, unblocks, handoffs, superseded work).",
+      "Deep assessment of a single Marvin artifact (task, action, or epic). Fetches live Jira status, analyzes comments with LLM, traverses all linked issues, detects drift, rolls up child progress, computes dependency-weighted progress from blocker resolution, and extracts contextual signals (blockers, unblocks, handoffs, superseded work).",
       {
         artifactId: external_exports.string().describe("Marvin artifact ID (e.g. 'T-063', 'A-151', 'E-003')"),
-        applyUpdates: external_exports.boolean().optional().describe("Apply proposed status/progress updates to the artifact (default false)")
+        applyUpdates: external_exports.boolean().optional().describe("Apply proposed status/progress updates to the artifact (default false)"),
+        prerequisiteWeight: external_exports.number().min(0).max(1).optional().describe("Weight for blocker-resolution progress signal (0-1, default 0.3). Portion of effort attributed to dependency readiness.")
       },
       async (args) => {
         const jira = createJiraClient(jiraUserConfig);
@@ -22269,6 +22330,7 @@ function createJiraTools(store, projectConfig) {
           {
             artifactId: args.artifactId,
             applyUpdates: args.applyUpdates ?? false,
+            prerequisiteWeight: args.prerequisiteWeight,
             statusMap
           }
         );
@@ -25907,7 +25969,10 @@ function normalizeEntry(entry) {
     childCount: typeof entry.childCount === "number" ? entry.childCount : 0,
     childDoneCount: typeof entry.childDoneCount === "number" ? entry.childDoneCount : 0,
     childRollupProgress: typeof entry.childRollupProgress === "number" ? entry.childRollupProgress : null,
-    linkedIssueCount: typeof entry.linkedIssueCount === "number" ? entry.linkedIssueCount : 0
+    linkedIssueCount: typeof entry.linkedIssueCount === "number" ? entry.linkedIssueCount : 0,
+    blockerProgress: typeof entry.blockerProgress === "number" ? entry.blockerProgress : null,
+    totalBlockers: typeof entry.totalBlockers === "number" ? entry.totalBlockers : 0,
+    resolvedBlockers: typeof entry.resolvedBlockers === "number" ? entry.resolvedBlockers : 0
   };
 }
 function renderAssessmentTimeline(history) {
@@ -25927,6 +25992,10 @@ function renderAssessmentTimeline(history) {
       const bar = progressBarHtml(entry.childRollupProgress ?? 0);
       parts.push(`<div class="assessment-stat">\u{1F476} Children: ${entry.childDoneCount}/${entry.childCount} done ${bar} ${entry.childRollupProgress ?? 0}%</div>`);
     }
+    if (entry.totalBlockers > 0) {
+      const bar = progressBarHtml(entry.blockerProgress ?? 0);
+      parts.push(`<div class="assessment-stat">\u{1F6A7} Blockers: ${entry.resolvedBlockers}/${entry.totalBlockers} resolved ${bar} ${entry.blockerProgress ?? 0}%</div>`);
+    }
     if (entry.linkedIssueCount > 0) {
       parts.push(`<div class="assessment-stat">\u{1F517} Linked issues: ${entry.linkedIssueCount}</div>`);
     }