pumuki 6.3.140 → 6.3.141

package/CHANGELOG.md

@@ -6,6 +6,12 @@ This project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [6.3.141] - 2026-05-05
+
+### Fixed
+
+- **PRE_PUSH en ramas actualizadas desde base:** el guard de atomicidad ignora commits heredados de `main`/`develop` y commits merge al validar trazabilidad y límites por commit, evitando bloqueos falsos en rollouts que solo resolvieron conflictos con la rama base.
+
 ## [6.3.140] - 2026-05-05
 
 ### Fixed

package/docs/operations/RELEASE_NOTES.md

@@ -4,6 +4,12 @@ This file tracks the active deterministic framework line used in this repository
 Canonical release chronology lives in `CHANGELOG.md`.
 This file keeps only the operational highlights and rollout notes that matter while running the framework.
 
+### 2026-05-05 (v6.3.141)
+
+- **PRE_PUSH sin falso bloqueo por historial base:** ramas de rollout que integran `main`/`develop` dejan de fallar por commits merge heredados como `Merge pull request ...`.
+- **Flux/SAAS follow-up:** esta patch desbloquea el push de las resoluciones de conflicto de los PRs de repin abiertos tras `6.3.140`.
+- **Rollout:** publicar `pumuki@6.3.141`, repinear primero RuralGo y repetir Flux/SAAS sin bypass.
+
 ### 2026-05-05 (v6.3.140)
 
 - **PRE_PUSH compatible con ramas largas:** la atomicidad se valida por commit individual, no por diff agregado de rama.

package/integrations/git/gitAtomicity.ts

@@ -32,6 +32,14 @@ const ATOMICITY_CONFIG_FILE = '.pumuki/git-atomicity.json';
 const DEFAULT_COMMIT_PATTERN =
   '^(feat|fix|chore|refactor|docs|test|perf|build|ci|revert)(\\([^)]+\\))?:\\s.+$';
 const MANAGED_EVIDENCE_PATHS = new Set(['.ai_evidence.json', '.AI_EVIDENCE.json']);
+const BASELINE_BRANCH_REFS = [
+  'origin/main',
+  'origin/develop',
+  'upstream/main',
+  'upstream/develop',
+  'main',
+  'develop',
+];
 
 const defaultConfig: GitAtomicityConfig = {
   enabled: true,
@@ -252,33 +260,90 @@ const collectCommitSubjects = (params: {
   fromRef?: string;
   toRef?: string;
 }): ReadonlyArray<string> => {
-  if (!params.fromRef || !params.toRef) {
-    return [];
-  }
+  return collectCommitRecords(params)
+    .filter((record) => shouldEvaluateCommitRecord({ git: params.git, repoRoot: params.repoRoot, record }))
+    .map((record) => record.subject);
+};
+
+type CommitRecord = {
+  hash: string;
+  parents: ReadonlyArray<string>;
+  subject: string;
+};
+
+const parseCommitRecords = (value: string): ReadonlyArray<CommitRecord> =>
+  value
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0)
+    .map((line) => {
+      const [hash = '', parents = '', subject = ''] = line.split('\u0001');
+      return {
+        hash: hash.trim(),
+        parents: parents.split(' ').map((parent) => parent.trim()).filter((parent) => parent.length > 0),
+        subject: subject.trim(),
+      };
+    })
+    .filter((record) => record.hash.length > 0);
+
+const isCommitReachableFromRef = (params: {
+  git: IGitService;
+  repoRoot: string;
+  commitHash: string;
+  ref: string;
+}): boolean => {
   try {
-    return parseLines(
-      params.git.runGit(['log', '--format=%s', `${params.fromRef}..${params.toRef}`], params.repoRoot)
-    );
-  } catch (error) {
-    if (isUnresolvableRevisionError(error)) {
-      return [];
-    }
-    throw error;
+    params.git.runGit(['merge-base', '--is-ancestor', params.commitHash, params.ref], params.repoRoot);
+    return true;
+  } catch {
+    return false;
   }
 };
 
-const collectCommitHashes = (params: {
+const isInheritedBaselineCommit = (params: {
+  git: IGitService;
+  repoRoot: string;
+  commitHash: string;
+}): boolean =>
+  BASELINE_BRANCH_REFS.some((ref) =>
+    isCommitReachableFromRef({
+      git: params.git,
+      repoRoot: params.repoRoot,
+      commitHash: params.commitHash,
+      ref,
+    })
+  );
+
+const shouldEvaluateCommitRecord = (params: {
+  git: IGitService;
+  repoRoot: string;
+  record: CommitRecord;
+}): boolean => {
+  if (params.record.parents.length > 1) {
+    return false;
+  }
+  return !isInheritedBaselineCommit({
+    git: params.git,
+    repoRoot: params.repoRoot,
+    commitHash: params.record.hash,
+  });
+};
+
+const collectCommitRecords = (params: {
   git: IGitService;
   repoRoot: string;
   fromRef?: string;
   toRef?: string;
-}): ReadonlyArray<string> => {
+}): ReadonlyArray<CommitRecord> => {
   if (!params.fromRef || !params.toRef) {
     return [];
   }
   try {
-    return parseLines(
-      params.git.runGit(['log', '--format=%H', '--reverse', `${params.fromRef}..${params.toRef}`], params.repoRoot)
+    return parseCommitRecords(
+      params.git.runGit(
+        ['log', '--format=%H%x01%P%x01%s', '--reverse', `${params.fromRef}..${params.toRef}`],
+        params.repoRoot
+      )
     );
   } catch (error) {
     if (isUnresolvableRevisionError(error)) {
@@ -367,29 +432,29 @@ const buildPrePushCommitPathLimitViolations = (params: {
   fromRef?: string;
   toRef?: string;
 }): GitAtomicityViolation[] | undefined => {
-  const commitHashes = collectCommitHashes({
+  const commitRecords = collectCommitRecords({
     git: params.git,
     repoRoot: params.repoRoot,
     fromRef: params.fromRef,
     toRef: params.toRef,
-  });
-  if (commitHashes.length === 0) {
+  }).filter((record) => shouldEvaluateCommitRecord({ git: params.git, repoRoot: params.repoRoot, record }));
+  if (commitRecords.length === 0) {
     return undefined;
   }
 
   const violations: GitAtomicityViolation[] = [];
-  for (const commitHash of commitHashes) {
+  for (const commitRecord of commitRecords) {
     const changedPaths = collectCommitChangedPaths({
       git: params.git,
       repoRoot: params.repoRoot,
-      commitHash,
+      commitHash: commitRecord.hash,
     }).filter((path) => !isManagedEvidencePath(path));
     violations.push(
       ...buildPathLimitViolations({
         changedPaths,
         config: params.config,
         stage: 'PRE_PUSH',
-        label: `commit=${commitHash.slice(0, 12)}`,
+        label: `commit=${commitRecord.hash.slice(0, 12)}`,
       })
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pumuki",
-  "version": "6.3.140",
+  "version": "6.3.141",
   "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": {