mrvn-cli 0.5.19 → 0.5.21

package/dist/marvin-serve.js

@@ -14369,24 +14369,26 @@ function getEffectiveProgress(frontmatter) {
   if (typeof raw === "number") return Math.max(0, Math.min(100, Math.round(raw)));
   return STATUS_PROGRESS_DEFAULTS[frontmatter.status] ?? 0;
 }
-function propagateProgressFromTask(store, taskId) {
+function propagateProgressFromTask(store, taskId, options) {
   const updated = [];
   const task = store.get(taskId);
   if (!task) return updated;
-  if (DONE_STATUSES.has(task.frontmatter.status)) {
-    if (task.frontmatter.progress !== 100) {
-      store.update(taskId, { progress: 100 });
-      updated.push(taskId);
-    }
-  } else if (!task.frontmatter.progressOverride) {
-    const children = store.list({ type: "contribution" }).filter((d) => d.frontmatter.aboutArtifact === taskId);
-    if (children.length > 0) {
-      const avg = children.reduce((sum, c) => sum + getEffectiveProgress(c.frontmatter), 0) / children.length;
-      const progress = Math.round(avg);
-      if (task.frontmatter.progress !== progress) {
-        store.update(taskId, { progress });
+  if (!options?.skipSelf) {
+    if (DONE_STATUSES.has(task.frontmatter.status)) {
+      if (task.frontmatter.progress !== 100) {
+        store.update(taskId, { progress: 100 });
         updated.push(taskId);
       }
+    } else if (!task.frontmatter.progressOverride) {
+      const children = store.list({ type: "contribution" }).filter((d) => d.frontmatter.aboutArtifact === taskId);
+      if (children.length > 0) {
+        const avg = children.reduce((sum, c) => sum + getEffectiveProgress(c.frontmatter), 0) / children.length;
+        const progress = Math.round(avg);
+        if (task.frontmatter.progress !== progress) {
+          store.update(taskId, { progress });
+          updated.push(taskId);
+        }
+      }
     }
   }
   const aboutArtifact = task.frontmatter.aboutArtifact;
@@ -14398,10 +14400,11 @@ function propagateProgressFromTask(store, taskId) {
   }
   return updated;
 }
-function propagateProgressToAction(store, actionId) {
+function propagateProgressToAction(store, actionId, options) {
   const updated = [];
   const action = store.get(actionId);
   if (!action) return updated;
+  if (options?.skipSelf) return updated;
   if (DONE_STATUSES.has(action.frontmatter.status)) {
     if (action.frontmatter.progress !== 100) {
       store.update(actionId, { progress: 100 });
@@ -14586,10 +14589,11 @@ 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().nullable().optional().describe("Explicit progress percentage (0-100). Pass null to clear the override and revert to auto-calculation from children.")
+        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."),
+        progressOverride: external_exports.boolean().optional().describe("Control auto-calculation lock. true = lock progress to explicit value, false = allow auto-calculation from children. When omitted: setting progress implies true, null progress implies false.")
       },
       async (args) => {
-        const { id, content, sprints, tags, workFocus, progress, owner, assignee, ...updates } = args;
+        const { id, content, sprints, tags, workFocus, progress, progressOverride, owner, assignee, ...updates } = args;
         if (owner !== void 0) updates.owner = normalizeOwner(owner);
         if (assignee !== void 0) updates.assignee = assignee;
         if (tags !== void 0) {
@@ -14628,13 +14632,17 @@ function createActionTools(store) {
         }
         if (typeof progress === "number") {
           updates.progress = Math.max(0, Math.min(100, Math.round(progress)));
-          updates.progressOverride = true;
+          updates.progressOverride = progressOverride ?? true;
         } else if (progress === null) {
           updates.progressOverride = false;
+        } else if (progressOverride !== void 0) {
+          updates.progressOverride = progressOverride;
         }
         const doc = store.update(id, updates, content);
         if (args.status !== void 0 || typeof progress === "number") {
-          propagateProgressToAction(store, id);
+          propagateProgressToAction(store, id, {
+            skipSelf: typeof progress === "number"
+          });
         }
         return {
           content: [
@@ -17867,10 +17875,11 @@ 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().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.")
+        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."),
+        progressOverride: external_exports.boolean().optional().describe("Control auto-calculation lock. true = lock progress to explicit value, false = allow auto-calculation from children. When omitted: setting progress implies true, null progress implies false.")
       },
       async (args) => {
-        const { id, content, linkedEpic: rawLinkedEpic, tags: userTags, workFocus, progress, ...updates } = args;
+        const { id, content, linkedEpic: rawLinkedEpic, tags: userTags, workFocus, progress, progressOverride, ...updates } = args;
         const warnings = [];
         if (rawLinkedEpic !== void 0) {
           const linkedEpics = normalizeLinkedEpics(rawLinkedEpic);
@@ -17899,13 +17908,17 @@ function createTaskTools(store) {
         }
         if (typeof progress === "number") {
           updates.progress = Math.max(0, Math.min(100, Math.round(progress)));
-          updates.progressOverride = true;
+          updates.progressOverride = progressOverride ?? true;
         } else if (progress === null) {
           updates.progressOverride = false;
+        } else if (progressOverride !== void 0) {
+          updates.progressOverride = progressOverride;
         }
         const doc = store.update(id, updates, content);
         if (args.status !== void 0 || typeof progress === "number") {
-          propagateProgressFromTask(store, id);
+          propagateProgressFromTask(store, id, {
+            skipSelf: typeof progress === "number"
+          });
         }
         const parts = [`Updated task ${doc.frontmatter.id}: ${doc.frontmatter.title}`];
         if (warnings.length > 0) {
@@ -20755,11 +20768,8 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
     children.push(childReport);
   }
   if (children.length > 0) {
-    const rolledUpProgress = computeWeightedProgress(
-      children.map((c) => ({
-        weight: resolveWeight(void 0).weight,
-        progress: c.marvinProgress
-      }))
+    const rolledUpProgress = Math.round(
+      children.reduce((s, c) => s + c.marvinProgress, 0) / children.length
     );
     if (rolledUpProgress !== currentProgress) {
       proposedUpdates.push({
@@ -20767,15 +20777,21 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
         field: "progress",
         currentValue: currentProgress,
         proposedValue: rolledUpProgress,
-        reason: `Rolled up from ${children.length} children (weighted average ${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) {
+    const doneArtifacts = new Set(
+      proposedUpdates.filter((u) => u.field === "status" && DONE_STATUSES6.has(String(u.proposedValue))).map((u) => u.artifactId)
+    );
     for (const update of proposedUpdates) {
       if (update.field === "review") continue;
+      if (update.field === "progress" && doneArtifacts.has(update.artifactId)) {
+        if (update.proposedValue !== 100) continue;
+      }
       try {
         const updatePayload = {
           [update.field]: update.proposedValue,
@@ -20785,12 +20801,14 @@ async function _assessArtifactRecursive(store, client, host, options, visited, d
           updatePayload.progressOverride = false;
         }
         store.update(update.artifactId, updatePayload);
-        const updatedDoc = store.get(update.artifactId);
-        if (updatedDoc) {
-          if (updatedDoc.frontmatter.type === "task") {
-            propagateProgressFromTask(store, update.artifactId);
-          } else if (updatedDoc.frontmatter.type === "action") {
-            propagateProgressToAction(store, update.artifactId);
+        if (update.field === "status") {
+          const updatedDoc = store.get(update.artifactId);
+          if (updatedDoc) {
+            if (updatedDoc.frontmatter.type === "task") {
+              propagateProgressFromTask(store, update.artifactId);
+            } else if (updatedDoc.frontmatter.type === "action") {
+              propagateProgressToAction(store, update.artifactId);
+            }
           }
         }
         appliedUpdates.push(update);
@@ -21019,11 +21037,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) {