pumuki 6.3.307 → 6.3.308

package/integrations/config/skillsDetectorRegistry.ts

@@ -69,6 +69,11 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
       'heuristics.ios.dispatchqueue.ast',
       'heuristics.ios.dispatchsemaphore.ast',
     ]),
+  'skills.ios.guideline.ios.sincronizacio-n-nativa-actors-para-estado-compartido-osallocatedunfair':
+    heuristicDetector('ios.concurrency.shared-state-actor-boundary', [
+      'heuristics.ios.dispatchqueue.ast',
+      'heuristics.ios.dispatchsemaphore.ast',
+    ]),
   'skills.ios.no-dispatchgroup': heuristicDetector('ios.dispatchgroup', [
     'heuristics.ios.dispatchgroup.ast',
   ]),
@@ -81,6 +86,10 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
   'skills.ios.no-task-detached': heuristicDetector('ios.task-detached', [
     'heuristics.ios.task-detached.ast',
   ]),
+  'skills.ios.guideline.ios.cancelar-correctamente-comprobar-task-iscancelled-en-operaciones-larga':
+    heuristicDetector('ios.concurrency.long-task-cancellation-check', [
+      'heuristics.ios.concurrency.long-task-without-cancellation-check.ast',
+    ]),
   'skills.ios.no-async-without-await': heuristicDetector('ios.concurrency.async-without-await', [
     'heuristics.ios.concurrency.async-without-await.ast',
   ]),
@@ -88,6 +97,10 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
     heuristicDetector('ios.concurrency.avoid-overuse-async-without-await', [
       'heuristics.ios.concurrency.async-without-await.ast',
     ]),
+  'skills.ios.guideline.ios-concurrency.use-references-linting-md-for-rule-intent-and-preferred-fixes-avoid-du':
+    heuristicDetector('ios.concurrency.dummy-await', [
+      'heuristics.ios.concurrency.dummy-await.ast',
+    ]),
   'skills.ios.guideline.ios.delegation-pattern-weak-delegates-para-evitar-retain-cycles': heuristicDetector(
     'ios.memory.strong-delegate',
     ['heuristics.ios.memory.strong-delegate.ast']
@@ -212,6 +225,10 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
     'ios.error.typed-error-enum',
     ['heuristics.ios.error.nserror-throw.ast']
   ),
+  'skills.ios.guideline.ios.apiendpoint-como-struct-data-driven-ocp-endpoints-en-features-no-enum-':
+    heuristicDetector('ios.networking.endpoint-enum-ocp', [
+      'heuristics.ios.networking.endpoint-enum-ocp.ast',
+    ]),
   'skills.ios.guideline.ios.no-loggear-pii-tokens-emails-ids-sensibles': heuristicDetector(
     'ios.logging.sensitive-data',
     ['heuristics.ios.logging.sensitive-data.ast']
@@ -255,6 +272,7 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
       'heuristics.ios.dependencies.carthage.ast',
       'heuristics.ios.architecture.swinject.ast',
       'heuristics.ios.architecture.tca-composable-architecture.ast',
+      'heuristics.ios.testing.third-party-ui-test-framework.ast',
     ]),
   'skills.ios.guideline.ios.libreri-as-de-terceros-usar-apis-nativas': heuristicDetector(
     'ios.dependencies.third-party-native-baseline',
@@ -264,6 +282,7 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
       'heuristics.ios.dependencies.carthage.ast',
       'heuristics.ios.architecture.swinject.ast',
       'heuristics.ios.architecture.tca-composable-architecture.ast',
+      'heuristics.ios.testing.third-party-ui-test-framework.ast',
     ]
   ),
   'skills.ios.guideline.ios.keychain-passwords-tokens-no-userdefaults': heuristicDetector(
@@ -330,6 +349,10 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
     'ios.performance.blocking-sleep',
     ['heuristics.ios.performance.blocking-sleep.ast']
   ),
+  'skills.ios.guideline.ios-concurrency.use-references-threading-md-to-avoid-thread-centric-debugging-and-rely':
+    heuristicDetector('ios.concurrency.thread-centric-debugging', [
+      'heuristics.ios.concurrency.thread-centric-debugging.ast',
+    ]),
   'skills.ios.guideline.ios.structured-concurrency-task-taskgroup-actor-asyncsequence-asyncstream':
     heuristicDetector('ios.concurrency.structured-baseline', [
       'heuristics.ios.callback-style.ast',
@@ -375,6 +398,21 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
     'ios.accessibility.on-tap-without-button-trait',
     ['heuristics.ios.accessibility.on-tap-without-button-trait.ast']
   ),
+  'skills.ios.guideline.ios.voiceover-labels-hints-traits': heuristicDetector(
+    'ios.accessibility.voiceover-labels-traits',
+    [
+      'heuristics.ios.accessibility.icon-only-control-label.ast',
+      'heuristics.ios.accessibility.on-tap-without-button-trait.ast',
+    ]
+  ),
+  'skills.ios.guideline.ios-swiftui-expert.use-interactive-only-for-tappable-focusable-elements':
+    heuristicDetector('ios.swiftui.glass-interactive-static-element', [
+      'heuristics.ios.swiftui.glass-interactive-static-element.ast',
+    ]),
+  'skills.ios.guideline.ios-swiftui-expert.use-glasseffectid-with-namespace-for-morphing-transitions':
+    heuristicDetector('ios.swiftui.glasseffectid-namespace', [
+      'heuristics.ios.swiftui.glasseffectid-without-namespace.ast',
+    ]),
   'skills.ios.guideline.ios.image-optimization-resize-compress-cache': heuristicDetector(
     'ios.swiftui.image-data-decoding',
     ['heuristics.ios.swiftui.image-data-decoding.ast']
@@ -415,10 +453,30 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
     heuristicDetector('ios.dependencies.swift-tools-version', [
       'heuristics.ios.dependencies.swift-tools-version-below-6-2.ast',
     ]),
+  'skills.ios.guideline.ios-concurrency.use-read-on-package-swift-for-swiftpm-settings-tools-version-strict-co':
+    heuristicDetector('ios.dependencies.swift-tools-version', [
+      'heuristics.ios.dependencies.swift-tools-version-below-6-2.ast',
+      'heuristics.ios.concurrency.swiftpm-default-isolation-not-mainactor.ast',
+      'heuristics.ios.concurrency.swiftpm-strict-concurrency-below-complete.ast',
+    ]),
   'skills.ios.guideline.ios.strict-concurrency-checking-activar-en-complete':
     heuristicDetector('ios.concurrency.strict-concurrency-below-complete', [
       'heuristics.ios.concurrency.strict-concurrency-below-complete.ast',
     ]),
+  'skills.ios.guideline.ios-concurrency.use-grep-for-swiftstrictconcurrency-or-swiftdefaultactorisolation-in-p':
+    heuristicDetector('ios.concurrency.project-settings', [
+      'heuristics.ios.concurrency.strict-concurrency-below-complete.ast',
+      'heuristics.ios.concurrency.default-actor-isolation-not-mainactor.ast',
+      'heuristics.ios.concurrency.swiftpm-default-isolation-not-mainactor.ast',
+      'heuristics.ios.concurrency.swiftpm-strict-concurrency-below-complete.ast',
+    ]),
+  'skills.ios.guideline.ios.validar-configuracio-n-de-concurrencia-swiftstrictconcurrency-swiftdef':
+    heuristicDetector('ios.concurrency.project-settings', [
+      'heuristics.ios.concurrency.strict-concurrency-below-complete.ast',
+      'heuristics.ios.concurrency.default-actor-isolation-not-mainactor.ast',
+      'heuristics.ios.concurrency.swiftpm-default-isolation-not-mainactor.ast',
+      'heuristics.ios.concurrency.swiftpm-strict-concurrency-below-complete.ast',
+    ]),
   'skills.ios.guideline.ios.file-naming-pascalcase-para-tipos': heuristicDetector(
     'ios.naming.non-pascal-case-type',
     ['heuristics.ios.naming.non-pascal-case-type.ast']
@@ -646,6 +704,10 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
     heuristicDetector('ios.swiftui.large-viewbuilder-function', [
       'heuristics.ios.swiftui.large-viewbuilder-function.ast',
     ]),
+  'skills.ios.guideline.ios.composicio-n-de-views-views-pequen-os-reutilizables':
+    heuristicDetector('ios.swiftui.large-viewbuilder-function', [
+      'heuristics.ios.swiftui.large-viewbuilder-function.ast',
+    ]),
   'skills.ios.guideline.ios-swiftui-expert.pass-only-needed-values-to-views-avoid-large-config-or-context-objects':
     heuristicDetector('ios.swiftui.large-config-context-prop', [
       'heuristics.ios.swiftui.large-config-context-prop.ast',
@@ -775,6 +837,10 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
     'ios.testing.quick-nimble',
     ['heuristics.ios.testing.quick-nimble.ast']
   ),
+  'skills.ios.guideline.ios.xcuitest-ui-testing-nativo': heuristicDetector(
+    'ios.testing.third-party-ui-test-framework',
+    ['heuristics.ios.testing.third-party-ui-test-framework.ast']
+  ),
   'skills.ios.no-nsmanagedobject-boundary': heuristicDetector(
     'ios.core-data.nsmanagedobject-boundary',
     ['heuristics.ios.core-data.nsmanagedobject-boundary.ast']
@@ -1150,6 +1216,34 @@ const registryByRuleId: Record<string, SkillsDetectorBinding> = {
       'heuristics.ios.solid.lsp.narrowed-precondition.ast',
     ]
   ),
+  'skills.ios.guideline.ios.feature-first-cada-feature-es-un-bounded-context-no-se-acoplan-entre-s':
+    heuristicDetector('ios.architecture.cross-feature-import', [
+      'heuristics.ios.architecture.cross-feature-import.ast',
+    ]),
+  'skills.ios.guideline.ios.las-features-no-se-importan-entre-si':
+    heuristicDetector('ios.architecture.cross-feature-import', [
+      'heuristics.ios.architecture.cross-feature-import.ast',
+    ]),
+  'skills.ios.guideline.ios.shared-kernel-solo-tipos-mi-nimos-compartidos-entre-features':
+    heuristicDetector('ios.architecture.cross-feature-import', [
+      'heuristics.ios.architecture.cross-feature-import.ast',
+    ]),
+  'skills.ios.guideline.ios.clean-por-feature-presentation-application-domain-infrastructure-domai':
+    heuristicDetector('ios.architecture.layer-direction', [
+      'heuristics.ios.architecture.layer-direction-violation.ast',
+    ]),
+  'skills.ios.guideline.ios.seguir-clean-architecture-domain-application-infrastructure-presentati':
+    heuristicDetector('ios.architecture.layer-direction', [
+      'heuristics.ios.architecture.layer-direction-violation.ast',
+    ]),
+  'skills.ios.guideline.ios.ddd-entidades-value-objects-repositorios-protocolos-eventos-de-dominio':
+    heuristicDetector('ios.architecture.layer-direction', [
+      'heuristics.ios.architecture.layer-direction-violation.ast',
+    ]),
+  'skills.ios.guideline.ios.public-api-solo-exponer-lo-necesario-public-internal-private':
+    heuristicDetector('ios.architecture.excessive-public-api', [
+      'heuristics.ios.architecture.excessive-public-api.ast',
+    ]),
   'skills.ios.guideline.ios.testability-inyectar-protocols-no-tipos-concretos':
     heuristicDetector('ios.testability.protocol-boundaries', [
       'heuristics.ios.solid.dip.concrete-framework-dependency.ast',

package/integrations/evidence/buildEvidence.ts

@@ -271,7 +271,49 @@ const equivalentRuleFamilies: ReadonlyArray<ReadonlyArray<string>> = [
   ['skills.ios.no-task-detached', 'heuristics.ios.task-detached.ast'],
   ['skills.ios.no-unchecked-sendable', 'heuristics.ios.unchecked-sendable.ast'],
   ['skills.ios.no-preconcurrency', 'heuristics.ios.preconcurrency.ast'],
+  [
+    'skills.ios.guideline.ios-concurrency.use-grep-for-swiftstrictconcurrency-or-swiftdefaultactorisolation-in-p',
+    'heuristics.ios.concurrency.strict-concurrency-below-complete.ast',
+    'heuristics.ios.concurrency.default-actor-isolation-not-mainactor.ast',
+    'heuristics.ios.concurrency.swiftpm-default-isolation-not-mainactor.ast',
+    'heuristics.ios.concurrency.swiftpm-strict-concurrency-below-complete.ast',
+  ],
+  [
+    'skills.ios.guideline.ios.validar-configuracio-n-de-concurrencia-swiftstrictconcurrency-swiftdef',
+    'heuristics.ios.concurrency.strict-concurrency-below-complete.ast',
+    'heuristics.ios.concurrency.default-actor-isolation-not-mainactor.ast',
+    'heuristics.ios.concurrency.swiftpm-default-isolation-not-mainactor.ast',
+    'heuristics.ios.concurrency.swiftpm-strict-concurrency-below-complete.ast',
+  ],
   ['skills.ios.no-nonisolated-unsafe', 'heuristics.ios.nonisolated-unsafe.ast'],
+  [
+    'skills.ios.guideline.ios.feature-first-cada-feature-es-un-bounded-context-no-se-acoplan-entre-s',
+    'heuristics.ios.architecture.cross-feature-import.ast',
+  ],
+  [
+    'skills.ios.guideline.ios.las-features-no-se-importan-entre-si',
+    'heuristics.ios.architecture.cross-feature-import.ast',
+  ],
+  [
+    'skills.ios.guideline.ios.shared-kernel-solo-tipos-mi-nimos-compartidos-entre-features',
+    'heuristics.ios.architecture.cross-feature-import.ast',
+  ],
+  [
+    'skills.ios.guideline.ios.clean-por-feature-presentation-application-domain-infrastructure-domai',
+    'heuristics.ios.architecture.layer-direction-violation.ast',
+  ],
+  [
+    'skills.ios.guideline.ios.seguir-clean-architecture-domain-application-infrastructure-presentati',
+    'heuristics.ios.architecture.layer-direction-violation.ast',
+  ],
+  [
+    'skills.ios.guideline.ios.ddd-entidades-value-objects-repositorios-protocolos-eventos-de-dominio',
+    'heuristics.ios.architecture.layer-direction-violation.ast',
+  ],
+  [
+    'skills.ios.guideline.ios.public-api-solo-exponer-lo-necesario-public-internal-private',
+    'heuristics.ios.architecture.excessive-public-api.ast',
+  ],
   ['skills.ios.no-assume-isolated', 'heuristics.ios.assume-isolated.ast'],
   ['skills.ios.no-observable-object', 'heuristics.ios.observable-object.ast'],
   [
@@ -312,6 +354,10 @@ const equivalentRuleFamilies: ReadonlyArray<ReadonlyArray<string>> = [
     'heuristics.ios.testing.legacy-expectation-description.ast',
   ],
   ['skills.ios.no-mixed-testing-frameworks', 'heuristics.ios.testing.mixed-frameworks.ast'],
+  [
+    'skills.ios.guideline.ios.xcuitest-ui-testing-nativo',
+    'heuristics.ios.testing.third-party-ui-test-framework.ast',
+  ],
   [
     'skills.ios.no-nsmanagedobject-boundary',
     'heuristics.ios.core-data.nsmanagedobject-boundary.ast',

package/integrations/lifecycle/adapter.templates.json

@@ -24,6 +24,13 @@
           "evidence": {
             "command": "npx --yes --package pumuki@latest pumuki-mcp-evidence-stdio"
           }
+        },
+        "enforcement": {
+          "pre_write": {
+            "required_before_edit": true,
+            "command": "npx --yes --package pumuki@latest pumuki-pre-write",
+            "agent_instruction": "STOP before editing files unless this command has produced a valid PRE_WRITE lease for the current repo and diff."
+          }
         }
       }
     }
@@ -54,6 +61,13 @@
           "evidence": {
             "command": "npx --yes --package pumuki@latest pumuki-mcp-evidence-stdio"
           }
+        },
+        "enforcement": {
+          "pre_write": {
+            "required_before_edit": true,
+            "command": "npx --yes --package pumuki@latest pumuki-pre-write",
+            "agent_instruction": "STOP before editing files unless this command has produced a valid PRE_WRITE lease for the current repo and diff."
+          }
         }
       }
     }
@@ -76,6 +90,13 @@
             "ci": {
               "command": "npx --yes --package pumuki@latest pumuki-ci"
             }
+          },
+          "enforcement": {
+            "pre_write": {
+              "required_before_edit": true,
+              "command": "npx --yes --package pumuki@latest pumuki-pre-write",
+              "agent_instruction": "STOP before editing files unless this command has produced a valid PRE_WRITE lease for the current repo and diff."
+            }
           }
         },
         "mcpServers": {
@@ -139,6 +160,13 @@
           "ci": {
             "command": "npx --yes --package pumuki@latest pumuki-ci"
           }
+        },
+        "enforcement": {
+          "pre_write": {
+            "required_before_edit": true,
+            "command": "npx --yes --package pumuki@latest pumuki-pre-write",
+            "agent_instruction": "STOP before editing files unless this command has produced a valid PRE_WRITE lease for the current repo and diff."
+          }
         }
       }
     },
@@ -166,6 +194,13 @@
           "evidence": {
             "command": "npx --yes --package pumuki@latest pumuki-mcp-evidence-stdio"
           }
+        },
+        "enforcement": {
+          "pre_write": {
+            "required_before_edit": true,
+            "command": "npx --yes --package pumuki@latest pumuki-pre-write",
+            "agent_instruction": "STOP before editing files unless this command has produced a valid PRE_WRITE lease for the current repo and diff."
+          }
         }
       }
     }
@@ -178,7 +213,14 @@
         "postCommand": "npx --yes --package pumuki@latest pumuki-pre-commit",
         "pushCommand": "npx --yes --package pumuki@latest pumuki-pre-push",
         "ciCommand": "npx --yes --package pumuki@latest pumuki-ci",
-        "mcpCommand": "npx --yes --package pumuki@latest pumuki-mcp-enterprise-stdio"
+        "mcpCommand": "npx --yes --package pumuki@latest pumuki-mcp-enterprise-stdio",
+        "enforcement": {
+          "pre_write": {
+            "required_before_edit": true,
+            "command": "npx --yes --package pumuki@latest pumuki-pre-write",
+            "agent_instruction": "STOP before editing files unless this command has produced a valid PRE_WRITE lease for the current repo and diff."
+          }
+        }
       }
     },
     {
@@ -246,6 +288,13 @@
           "evidence": {
             "command": "npx --yes --package pumuki@latest pumuki-mcp-evidence-stdio"
           }
+        },
+        "enforcement": {
+          "pre_write": {
+            "required_before_edit": true,
+            "command": "npx --yes --package pumuki@latest pumuki-pre-write",
+            "agent_instruction": "STOP before editing files unless this command has produced a valid PRE_WRITE lease for the current repo and diff."
+          }
         }
       }
     }

package/integrations/lifecycle/doctor.ts

@@ -269,6 +269,20 @@ const readNestedString = (
   return typeof cursor === 'string' && cursor.trim().length > 0 ? cursor : undefined;
 };
 
+const readNestedBoolean = (
+  source: Record<string, unknown>,
+  path: ReadonlyArray<string>
+): boolean | undefined => {
+  let cursor: unknown = source;
+  for (const segment of path) {
+    if (!isRecord(cursor)) {
+      return undefined;
+    }
+    cursor = cursor[segment];
+  }
+  return typeof cursor === 'boolean' ? cursor : undefined;
+};
+
 const hasRobustPumukiCommandResolution = (command: string): boolean => {
   const normalized = command.trim();
   if (normalized.length === 0) {
@@ -396,17 +410,26 @@ const evaluateAdapterWiringCheck = (repoRoot: string): DoctorDeepCheck => {
   const missingPaths = requiredCommandPaths
     .filter((path) => !readNestedString(parsed, path))
     .map((path) => path.join('.'));
-
-  if (missingPaths.length > 0) {
+  const missingContractPaths = [
+    !readNestedBoolean(parsed, ['enforcement', 'pre_write', 'required_before_edit'])
+      ? 'enforcement.pre_write.required_before_edit'
+      : undefined,
+    !readNestedString(parsed, ['enforcement', 'pre_write', 'agent_instruction'])
+      ? 'enforcement.pre_write.agent_instruction'
+      : undefined,
+  ].filter((path): path is string => typeof path === 'string');
+
+  if (missingPaths.length > 0 || missingContractPaths.length > 0) {
+    const missing = [...missingPaths, ...missingContractPaths];
     return buildDeepCheck({
       id: 'adapter-wiring',
       status: 'fail',
       severity: 'error',
-      message: `Adapter wiring is incomplete (missing: ${missingPaths.join(', ')}).`,
+      message: `Adapter wiring is incomplete (missing: ${missing.join(', ')}).`,
       remediation: 'Re-run "pumuki adapter install --agent=codex" and keep generated commands unchanged.',
       metadata: {
         path: adapterPath,
-        missing_count: missingPaths.length,
+        missing_count: missing.length,
       },
     });
   }
@@ -445,13 +468,26 @@ const evaluateAdapterWiringCheck = (repoRoot: string): DoctorDeepCheck => {
     });
   }
 
+  const preWriteEnforcementCommand =
+    readNestedString(parsed, ['enforcement', 'pre_write', 'command']) ??
+    readNestedString(parsed, ['hooks', 'pre_write', 'command']);
+  const preWriteAgentInstruction = readNestedString(parsed, [
+    'enforcement',
+    'pre_write',
+    'agent_instruction',
+  ]);
+
   return buildDeepCheck({
     id: 'adapter-wiring',
     status: 'pass',
     severity: 'info',
-    message: 'Adapter wiring contract is valid.',
+    message:
+      'Adapter wiring contract is valid; PRE_WRITE hard-stop is required before editing.',
     metadata: {
       path: adapterPath,
+      pre_write_required_before_edit: true,
+      pre_write_command: preWriteEnforcementCommand ?? null,
+      pre_write_agent_instruction: preWriteAgentInstruction ?? null,
     },
   });
 };

package/integrations/lifecycle/preWriteLease.ts

@@ -300,7 +300,11 @@ export const toPreWriteEnforcementGapFinding = (params: {
     code: 'ENFORCEMENT_GAP_PRE_WRITE_LEASE_MISSING',
     message:
       `PRE_WRITE hard-stop lease is not valid at ${params.stage}: ${params.status.code}. ` +
-      'Run PRE_WRITE before editing code; hooks/audit cannot accept code diffs without a prior clean PRE_WRITE lease.',
+      'User action: run `npx pumuki-pre-write` before editing code, then rerun the gate. ' +
+      'AI agent instruction: STOP; do not edit files until a valid PRE_WRITE lease exists for this repo and diff.',
+    expected_fix:
+      'User: run `npx pumuki-pre-write` or `npx pumuki sdd validate --stage=PRE_WRITE --json` before editing. ' +
+      'AI agent: stop immediately, do not apply patches or write files, and continue only after the command produces a valid clean or validated-diff PRE_WRITE lease.',
     filePath: '.pumuki/prewrite-lease.json',
     matchedBy: 'PreWriteLeaseGuard',
     source: 'prewrite-lease',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pumuki",
-  "version": "6.3.307",
+  "version": "6.3.308",
   "description": "Enterprise-grade AST Intelligence System with multi-platform support (iOS, Android, Backend, Frontend) and Feature-First + DDD + Clean Architecture enforcement. Includes dynamic violations API for intelligent querying.",
   "main": "index.js",
   "bin": {

package/scripts/framework-menu-matrix-canary-evidence.ts

@@ -1,9 +1,30 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-export const extractRuleIdsFromEvidence = (repoRoot: string): string[] => {
+export type CanaryEvidenceRuleMatch = {
+  ruleId: string;
+  filePath: string;
+};
+
+const normalizeEvidencePath = (value: string): string => value.replaceAll('\\', '/');
+
+const readEvidenceSnapshotFindings = (repoRoot: string): Array<Record<string, unknown>> => {
   const evidencePath = join(repoRoot, '.ai_evidence.json');
   try {
+    const parsed = JSON.parse(readFileSync(evidencePath, 'utf8')) as {
+      snapshot?: {
+        findings?: Array<Record<string, unknown>>;
+      };
+    };
+    return Array.isArray(parsed?.snapshot?.findings) ? parsed.snapshot.findings : [];
+  } catch {
+    return [];
+  }
+};
+
+export const extractRuleIdsFromEvidence = (repoRoot: string): string[] => {
+  try {
+    const evidencePath = join(repoRoot, '.ai_evidence.json');
     const parsed = JSON.parse(readFileSync(evidencePath, 'utf8')) as {
       snapshot?: {
         findings?: Array<{ ruleId?: unknown }>;
@@ -32,3 +53,23 @@ export const extractRuleIdsFromEvidence = (repoRoot: string): string[] => {
     return [];
   }
 };
+
+export const extractRuleMatchesFromEvidence = (repoRoot: string): CanaryEvidenceRuleMatch[] => {
+  return readEvidenceSnapshotFindings(repoRoot)
+    .map((finding) => {
+      const ruleId = typeof finding.ruleId === 'string' ? finding.ruleId : '';
+      const filePath =
+        typeof finding.filePath === 'string'
+          ? finding.filePath
+          : typeof finding.file === 'string'
+            ? finding.file
+            : typeof finding.path === 'string'
+              ? finding.path
+              : '';
+      return {
+        ruleId,
+        filePath: normalizeEvidencePath(filePath),
+      };
+    })
+    .filter((match) => match.ruleId.length > 0 && match.filePath.length > 0);
+};

package/scripts/framework-menu-matrix-canary-lib.ts

@@ -11,7 +11,11 @@ import {
   runWorkingTreePrePushGateSilent,
 } from './framework-menu-gate-lib';
 import { readMatrixOptionReport, type MatrixOptionId } from './framework-menu-matrix-evidence-lib';
-import { extractRuleIdsFromEvidence } from './framework-menu-matrix-canary-evidence';
+import {
+  extractRuleIdsFromEvidence,
+  extractRuleMatchesFromEvidence,
+  type CanaryEvidenceRuleMatch,
+} from './framework-menu-matrix-canary-evidence';
 import { resolveConsumerMenuCanaryScenario } from './framework-menu-matrix-canary-scenario';
 import type {
   ConsumerMenuCanaryPlatform,
@@ -102,6 +106,10 @@ export const runConsumerMenuCanary = async (params?: {
     runGate?: (option: MatrixOptionId) => Promise<void>;
     readOptionReport?: typeof readMatrixOptionReport;
     extractRuleIds?: (repoRoot: string) => string[];
+    extractRuleMatches?: (
+      repoRoot: string,
+      scenario: ReturnType<typeof resolveConsumerMenuCanaryScenario>
+    ) => CanaryEvidenceRuleMatch[];
   };
 }): Promise<ConsumerMenuCanaryResult> => {
   const previousCwd = cwd();
@@ -116,6 +124,7 @@ export const runConsumerMenuCanary = async (params?: {
   const runGate = dependencies?.runGate ?? runGateByOption;
   const readOptionReport = dependencies?.readOptionReport ?? readMatrixOptionReport;
   const extractRuleIds = dependencies?.extractRuleIds ?? extractRuleIdsFromEvidence;
+  const extractRuleMatches = dependencies?.extractRuleMatches ?? extractRuleMatchesFromEvidence;
 
   chdir(repoRoot);
   try {
@@ -132,11 +141,25 @@ export const runConsumerMenuCanary = async (params?: {
     await runGate(scenario.option);
     const optionReport = readOptionReport(repoRoot, scenario.option);
     const ruleIds = extractRuleIds(repoRoot);
+    const expectedRuleIds = [scenario.expectedRuleId, ...(scenario.equivalentRuleIds ?? [])];
+    const ruleMatches = extractRuleMatches(repoRoot, scenario);
+    const canaryRuleMatched = ruleMatches.some((match) =>
+      expectedRuleIds.includes(match.ruleId)
+        && match.filePath.replaceAll('\\', '/').endsWith(canaryRelativePath)
+    );
+    const blocked = optionReport.outcome === 'BLOCK' && optionReport.diagnosis === 'violations-detected';
 
     return {
       option: scenario.option,
       detected:
-        optionReport.totalViolations > 0 && ruleIds.includes(scenario.expectedRuleId),
+        blocked
+        && optionReport.totalViolations > 0
+        && expectedRuleIds.some((ruleId) => ruleIds.includes(ruleId))
+        && canaryRuleMatched,
+      outcome: optionReport.outcome,
+      diagnosis: optionReport.diagnosis,
+      canaryRelativePath,
+      canaryRuleMatched,
       totalViolations: optionReport.totalViolations,
       filesScanned: optionReport.filesScanned,
       ruleIds,

package/scripts/framework-menu-matrix-canary-scenario.ts

@@ -39,6 +39,7 @@ export const resolveConsumerMenuCanaryScenario = (params?: {
       platform,
       option: stage === 'PRE_COMMIT' ? '1' : '2',
       expectedRuleId: 'skills.ios.no-force-unwrap',
+      equivalentRuleIds: ['ios.no-force-unwrap'],
       canaryRelativePath: `apps/ios/App/__pumuki_matrix_canary_ios_${suffix}.swift`,
       canarySource: [
         'import Foundation',
@@ -78,11 +79,12 @@ export const resolveConsumerMenuCanaryScenario = (params?: {
     platform: 'backend',
     option: stage === 'PRE_COMMIT' ? '1' : '2',
     expectedRuleId: 'skills.backend.no-empty-catch',
+    equivalentRuleIds: ['common.error.empty_catch', 'heuristics.ts.empty-catch.ast'],
     canaryRelativePath: `apps/backend/src/__pumuki_matrix_canary_backend_${suffix}.ts`,
     canarySource: [
       'export const __pumukiMatrixCanaryBackend = (): void => {',
       '  try {',
-      "    throw new Error('pumuki-matrix-canary')",
+      '    void 0;',
       '  } catch {}',
       '};',
       '',

package/scripts/framework-menu-matrix-canary-types.ts

@@ -1,4 +1,4 @@
-import type { MatrixOptionId } from './framework-menu-matrix-evidence-lib';
+import type { MatrixOptionDiagnosis, MatrixOptionId } from './framework-menu-matrix-evidence-lib';
 
 export type ConsumerMenuCanaryStage = 'PRE_COMMIT' | 'PRE_PUSH' | 'CI';
 export type ConsumerMenuCanaryPlatform = 'ios' | 'android' | 'backend' | 'frontend';
@@ -6,6 +6,10 @@ export type ConsumerMenuCanaryPlatform = 'ios' | 'android' | 'backend' | 'fronte
 export type ConsumerMenuCanaryResult = {
   option: MatrixOptionId;
   detected: boolean;
+  outcome: string;
+  diagnosis: MatrixOptionDiagnosis;
+  canaryRelativePath: string;
+  canaryRuleMatched: boolean;
   totalViolations: number;
   filesScanned: number;
   ruleIds: string[];
@@ -16,6 +20,7 @@ export type ConsumerMenuCanaryScenario = {
   platform: ConsumerMenuCanaryPlatform;
   option: MatrixOptionId;
   expectedRuleId: string;
+  equivalentRuleIds?: string[];
   canaryRelativePath: string;
   canarySource: string;
 };

package/scripts/framework-menu-system-notifications-macos-dialog-payload.ts

@@ -1,5 +1,6 @@
 import type { PumukiCriticalNotificationEvent } from './framework-menu-system-notifications-types';
 import {
+  resolvePrioritizedBlockingCauses,
   resolveBlockedCauseSummary,
   resolveBlockedRemediation,
   resolveProjectLabel,
@@ -25,7 +26,7 @@ const buildBlockingCausesDetails = (
   const header = total === 1
     ? 'Causas bloqueantes: 1'
     : `Causas bloqueantes: ${total}`;
-  return causes
+  return resolvePrioritizedBlockingCauses(causes)
     .flatMap((cause, index) => formatBlockingCauseForDialog(cause, index))
     .reduce((lines, line) => [...lines, line], [header])
     .join('\n');