mrvn-cli 0.5.15 → 0.5.16

package/dist/index.d.ts

@@ -16,8 +16,12 @@ interface MarvinUserConfig {
 interface GitConfig {
     remote?: string;
 }
+interface ConditionalJiraStatusEntry {
+    default: string[];
+    inSprint?: string[];
+}
 interface JiraStatusMap {
-    [marvinStatus: string]: string[];
+    [marvinStatus: string]: string[] | ConditionalJiraStatusEntry;
 }
 interface JiraProjectConfig {
     projectKey?: string;

package/dist/index.js

@@ -25092,24 +25092,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));
@@ -25151,7 +25180,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) {
@@ -25503,7 +25533,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++) {
@@ -25520,7 +25550,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(() => []),
@@ -25608,7 +25638,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({
@@ -25860,7 +25891,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);
@@ -26899,12 +26931,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):`,
@@ -32475,11 +32515,13 @@ async function jiraStatusesCommand(projectKey) {
     statusCounts.set(s, (statusCounts.get(s) ?? 0) + 1);
   }
   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);
   }
   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);
   }
   console.log(
@@ -32662,7 +32704,7 @@ function createProgram() {
   const program = new Command();
   program.name("marvin").description(
     "AI-powered product development assistant with Product Owner, Delivery Manager, and Technical Lead personas"
-  ).version("0.5.15");
+  ).version("0.5.16");
   program.command("init").description("Initialize a new Marvin project in the current directory").action(async () => {
     await initCommand();
   });