mrvn-cli 0.5.14 → 0.5.16

package/dist/marvin-serve.js

@@ -19178,24 +19178,53 @@ var DEFAULT_TASK_STATUS_MAP = {
   blocked: ["Blocked"],
   backlog: ["To Do", "Open", "Backlog", "New"]
 };
-function buildStatusLookup(configMap, defaults) {
+function isConditionalEntry(value) {
+  return !Array.isArray(value) && typeof value === "object" && "default" in value;
+}
+function buildStatusLookup(configMap, defaults, inSprint = false) {
   const map2 = configMap ?? defaults;
   const lookup = /* @__PURE__ */ new Map();
-  for (const [marvinStatus, jiraStatuses] of Object.entries(map2)) {
-    for (const js of jiraStatuses) {
+  for (const [marvinStatus, value] of Object.entries(map2)) {
+    const statuses = isConditionalEntry(value) ? value.default : value;
+    for (const js of statuses) {
       lookup.set(js.toLowerCase(), marvinStatus);
     }
   }
+  if (inSprint) {
+    for (const [marvinStatus, value] of Object.entries(map2)) {
+      if (isConditionalEntry(value) && value.inSprint) {
+        for (const js of value.inSprint) {
+          lookup.set(js.toLowerCase(), marvinStatus);
+        }
+      }
+    }
+  }
   return lookup;
 }
-function mapJiraStatusForAction(status, configMap) {
-  const lookup = buildStatusLookup(configMap, DEFAULT_ACTION_STATUS_MAP);
+function mapJiraStatusForAction(status, configMap, inSprint) {
+  const lookup = buildStatusLookup(configMap, DEFAULT_ACTION_STATUS_MAP, inSprint ?? false);
   return lookup.get(status.toLowerCase()) ?? "open";
 }
-function mapJiraStatusForTask(status, configMap) {
-  const lookup = buildStatusLookup(configMap, DEFAULT_TASK_STATUS_MAP);
+function mapJiraStatusForTask(status, configMap, inSprint) {
+  const lookup = buildStatusLookup(configMap, DEFAULT_TASK_STATUS_MAP, inSprint ?? false);
   return lookup.get(status.toLowerCase()) ?? "backlog";
 }
+function isInActiveSprint(store, tags) {
+  if (!tags) return false;
+  const sprintTags = tags.filter((t) => t.startsWith("sprint:"));
+  if (sprintTags.length === 0) return false;
+  for (const tag of sprintTags) {
+    const sprintId = tag.slice(7);
+    const sprintDoc = store.get(sprintId);
+    if (sprintDoc) {
+      const status = sprintDoc.frontmatter.status;
+      if (status === "active" || status === "completed") {
+        return true;
+      }
+    }
+  }
+  return false;
+}
 function extractJiraKeyFromTags(tags) {
   if (!tags) return void 0;
   const tag = tags.find((t) => /^jira:[A-Z]+-\d+$/i.test(t));
@@ -19237,7 +19266,8 @@ async function fetchJiraStatus(store, client, host, artifactId, statusMap) {
     const artifactType = doc.frontmatter.type;
     try {
       const issue2 = await client.getIssueWithLinks(jiraKey);
-      const proposedStatus = artifactType === "task" ? mapJiraStatusForTask(issue2.fields.status.name, statusMap?.task) : mapJiraStatusForAction(issue2.fields.status.name, statusMap?.action);
+      const inSprint = isInActiveSprint(store, doc.frontmatter.tags);
+      const proposedStatus = artifactType === "task" ? mapJiraStatusForTask(issue2.fields.status.name, statusMap?.task, inSprint) : mapJiraStatusForAction(issue2.fields.status.name, statusMap?.action, inSprint);
       const currentStatus = doc.frontmatter.status;
       const linkedIssues = [];
       if (issue2.fields.subtasks) {
@@ -19549,7 +19579,7 @@ async function fetchJiraDaily(store, client, host, projectKey, dateRange, status
     const batch = issues.slice(i, i + BATCH_SIZE2);
     const results = await Promise.allSettled(
       batch.map(
-        (issue2) => processIssue(issue2, client, host, dateRange, jiraKeyToArtifacts, allDocs, statusMap)
+        (issue2) => processIssue(issue2, client, host, dateRange, jiraKeyToArtifacts, allDocs, statusMap, store)
       )
     );
     for (let j = 0; j < results.length; j++) {
@@ -19566,7 +19596,7 @@ async function fetchJiraDaily(store, client, host, projectKey, dateRange, status
   summary.proposedActions = generateProposedActions(summary.issues);
   return summary;
 }
-async function processIssue(issue2, client, host, dateRange, jiraKeyToArtifacts, allDocs, statusMap) {
+async function processIssue(issue2, client, host, dateRange, jiraKeyToArtifacts, allDocs, statusMap, store) {
   const [changelogResult, commentsResult, remoteLinksResult, issueWithLinks] = await Promise.all([
     client.getChangelog(issue2.key).catch(() => []),
     client.getComments(issue2.key).catch(() => []),
@@ -19654,7 +19684,8 @@ async function processIssue(issue2, client, host, dateRange, jiraKeyToArtifacts,
     if (artifactType === "action" || artifactType === "task") {
       const jiraStatus = issue2.fields.status?.name;
       if (jiraStatus) {
-        proposedStatus = artifactType === "task" ? mapJiraStatusForTask(jiraStatus, statusMap?.task) : mapJiraStatusForAction(jiraStatus, statusMap?.action);
+        const inSprint = store ? isInActiveSprint(store, fm.tags) : false;
+        proposedStatus = artifactType === "task" ? mapJiraStatusForTask(jiraStatus, statusMap?.task, inSprint) : mapJiraStatusForAction(jiraStatus, statusMap?.action, inSprint);
       }
     }
     marvinArtifacts.push({
@@ -19774,6 +19805,61 @@ function generateProposedActions(issues) {
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 var DONE_STATUSES7 = /* @__PURE__ */ new Set(["done", "closed", "resolved", "obsolete", "wont do", "cancelled"]);
 var BATCH_SIZE = 5;
+var BLOCKED_WEIGHT_RISK_THRESHOLD = 0.3;
+var COMPLEXITY_WEIGHTS = {
+  trivial: 1,
+  simple: 2,
+  moderate: 3,
+  complex: 5,
+  "very-complex": 8
+};
+var DEFAULT_WEIGHT = 3;
+var STATUS_PROGRESS_DEFAULTS = {
+  done: 100,
+  closed: 100,
+  resolved: 100,
+  obsolete: 100,
+  "wont do": 100,
+  cancelled: 100,
+  review: 80,
+  "in-progress": 40,
+  ready: 5,
+  backlog: 0,
+  open: 0
+};
+var BLOCKED_DEFAULT_PROGRESS = 10;
+function resolveWeight(complexity) {
+  if (complexity && complexity in COMPLEXITY_WEIGHTS) {
+    return { weight: COMPLEXITY_WEIGHTS[complexity], weightSource: "complexity" };
+  }
+  return { weight: DEFAULT_WEIGHT, weightSource: "default" };
+}
+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" };
+  }
+  if (commentAnalysisProgress !== null) {
+    return { progress: Math.max(0, Math.min(100, Math.round(commentAnalysisProgress))), progressSource: "comment-analysis" };
+  }
+  const status = frontmatter.status;
+  if (status === "blocked") {
+    return { progress: BLOCKED_DEFAULT_PROGRESS, progressSource: "status-default" };
+  }
+  const defaultProgress = STATUS_PROGRESS_DEFAULTS[status] ?? 0;
+  return { progress: defaultProgress, progressSource: "status-default" };
+}
+function computeWeightedProgress(items) {
+  if (items.length === 0) return 0;
+  let totalWeight = 0;
+  let weightedSum = 0;
+  for (const item of items) {
+    totalWeight += item.weight;
+    weightedSum += item.weight * item.progress;
+  }
+  if (totalWeight === 0) return 0;
+  return Math.round(weightedSum / totalWeight);
+}
 async function assessSprintProgress(store, client, host, options = {}) {
   const errors = [];
   const sprintData = collectSprintSummaryData(store, options.sprintId);
@@ -19851,7 +19937,8 @@ async function assessSprintProgress(store, client, host, options = {}) {
     const commentSignals = [];
     if (jiraData) {
       jiraStatus = jiraData.issue.fields.status.name;
-      proposedMarvinStatus = fm.type === "task" ? mapJiraStatusForTask(jiraStatus, options.statusMap?.task) : mapJiraStatusForAction(jiraStatus, options.statusMap?.action);
+      const inSprint = isInActiveSprint(store, fm.tags);
+      proposedMarvinStatus = fm.type === "task" ? mapJiraStatusForTask(jiraStatus, options.statusMap?.task, inSprint) : mapJiraStatusForAction(jiraStatus, options.statusMap?.action, inSprint);
       const subtasks = jiraData.issue.fields.subtasks ?? [];
       if (subtasks.length > 0) {
         jiraSubtaskProgress = computeSubtaskProgress(subtasks);
@@ -19885,12 +19972,18 @@ async function assessSprintProgress(store, client, host, options = {}) {
     }
     const tags = fm.tags ?? [];
     const focusTag = tags.find((t) => t.startsWith("focus:"));
+    const { weight, weightSource } = resolveWeight(fm.complexity);
+    const { progress: resolvedProgress, progressSource } = resolveProgress(fm, null);
     const report = {
       id: fm.id,
       title: fm.title,
       type: fm.type,
       marvinStatus: fm.status,
       marvinProgress: currentProgress,
+      progress: resolvedProgress,
+      progressSource,
+      weight,
+      weightSource,
       jiraKey,
       jiraStatus,
       jiraSubtaskProgress,
@@ -19923,32 +20016,44 @@ async function assessSprintProgress(store, client, host, options = {}) {
     for (const child of children) childIds.add(child.id);
   }
   const rootReports = itemReports.filter((r) => !childIds.has(r.id));
+  for (const report of rootReports) {
+    if (report.children.length > 0) {
+      const doc = store.get(report.id);
+      const hasExplicitOverride = doc?.frontmatter.progressOverride;
+      if (!hasExplicitOverride) {
+        report.progress = computeWeightedProgress(report.children);
+        report.progressSource = "status-default";
+      }
+    }
+  }
   const focusAreaMap = /* @__PURE__ */ new Map();
   for (const report of rootReports) {
-    const area = report.focusArea ?? "Uncategorized";
-    if (!focusAreaMap.has(area)) focusAreaMap.set(area, []);
-    focusAreaMap.get(area).push(report);
+    if (!report.focusArea) continue;
+    if (!focusAreaMap.has(report.focusArea)) focusAreaMap.set(report.focusArea, []);
+    focusAreaMap.get(report.focusArea).push(report);
   }
   const focusAreas = [];
   for (const [name, items] of focusAreaMap) {
     const allFlatItems = items.flatMap((i) => [i, ...i.children]);
     const doneCount = allFlatItems.filter((i) => DONE_STATUSES7.has(i.marvinStatus)).length;
     const blockedCount = allFlatItems.filter((i) => i.marvinStatus === "blocked").length;
-    const avgProgress = allFlatItems.length > 0 ? Math.round(allFlatItems.reduce((s, i) => s + i.marvinProgress, 0) / allFlatItems.length) : 0;
+    const progress = computeWeightedProgress(items);
+    const totalWeight = items.reduce((s, i) => s + i.weight, 0);
+    const blockedWeight = items.filter((i) => i.marvinStatus === "blocked").reduce((s, i) => s + i.weight, 0);
+    const blockedWeightPct = totalWeight > 0 ? Math.round(blockedWeight / totalWeight * 100) : 0;
+    const riskWarning = blockedWeightPct > BLOCKED_WEIGHT_RISK_THRESHOLD * 100 ? `${blockedWeightPct}% of scope is blocked` : null;
     focusAreas.push({
       name,
-      items,
-      totalCount: allFlatItems.length,
+      progress,
+      taskCount: allFlatItems.length,
       doneCount,
       blockedCount,
-      avgProgress
+      blockedWeightPct,
+      riskWarning,
+      items
     });
   }
-  focusAreas.sort((a, b) => {
-    if (a.name === "Uncategorized") return 1;
-    if (b.name === "Uncategorized") return -1;
-    return a.name.localeCompare(b.name);
-  });
+  focusAreas.sort((a, b) => a.name.localeCompare(b.name));
   const driftItems = itemReports.filter((r) => r.statusDrift || r.progressDrift);
   const blockers = itemReports.filter(
     (r) => r.marvinStatus === "blocked" || r.commentSignals.some((s) => s.type === "blocker")
@@ -19964,7 +20069,19 @@ async function assessSprintProgress(store, client, host, options = {}) {
         );
         for (const [artifactId, summary] of summaries) {
           const report = itemReports.find((r) => r.id === artifactId);
-          if (report) report.commentSummary = summary;
+          if (report) {
+            report.commentSummary = summary;
+            if (report.progressSource === "status-default") {
+              const pctMatch = summary.match(/(\d{1,3})%/);
+              if (pctMatch) {
+                const pct = parseInt(pctMatch[1], 10);
+                if (pct >= 0 && pct <= 100) {
+                  report.progress = pct;
+                  report.progressSource = "comment-analysis";
+                }
+              }
+            }
+          }
         }
       } catch (err) {
         errors.push(`Comment analysis failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -20006,7 +20123,7 @@ async function assessSprintProgress(store, client, host, options = {}) {
       totalDays: sprintData.timeline.totalDays,
       percentComplete: sprintData.timeline.percentComplete
     },
-    overallProgress: sprintData.workItems.completionPct,
+    overallProgress: rootReports.length > 0 ? computeWeightedProgress(rootReports) : sprintData.workItems.completionPct,
     itemReports: rootReports,
     focusAreas,
     driftItems,
@@ -20103,9 +20220,12 @@ function formatProgressReport(report) {
     parts.push(`## Focus Areas`);
     parts.push("");
     for (const area of report.focusAreas) {
-      const bar = progressBar(area.avgProgress);
-      parts.push(`### ${area.name} ${bar} ${area.avgProgress}%`);
-      parts.push(`${area.doneCount}/${area.totalCount} done${area.blockedCount > 0 ? ` | ${area.blockedCount} blocked` : ""}`);
+      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` : ""}`);
+      if (area.riskWarning) {
+        parts.push(`  \u26A0 ${area.riskWarning}`);
+      }
       parts.push("");
       for (const item of area.items) {
         formatItemLine(parts, item, 0);
@@ -20169,8 +20289,10 @@ function formatItemLine(parts, item, depth) {
   const statusIcon = DONE_STATUSES7.has(item.marvinStatus) ? "\u2713" : item.marvinStatus === "blocked" ? "\u{1F6AB}" : item.marvinStatus === "in-progress" ? "\u25B6" : "\u25CB";
   const jiraLabel = item.jiraKey ? ` [${item.jiraKey}: ${item.jiraStatus}]` : "";
   const driftFlag = item.statusDrift ? " \u26A0drift" : "";
-  const progressLabel = item.marvinProgress > 0 ? ` ${item.marvinProgress}%` : "";
-  parts.push(`${indent}${statusIcon} ${item.id} \u2014 ${item.title} [${item.marvinStatus}]${progressLabel}${jiraLabel}${driftFlag}`);
+  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}`);
   if (item.commentSummary) {
     parts.push(`${indent}  \u{1F4AC} ${item.commentSummary}`);
   }
@@ -20855,12 +20977,20 @@ function createJiraTools(store, projectConfig) {
         const actionMap = statusMap?.action ?? DEFAULT_ACTION_STATUS_MAP;
         const taskMap = statusMap?.task ?? DEFAULT_TASK_STATUS_MAP;
         const actionLookup = /* @__PURE__ */ new Map();
-        for (const [marvin, jiraStatuses] of Object.entries(actionMap)) {
+        for (const [marvin, value] of Object.entries(actionMap)) {
+          const jiraStatuses = Array.isArray(value) ? value : value.default;
           for (const js of jiraStatuses) actionLookup.set(js.toLowerCase(), marvin);
+          if (!Array.isArray(value) && value.inSprint) {
+            for (const js of value.inSprint) actionLookup.set(js.toLowerCase(), `${marvin} (inSprint)`);
+          }
         }
         const taskLookup = /* @__PURE__ */ new Map();
-        for (const [marvin, jiraStatuses] of Object.entries(taskMap)) {
+        for (const [marvin, value] of Object.entries(taskMap)) {
+          const jiraStatuses = Array.isArray(value) ? value : value.default;
           for (const js of jiraStatuses) taskLookup.set(js.toLowerCase(), marvin);
+          if (!Array.isArray(value) && value.inSprint) {
+            for (const js of value.inSprint) taskLookup.set(js.toLowerCase(), `${marvin} (inSprint)`);
+          }
         }
         const parts = [
           `Found ${statusCounts.size} distinct statuses in ${resolvedProjectKey} (scanned ${data.issues.length} of ${data.total} issues):`,