mrvn-cli 0.5.18 → 0.5.20

package/dist/marvin-serve.js

@@ -14586,7 +14586,7 @@ function createActionTools(store) {
         tags: external_exports.array(external_exports.string()).optional().describe("Replace all tags. When provided with sprints, sprint tags are merged into this array."),
         sprints: external_exports.array(external_exports.string()).optional().describe("Sprint IDs to assign (replaces existing sprint tags). E.g. ['SP-001']."),
         workFocus: external_exports.string().optional().describe("Work focus name (e.g. 'Budget UX'). Replaces existing focus:<value> tag."),
-        progress: external_exports.number().optional().describe("Explicit progress percentage (0-100).")
+        progress: external_exports.number().nullable().optional().describe("Explicit progress percentage (0-100). Pass null to clear the override and revert to auto-calculation from children.")
       },
       async (args) => {
         const { id, content, sprints, tags, workFocus, progress, owner, assignee, ...updates } = args;
@@ -14629,6 +14629,8 @@ function createActionTools(store) {
         if (typeof progress === "number") {
           updates.progress = Math.max(0, Math.min(100, Math.round(progress)));
           updates.progressOverride = true;
+        } else if (progress === null) {
+          updates.progressOverride = false;
         }
         const doc = store.update(id, updates, content);
         if (args.status !== void 0 || typeof progress === "number") {
@@ -17865,7 +17867,7 @@ function createTaskTools(store) {
         priority: external_exports.enum(["critical", "high", "medium", "low"]).optional().describe("New priority"),
         tags: external_exports.array(external_exports.string()).optional().describe("Replace tags (e.g. remove old tags, add new ones)"),
         workFocus: external_exports.string().optional().describe("Work focus name (e.g. 'Budget UX'). Replaces existing focus:<value> tag."),
-        progress: external_exports.number().optional().describe("Explicit progress percentage (0-100). Overrides auto-calculation from child contributions.")
+        progress: external_exports.number().nullable().optional().describe("Explicit progress percentage (0-100). Overrides auto-calculation from child contributions. Pass null to clear the override and revert to auto-calculation.")
       },
       async (args) => {
         const { id, content, linkedEpic: rawLinkedEpic, tags: userTags, workFocus, progress, ...updates } = args;
@@ -17898,6 +17900,8 @@ function createTaskTools(store) {
         if (typeof progress === "number") {
           updates.progress = Math.max(0, Math.min(100, Math.round(progress)));
           updates.progressOverride = true;
+        } else if (progress === null) {
+          updates.progressOverride = false;
         }
         const doc = store.update(id, updates, content);
         if (args.status !== void 0 || typeof progress === "number") {
@@ -20750,16 +20754,34 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
     );
     children.push(childReport);
   }
+  if (children.length > 0) {
+    const rolledUpProgress = Math.round(
+      children.reduce((s, c) => s + c.marvinProgress, 0) / children.length
+    );
+    if (rolledUpProgress !== currentProgress) {
+      proposedUpdates.push({
+        artifactId: fm.id,
+        field: "progress",
+        currentValue: currentProgress,
+        proposedValue: rolledUpProgress,
+        reason: `Rolled up from ${children.length} children (average ${rolledUpProgress}%)`
+      });
+    }
+  }
   const signals = buildSignals(commentSignals, linkedIssues, statusDrift, proposedMarvinStatus);
   const appliedUpdates = [];
   if (options.applyUpdates && proposedUpdates.length > 0) {
     for (const update of proposedUpdates) {
       if (update.field === "review") continue;
       try {
-        store.update(update.artifactId, {
+        const updatePayload = {
           [update.field]: update.proposedValue,
           lastJiraSyncAt: (/* @__PURE__ */ new Date()).toISOString()
-        });
+        };
+        if (update.field === "progress") {
+          updatePayload.progressOverride = false;
+        }
+        store.update(update.artifactId, updatePayload);
         const updatedDoc = store.get(update.artifactId);
         if (updatedDoc) {
           if (updatedDoc.frontmatter.type === "task") {
@@ -20994,11 +21016,9 @@ function formatArtifactReport(report) {
   }
   if (report.children.length > 0) {
     const doneCount = report.children.filter((c) => DONE_STATUSES6.has(c.marvinStatus)).length;
-    const childWeights = report.children.map((c) => {
-      const { weight } = resolveWeight(void 0);
-      return { weight, progress: c.marvinProgress };
-    });
-    const childProgress = childWeights.length > 0 ? Math.round(childWeights.reduce((s, c) => s + c.weight * c.progress, 0) / childWeights.reduce((s, c) => s + c.weight, 0)) : 0;
+    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}%`);
     for (const child of report.children) {