mrvn-cli 0.5.26 → 0.5.28

package/dist/marvin-serve.js

@@ -20078,10 +20078,16 @@ function resolveWeight(complexity) {
 function resolveProgress(frontmatter, commentAnalysisProgress) {
   const hasExplicitProgress = "progress" in frontmatter && typeof frontmatter.progress === "number";
   if (hasExplicitProgress) {
-    return { progress: Math.max(0, Math.min(100, Math.round(frontmatter.progress))), progressSource: "explicit" };
+    return {
+      progress: Math.max(0, Math.min(100, Math.round(frontmatter.progress))),
+      progressSource: "explicit"
+    };
   }
   if (commentAnalysisProgress !== null) {
-    return { progress: Math.max(0, Math.min(100, Math.round(commentAnalysisProgress))), progressSource: "comment-analysis" };
+    return {
+      progress: Math.max(0, Math.min(100, Math.round(commentAnalysisProgress))),
+      progressSource: "comment-analysis"
+    };
   }
   const status = frontmatter.status;
   const defaultProgress = STATUS_PROGRESS_DEFAULTS[status] ?? 0;
@@ -20106,7 +20112,13 @@ async function assessSprintProgress(store, client, host, options = {}) {
       sprintId: options.sprintId ?? "unknown",
       sprintTitle: "Sprint not found",
       generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      timeline: { startDate: null, endDate: null, daysRemaining: 0, totalDays: 0, percentComplete: 0 },
+      timeline: {
+        startDate: null,
+        endDate: null,
+        daysRemaining: 0,
+        totalDays: 0,
+        percentComplete: 0
+      },
       overallProgress: 0,
       itemReports: [],
       focusAreas: [],
@@ -20114,7 +20126,9 @@ async function assessSprintProgress(store, client, host, options = {}) {
       blockers: [],
       proposedUpdates: [],
       appliedUpdates: [],
-      errors: [`Sprint ${options.sprintId ?? "(active)"} not found. Create a sprint artifact first.`]
+      errors: [
+        `Sprint ${options.sprintId ?? "(active)"} not found. Create a sprint artifact first.`
+      ]
     };
   }
   const sprintTag = `sprint:${sprintData.sprint.id}`;
@@ -20158,7 +20172,9 @@ async function assessSprintProgress(store, client, host, options = {}) {
         });
       } else {
         const batchKey = batch[results.indexOf(result)];
-        errors.push(`Failed to fetch ${batchKey}: ${result.reason instanceof Error ? result.reason.message : String(result.reason)}`);
+        errors.push(
+          `Failed to fetch ${batchKey}: ${result.reason instanceof Error ? result.reason.message : String(result.reason)}`
+        );
       }
     }
   }
@@ -20200,12 +20216,16 @@ async function assessSprintProgress(store, client, host, options = {}) {
           }
         } else {
           const batchKey = batch[results.indexOf(result)];
-          errors.push(`Failed to fetch linked issue ${batchKey}: ${result.reason instanceof Error ? result.reason.message : String(result.reason)}`);
+          errors.push(
+            `Failed to fetch linked issue ${batchKey}: ${result.reason instanceof Error ? result.reason.message : String(result.reason)}`
+          );
         }
       }
     }
     if (queue.length > 0) {
-      errors.push(`Link traversal capped at ${MAX_LINKED_ISSUES} linked issues (${queue.length} remaining undiscovered)`);
+      errors.push(
+        `Link traversal capped at ${MAX_LINKED_ISSUES} linked issues (${queue.length} remaining undiscovered)`
+      );
     }
   }
   const proposedUpdates = [];
@@ -20283,12 +20303,7 @@ async function assessSprintProgress(store, client, host, options = {}) {
       );
       itemLinkedIssues = allLinks;
       itemLinkedIssueSignals.push(...allSignals);
-      analyzeLinkedIssueSignals(
-        allLinks,
-        fm,
-        jiraKey,
-        proposedUpdates
-      );
+      analyzeLinkedIssueSignals(allLinks, fm, jiraKey, proposedUpdates);
     }
     const report = {
       id: fm.id,
@@ -20407,10 +20422,7 @@ async function assessSprintProgress(store, client, host, options = {}) {
     }
     if (options.traverseLinks) {
       try {
-        const linkedSummaries = await analyzeLinkedIssueComments(
-          itemReports,
-          linkedJiraIssues
-        );
+        const linkedSummaries = await analyzeLinkedIssueComments(itemReports, linkedJiraIssues);
         for (const [artifactId, signalSummaries] of linkedSummaries) {
           const report = itemReports.find((r) => r.id === artifactId);
           if (!report) continue;
@@ -20422,7 +20434,9 @@ async function assessSprintProgress(store, client, host, options = {}) {
           }
         }
       } catch (err) {
-        errors.push(`Linked issue comment analysis failed: ${err instanceof Error ? err.message : String(err)}`);
+        errors.push(
+          `Linked issue comment analysis failed: ${err instanceof Error ? err.message : String(err)}`
+        );
       }
     }
   }
@@ -20494,9 +20508,11 @@ async function analyzeCommentsForProgress(items, jiraIssues, itemJiraKeys) {
       const text = extractCommentText(c.body);
       return `  [${c.author.displayName}, ${c.created.slice(0, 10)}]: ${text.slice(0, 500)}`;
     }).join("\n");
-    promptParts.push(`## ${item.id} \u2014 ${item.title} (${jiraKey}, Jira status: ${item.jiraStatus})
+    promptParts.push(
+      `## ${item.id} \u2014 ${item.title} (${jiraKey}, Jira status: ${item.jiraStatus})
 Comments:
-${commentTexts}`);
+${commentTexts}`
+    );
   }
   if (promptParts.length === 0) return summaries;
   const prompt = promptParts.join("\n\n");
@@ -20569,7 +20585,9 @@ function collectTransitiveLinks(primaryIssue, primaryIssues, linkedJiraIssues) {
         commentSummary: null
       });
     }
-    const nextLinks = collectLinkedIssues(linkedData.issue).filter((l) => l.relationship !== "subtask" && !visited.has(l.key));
+    const nextLinks = collectLinkedIssues(linkedData.issue).filter(
+      (l) => l.relationship !== "subtask" && !visited.has(l.key)
+    );
     for (const next of nextLinks) {
       visited.add(next.key);
       queue.push(next);
@@ -20593,9 +20611,7 @@ function analyzeLinkedIssueSignals(linkedIssues, frontmatter, jiraKey, proposedU
       reason: `All blocking issues resolved: ${blockerLinks.map((l) => l.key).join(", ")}`
     });
   }
-  const wontDoLinks = linkedIssues.filter(
-    (l) => WONT_DO_STATUSES.has(l.status.toLowerCase())
-  );
+  const wontDoLinks = linkedIssues.filter((l) => WONT_DO_STATUSES.has(l.status.toLowerCase()));
   if (wontDoLinks.length > 0) {
     proposedUpdates.push({
       artifactId: frontmatter.id,
@@ -20606,6 +20622,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.
@@ -20660,7 +20685,9 @@ ${linkedParts.join("\n")}`);
           for (const [artifactId, linkedSummaries] of Object.entries(parsed)) {
             if (typeof linkedSummaries === "object" && linkedSummaries !== null) {
               const signalMap = /* @__PURE__ */ new Map();
-              for (const [key, summary] of Object.entries(linkedSummaries)) {
+              for (const [key, summary] of Object.entries(
+                linkedSummaries
+              )) {
                 if (typeof summary === "string") {
                   signalMap.set(key, summary);
                 }
@@ -20699,7 +20726,9 @@ function formatProgressReport(report) {
   if (report.timeline.startDate && report.timeline.endDate) {
     parts.push(`## Timeline`);
     parts.push(`${report.timeline.startDate} \u2192 ${report.timeline.endDate}`);
-    parts.push(`Days remaining: ${report.timeline.daysRemaining} / ${report.timeline.totalDays} (${report.timeline.percentComplete}% elapsed)`);
+    parts.push(
+      `Days remaining: ${report.timeline.daysRemaining} / ${report.timeline.totalDays} (${report.timeline.percentComplete}% elapsed)`
+    );
     parts.push(`Overall progress: ${report.overallProgress}%`);
     parts.push("");
   }
@@ -20709,7 +20738,9 @@ function formatProgressReport(report) {
     for (const area of report.focusAreas) {
       const bar = progressBar(area.progress);
       parts.push(`### ${area.name} ${bar} ${area.progress}%`);
-      parts.push(`${area.doneCount}/${area.taskCount} done${area.blockedCount > 0 ? ` | ${area.blockedCount} blocked` : ""}`);
+      parts.push(
+        `${area.doneCount}/${area.taskCount} done${area.blockedCount > 0 ? ` | ${area.blockedCount} blocked` : ""}`
+      );
       if (area.riskWarning) {
         parts.push(`  \u26A0 ${area.riskWarning}`);
       }
@@ -20748,7 +20779,9 @@ function formatProgressReport(report) {
   if (report.proposedUpdates.length > 0) {
     parts.push(`## Proposed Updates (${report.proposedUpdates.length})`);
     for (const update of report.proposedUpdates) {
-      parts.push(`  ${update.artifactId}.${update.field}: ${String(update.currentValue)} \u2192 ${String(update.proposedValue)}`);
+      parts.push(
+        `  ${update.artifactId}.${update.field}: ${String(update.currentValue)} \u2192 ${String(update.proposedValue)}`
+      );
       parts.push(`    Reason: ${update.reason}`);
     }
     parts.push("");
@@ -20758,7 +20791,9 @@ function formatProgressReport(report) {
   if (report.appliedUpdates.length > 0) {
     parts.push(`## Applied Updates (${report.appliedUpdates.length})`);
     for (const update of report.appliedUpdates) {
-      parts.push(`  \u2713 ${update.artifactId}.${update.field}: ${String(update.currentValue)} \u2192 ${String(update.proposedValue)}`);
+      parts.push(
+        `  \u2713 ${update.artifactId}.${update.field}: ${String(update.currentValue)} \u2192 ${String(update.proposedValue)}`
+      );
     }
     parts.push("");
   }
@@ -20779,7 +20814,9 @@ function formatItemLine(parts, item, depth) {
   const progressLabel = ` ${item.progress}%`;
   const weightLabel = `w${item.weight}`;
   const sourceLabel = item.progressSource === "explicit" ? "" : item.progressSource === "comment-analysis" ? " (llm)" : " (est)";
-  parts.push(`${indent}${statusIcon} ${item.id} \u2014 ${item.title} [${item.marvinStatus}]${progressLabel}${sourceLabel} (${weightLabel})${jiraLabel}${driftFlag}`);
+  parts.push(
+    `${indent}${statusIcon} ${item.id} \u2014 ${item.title} [${item.marvinStatus}]${progressLabel}${sourceLabel} (${weightLabel})${jiraLabel}${driftFlag}`
+  );
   if (item.commentSummary) {
     parts.push(`${indent}  \u{1F4AC} ${item.commentSummary}`);
   }
@@ -20789,7 +20826,9 @@ function formatItemLine(parts, item, depth) {
       const doneMarker = link.isDone ? " \u2713" : "";
       const blockerResolved = link.isDone && BLOCKER_LINK_PATTERNS.some((p) => link.relationship.toLowerCase().includes(p.split(" ")[0])) ? " unblock signal" : "";
       const wontDo = WONT_DO_STATUSES.has(link.status.toLowerCase()) ? " \u26A0 needs review" : "";
-      parts.push(`${indent}    ${link.relationship} ${link.key} "${link.summary}" [${link.status}]${doneMarker}${blockerResolved}${wontDo}`);
+      parts.push(
+        `${indent}    ${link.relationship} ${link.key} "${link.summary}" [${link.status}]${doneMarker}${blockerResolved}${wontDo}`
+      );
       const signal = item.linkedIssueSignals.find((s) => s.sourceKey === link.key);
       if (signal?.commentSummary) {
         parts.push(`${indent}      \u{1F4AC} ${signal.commentSummary}`);
@@ -20808,6 +20847,7 @@ function progressBar(pct) {
 var MAX_ARTIFACT_NODES = 50;
 var MAX_LLM_DEPTH = 3;
 var MAX_LLM_COMMENT_CHARS = 8e3;
+var DEFAULT_PROGRESS_DIVERGENCE_THRESHOLD = 15;
 async function assessArtifact(store, client, host, options) {
   const visited = /* @__PURE__ */ new Set();
   return _assessArtifactRecursive(store, client, host, options, visited, 0);
@@ -20815,10 +20855,14 @@ async function assessArtifact(store, client, host, options) {
 async function _assessArtifactRecursive(store, client, host, options, visited, depth) {
   const errors = [];
   if (visited.has(options.artifactId)) {
-    return emptyArtifactReport(options.artifactId, [`Cycle detected: ${options.artifactId} already visited`]);
+    return emptyArtifactReport(options.artifactId, [
+      `Cycle detected: ${options.artifactId} already visited`
+    ]);
   }
   if (visited.size >= MAX_ARTIFACT_NODES) {
-    return emptyArtifactReport(options.artifactId, [`Node cap reached (${MAX_ARTIFACT_NODES}), skipping ${options.artifactId}`]);
+    return emptyArtifactReport(options.artifactId, [
+      `Node cap reached (${MAX_ARTIFACT_NODES}), skipping ${options.artifactId}`
+    ]);
   }
   visited.add(options.artifactId);
   const doc = store.get(options.artifactId);
@@ -20888,27 +20932,29 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
           if (result.status === "fulfilled") {
             const { key, issue: li, comments: lc } = result.value;
             linkedJiraIssues.set(key, { issue: li, comments: lc });
-            const newLinks = collectLinkedIssues(li).filter((l) => l.relationship !== "subtask" && !jiraVisited.has(l.key));
+            const newLinks = collectLinkedIssues(li).filter(
+              (l) => l.relationship !== "subtask" && !jiraVisited.has(l.key)
+            );
             for (const nl of newLinks) {
               jiraVisited.add(nl.key);
               queue.push(nl.key);
             }
           } else {
             const batchKey = batch[results.indexOf(result)];
-            errors.push(`Failed to fetch linked issue ${batchKey}: ${result.reason instanceof Error ? result.reason.message : String(result.reason)}`);
+            errors.push(
+              `Failed to fetch linked issue ${batchKey}: ${result.reason instanceof Error ? result.reason.message : String(result.reason)}`
+            );
           }
         }
       }
-      const { allLinks, allSignals } = collectTransitiveLinks(
-        issue2,
-        jiraIssues,
-        linkedJiraIssues
-      );
+      const { allLinks, allSignals } = collectTransitiveLinks(issue2, jiraIssues, linkedJiraIssues);
       linkedIssues = allLinks;
       linkedIssueSignals = allSignals;
       analyzeLinkedIssueSignals(allLinks, fm, jiraKey, proposedUpdates);
     } catch (err) {
-      errors.push(`Failed to fetch ${jiraKey}: ${err instanceof Error ? err.message : String(err)}`);
+      errors.push(
+        `Failed to fetch ${jiraKey}: ${err instanceof Error ? err.message : String(err)}`
+      );
     }
   }
   const currentProgress = getEffectiveProgress(fm);
@@ -20949,7 +20995,11 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
   const primaryHasComments = jiraKey ? (jiraIssues.get(jiraKey)?.comments.length ?? 0) > 0 : false;
   let commentAnalysisProgress = null;
   if (depth < MAX_LLM_DEPTH && jiraKey && primaryHasComments) {
-    const estimatedChars = estimateCommentTextSize(jiraIssues, linkedJiraIssues, linkedIssueSignals);
+    const estimatedChars = estimateCommentTextSize(
+      jiraIssues,
+      linkedJiraIssues,
+      linkedIssueSignals
+    );
     if (estimatedChars <= MAX_LLM_COMMENT_CHARS) {
       try {
         const analysis = await analyzeSingleArtifactComments(
@@ -20964,14 +21014,16 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
         commentSummary = analysis.summary;
         commentAnalysisProgress = analysis.progressEstimate;
         if (commentAnalysisProgress !== null) {
-          const hasExplicitProgress = "progress" in fm && typeof fm.progress === "number";
-          if (!hasExplicitProgress && !fm.progressOverride && commentAnalysisProgress !== currentProgress) {
+          const divergence = Math.abs(commentAnalysisProgress - currentProgress);
+          const threshold = options.progressDivergenceThreshold ?? DEFAULT_PROGRESS_DIVERGENCE_THRESHOLD;
+          if (divergence >= threshold && commentAnalysisProgress !== currentProgress) {
+            const overrideWarning = fm.progressOverride ? " \u26A0 progressOverride is set \u2014 review before applying" : "";
             proposedUpdates.push({
               artifactId: fm.id,
               field: "progress",
               currentValue: currentProgress,
               proposedValue: commentAnalysisProgress,
-              reason: `Comment analysis estimates ${commentAnalysisProgress}% progress`
+              reason: `Comment-derived estimate (${commentAnalysisProgress}%) diverges from current (${currentProgress}%) by ${divergence}pp${overrideWarning}`
             });
           }
         }
@@ -20984,7 +21036,9 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
   const children = [];
   for (const childId of childIds) {
     if (visited.size >= MAX_ARTIFACT_NODES) {
-      errors.push(`Node cap reached (${MAX_ARTIFACT_NODES}), ${childIds.length - children.length} children skipped`);
+      errors.push(
+        `Node cap reached (${MAX_ARTIFACT_NODES}), ${childIds.length - children.length} children skipped`
+      );
       break;
     }
     const childReport = await _assessArtifactRecursive(
@@ -21019,6 +21073,42 @@ 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 +21151,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;
@@ -21087,7 +21180,9 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
       }
       store.update(fm.id, payload);
     } catch (err) {
-      errors.push(`Failed to persist assessment history: ${err instanceof Error ? err.message : String(err)}`);
+      errors.push(
+        `Failed to persist assessment history: ${err instanceof Error ? err.message : String(err)}`
+      );
     }
   }
   return {
@@ -21110,6 +21205,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,
@@ -21144,9 +21242,7 @@ function buildSignals(commentSignals, linkedIssues, statusDrift, proposedStatus)
       signals.push(`\u{1F6AB} Blocker \u2014 "${s.snippet}"`);
     }
   }
-  const blockingLinks = linkedIssues.filter(
-    (l) => l.relationship.toLowerCase().includes("block")
-  );
+  const blockingLinks = linkedIssues.filter((l) => l.relationship.toLowerCase().includes("block"));
   const activeBlockers = blockingLinks.filter((l) => !l.isDone);
   const resolvedBlockers = blockingLinks.filter((l) => l.isDone);
   if (activeBlockers.length > 0) {
@@ -21155,7 +21251,9 @@ function buildSignals(commentSignals, linkedIssues, statusDrift, proposedStatus)
     }
   }
   if (resolvedBlockers.length > 0 && activeBlockers.length === 0) {
-    signals.push(`\u2705 Unblocked \u2014 all blocking issues resolved: ${resolvedBlockers.map((l) => l.key).join(", ")}`);
+    signals.push(
+      `\u2705 Unblocked \u2014 all blocking issues resolved: ${resolvedBlockers.map((l) => l.key).join(", ")}`
+    );
   }
   const wontDoLinks = linkedIssues.filter((l) => WONT_DO_STATUSES.has(l.status.toLowerCase()));
   for (const l of wontDoLinks) {
@@ -21217,9 +21315,11 @@ async function analyzeSingleArtifactComments(artifactId, title, jiraKey, jiraSta
       const text = extractCommentText(c.body);
       return `[${c.author.displayName}, ${c.created.slice(0, 10)}]: ${text.slice(0, 500)}`;
     }).join("\n");
-    promptParts.push(`## ${artifactId} \u2014 ${title} (${jiraKey}, status: ${jiraStatus})
+    promptParts.push(
+      `## ${artifactId} \u2014 ${title} (${jiraKey}, status: ${jiraStatus})
 Comments:
-${commentTexts}`);
+${commentTexts}`
+    );
   }
   for (const signal of linkedIssueSignals) {
     const linkedData = linkedJiraIssues.get(signal.sourceKey);
@@ -21289,6 +21389,9 @@ function emptyArtifactReport(artifactId, errors) {
     commentAnalysisProgress: null,
     linkedIssues: [],
     linkedIssueSignals: [],
+    blockerProgress: null,
+    totalBlockers: 0,
+    resolvedBlockers: 0,
     children: [],
     proposedUpdates: [],
     appliedUpdates: [],
@@ -21296,7 +21399,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");
@@ -21305,7 +21408,7 @@ function buildAssessmentSummary(commentSummary, commentAnalysisProgress, signals
     if (lastProgress) return lastProgress.proposedValue;
     return c.marvinProgress;
   });
-  const childDoneCount = children.filter((c, i) => {
+  const childDoneCount = children.filter((c) => {
     const updates = c.appliedUpdates.length > 0 ? c.appliedUpdates : c.proposedUpdates;
     const lastStatus = findLast(updates, (u) => u.field === "status");
     const effectiveStatus = lastStatus ? String(lastStatus.proposedValue) : c.marvinStatus;
@@ -21320,7 +21423,10 @@ function buildAssessmentSummary(commentSummary, commentAnalysisProgress, signals
     childCount: children.length,
     childDoneCount,
     childRollupProgress,
-    linkedIssueCount: linkedIssues.length
+    linkedIssueCount: linkedIssues.length,
+    blockerProgress,
+    totalBlockers,
+    resolvedBlockers
   };
 }
 function formatArtifactReport(report) {
@@ -21338,7 +21444,8 @@ function formatArtifactReport(report) {
     parts.push(`## Jira State (${report.jiraKey})`);
     const jiraParts = [`Status: ${report.jiraStatus ?? "unknown"}`];
     if (report.jiraAssignee) jiraParts.push(`Assignee: ${report.jiraAssignee}`);
-    if (report.jiraSubtaskProgress !== null) jiraParts.push(`Subtask progress: ${report.jiraSubtaskProgress}%`);
+    if (report.jiraSubtaskProgress !== null)
+      jiraParts.push(`Subtask progress: ${report.jiraSubtaskProgress}%`);
     parts.push(jiraParts.join(" | "));
     if (report.statusDrift) {
       parts.push(`\u26A0 Drift: ${report.marvinStatus} \u2192 ${report.proposedMarvinStatus}`);
@@ -21356,13 +21463,23 @@ 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(
       report.children.reduce((s, c) => s + c.marvinProgress, 0) / report.children.length
     );
     const bar = progressBar(childProgress);
-    parts.push(`## Children (${doneCount}/${report.children.length} done) ${bar} ${childProgress}%`);
+    parts.push(
+      `## Children (${doneCount}/${report.children.length} done) ${bar} ${childProgress}%`
+    );
     for (const child of report.children) {
       formatArtifactChild(parts, child, 1);
     }
@@ -21372,7 +21489,9 @@ function formatArtifactReport(report) {
     parts.push(`## Linked Issues (${report.linkedIssues.length})`);
     for (const link of report.linkedIssues) {
       const doneMarker = link.isDone ? " \u2713" : "";
-      parts.push(`  ${link.relationship} ${link.key} "${link.summary}" [${link.status}]${doneMarker}`);
+      parts.push(
+        `  ${link.relationship} ${link.key} "${link.summary}" [${link.status}]${doneMarker}`
+      );
       const signal = report.linkedIssueSignals.find((s) => s.sourceKey === link.key);
       if (signal?.commentSummary) {
         parts.push(`    \u{1F4AC} ${signal.commentSummary}`);
@@ -21390,7 +21509,9 @@ function formatArtifactReport(report) {
   if (report.proposedUpdates.length > 0) {
     parts.push(`## Proposed Updates (${report.proposedUpdates.length})`);
     for (const update of report.proposedUpdates) {
-      parts.push(`  ${update.artifactId}.${update.field}: ${String(update.currentValue)} \u2192 ${String(update.proposedValue)}`);
+      parts.push(
+        `  ${update.artifactId}.${update.field}: ${String(update.currentValue)} \u2192 ${String(update.proposedValue)}`
+      );
       parts.push(`    Reason: ${update.reason}`);
     }
     parts.push("");
@@ -21400,7 +21521,9 @@ function formatArtifactReport(report) {
   if (report.appliedUpdates.length > 0) {
     parts.push(`## Applied Updates (${report.appliedUpdates.length})`);
     for (const update of report.appliedUpdates) {
-      parts.push(`  \u2713 ${update.artifactId}.${update.field}: ${String(update.currentValue)} \u2192 ${String(update.proposedValue)}`);
+      parts.push(
+        `  \u2713 ${update.artifactId}.${update.field}: ${String(update.currentValue)} \u2192 ${String(update.proposedValue)}`
+      );
     }
     parts.push("");
   }
@@ -21423,7 +21546,9 @@ function formatArtifactChild(parts, child, depth) {
     if (s.startsWith("\u2705 No active")) continue;
     signalHints.push(s);
   }
-  parts.push(`${indent}${icon} ${child.artifactId} \u2014 ${child.title} [${child.marvinStatus}] ${child.marvinProgress}%${jiraLabel}${driftLabel}`);
+  parts.push(
+    `${indent}${icon} ${child.artifactId} \u2014 ${child.title} [${child.marvinStatus}] ${child.marvinProgress}%${jiraLabel}${driftLabel}`
+  );
   if (child.commentSummary) {
     parts.push(`${indent}  \u{1F4AC} ${child.commentSummary}`);
   }
@@ -22254,10 +22379,12 @@ 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."),
+        progressDivergenceThreshold: external_exports.number().min(0).max(100).optional().describe("Minimum divergence in percentage points between comment-derived progress estimate and stored progress to trigger a proposal (default 15).")
       },
       async (args) => {
         const jira = createJiraClient(jiraUserConfig);
@@ -22269,6 +22396,8 @@ function createJiraTools(store, projectConfig) {
           {
             artifactId: args.artifactId,
             applyUpdates: args.applyUpdates ?? false,
+            prerequisiteWeight: args.prerequisiteWeight,
+            progressDivergenceThreshold: args.progressDivergenceThreshold,
             statusMap
           }
         );
@@ -25907,7 +26036,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 +26059,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>`);
     }