@wairon/cli 5.1.1-dev.32 → 5.1.1-dev.34

package/dist/cli/index.js

@@ -65,7 +65,7 @@ var init_defaults = __esm({
       copilot: ".github/prompts",
       codex: ".codex/agents"
     };
-    WAIRON_VERSION = "5.1.1-dev.32";
+    WAIRON_VERSION = "5.1.1-dev.34";
     GITHUB_REPO = "SYW-Apps/Waffle-AIron";
     SUPPORTED_ALIASES = ["wai"];
     SCAN_EXCLUDE_DIRS = /* @__PURE__ */ new Set([
@@ -23143,6 +23143,7 @@ __export(specs_exports, {
   setExecutionTier: () => setExecutionTier,
   setProjectType: () => setProjectType,
   snapshotSpecFiles: () => snapshotSpecFiles,
+  specChanges: () => specChanges,
   specPathsInScope: () => specPathsInScope,
   updateSpec: () => updateSpec,
   upsertPackSelection: () => upsertPackSelection,
@@ -23526,6 +23527,92 @@ function computeSpecTreeSignature(dirs) {
   }
   return parts.join("|");
 }
+function summarizeValue(value) {
+  if (value === void 0) return "";
+  const text2 = typeof value === "string" ? value : JSON.stringify(value) ?? String(value);
+  return text2.length > 120 ? `${text2.slice(0, 117)}...` : text2;
+}
+function identityKeyOf(field, item) {
+  if (item === null || typeof item !== "object") return null;
+  const o = item;
+  const str = (v) => typeof v === "string" && v.length > 0 ? v : null;
+  switch (field) {
+    case "dispatch":
+      return str(o.capability);
+    case "lifecycle":
+      return `${String(o.phase)} ${String(o.component)} ${String(o.method)}`;
+    case "emits":
+    case "subscribesTo":
+      return `${String(o.topic)} ${o.event === void 0 ? "" : String(o.event)}`;
+    case "trustedLinks":
+      return str(o.subsystem);
+    case "allow":
+      return str(o.code);
+    // lint.allow
+    case "findings":
+      return str(o.code);
+    // an interface method's findings
+    case "invariants":
+      return str(o.id);
+    case "patterns":
+      return str(o.id);
+    case "boundaries":
+      return str(o.name);
+    case "globalRequirements":
+      return str(o.description);
+    case "databases":
+      return str(o.id) ?? str(o.name);
+    default:
+      return str(o.name) ?? str(o.id);
+  }
+}
+function reportIdentityOf(field, item) {
+  if (item !== null && typeof item === "object") {
+    const step = item.stepNumber;
+    if (field === "narrative" && typeof step === "number") return `step ${step}`;
+  }
+  return identityKeyOf(field, item);
+}
+function specChanges(before, after, prefix = "") {
+  const at = (key) => prefix ? `${prefix}.${key}` : key;
+  const isPlain = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+  if (Array.isArray(before) && Array.isArray(after)) {
+    if (after.length === 0 && before.length > 0) {
+      return [{ path: prefix, change: "cleared", before: summarizeValue(before) }];
+    }
+    const identified = [...before, ...after].every((i) => reportIdentityOf(prefix.split(".").pop() ?? prefix, i) !== null);
+    if (!identified) {
+      return JSON.stringify(before) === JSON.stringify(after) ? [] : [{ path: prefix, change: "set", before: summarizeValue(before), after: summarizeValue(after) }];
+    }
+    const field = prefix.split(".").pop() ?? prefix;
+    const keyOf = (i) => String(reportIdentityOf(field, i));
+    const changes = [];
+    for (const item of before) {
+      const match = after.find((a) => keyOf(a) === keyOf(item));
+      if (match === void 0) changes.push({ path: at(keyOf(item)), change: "removed", before: summarizeValue(item) });
+      else changes.push(...specChanges(item, match, at(keyOf(item))));
+    }
+    for (const item of after) {
+      if (!before.some((b) => keyOf(b) === keyOf(item))) {
+        changes.push({ path: at(keyOf(item)), change: "added", after: summarizeValue(item) });
+      }
+    }
+    return changes;
+  }
+  if (isPlain(before) && isPlain(after)) {
+    const changes = [];
+    for (const key of /* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(after)])) {
+      const b = before[key];
+      const a = after[key];
+      if (b === void 0 && a !== void 0) changes.push({ path: at(key), change: "added", after: summarizeValue(a) });
+      else if (b !== void 0 && a === void 0) changes.push({ path: at(key), change: "removed", before: summarizeValue(b) });
+      else changes.push(...specChanges(b, a, at(key)));
+    }
+    return changes;
+  }
+  if (JSON.stringify(before) === JSON.stringify(after)) return [];
+  return [{ path: prefix, change: "set", before: summarizeValue(before), after: summarizeValue(after) }];
+}
 function workspaceFor(rootDir) {
   const key = path23.resolve(rootDir);
   let ws = workspaces.get(key);
@@ -25089,6 +25176,14 @@ var init_specs2 = __esm({
           return refs;
         };
         const normalizeIdentity = (k) => String(k ?? "").toLowerCase().replace(/[_\-\s]/g, "");
+        const unsetFieldsOf = (item) => Array.isArray(item?.unset) ? item.unset.filter((f) => typeof f === "string") : [];
+        const withUnset = (merged, deltaItem) => {
+          const fields = unsetFieldsOf(deltaItem);
+          const out = { ...merged };
+          delete out.unset;
+          for (const field of fields) delete out[field];
+          return out;
+        };
         const assertDeltaMarkers = (item, label) => {
           if (!item || typeof item !== "object") return;
           if ("remove" in item && typeof item.remove !== "boolean") {
@@ -25155,18 +25250,18 @@ var init_specs2 = __esm({
                 capture
               ));
               const { action, remove: remove2, captureJumps, ...cleanStep } = deltaStep;
-              steps.push(cleanStep);
+              steps.push(withUnset(cleanStep, deltaStep));
             } else {
               const idx = steps.findIndex((s) => s.stepNumber === stepNum);
               if (idx !== -1) {
                 const { action, remove: remove2, ...cleanStep } = deltaStep;
-                steps[idx] = {
+                steps[idx] = withUnset({
                   ...steps[idx],
                   ...cleanStep
-                };
+                }, deltaStep);
               } else {
                 const { action, remove: remove2, ...cleanStep } = deltaStep;
-                steps.push(cleanStep);
+                steps.push(withUnset(cleanStep, deltaStep));
               }
             }
           }
@@ -25193,20 +25288,20 @@ var init_specs2 = __esm({
               } else {
                 const existingMethod = merged[idx];
                 let narrative = existingMethod.narrative ? [...existingMethod.narrative] : [];
-                if (deltaMethod.narrative && Array.isArray(deltaMethod.narrative)) {
-                  narrative = mergeNarrative(narrative, deltaMethod.narrative);
+                if (Array.isArray(deltaMethod.narrative)) {
+                  narrative = deltaMethod.narrative.length === 0 ? [] : mergeNarrative(narrative, deltaMethod.narrative);
                 }
                 const { narrative: _, ...cleanMethod } = deltaMethod;
-                merged[idx] = {
+                merged[idx] = withUnset({
                   ...existingMethod,
                   ...cleanMethod,
                   ...deltaMethod.ext !== void 0 ? { ext: mergeExt(existingMethod.ext, deltaMethod.ext) } : {},
                   narrative
-                };
+                }, deltaMethod);
               }
             } else {
               assertUnmatchedIsAnAddition(deltaMethod, deltaMethod.name, merged.map((m) => m.name), "method");
-              merged.push(deltaMethod);
+              merged.push(withUnset(deltaMethod, deltaMethod));
             }
           }
           return merged;
@@ -25220,18 +25315,18 @@ var init_specs2 = __esm({
               if (deltaItem.remove === true || deltaItem.action === "delete") {
                 merged.splice(idx, 1);
               } else {
-                merged[idx] = {
+                merged[idx] = withUnset({
                   ...merged[idx],
                   ...deltaItem,
                   ...deltaItem.ext !== void 0 ? { ext: mergeExt(merged[idx].ext, deltaItem.ext) } : {},
                   // An interface method's findings upsert and delete by code, like
                   // lint.allow; an empty list still clears them outright.
                   ...Array.isArray(deltaItem.findings) && deltaItem.findings.length > 0 ? { findings: mergeIdentifiedArray("findings", merged[idx].findings ?? [], deltaItem.findings) } : {}
-                };
+                }, deltaItem);
               }
             } else {
               assertUnmatchedIsAnAddition(deltaItem, deltaItem.name, merged.map((i) => i.name), "entry");
-              merged.push(deltaItem);
+              merged.push(withUnset(deltaItem, deltaItem));
             }
           }
           return merged;
@@ -25245,11 +25340,11 @@ var init_specs2 = __esm({
               if (deltaItem.remove === true || deltaItem.action === "delete") {
                 merged.splice(idx, 1);
               } else {
-                merged[idx] = { ...merged[idx], ...deltaItem };
+                merged[idx] = withUnset({ ...merged[idx], ...deltaItem }, deltaItem);
               }
             } else {
               assertUnmatchedIsAnAddition(deltaItem, keyOf(deltaItem), merged.map(keyOf), "entry");
-              merged.push(deltaItem);
+              merged.push(withUnset(deltaItem, deltaItem));
             }
           }
           return merged.map(({ action, remove: remove2, ...item }) => item);
@@ -25264,52 +25359,18 @@ var init_specs2 = __esm({
               if (deltaItem.remove === true || deltaItem.action === "delete") {
                 merged.splice(idx, 1);
               } else {
-                merged[idx] = {
+                merged[idx] = withUnset({
                   ...merged[idx],
                   ...deltaItem
-                };
+                }, deltaItem);
               }
             } else {
               assertUnmatchedIsAnAddition(deltaItem, piKey(deltaItem), merged.map(piKey), "publicInterface");
-              merged.push(deltaItem);
+              merged.push(withUnset(deltaItem, deltaItem));
             }
           }
           return merged;
         };
-        const identityKeyOf = (field, item) => {
-          if (item === null || typeof item !== "object") return null;
-          const o = item;
-          const str = (v) => typeof v === "string" && v.length > 0 ? v : null;
-          switch (field) {
-            case "dispatch":
-              return str(o.capability);
-            case "lifecycle":
-              return `${String(o.phase)} ${String(o.component)} ${String(o.method)}`;
-            case "emits":
-            case "subscribesTo":
-              return `${String(o.topic)} ${o.event === void 0 ? "" : String(o.event)}`;
-            case "trustedLinks":
-              return str(o.subsystem);
-            case "allow":
-              return str(o.code);
-            // lint.allow
-            case "findings":
-              return str(o.code);
-            // an interface method's findings
-            case "invariants":
-              return str(o.id);
-            case "patterns":
-              return str(o.id);
-            case "boundaries":
-              return str(o.name);
-            case "globalRequirements":
-              return str(o.description);
-            case "databases":
-              return str(o.id) ?? str(o.name);
-            default:
-              return str(o.name) ?? str(o.id);
-          }
-        };
         const mergeIdentifiedArray = (field, existing, delta2) => {
           const merged = [...existing];
           for (const deltaItem of delta2) {
@@ -25319,7 +25380,7 @@ var init_specs2 = __esm({
             const isDelete = deltaItem?.remove === true || deltaItem?.action === "delete";
             if (idx !== -1) {
               if (isDelete) merged.splice(idx, 1);
-              else merged[idx] = { ...merged[idx], ...deltaItem };
+              else merged[idx] = withUnset({ ...merged[idx], ...deltaItem }, deltaItem);
             } else {
               if (key !== null) {
                 assertUnmatchedIsAnAddition(
@@ -25331,7 +25392,7 @@ var init_specs2 = __esm({
               } else if (isDelete) {
                 throw new Error(`Refusing to delete a ${field} entry with no resolvable identity.`);
               }
-              merged.push(deltaItem);
+              merged.push(withUnset(deltaItem, deltaItem));
             }
           }
           return merged.map((item) => item && typeof item === "object" ? (({ action, remove: remove2, ...rest }) => rest)(item) : item);
@@ -25340,6 +25401,7 @@ var init_specs2 = __esm({
         const mergeDelta = (existing, delta2) => {
           const res = { ...existing };
           for (const [key, value] of Object.entries(delta2)) {
+            if (key === "unset") continue;
             if (value === void 0 || value === null) {
               continue;
             }
@@ -25367,7 +25429,7 @@ var init_specs2 = __esm({
               res[key] = value;
             }
           }
-          return res;
+          return withUnset(res, delta2);
         };
         const qualifyDeltaRefs = (d) => {
           if (kind === "system") return d;
@@ -25421,9 +25483,9 @@ var init_specs2 = __esm({
         };
         const unsetFields = Array.isArray(delta.unset) ? delta.unset.filter((f) => typeof f === "string") : [];
         const { unset: _unset, ...mergeableDelta } = delta;
+        const storedBefore = JSON.parse(JSON.stringify(result));
         const mergedResult = mergeDelta(result, qualifyDeltaRefs(mergeableDelta));
         for (const field of unsetFields) delete mergedResult[field];
-        mergedResult.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
         if (kind === "implementation" && Array.isArray(mergedResult.methods)) {
           const labelErrors = [];
           for (const m of mergedResult.methods) {
@@ -25434,6 +25496,24 @@ var init_specs2 = __esm({
 - ${labelErrors.join("\n- ")}`);
           }
         }
+        const canonical = (spec) => {
+          const parsed = deltaSchema.safeParse(spec);
+          const value = { ...parsed.success ? parsed.data : spec };
+          delete value.updatedAt;
+          return value;
+        };
+        const changes = specChanges(canonical(storedBefore), canonical(mergedResult));
+        if (changes.length === 0) {
+          return {
+            kind,
+            id,
+            written: false,
+            changes,
+            notices,
+            summary: `No change to ${kind} "${id}" \u2014 the delta matches what is stored, so nothing was written.`
+          };
+        }
+        mergedResult.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
         const gateNotices = hooks?.gate?.(kind, mergedResult);
         if (gateNotices?.length) notices.push(...gateNotices);
         const opts = {
@@ -25459,7 +25539,14 @@ var init_specs2 = __esm({
             notices.push(...this.saveTypeSpec(mergedResult));
             break;
         }
-        return notices;
+        return {
+          kind,
+          id,
+          written: true,
+          changes,
+          notices,
+          summary: `Updated ${kind} "${id}": ${changes.length} change${changes.length === 1 ? "" : "s"}.`
+        };
       }
     };
     workspaces = /* @__PURE__ */ new Map();
@@ -26425,6 +26512,16 @@ function json(value) {
 function errText(message) {
   return { content: [{ type: "text", text: `Error: ${message}` }], isError: true };
 }
+function renderChangeReport(report2) {
+  const lines = [report2.summary];
+  for (const change of report2.changes) {
+    const to = change.after === void 0 ? "" : `: ${JSON.stringify(change.after)}`;
+    const from = change.before === void 0 ? "" : ` (was ${JSON.stringify(change.before)})`;
+    lines.push(`- ${change.path} ${change.change}${to}${from}`);
+  }
+  if (report2.notices.length) lines.push("", "NOTICE:", ...report2.notices.map((n) => `- ${n}`));
+  return lines.join("\n");
+}
 function captureBuildStamp(entryPath) {
   try {
     const s = fs20.statSync(entryPath);
@@ -27626,12 +27723,7 @@ NOTICE:
     },
     ({ kind, id, delta }) => {
       try {
-        const notices = updateSpecGated(kind, id, delta);
-        const noticeBlock = notices.length ? `
-
-NOTICE:
-- ${notices.join("\n- ")}` : "";
-        return text(`Successfully updated ${kind} spec "${id}".${noticeBlock}`);
+        return text(renderChangeReport(updateSpecGated(kind, id, delta)));
       } catch (e) {
         return errText(String(e));
       }