mrvn-cli 0.5.21 → 0.5.23

package/dist/marvin-serve.js

@@ -19842,6 +19842,7 @@ function generateProposedActions(issues) {
 // src/skills/builtin/jira/sprint-progress.ts
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 var DONE_STATUSES6 = /* @__PURE__ */ new Set(["done", "closed", "resolved", "obsolete", "wont do", "cancelled"]);
+var PROGRESS_DONE_STATUSES = /* @__PURE__ */ new Set(["done", "closed", "resolved", "obsolete", "wont do"]);
 var BATCH_SIZE = 5;
 var MAX_LINKED_ISSUES = 50;
 var BLOCKED_WEIGHT_RISK_THRESHOLD = 0.3;
@@ -20731,11 +20732,12 @@ 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);
     if (estimatedChars <= MAX_LLM_COMMENT_CHARS) {
       try {
-        const summary = await analyzeSingleArtifactComments(
+        const analysis = await analyzeSingleArtifactComments(
           fm.id,
           fm.title,
           jiraKey,
@@ -20744,7 +20746,20 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
           linkedJiraIssues,
           linkedIssueSignals
         );
-        commentSummary = summary;
+        commentSummary = analysis.summary;
+        commentAnalysisProgress = analysis.progressEstimate;
+        if (commentAnalysisProgress !== null) {
+          const hasExplicitProgress = "progress" in fm && typeof fm.progress === "number";
+          if (!hasExplicitProgress && !fm.progressOverride && commentAnalysisProgress !== currentProgress) {
+            proposedUpdates.push({
+              artifactId: fm.id,
+              field: "progress",
+              currentValue: currentProgress,
+              proposedValue: commentAnalysisProgress,
+              reason: `Comment analysis estimates ${commentAnalysisProgress}% progress`
+            });
+          }
+        }
       } catch (err) {
         errors.push(`Comment analysis failed: ${err instanceof Error ? err.message : String(err)}`);
       }
@@ -20768,8 +20783,16 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
     children.push(childReport);
   }
   if (children.length > 0) {
+    const childProgressValues = children.map((c) => {
+      const updates = c.appliedUpdates.length > 0 ? c.appliedUpdates : c.proposedUpdates;
+      const lastStatus = findLast(updates, (u) => u.field === "status");
+      if (lastStatus && PROGRESS_DONE_STATUSES.has(String(lastStatus.proposedValue))) return 100;
+      const lastProgress = findLast(updates, (u) => u.field === "progress");
+      if (lastProgress) return lastProgress.proposedValue;
+      return c.marvinProgress;
+    });
     const rolledUpProgress = Math.round(
-      children.reduce((s, c) => s + c.marvinProgress, 0) / children.length
+      childProgressValues.reduce((s, p) => s + p, 0) / childProgressValues.length
     );
     if (rolledUpProgress !== currentProgress) {
       proposedUpdates.push({
@@ -20785,7 +20808,7 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
   const appliedUpdates = [];
   if (options.applyUpdates && proposedUpdates.length > 0) {
     const doneArtifacts = new Set(
-      proposedUpdates.filter((u) => u.field === "status" && DONE_STATUSES6.has(String(u.proposedValue))).map((u) => u.artifactId)
+      proposedUpdates.filter((u) => u.field === "status" && PROGRESS_DONE_STATUSES.has(String(u.proposedValue))).map((u) => u.artifactId)
     );
     for (const update of proposedUpdates) {
       if (update.field === "review") continue;
@@ -20834,6 +20857,7 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
     progressDrift,
     commentSignals,
     commentSummary,
+    commentAnalysisProgress,
     linkedIssues,
     linkedIssueSignals,
     children,
@@ -20926,13 +20950,15 @@ function estimateCommentTextSize(jiraIssues, linkedJiraIssues, linkedIssueSignal
 }
 var SINGLE_ARTIFACT_COMMENT_PROMPT = `You are a delivery management assistant analyzing Jira comments for a single work item.
 
-Produce a 2-3 sentence progress summary covering:
-- What work has been completed
-- What is pending or blocked
-- Any decisions, handoffs, or scheduling mentioned
-- Relevant context from linked issue comments (if provided)
+Analyze the comments and produce:
+1. A 2-3 sentence progress summary covering: what work has been completed, what is pending or blocked, any decisions/handoffs/scheduling mentioned, and relevant context from linked issue comments (if provided).
+2. A progress estimate (0-100%) based on evidence in the comments \u2014 e.g., if comments indicate all items have been triaged into tasks, or implementation is complete pending review, estimate accordingly. If you cannot determine progress from the comments, set progressEstimate to null.
 
-Return ONLY the summary text, no JSON or formatting.`;
+Return a JSON object with this exact structure:
+{"summary": "your 2-3 sentence summary", "progressEstimate": 75}
+
+Use null for progressEstimate if the comments don't provide enough evidence to estimate.
+IMPORTANT: Only return the JSON object, no other text.`;
 async function analyzeSingleArtifactComments(artifactId, title, jiraKey, jiraStatus, jiraIssues, linkedJiraIssues, linkedIssueSignals) {
   const promptParts = [];
   const primaryData = jiraIssues.get(jiraKey);
@@ -20955,7 +20981,7 @@ ${commentTexts}`);
     promptParts.push(`### Linked: ${signal.sourceKey} (${signal.linkType})
 ${commentTexts}`);
   }
-  if (promptParts.length === 0) return null;
+  if (promptParts.length === 0) return { summary: null, progressEstimate: null };
   const prompt = promptParts.join("\n\n");
   const result = query2({
     prompt,
@@ -20972,11 +20998,25 @@ ${commentTexts}`);
         (b) => b.type === "text"
       );
       if (textBlock) {
-        return textBlock.text.trim();
+        return parseCommentAnalysis(textBlock.text.trim());
       }
     }
   }
-  return null;
+  return { summary: null, progressEstimate: null };
+}
+function parseCommentAnalysis(text) {
+  const parsed = parseLlmJson(text);
+  if (parsed && typeof parsed.summary === "string") {
+    const progressEstimate2 = typeof parsed.progressEstimate === "number" && parsed.progressEstimate >= 0 && parsed.progressEstimate <= 100 ? Math.round(parsed.progressEstimate) : null;
+    return { summary: parsed.summary, progressEstimate: progressEstimate2 };
+  }
+  let progressEstimate = null;
+  const pctMatch = text.match(/(\d{1,3})%/);
+  if (pctMatch) {
+    const pct = parseInt(pctMatch[1], 10);
+    if (pct >= 0 && pct <= 100) progressEstimate = pct;
+  }
+  return { summary: text, progressEstimate };
 }
 function emptyArtifactReport(artifactId, errors) {
   return {
@@ -20996,6 +21036,7 @@ function emptyArtifactReport(artifactId, errors) {
     progressDrift: false,
     commentSignals: [],
     commentSummary: null,
+    commentAnalysisProgress: null,
     linkedIssues: [],
     linkedIssueSignals: [],
     children: [],
@@ -21033,6 +21074,9 @@ function formatArtifactReport(report) {
   if (report.commentSummary) {
     parts.push(`## Comments`);
     parts.push(report.commentSummary);
+    if (report.commentAnalysisProgress !== null) {
+      parts.push(`  \u{1F4CA} Comment-derived progress estimate: ${report.commentAnalysisProgress}%`);
+    }
     parts.push("");
   }
   if (report.children.length > 0) {
@@ -21113,6 +21157,12 @@ function formatArtifactChild(parts, child, depth) {
     formatArtifactChild(parts, grandchild, depth + 1);
   }
 }
+function findLast(arr, predicate) {
+  for (let i = arr.length - 1; i >= 0; i--) {
+    if (predicate(arr[i])) return arr[i];
+  }
+  return void 0;
+}
 
 // src/skills/builtin/jira/tools.ts
 var JIRA_TYPE = "jira-issue";