mrvn-cli 0.5.15 → 0.5.17

package/dist/marvin-serve.js

@@ -14349,11 +14349,25 @@ import { tool as tool2 } from "@anthropic-ai/claude-agent-sdk";
 
 // src/storage/progress.ts
 var DONE_STATUSES = /* @__PURE__ */ new Set(["done", "closed", "resolved", "cancelled"]);
+var STATUS_PROGRESS_DEFAULTS = {
+  done: 100,
+  closed: 100,
+  resolved: 100,
+  obsolete: 100,
+  "wont do": 100,
+  cancelled: 100,
+  review: 80,
+  "in-progress": 40,
+  ready: 5,
+  blocked: 10,
+  backlog: 0,
+  open: 0
+};
 function getEffectiveProgress(frontmatter) {
   if (DONE_STATUSES.has(frontmatter.status)) return 100;
   const raw = frontmatter.progress;
   if (typeof raw === "number") return Math.max(0, Math.min(100, Math.round(raw)));
-  return 0;
+  return STATUS_PROGRESS_DEFAULTS[frontmatter.status] ?? 0;
 }
 function propagateProgressFromTask(store, taskId) {
   const updated = [];
@@ -19178,24 +19192,80 @@ var DEFAULT_TASK_STATUS_MAP = {
   blocked: ["Blocked"],
   backlog: ["To Do", "Open", "Backlog", "New"]
 };
-function buildStatusLookup(configMap, defaults) {
-  const map2 = configMap ?? defaults;
+function isLegacyFormat(statusMap) {
+  if (!statusMap || typeof statusMap !== "object") return false;
+  const keys = Object.keys(statusMap);
+  if (!keys.every((k) => k === "action" || k === "task")) return false;
+  for (const key of keys) {
+    const val = statusMap[key];
+    if (typeof val !== "object" || val === null) return false;
+    for (const innerVal of Object.values(val)) {
+      if (!Array.isArray(innerVal)) return false;
+      if (!innerVal.every((v) => typeof v === "string")) return false;
+    }
+  }
+  return true;
+}
+function buildLegacyLookup(legacyMap) {
   const lookup = /* @__PURE__ */ new Map();
-  for (const [marvinStatus, jiraStatuses] of Object.entries(map2)) {
+  for (const [marvinStatus, jiraStatuses] of Object.entries(legacyMap)) {
     for (const js of jiraStatuses) {
       lookup.set(js.toLowerCase(), marvinStatus);
     }
   }
   return lookup;
 }
-function mapJiraStatusForAction(status, configMap) {
-  const lookup = buildStatusLookup(configMap, DEFAULT_ACTION_STATUS_MAP);
+function buildFlatLookup(flatMap, inSprint) {
+  const lookup = /* @__PURE__ */ new Map();
+  for (const [jiraStatus, value] of Object.entries(flatMap)) {
+    if (typeof value === "string") {
+      lookup.set(jiraStatus.toLowerCase(), value);
+    } else {
+      const resolved = inSprint && value.inSprint ? value.inSprint : value.default;
+      lookup.set(jiraStatus.toLowerCase(), resolved);
+    }
+  }
+  return lookup;
+}
+function normalizeStatusMap(statusMap) {
+  if (!statusMap) return {};
+  if (isLegacyFormat(statusMap)) {
+    return { legacy: statusMap };
+  }
+  return { flat: statusMap };
+}
+function mapJiraStatusForAction(status, resolved, inSprint = false) {
+  if (resolved.flat) {
+    const lookup2 = buildFlatLookup(resolved.flat, inSprint);
+    return lookup2.get(status.toLowerCase()) ?? "open";
+  }
+  const lookup = buildLegacyLookup(resolved.legacy?.action ?? DEFAULT_ACTION_STATUS_MAP);
   return lookup.get(status.toLowerCase()) ?? "open";
 }
-function mapJiraStatusForTask(status, configMap) {
-  const lookup = buildStatusLookup(configMap, DEFAULT_TASK_STATUS_MAP);
+function mapJiraStatusForTask(status, resolved, inSprint = false) {
+  if (resolved.flat) {
+    const lookup2 = buildFlatLookup(resolved.flat, inSprint);
+    return lookup2.get(status.toLowerCase()) ?? "backlog";
+  }
+  const lookup = buildLegacyLookup(resolved.legacy?.task ?? DEFAULT_TASK_STATUS_MAP);
   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 +19307,9 @@ 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 resolved = statusMap ?? {};
+      const proposedStatus = artifactType === "task" ? mapJiraStatusForTask(issue2.fields.status.name, resolved, inSprint) : mapJiraStatusForAction(issue2.fields.status.name, resolved, inSprint);
       const currentStatus = doc.frontmatter.status;
       const linkedIssues = [];
       if (issue2.fields.subtasks) {
@@ -19549,7 +19621,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 +19638,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 +19726,9 @@ 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;
+        const resolved = statusMap ?? {};
+        proposedStatus = artifactType === "task" ? mapJiraStatusForTask(jiraStatus, resolved, inSprint) : mapJiraStatusForAction(jiraStatus, resolved, inSprint);
       }
     }
     marvinArtifacts.push({
@@ -19783,20 +19857,6 @@ var COMPLEXITY_WEIGHTS = {
   "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" };
@@ -19812,9 +19872,6 @@ function resolveProgress(frontmatter, commentAnalysisProgress) {
     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" };
 }
@@ -19906,7 +19963,9 @@ 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);
+      const resolved = options.statusMap ?? {};
+      proposedMarvinStatus = fm.type === "task" ? mapJiraStatusForTask(jiraStatus, resolved, inSprint) : mapJiraStatusForAction(jiraStatus, resolved, inSprint);
       const subtasks = jiraData.issue.fields.subtasks ?? [];
       if (subtasks.length > 0) {
         jiraSubtaskProgress = computeSubtaskProgress(subtasks);
@@ -19937,6 +19996,20 @@ async function assessSprintProgress(store, client, host, options = {}) {
         proposedValue: jiraSubtaskProgress,
         reason: `Jira ${jiraKey} subtask progress is ${jiraSubtaskProgress}%`
       });
+    } else if (statusDrift && proposedMarvinStatus && !fm.progressOverride) {
+      const hasExplicitProgress = "progress" in fm && typeof fm.progress === "number";
+      if (!hasExplicitProgress) {
+        const proposedProgress = STATUS_PROGRESS_DEFAULTS[proposedMarvinStatus] ?? 0;
+        if (proposedProgress !== currentProgress) {
+          proposedUpdates.push({
+            artifactId: fm.id,
+            field: "progress",
+            currentValue: currentProgress,
+            proposedValue: proposedProgress,
+            reason: `Status changing to "${proposedMarvinStatus}" \u2192 default progress ${proposedProgress}%`
+          });
+        }
+      }
     }
     const tags = fm.tags ?? [];
     const focusTag = tags.find((t) => t.startsWith("focus:"));
@@ -20315,7 +20388,7 @@ function findByJiraKey(store, jiraKey) {
 function createJiraTools(store, projectConfig) {
   const jiraUserConfig = loadUserConfig().jira;
   const defaultProjectKey = projectConfig?.jira?.projectKey;
-  const statusMap = projectConfig?.jira?.statusMap;
+  const statusMap = normalizeStatusMap(projectConfig?.jira?.statusMap);
   return [
     // --- Local read tools ---
     tool20(
@@ -20942,15 +21015,32 @@ function createJiraTools(store, projectConfig) {
           const s = issue2.fields.status.name;
           statusCounts.set(s, (statusCounts.get(s) ?? 0) + 1);
         }
-        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 js of jiraStatuses) actionLookup.set(js.toLowerCase(), marvin);
-        }
         const taskLookup = /* @__PURE__ */ new Map();
-        for (const [marvin, jiraStatuses] of Object.entries(taskMap)) {
-          for (const js of jiraStatuses) taskLookup.set(js.toLowerCase(), marvin);
+        if (statusMap.flat) {
+          for (const [jiraStatus, value] of Object.entries(statusMap.flat)) {
+            const lower = jiraStatus.toLowerCase();
+            if (typeof value === "string") {
+              actionLookup.set(lower, value);
+              taskLookup.set(lower, value);
+            } else {
+              actionLookup.set(lower, value.default);
+              taskLookup.set(lower, value.default);
+              if (value.inSprint) {
+                actionLookup.set(lower, `${value.default} / ${value.inSprint} (inSprint)`);
+                taskLookup.set(lower, `${value.default} / ${value.inSprint} (inSprint)`);
+              }
+            }
+          }
+        } else {
+          const actionMap = statusMap.legacy?.action ?? DEFAULT_ACTION_STATUS_MAP;
+          const taskMap = statusMap.legacy?.task ?? DEFAULT_TASK_STATUS_MAP;
+          for (const [marvin, jiraStatuses] of Object.entries(actionMap)) {
+            for (const js of jiraStatuses) actionLookup.set(js.toLowerCase(), marvin);
+          }
+          for (const [marvin, jiraStatuses] of Object.entries(taskMap)) {
+            for (const js of jiraStatuses) taskLookup.set(js.toLowerCase(), marvin);
+          }
         }
         const parts = [
           `Found ${statusCounts.size} distinct statuses in ${resolvedProjectKey} (scanned ${data.issues.length} of ${data.total} issues):`,
@@ -20971,25 +21061,20 @@ function createJiraTools(store, projectConfig) {
           if (!taskTarget) unmappedTask.push(status);
         }
         if (unmappedAction.length > 0 || unmappedTask.length > 0) {
+          const allUnmapped = [.../* @__PURE__ */ new Set([...unmappedAction, ...unmappedTask])];
           parts.push("");
           parts.push("To fix unmapped statuses, add jira.statusMap to .marvin/config.yaml:");
           parts.push("  jira:");
           parts.push("    statusMap:");
-          if (unmappedAction.length > 0) {
-            parts.push("      action:");
-            parts.push(`        # Map these: ${unmappedAction.join(", ")}`);
-            parts.push("        # <marvin-status>: [<jira-status>, ...]");
-          }
-          if (unmappedTask.length > 0) {
-            parts.push("      task:");
-            parts.push(`        # Map these: ${unmappedTask.join(", ")}`);
-            parts.push("        # <marvin-status>: [<jira-status>, ...]");
+          for (const s of allUnmapped) {
+            parts.push(`      "${s}": <marvin-status>`);
           }
+          parts.push("  # Supported marvin statuses: done, in-progress, review, ready, blocked, backlog, open");
         } else {
           parts.push("");
           parts.push("All statuses are mapped.");
         }
-        const usingConfig = statusMap?.action || statusMap?.task;
+        const usingConfig = statusMap.flat || statusMap.legacy;
         parts.push("");
         parts.push(usingConfig ? "Using status maps from .marvin/config.yaml." : "Using built-in default status maps (no jira.statusMap in config).");
         return {