navori 0.2.5 → 0.2.6

package/dist/index.js

@@ -1653,6 +1653,51 @@ function extractManagedContent(existing, id, commentStyle = "html") {
   const match = findMarker(existing, id, syntax);
   return match ? match.content : null;
 }
+function locateManagedBlocks(content, syntax) {
+  const openRegex = new RegExp(
+    `${escapeRegex(syntax.openPrefix)}\\s+id="([^"]+)"${syntax.attrsAndTerminatorPattern}`,
+    "g"
+  );
+  const blocks = [];
+  for (const m of content.matchAll(openRegex)) {
+    if (m.index === void 0) continue;
+    const id = m[1];
+    const close = closeMarker(id, syntax);
+    const closeStart = content.indexOf(close, m.index + m[0].length);
+    if (closeStart < 0) continue;
+    blocks.push({ id, openStart: m.index, closeEnd: closeStart + close.length });
+  }
+  return blocks;
+}
+function reorderManagedBlocks(content, canonicalOrder, commentStyle = "html") {
+  const syntax = syntaxFor(commentStyle);
+  const blocks = locateManagedBlocks(content, syntax);
+  if (blocks.length < 2) {
+    return { output: content, reordered: false, blockedByInterleaving: false };
+  }
+  const rank = /* @__PURE__ */ new Map();
+  canonicalOrder.forEach((id, i) => {
+    if (!rank.has(id)) rank.set(id, i);
+  });
+  const unknownBase = canonicalOrder.length;
+  const desired = blocks.map((b, i) => ({ b, i, key: rank.has(b.id) ? rank.get(b.id) : unknownBase + i })).sort((a, z8) => a.key - z8.key || a.i - z8.i).map((x) => x.b);
+  if (desired.every((b, i) => b === blocks[i])) {
+    return { output: content, reordered: false, blockedByInterleaving: false };
+  }
+  for (let i = 0; i < blocks.length - 1; i++) {
+    const gap = content.slice(blocks[i].closeEnd, blocks[i + 1].openStart);
+    if (gap.trim() !== "") {
+      return { output: content, reordered: false, blockedByInterleaving: true };
+    }
+  }
+  const first = blocks[0];
+  const last = blocks[blocks.length - 1];
+  const preamble = content.slice(0, first.openStart);
+  const suffix = content.slice(last.closeEnd);
+  const body = desired.map((b) => content.slice(b.openStart, b.closeEnd)).join("\n\n");
+  const pre = preamble === "" ? "" : preamble.replace(/\n*$/, "\n\n");
+  return { output: pre + body + suffix, reordered: true, blockedByInterleaving: false };
+}
 function resolveCondition(config, path) {
   const segments = path.split(".");
   let cursor = config;
@@ -1885,6 +1930,16 @@ function computeRenderPlan(existing, inputConfig, repoRoot, options = {}) {
     updatesAvailable
   };
 }
+var CLAUDE_COMPUTED_BLOCK_IDS = [
+  "skills-index",
+  "agentes-disponibles",
+  "contexto-proyecto"
+];
+function canonicalManagedOrder(config, repoRoot) {
+  const plan = computeRenderPlan("", config, repoRoot);
+  const ids = plan.entries.filter((entry) => entry.newContent !== null).map((entry) => entry.asset.id);
+  return [...ids, ...CLAUDE_COMPUTED_BLOCK_IDS];
+}
 
 // src/engines/claude/settings-detection.ts
 var NAVORI_OWNERSHIP_MARKER = "$navori";
@@ -2491,6 +2546,13 @@ function renderClaudeEngine(cwd, inputConfig, options = {}) {
   } else {
     claudeMdContent = removeManagedSection(claudeMdContent, CONTEXTO_PROYECTO_ID);
   }
+  const reorder = reorderManagedBlocks(claudeMdContent, canonicalManagedOrder(config, repoRoot));
+  claudeMdContent = reorder.output;
+  if (reorder.blockedByInterleaving) {
+    warnings.push(
+      "CLAUDE.md: los bloques managed est\xE1n fuera del orden can\xF3nico, pero hay texto tuyo intercalado entre bloques, as\xED que no los reorden\xE9. Mueve ese texto arriba del primer bloque managed o abajo del \xFAltimo para que navori pueda ordenarlos."
+    );
+  }
   if (claudeMdContent !== claudeMdExisting) {
     pending.push({
       path: claudeMdPath,
@@ -4831,21 +4893,45 @@ function scanManagedDrift(cwd, config) {
   }
   return out;
 }
+function scanManagedOrder(cwd, config) {
+  const claudeMdPath = join13(cwd, "CLAUDE.md");
+  if (!existsSync17(claudeMdPath)) return null;
+  const content = readFileSync14(claudeMdPath, "utf-8");
+  const current = listMarkers(claudeMdPath).map((m) => m.id);
+  if (current.length < 2) return null;
+  const canonical = canonicalManagedOrder(config, cwd);
+  const result = reorderManagedBlocks(content, canonical);
+  if (!result.reordered && !result.blockedByInterleaving) return null;
+  const rank = /* @__PURE__ */ new Map();
+  canonical.forEach((id, i) => {
+    if (!rank.has(id)) rank.set(id, i);
+  });
+  const expected = current.map((id, i) => ({ id, i, key: rank.has(id) ? rank.get(id) : canonical.length + i })).sort((a, z8) => a.key - z8.key || a.i - z8.i).map((x) => x.id);
+  return { current, expected, interleaved: result.blockedByInterleaving };
+}
 function suggestNextSteps(state) {
   const steps = [];
   if (!state.claudeMdExists) {
-    steps.push("Corr\xE9 'navori render --apply' para generar CLAUDE.md + .claude/.");
+    steps.push("Corre 'navori render --apply' para generar CLAUDE.md + .claude/.");
   }
   if (state.missingPlugins.length > 0) {
     steps.push(
-      `Resolv\xE9 ${state.missingPlugins.length} plugin(s) faltante(s): instalalos o quitalos del config.`
+      `Resuelve ${state.missingPlugins.length} plugin(s) faltante(s): inst\xE1lalos o qu\xEDtalos del config.`
     );
   }
   if (state.drifts.some((d) => d.kind === "content")) {
-    steps.push("Corr\xE9 'navori sync --interactive' para resolver bloques editados a mano.");
+    steps.push("Corre 'navori sync --interactive' para resolver bloques editados a mano.");
   }
   if (state.drifts.some((d) => d.kind === "version")) {
-    steps.push("Corr\xE9 'navori render --apply' para traer los bloques a la \xFAltima versi\xF3n.");
+    steps.push("Corre 'navori render --apply' para traer los bloques a la \xFAltima versi\xF3n.");
+  }
+  if (state.orderReport && !state.orderReport.interleaved) {
+    steps.push("Corre 'navori render --apply' para reordenar los bloques de CLAUDE.md al orden can\xF3nico.");
+  }
+  if (state.orderReport?.interleaved) {
+    steps.push(
+      "Mueve el texto que tienes entre bloques managed de CLAUDE.md arriba del primer bloque o abajo del \xFAltimo; luego corre 'navori render --apply' para reordenarlos."
+    );
   }
   if (steps.length === 0) {
     steps.push("Todo al d\xEDa \u2014 sin acciones pendientes.");
@@ -4910,6 +4996,7 @@ var doctorCommand = defineCommand3({
     const markers = listMarkers(claudeMdPath);
     const missingPlugins = collectMissingPlugins(config);
     const drifts = scanManagedDrift(cwd, config);
+    const orderReport = scanManagedOrder(cwd, config);
     const corruptedSettings = scanCorruptedSettings(cwd);
     const missingInvariants = scanMissingInvariants(cwd, config);
     const resolvedPreset = config.preset !== "custom" ? resolvePreset(config.preset, cwd) : null;
@@ -4934,6 +5021,7 @@ var doctorCommand = defineCommand3({
       managedBlocks: markers,
       missingPlugins,
       drifts,
+      orderReport,
       corruptedSettings,
       missingInvariants,
       missingPreset,
@@ -5057,10 +5145,26 @@ ${lines.join("\n")}`
 ${lines.join("\n")}`
       );
     }
+    if (orderReport) {
+      if (orderReport.interleaved) {
+        p3.log.warn(
+          `Bloques managed de CLAUDE.md fuera del orden can\xF3nico \u2014 NO se pueden reordenar autom\xE1ticamente porque hay texto tuyo entre bloques. Mueve ese texto arriba del primer bloque managed o abajo del \xFAltimo; luego corre 'navori render --apply'.
+  orden actual:   ${orderReport.current.join(", ")}
+  orden can\xF3nico: ${orderReport.expected.join(", ")}`
+        );
+      } else {
+        p3.log.warn(
+          `Bloques managed de CLAUDE.md fuera del orden can\xF3nico \u2014 corre 'navori render --apply' o 'navori sync' para reordenarlos (el primer bloque marca el centro de gravedad del harness).
+  orden actual:   ${orderReport.current.join(", ")}
+  orden can\xF3nico: ${orderReport.expected.join(", ")}`
+        );
+      }
+    }
     const nextSteps = suggestNextSteps({
       claudeMdExists: report.checks.claudeMdExists,
       missingPlugins,
-      drifts
+      drifts,
+      orderReport
     });
     p3.note(
       nextSteps.map((s) => `  ${color.cyan(sym.bullet)} ${s}`).join("\n"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "navori",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Multi-agent harness + SDD scaffolder for Claude Code and other AI engines",
   "type": "module",
   "bin": {