pull-request-split-advisor 3.2.8 → 3.2.10

package/dist/cli.js

@@ -399,8 +399,9 @@ async function main() {
             ], "red");
             // ─── Estado de la cascada en terminal ───────────────────────────────────
             ui.section("ESTADO DE LA CASCADA", "#");
-            for (const sibling of siblings) {
-                ui.subsection(sibling.name);
+            for (let i = 0; i < siblings.length; i++) {
+                const sibling = siblings[i];
+                ui.subsection(`#${i + 1}  ${sibling.name}`);
                 if (sibling.commits.length === 0) {
                     ui.muted("  Sin commits detectados.");
                 }
@@ -408,7 +409,7 @@ async function main() {
                     ui.table(["SHA", "Mensaje"], sibling.commits.map((c) => [c.sha, c.subject]), true);
                 }
             }
-            ui.subsection(`${currentBranch}  ← rama actual`);
+            ui.subsection(`#${siblings.length + 1}  ${currentBranch}  ← rama actual`);
             if (currentBranchCommits.length === 0) {
                 ui.muted("  Sin commits detectados.");
             }
@@ -418,13 +419,30 @@ async function main() {
         }
         // ─── Pipeline de análisis ────────────────────────────────────────────────
         ui.spinner.start("Analizando cambios del working tree...");
-        const changedFiles = gatherChangedFiles(config, baseBranch);
-        if (!changedFiles.length) {
+        const allChangedFiles = gatherChangedFiles(config, baseBranch);
+        if (!allChangedFiles.length) {
             ui.spinner.stop();
             ui.warn("No hay cambios respecto a la rama base.");
             closeReadlineInterface();
             return;
         }
+        // ─── Computar origen de cada archivo en el árbol git ─────────────────────
+        // Se calcula ANTES del pipeline para filtrar el análisis a solo cambios
+        // del working tree (WIP: sin commitear o nuevos sin rastrear).
+        // Archivos ya commiteados (local-commit / pushed) quedan excluidos del
+        // plan de PRs, igual que hace el subcomando 'score'.
+        resetTrackedFilesCache();
+        const origins = computeFileOrigins(allChangedFiles, baseBranch, currentBranch, remote);
+        const changedFiles = allChangedFiles.filter((f) => {
+            const o = origins.get(f) ?? "working-tree";
+            return o === "working-tree" || o === "untracked";
+        });
+        if (changedFiles.length === 0) {
+            ui.spinner.stop();
+            ui.info("No hay cambios en el working tree. Solo existen commits locales o publicados.");
+            closeReadlineInterface();
+            return;
+        }
         const fileStats = getFileStats(changedFiles, baseBranch);
         const deps = buildDependencyEdges(changedFiles);
         const blocks = buildBlocks(fileStats, config, deps);
@@ -436,13 +454,6 @@ async function main() {
         const plans = findBestPlan(blocks, currentBranch, config, deps);
         config.testCoveragePercent = computeTestCoveragePercent(fileStats);
         ui.spinner.stop("Analisis completado.");
-        // ─── Computar origen de cada archivo en el árbol git ─────────────────────
-        // Diferencia entre: ya publicado (REMOTO), commiteado local (LOCAL),
-        // cambio sin commitear (WIP) y archivo nuevo sin rastrear (NUEVO).
-        // Resetear la caché de tracked files para que computeFileOrigins use
-        // un Set fresco (evita stale data si el index cambió durante el análisis).
-        resetTrackedFilesCache();
-        const origins = computeFileOrigins(changedFiles, baseBranch, currentBranch, remote);
         for (const stat of fileStats) {
             stat.origin = origins.get(stat.path);
         }
@@ -461,7 +472,8 @@ async function main() {
         printBlocks(blocks);
         printPlans(plans, baseBranch, currentBranch, config);
         // ─── Exportar reporte HTML ───────────────────────────────────────────────
-        const wipFileStats = fileStats.filter((f) => !f.origin || f.origin === "working-tree" || f.origin === "untracked");
+        // Todos los fileStats ya son WIP (filtrado antes del pipeline).
+        const wipFileStats = fileStats;
         const reportInput = { currentBranch, baseBranch, config, fileStats, wipFileStats, deps, blocks, plans, cascadeWarning };
         const htmlFile = "pr-split-report.html";
         writeHtmlReport(htmlFile, reportInput);

package/dist/git/git.js

@@ -290,20 +290,23 @@ function discoverSortedSiblings(currentBranch, baseBranch, familyPrefix) {
         seenNames.add(name.toUpperCase());
     }
     const candidates = branches.filter(({ name }) => name !== currentBranch &&
-        name.toUpperCase().startsWith(familyPrefix.toUpperCase()));
+        name.toUpperCase().startsWith(familyPrefix.toUpperCase()) &&
+        !/backup/i.test(name));
     if (candidates.length === 0)
         return [];
-    const withAhead = candidates.filter(({ ref }) => {
-        const count = shSafe(`git rev-list ${q(baseBranch)}..${q(ref)} --count`);
-        return (parseInt(count, 10) || 0) > 0;
-    });
+    const withAhead = candidates
+        .map(({ name, ref }) => ({
+        name,
+        ref,
+        count: parseInt(shSafe(`git rev-list ${q(baseBranch)}..${q(ref)} --count`), 10) || 0,
+    }))
+        .filter(({ count }) => count > 0);
     if (withAhead.length === 0)
         return [];
-    return withAhead.sort((a, b) => {
-        const dateA = shSafe(`git log -1 --format=%ct ${q(a.ref)}`);
-        const dateB = shSafe(`git log -1 --format=%ct ${q(b.ref)}`);
-        return (parseInt(dateB, 10) || 0) - (parseInt(dateA, 10) || 0);
-    });
+    // Ordenar por nº de commits DESC: más commits = más al final de la cadena de cascada.
+    // findCascadeParent toma sorted[0] (más commits = rama más reciente = padre correcto).
+    // findCascadeSiblings invierte el array → orden ASC = menos commits (#1) primero.
+    return withAhead.sort((a, b) => b.count - a.count);
 }
 /**
  * Busca la rama hermana más reciente de la misma "familia" con commits adelantados

package/dist/output/report.js

@@ -509,14 +509,20 @@ export function renderHtmlReport(input) {
             ...cw.siblings,
             { name: currentBranch, commits: cw.currentBranchCommits, isCurrent: true }
         ];
-        const cascadeStateHtml = allBranches.map((branch) => {
+        const cascadeStateHtml = allBranches.map((branch, idx) => {
+            const num = idx + 1;
+            const color = branch.isCurrent ? "#e2e8f0" : "#94a3b8";
             const commitsHtml = branch.commits.length > 0
                 ? `<ul style="margin:4px 0 0 0;padding:0;list-style:none">${branch.commits.map((c) => `<li style="font-size:.82em;padding:2px 0">` +
                     `<code style="color:#60a5fa;margin-right:8px">${esc(c.sha)}</code>` +
                     `<span style="opacity:.9">${esc(c.subject)}</span></li>`).join("")}</ul>`
                 : `<div style="font-size:.8em;opacity:.5;margin-top:2px">Sin commits</div>`;
-            return `<div style="margin:6px 0;padding:8px 10px;background:rgba(0,0,0,.15);border-radius:5px;border-left:3px solid ${branch.isCurrent ? "#fbbf24" : "#94a3b8"}">
-        <div style="font-weight:600;font-size:.88em;color:${branch.isCurrent ? "#fbbf24" : "#94a3b8"}">${esc(branch.name)}${branch.isCurrent ? " <span style=\"font-size:.8em;opacity:.7\">← rama actual</span>" : ""}</div>
+            return `<div style="margin:6px 0;padding:8px 10px;background:rgba(0,0,0,.15);border-radius:5px;border-left:3px solid ${color}">
+        <div style="display:flex;align-items:center;gap:6px;margin-bottom:4px">
+          <span style="font-size:.75em;font-weight:700;opacity:.5;min-width:22px">#${num}</span>
+          <code style="display:inline-block;background:#fff;color:#1e293b;font-size:.8em;font-weight:600;padding:1px 7px;border-radius:4px;letter-spacing:.01em">${esc(branch.name)}</code>
+          ${branch.isCurrent ? `<span style="font-size:.75em;color:#e2e8f0;opacity:.7">← rama actual</span>` : ""}
+        </div>
         ${commitsHtml}
       </div>`;
         }).join("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pull-request-split-advisor",
-  "version": "3.2.8",
+  "version": "3.2.10",
   "description": "CLI that analyses your Git working tree and suggests how to split changes into smaller, reviewable pull requests and commits.",
   "keywords": [
     "git",