canary-test-cli 6.5.0 → 6.7.0

package/dist/gate-result.js

@@ -30,10 +30,33 @@ const CONTROL_CHARS = /[\u0000-\u001F\u007F]/g;
 function skippedSuffix(skipped) {
     if (!skipped || skipped.length === 0)
         return '';
-    const names = skipped
-        .map((s) => s.name.replace(CONTROL_CHARS, ''))
-        .join(', ');
-    return ` (${skipped.length} skipped: ${names})`;
+    // #579: `reason` used to be write-only -- every caller set one and no
+    // surface ever rendered it, so a reader could see THAT a path was dropped
+    // but never WHY. Name and cause now travel together, keeping the D7
+    // contract that the path stays visible rather than collapsing into a bare
+    // count.
+    //
+    // Grouped by reason, because producers write reasons at very different
+    // grain: the guardian uses short tokens (`skipGlobs`), doctor uses whole
+    // remedy sentences. Repeating the reason per name turned one doctor line
+    // into 183 characters that said the same thing twice. Groups keep
+    // first-appearance order, so output stays deterministic.
+    //
+    // Reasons are control-char stripped for the same line-forging reason names
+    // are -- rendering the field is what made it an injection surface.
+    const groups = new Map();
+    for (const entry of skipped) {
+        const reason = entry.reason.replace(CONTROL_CHARS, '');
+        const names = groups.get(reason);
+        if (names)
+            names.push(entry.name.replace(CONTROL_CHARS, ''));
+        else
+            groups.set(reason, [entry.name.replace(CONTROL_CHARS, '')]);
+    }
+    const rendered = [...groups]
+        .map(([reason, names]) => reason ? `${names.join(', ')} [${reason}]` : names.join(', '))
+        .join('; ');
+    return ` (${skipped.length} skipped: ${rendered})`;
 }
 /**
  * The single summary-line/exit-code path for swept commands.

package/dist/overlay-commands.js

@@ -109,7 +109,9 @@ function collectConsent(dest, name, confirm, out) {
     }
     const granted = confirm(`Allow 'canary doctor' to run these commands for "${name}"? [y/N] `);
     if (!granted) {
-        out.write("Declined — 'canary doctor' will skip these command checks. Re-add the overlay to change this.\n");
+        out.write("Declined — 'canary doctor' will skip these command checks. Run the same " +
+            "'canary overlay add' again to change this; it re-asks consent and " +
+            'never re-clones.\n');
     }
     return { consent: granted, consentCommandsHash: hash };
 }
@@ -184,8 +186,34 @@ function add(source, options = {}, deps = {}) {
         err.write(`canary overlay add: ${e.message}\n`);
         return 1;
     }
-    // Idempotent: re-adding a registered overlay is a no-op with an update hint.
-    if (registry.get(reg, parsed.name)) {
+    // Idempotent: re-adding a registered overlay never re-clones. It DOES
+    // re-run the consent prompt (#505), because `add` is the consent path every
+    // other surface points at -- doctor's skip remedy ("re-run 'canary overlay
+    // add'") and the decline message ("Re-add the overlay to change this") both
+    // said so while this branch returned before reaching `collectConsent`. The
+    // advice was a dead end: short of `overlay remove` + `add`, a user who
+    // declined once could never grant consent.
+    const existing = registry.get(reg, parsed.name);
+    if (existing) {
+        const refreshed = collectConsent(existing.path, parsed.name, deps.confirm ?? defaultConfirm, out);
+        if (refreshed.consentCommandsHash !== existing.consentCommandsHash ||
+            refreshed.consent !== existing.consent) {
+            const updated = {
+                ...existing,
+                consent: refreshed.consent,
+                consentCommandsHash: refreshed.consentCommandsHash,
+            };
+            try {
+                registry.write({
+                    ...reg,
+                    overlays: reg.overlays.map((o) => o.name === parsed.name ? updated : o),
+                }, homeDir);
+            }
+            catch (e) {
+                err.write(`canary overlay add: ${e.message}\n`);
+                return 1;
+            }
+        }
         out.write(`overlay "${parsed.name}" is already added — run 'canary overlay update ${parsed.name}' to refresh it.\n`);
         return 0;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canary-test-cli",
-  "version": "6.5.0",
+  "version": "6.7.0",
   "description": "Canary — AI-powered test automation agent",
   "license": "MIT",
   "repository": {
@@ -34,7 +34,7 @@
     "test": "tsc && node --test \"scripts/__tests__/*.test.js\""
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "files": [
     "bin/canary.js",