filegrc 0.15.2 → 0.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filegrc",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Zero-dependency Git-native GRC engine",
   "license": "MIT",
   "repository": {

package/src/audit-preparation.js

@@ -997,24 +997,30 @@ function occurrenceContinuityStage(audit, records, model, asOf) {
 export function occurrenceProgressUnits(plan, { selectedControlIds, periodStart, periodThrough }) {
   return [
     ...plan.calendarItems.flatMap((occurrence) => {
-      const completedMemberIds = new Set(occurrence.completedMemberIds || []);
+      const resolvedMemberIds = new Set(occurrence.resolvedMemberIds || occurrence.completedMemberIds || []);
+      const membersComplete = occurrence.membershipFinal && (occurrence.expectedMemberIds || [])
+        .every((resourceId) => resolvedMemberIds.has(resourceId));
       const conclusionComplete = occurrence.reconciliationStatus === "reconciled"
-        && ["complete", "complete-with-exceptions", "zero-population"].includes(occurrence.operatingResult);
+        && ["complete", "complete-with-exceptions", "zero-population"].includes(occurrence.operatingResult)
+        && membersComplete
+        && occurrence.conclusionValid !== false;
       const occurrenceComplete = conclusionComplete || occurrence.legacySchedule && occurrence.status === "complete";
-      const memberUnits = (occurrence.expectedMemberIds || []).map((resourceId) => ({
-        id: `occurrence-${occurrence.occurrenceKey}-member-${resourceId}`,
-        status: occurrenceComplete || completedMemberIds.has(resourceId) ? "complete" : "action",
-        title: `${occurrence.title} member ${resourceId}`
-      }));
-      const membersComplete = memberUnits.every(({ status }) => status === "complete");
-      return [
-        ...memberUnits,
+      const workComplete = occurrenceComplete || membersComplete;
+      const workUnit = {
+        id: `occurrence-${occurrence.occurrenceKey}-work`,
+        status: workComplete ? "complete" : "action",
+        title: `${occurrence.title} occurrence work`
+      };
+      return occurrence.legacySchedule
+        ? [workUnit]
+        : [
+          workUnit,
         {
           id: `occurrence-${occurrence.occurrenceKey}-reconciliation`,
-          status: occurrenceComplete ? "complete" : membersComplete && occurrence.membershipFinal ? "action" : "blocked",
+          status: occurrenceComplete ? "complete" : workComplete && occurrence.membershipFinal ? "action" : "blocked",
           title: `${occurrence.title} reconciliation`
         }
-      ];
+        ];
     }),
     ...plan.eventRuns
       .filter((run) => run.status !== "canceled" && run.occurredOn >= periodStart && run.occurredOn <= periodThrough)

package/src/obligation-members.js

@@ -0,0 +1,31 @@
+export function occurrenceMemberExceptionIsValid(member, occurrence, byId) {
+  const exception = byId.get(member.exceptionId);
+  const occurrenceStart = occurrence.coverage?.kind === "as-of"
+    ? occurrence.coverage.on
+    : occurrence.coverage?.startsOn;
+  const occurrenceEnd = occurrence.coverage?.kind === "as-of"
+    ? occurrence.coverage.on
+    : occurrence.coverage?.endsOn;
+  const exceptionCoversMember = exception?.scopeResourceIds?.includes(member.resourceId)
+    || exception?.scopeResourceIds?.includes(occurrence.obligationId);
+  const statusCoveredOccurrence = exception?.status === "approved"
+    || ["revoked", "closed"].includes(exception?.status)
+      && exception.resolution?.resolvedOn > occurrenceEnd;
+  return Boolean(
+    exception?.type === "exception"
+    && statusCoveredOccurrence
+    && exceptionCoversMember
+    && exception.approval?.approvedOn <= occurrenceStart
+    && exception.approval?.expiresOn >= occurrenceEnd
+  );
+}
+
+export function occurrenceMemberIsResolved(member, occurrence, byId, expectedCompletionIsValid = () => false) {
+  if (member.disposition === "expected") {
+    return member.result === "passed"
+      && (member.completionResourceIds || []).some((id) => expectedCompletionIsValid(id, member));
+  }
+  if (member.disposition === "exception") return occurrenceMemberExceptionIsValid(member, occurrence, byId);
+  if (member.disposition === "not-applicable") return Boolean(String(member.rationale || "").trim());
+  return false;
+}

package/src/obligations.js

@@ -29,6 +29,7 @@ import { serializeWorkspaceMutation } from "./mutation.js";
 import { collectionReviewRevision, historicalCollectionReviewSnapshot } from "./collection-review-integrity.js";
 import { bindAttestationReportingRouteSet, reportingRouteRevision } from "./reporting-route-integrity.js";
 import { selectScopedCollectionRecords } from "./collection-scope.js";
+import { occurrenceMemberIsResolved } from "./obligation-members.js";
 
 const COMPLETION_DATE_FIELDS = [
   "completedOn",
@@ -214,8 +215,22 @@ export function planObligations(resources, options = {}) {
       const completedMemberIds = new Set((reconciliation?.members || [])
         .filter((member) => member.result === "passed" && member.disposition === "expected")
         .map((member) => member.resourceId));
+      const resolvedMemberIds = new Set((reconciliation?.members || [])
+        .filter((member) => occurrenceMemberIsResolved(member, reconciliation, byId, (completionId) => {
+          const completion = byId.get(completionId);
+          return completionTypeMatches(completion, expectedCompletionTypes)
+            && completionMatchesMember(completion, activity.aggregate?.completionMemberField, member.resourceId)
+            && completionFallsInWindow(completion, window, rule?.timezone || workspace?.timezone || "UTC")
+            && completionPassesActivity(completion, activity);
+        }))
+        .map((member) => member.resourceId));
+      const resolutionsComplete = membershipFinal
+        && expectedMemberIds.every((resourceId) => resolvedMemberIds.has(resourceId));
+      const conclusionValid = ["complete", "complete-with-exceptions", "zero-population"].includes(reconciliation?.conclusion)
+        && resolutionsComplete;
       const successful = reconciliation
-        ? reconciliation.status === "reconciled" && ["complete", "complete-with-exceptions", "zero-population"].includes(reconciliation.conclusion)
+        ? reconciliation.status === "reconciled"
+          && conclusionValid
         : legacyCompletions.length > 0;
       const timingStatus = occurrenceStatus(window, asOf, successful);
       const status = timingStatus === "complete" || programStatus === "accepted" ? timingStatus : "proposed";
@@ -244,6 +259,9 @@ export function planObligations(resources, options = {}) {
         completionResourceIds,
         expectedMemberIds,
         completedMemberIds: [...completedMemberIds],
+        resolvedMemberIds: [...resolvedMemberIds],
+        resolutionsComplete,
+        conclusionValid,
         expectedCount: reconciliation?.status === "open" && !membershipFinal
           ? expectedMemberIds.length
           : reconciliation?.expectedCount ?? expectedMemberIds.length,
@@ -282,8 +300,20 @@ export function planObligations(resources, options = {}) {
     const completedMemberIds = (occurrence.members || [])
       .filter(({ disposition, result }) => disposition === "expected" && result === "passed")
       .map(({ resourceId }) => resourceId);
+    const resolvedMemberIds = (occurrence.members || [])
+      .filter((member) => occurrenceMemberIsResolved(member, occurrence, byId, (completionId) => {
+        const completion = byId.get(completionId);
+        return completionTypeMatches(completion, activity.completionResourceTypes)
+          && completionMatchesMember(completion, activity.aggregate?.completionMemberField, member.resourceId)
+          && completionFallsInWindow(completion, window, rule.timezone || workspace?.timezone || "UTC")
+          && completionPassesActivity(completion, activity);
+      }))
+      .map(({ resourceId }) => resourceId);
+    const resolutionsComplete = (occurrence.members || []).every(({ resourceId }) => resolvedMemberIds.includes(resourceId));
+    const conclusionValid = ["complete", "complete-with-exceptions", "zero-population"].includes(occurrence.conclusion)
+      && resolutionsComplete;
     const successful = occurrence.status === "reconciled"
-      && ["complete", "complete-with-exceptions", "zero-population"].includes(occurrence.conclusion);
+      && conclusionValid;
     const timingStatus = occurrenceStatus(window, asOf, successful);
     if (timingStatus === "complete" && !options.includeComplete) continue;
     calendarItems.push({
@@ -307,6 +337,9 @@ export function planObligations(resources, options = {}) {
       completionResourceIds: [...new Set((occurrence.members || []).flatMap(({ completionResourceIds = [] }) => completionResourceIds))],
       expectedMemberIds: (occurrence.members || []).map(({ resourceId }) => resourceId),
       completedMemberIds,
+      resolvedMemberIds,
+      resolutionsComplete,
+      conclusionValid,
       expectedCount: occurrence.expectedCount,
       completedCount: occurrence.completedCount,
       membershipFinal: true,
@@ -1750,8 +1783,8 @@ function plannedCompletionWindow(window) {
   };
 }
 
-function completionFallsInWindow(record, window) {
-  const date = completionDate(record);
+function completionFallsInWindow(record, window, timezone = "UTC") {
+  const date = completionDate(record, timezone);
   return Boolean(date && date >= window.dueWindowStart && date <= window.dueWindowEnd);
 }
 
@@ -1765,11 +1798,11 @@ function completionTypeMatches(record, expectedTypes = []) {
   return Boolean(record && (expectedTypes.length === 0 || expectedTypes.includes(record.type)));
 }
 
-function completionDate(record) {
+function completionDate(record, timezone = "UTC") {
   const coverageDate = coverageEnd(record.coverage);
   if (parseCalendarDate(coverageDate)) return coverageDate;
   for (const field of COMPLETION_TIMESTAMP_FIELDS) {
-    if (isRfc3339Timestamp(record[field])) return record[field].slice(0, 10);
+    if (isRfc3339Timestamp(record[field])) return currentCalendarDate(timezone, new Date(record[field]));
   }
   for (const field of COMPLETION_DATE_FIELDS) {
     if (parseCalendarDate(record[field])) return record[field];

package/src/program-readiness.js

@@ -707,15 +707,34 @@ function reportingRouteItem(records, byId, asOf, timezone = "UTC") {
   );
 }
 
-function collectionReviewReadinessItem(assessment) {
+export function collectionReviewReadinessItem(assessment) {
   const proposalUnits = (assessment.recordProposals || []).map((proposal) => ({
     id: `${assessment.resourceType}-proposal-${proposal.resourceId}`,
     status: proposal.complete ? "complete" : "action",
     title: `${proposal.title} proposal`
   }));
+  const proposalBatchComplete = proposalUnits.every(({ status }) => status === "complete");
+  const scheduleApprovalBlocked = assessment.resourceType === "retention-schedule-item"
+    && proposalUnits.some(({ status }) => status !== "complete");
+  const batchProgressUnits = assessment.resourceType !== "retention-schedule-item" && proposalUnits.length
+    ? [
+        {
+          id: `${assessment.resourceType}-proposal-batch`,
+          status: proposalBatchComplete ? "complete" : "action",
+          title: `${assessment.configuration.title} proposals`
+        },
+        {
+          id: `${assessment.resourceType}-collection-review`,
+          status: proposalBatchComplete
+            ? assessment.complete ? "complete" : "action"
+            : "blocked",
+          title: `${assessment.configuration.title} collection review`
+        }
+      ]
+    : null;
   return item(
     `collection-review-${assessment.resourceType}`,
-    assessment.complete ? "complete" : "action",
+    assessment.complete ? "complete" : scheduleApprovalBlocked ? "blocked" : "action",
     assessment.status === "stale"
       ? `Review ${assessment.configuration.title.toLowerCase()} again`
       : `Review ${assessment.configuration.title.toLowerCase()}`,
@@ -724,18 +743,7 @@ function collectionReviewReadinessItem(assessment) {
     {
       resourceType: assessment.resourceType,
       reviewPoints: assessment.configuration.reviewPoints,
-      ...(proposalUnits.length ? {
-        progressUnits: [
-          ...proposalUnits,
-          {
-            id: `${assessment.resourceType}-collection-review`,
-            status: proposalUnits.every(({ status }) => status === "complete")
-              ? assessment.complete ? "complete" : "action"
-              : "blocked",
-            title: `${assessment.configuration.title} collection review`
-          }
-        ]
-      } : {}),
+      ...(batchProgressUnits ? { progressUnits: batchProgressUnits } : {}),
       commands: [
         `npx filegrc review-collection ${assessment.resourceType} --scaffold`,
         `npx filegrc review-collection ${assessment.resourceType} REVIEW.json --preview --json`
@@ -1646,6 +1654,7 @@ async function evidenceSourcesStage(scope, byId, model, readMarkdown) {
         : `${coveredControls.length} of ${family.controls.length} selected controls have an active authoritative ${componentSources ? "Component" : "System"} with the required source role, access owners, and extraction instructions.`,
       completeSources[0] || selectedSources[0] || { type: sourceType },
       {
+        progressUnit: false,
         familyId: family.id,
         sourceKinds: family.sourceKinds,
         controlIds: family.controls.map((control) => control.id),

package/src/retention.js

@@ -137,6 +137,7 @@ export async function assessRetentionReadiness(loaded, program, options = {}) {
         : `${duplicates.length} similar pair${duplicates.length === 1 ? " needs" : "s need"} management review. FileGRC will not merge records or rewrite relationships automatically.`,
       { type: "information-type" },
       {
+        progressUnit: false,
         candidates: duplicates,
         commands: [
           "npx filegrc list information-type --workflow --json",

package/src/validate.js

@@ -44,6 +44,7 @@ import {
   recordsAtRevision
 } from "./reporting-route-integrity.js";
 import { validateWorkflowHistoryIntegrity } from "./workflow-history-integrity.js";
+import { occurrenceMemberExceptionIsValid } from "./obligation-members.js";
 
 let fingerprintFileReadObserver = null;
 
@@ -667,18 +668,7 @@ function validateObligationOccurrence(record, model, resources, entries, root, w
       ));
     }
     if (member.disposition === "exception") {
-      const exception = byId.get(member.exceptionId);
-      const occurrenceStart = record.coverage?.kind === "as-of" ? record.coverage.on : record.coverage?.startsOn;
-      const occurrenceEnd = record.coverage?.kind === "as-of" ? record.coverage.on : record.coverage?.endsOn;
-      const exceptionCoversMember = exception?.scopeResourceIds?.includes(member.resourceId)
-        || exception?.scopeResourceIds?.includes(record.obligationId);
-      if (
-        exception?.type !== "exception"
-        || exception.status !== "approved"
-        || !exceptionCoversMember
-        || exception.approval?.approvedOn > occurrenceStart
-        || exception.approval?.expiresOn < occurrenceEnd
-      ) {
+      if (!occurrenceMemberExceptionIsValid(member, record, byId)) {
         diagnostics.push(error(
           "invalid-member-exception",
           path,

package/src/web.js

@@ -670,7 +670,8 @@ function renderRetentionSchedulePage(main, params = new URLSearchParams()) {
   const guideTrigger = '<button class="guide-trigger" id="resource-guide-trigger" type="button" aria-label="About Data Retention Schedule" aria-haspopup="dialog" aria-controls="resource-guide" aria-expanded="false"><svg viewBox="0 0 20 20" aria-hidden="true"><circle cx="10" cy="10" r="8"></circle><path d="M7.8 7.5a2.4 2.4 0 1 1 3.25 2.25c-.7.31-1.05.72-1.05 1.5v.25M10 14.5v.1"></path></svg></button>';
   const initialFilter = params.get("q") || "";
   const showHistory = params.get("history") === "1";
-  const tableTools = '<div class="retention-table-tools"><label><span class="sr-only">Filter schedule rows</span><input type="search" data-retention-search placeholder="Filter schedule rows" value="' + esc(initialFilter) + '"></label><label class="history-toggle"><input type="checkbox" data-retention-history ' + (showHistory ? "checked" : "") + '> Show retired</label></div>';
+  const retiredRows = rows.filter(({ record }) => ["superseded", "retired"].includes(record.status)).length;
+  const tableTools = '<div class="retention-table-tools"><label><span class="sr-only">Filter schedule rows</span><input type="search" data-retention-search placeholder="Filter schedule rows" value="' + esc(initialFilter) + '"></label>' + (retiredRows ? '<label class="history-toggle"><input type="checkbox" data-retention-history ' + (showHistory ? "checked" : "") + '> Show ' + retiredRows + ' retired ' + pluralize("row", retiredRows) + '</label>' : '<input type="checkbox" data-retention-history hidden>') + '</div>';
   main.innerHTML = '<div class="page retention-schedule-page"><nav class="breadcrumbs"><a href="#/stage/policies">Step 2</a><span>/</span><span>Data Retention Schedule</span></nav>' +
     '<div class="page-intro"><div><p class="kicker">Step 2</p><div class="page-title-line"><h2>Data Retention Schedule</h2>' + guideTrigger + '</div><p>Owners finish each proposed retention row first. A separate reviewer then approves the complete document and all proposed rows once.</p></div><div class="actions">' + documentAction + add + '</div></div>' + resourceGuide("retention-schedule-item") +
     '<div class="retention-summary"><div><span class="retention-summary-label">Governing document</span>' + documentSummary + '</div><div><span class="retention-summary-label">Schedule revision</span><span><strong>' + proposedRows + ' completed ' + pluralize("proposal", proposedRows) + '</strong><small>Final approval follows every row proposal</small></span><span class="badge ' + (state.collectionReviews?.["retention-schedule-item"]?.status === "current" ? "good" : "warn") + '">' + (state.collectionReviews?.["retention-schedule-item"]?.status === "current" ? "Approved" : "Approval needed") + '</span></div></div>' +
@@ -746,7 +747,13 @@ function wireRetentionScheduleTable(total, initialPage = 1) {
     noResults.hidden = filtered.length !== 0 || total === 0;
     const firstVisible = filtered.length ? start + 1 : 0;
     const lastVisible = Math.min(start + LIST_PAGE_SIZE, filtered.length);
-    count.textContent = firstVisible + "–" + lastVisible + " of " + filtered.length + " " + pluralize("row", filtered.length) + (filtered.length === total ? "" : " · " + total + " total");
+    const hiddenByHistory = historyToggle.checked ? 0 : [...table.querySelectorAll('[data-retention-row][data-history="true"]')]
+      .filter((row) => !query || row.textContent.toLowerCase().includes(query)).length;
+    const matching = filtered.length + hiddenByHistory;
+    count.textContent = firstVisible + "–" + lastVisible + " of " + filtered.length + (historyToggle.checked ? " shown " : " active ") + pluralize("row", filtered.length)
+      + (hiddenByHistory ? " · " + hiddenByHistory + " retired hidden" : "")
+      + (query ? " · " + matching + " matching" : "")
+      + " · " + total + " total";
     pagination.hidden = totalPages === 1;
     pageStatus.textContent = "Page " + pageNumber + " of " + totalPages;
     previous.disabled = pageNumber === 1;