pumuki 6.3.337 → 6.3.339

package/integrations/notifications/emitAuditSummaryNotification.ts

@@ -76,25 +76,56 @@ const normalizeRuleCode = (ruleId: string): string =>
     .replace(/[.-]/gu, '_')
     .toUpperCase();
 
+const extractMessageField = (message: string, field: string): string | undefined => {
+  const escapedField = field.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const match = message.match(new RegExp(`\\b${escapedField}=([^\\n]+?)(?=\\s(?:severity|code|rule|file|lines?|message|remediation|snippet|node|primary_node|missing)=|\\s\\|\\|\\s\\d+\\)|$)`, 'i'));
+  const value = match?.[1]?.trim();
+  return value && value.length > 0 ? value : undefined;
+};
+
+const extractFirstNestedSkillSegment = (message: string): string =>
+  message
+    .replace(/^.*?\bBlocking causes:\s*1\)\s*/isu, '')
+    .replace(/\s+\|\|\s+\d+\)\s+[\s\S]*$/u, '')
+    .trim();
+
+const normalizeNestedSkillMessage = (params: {
+  ruleId: string;
+  segment: string;
+}): string => {
+  if (/\bmessage=/i.test(params.segment)) {
+    return params.segment;
+  }
+  const withoutRule = params.segment.replace(params.ruleId, '').trim();
+  return `message=${withoutRule || 'Skill violada.'}`;
+};
+
 const extractNestedSkillCauseFromWrapper = (cause: NotificationBlockingCause): NotificationBlockingCause => {
   if (cause.ruleId?.startsWith('skills.') || cause.code.startsWith('SKILLS_')) {
     return cause;
   }
-  const nested = cause.message.match(/\bBlocking causes:\s*1\)\s*(skills\.[a-z0-9_.-]+)\s+(.+?)$/iu);
+  const nested = cause.message.match(/\bBlocking causes:\s*1\)\s*(skills\.[a-z0-9_.-]+)\s+(.+?)$/isu);
   if (!nested?.[1]) {
     return cause;
   }
   const ruleId = nested[1];
-  const nestedMessage = nested[2]?.trim() || 'Skill violada.';
+  const nestedMessage = extractFirstNestedSkillSegment(cause.message) || nested[2]?.trim() || 'Skill violada.';
+  const normalizedNestedMessage = normalizeNestedSkillMessage({
+    ruleId,
+    segment: nestedMessage,
+  });
+  const nestedFile = extractMessageField(normalizedNestedMessage, 'file');
+  const nestedRemediation = extractMessageField(normalizedNestedMessage, 'remediation');
   return {
     ...cause,
     code: normalizeRuleCode(ruleId),
     ruleId,
-    message: `rule=${ruleId} message=${nestedMessage}`,
+    file: nestedFile ?? cause.file,
+    message: `rule=${ruleId} ${normalizedNestedMessage}`,
     remediation:
-      cause.remediation && !/corrige la violaci[oó]n indicada/i.test(cause.remediation)
+      cause.remediation && !/corrige la violaci[oó]n indicada|corrige la causa bloqueante/i.test(cause.remediation)
         ? cause.remediation
-        : 'Corrige la violación de la skill indicada en el fichero afectado y vuelve a intentar el commit.',
+        : nestedRemediation ?? 'Corrige la violación de la skill indicada en el fichero afectado y vuelve a intentar el commit.',
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pumuki",
-  "version": "6.3.337",
+  "version": "6.3.339",
   "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-system-notifications-macos-swift-source.ts

@@ -8,6 +8,7 @@ struct DialogConfig {
   let disableButton: String
   let muteButton: String
   let keepButton: String
+  let timeoutSeconds: Double
 }
 
 func parseArguments() -> DialogConfig {
@@ -18,13 +19,20 @@ func parseArguments() -> DialogConfig {
     }
     return args[index + 1]
   }
+  func readDouble(_ key: String, fallback: Double) -> Double {
+    guard let value = Double(read(key, fallback: String(fallback))), value > 0 else {
+      return fallback
+    }
+    return value
+  }
   return DialogConfig(
     title: read("--title", fallback: "Pumuki bloqueado"),
     cause: read("--cause", fallback: "Bloqueo detectado."),
     remediation: read("--remediation", fallback: "Corrige el bloqueo y vuelve a ejecutar."),
     disableButton: read("--disable-button", fallback: "Desactivar"),
     muteButton: read("--mute-button", fallback: "Silenciar 30 min"),
-    keepButton: read("--keep-button", fallback: "Mantener activas")
+    keepButton: read("--keep-button", fallback: "Mantener activas"),
+    timeoutSeconds: readDouble("--timeout-seconds", fallback: 15)
   )
 }
 
@@ -69,6 +77,13 @@ final class DialogAppDelegate: NSObject, NSApplicationDelegate {
     alert.addButton(withTitle: config.muteButton)
     alert.addButton(withTitle: config.disableButton)
 
+    DispatchQueue.main.asyncAfter(deadline: .now() + config.timeoutSeconds) {
+      if alert.window.isVisible {
+        alert.window.orderOut(nil)
+        NSApp.stopModal(withCode: .alertFirstButtonReturn)
+      }
+    }
+
     let response = alert.runModal()
     let choice: String
     switch response {

package/scripts/framework-menu-system-notifications-payloads-blocked.ts

@@ -168,7 +168,7 @@ const formatVisibleRule = (cause: BlockedCause): string => {
 
 const extractMessageField = (message: string, field: string): string | null => {
   const escapedField = field.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-  const match = message.match(new RegExp(`\\b${escapedField}=([^\\n]+?)(?=\\s(?:severity|code|rule|file|lines?|message|remediation|snippet|node|primary_node|missing)=|$)`, 'i'));
+  const match = message.match(new RegExp(`\\b${escapedField}=([^\\n]+?)(?=\\s(?:severity|code|rule|file|lines?|message|remediation|snippet|node|primary_node|missing)=|\\s\\|\\|\\s\\d+\\)|$)`, 'i'));
   const value = match?.[1]?.trim();
   return value && value.length > 0 ? normalizeNotificationText(value) : null;
 };
@@ -208,11 +208,18 @@ const normalizeRuleCode = (ruleId: string): string =>
 const isGenericCauseFix = (value?: string): boolean =>
   !value ||
   /corrige la violaci[oó]n indicada/i.test(value) ||
-  /corrige las violaciones listadas/i.test(value);
+  /corrige las violaciones listadas/i.test(value) ||
+  /corrige la causa bloqueante/i.test(value);
 
 const extractNestedSkillRuleId = (message: string): string | null =>
   message.match(/\b(skills\.[a-z0-9_.-]+)\b/iu)?.[1] ?? null;
 
+const extractFirstNestedSkillSegment = (message: string): string =>
+  message
+    .replace(/^.*?\bBlocking causes:\s*1\)\s*/isu, '')
+    .replace(/\s+\|\|\s+\d+\)\s+[\s\S]*$/u, '')
+    .trim();
+
 const normalizeDisplayCause = (cause: BlockedCause): BlockedCause => {
   if (isSkillCause(cause) || isSkillsContractCause(cause)) {
     return cause;
@@ -221,15 +228,17 @@ const normalizeDisplayCause = (cause: BlockedCause): BlockedCause => {
   if (!nestedSkillRuleId) {
     return cause;
   }
-  const nestedFile = extractMessageField(cause.message, 'file');
-  const nestedRemediation = extractMessageField(cause.message, 'remediation');
+  const nestedSegment = extractFirstNestedSkillSegment(cause.message);
+  const nestedFile = extractMessageField(nestedSegment, 'file');
+  const nestedRemediation = extractMessageField(nestedSegment, 'remediation');
   return {
     ...cause,
     code: normalizeRuleCode(nestedSkillRuleId),
     ruleId: nestedSkillRuleId,
     file: nestedFile ?? cause.file,
+    message: nestedSegment,
     remediation: isGenericCauseFix(cause.remediation)
-      ? nestedRemediation ?? cause.remediation
+      ? nestedRemediation ?? 'Corrige la violación de la skill indicada en el fichero afectado y vuelve a intentar el commit.'
       : cause.remediation,
   };
 };