karajan-code 4.70.3 → 5.0.0

package/src/policy/add.js

@@ -67,31 +67,29 @@ const naiveDiff = (oldText, newText) => {
   ].join("\n");
 };
 
-export async function policyAddCommand({ text, config = {}, flags = {}, logger = console, deps = {} }) {
-  const projectDir = config?.projectDir || process.cwd();
-  if (!text?.trim()) {
-    logger.error?.('policy add: falta la regla — kj policy add "el coder no toca los workflows"');
-    return 1;
-  }
-  const { translateFn = defaultTranslate } = deps;
-  const raw = await translateFn({ text, config, logger });
+// The agent's answer as a policy fragment, or null (said) when it is not one:
+// untranslatable, not YAML, or keys outside the closed vocabulary.
+function fragmentOf(raw, logger) {
   if (raw.includes("NO_TRADUCIBLE")) {
     logger.error?.("policy add: la regla no cabe en el vocabulario cerrado v1 — no se inventa nada; exprésala como write/shell/diff-threshold o queda como instrucción de prompt");
-    return 1;
+    return null;
   }
   let frag;
   try {
     frag = yaml.load(raw);
   } catch (err) {
     logger.error?.(`policy add: el agente no devolvió YAML válido (${err.message}) — nada que aplicar`);
-    return 1;
+    return null;
   }
   if (typeof frag !== "object" || frag === null || Object.keys(frag).some((k) => !["roles", "invariants"].includes(k))) {
     logger.error?.("policy add: el fragmento solo puede declarar roles y/o invariants — rechazado (vocabulario cerrado)");
-    return 1;
+    return null;
   }
+  return frag;
+}
 
-  const file = join(projectDir, ".karajan", "policy.yml");
+// The current policy merged with the fragment, or null (said) when the engine rejects it.
+function proposePolicy(file, frag, logger) {
   let current = "";
   try {
     current = readFileSync(file, "utf8");
@@ -102,8 +100,24 @@ export async function policyAddCommand({ text, config = {}, flags = {}, logger =
   if (errors.length > 0) {
     for (const e of errors) logger.error?.(`✗ ${e}`);
     logger.error?.("policy add: la regla traducida no valida contra el vocabulario del motor — rechazada, no se inventa");
+    return null;
+  }
+  return { current, proposed };
+}
+
+export async function policyAddCommand({ text, config = {}, flags = {}, logger = console, deps = {} }) {
+  const projectDir = config?.projectDir || process.cwd();
+  if (!text?.trim()) {
+    logger.error?.('policy add: falta la regla — kj policy add "el coder no toca los workflows"');
     return 1;
   }
+  const { translateFn = defaultTranslate } = deps;
+  const frag = fragmentOf(await translateFn({ text, config, logger }), logger);
+  if (!frag) return 1;
+  const file = join(projectDir, ".karajan", "policy.yml");
+  const proposal = proposePolicy(file, frag, logger);
+  if (!proposal) return 1;
+  const { current, proposed } = proposal;
 
   logger.info?.(`policy add — diff propuesto para .karajan/policy.yml:\n${naiveDiff(current, proposed)}`);
   if (current.includes("#")) {

package/src/policy/adr-number-check.js

@@ -0,0 +1,31 @@
+/**
+ * HU-2792: two branches can add `.karajan/adrs/0037-a.md` and `0037-b.md` in
+ * parallel: the names differ, so git sees no conflict and both land with the
+ * same number. CI judges a PR that adds an ADR whose number the base already
+ * holds under another name (unless the same diff deletes that one: a rename).
+ */
+export const ADR_RULE = "defaults.adr.number";
+const ADR_DIR = ".karajan/adrs/";
+const ADR = /^\.karajan\/adrs\/(\d{4})-[^/]*\.md$/;
+const lines = (text) => text.split("\n").map((s) => s.trim()).filter(Boolean);
+const numberOf = (file) => Number(ADR.exec(file)[1]);
+
+/**
+ * @param {{files: string[], range: string|null, run: (args: string[]) => Promise<string>}} opts
+ * @returns {Promise<object|null>} the violation, or null when no added ADR collides with the base
+ */
+export async function adrNumberViolation({ files, range, run }) {
+  if (!files.some((f) => ADR.test(f))) return null;
+  const baseRef = range ? range.split(/\.{2,3}/)[0] : "HEAD";
+  const changes = lines(await run(["diff", "--no-renames", "--name-status", ...(range ? ["--end-of-options", range] : ["--cached"])])).map((l) => l.split("\t"));
+  const added = changes.filter(([status, file]) => status === "A" && ADR.test(file)).map(([, file]) => file);
+  const deleted = new Set(changes.filter(([status]) => status === "D").map(([, file]) => file));
+  const onBase = lines(await run(["ls-tree", "--name-only", "--end-of-options", baseRef, ADR_DIR])).filter((f) => ADR.test(f));
+  for (const file of added) {
+    const clash = onBase.find((f) => f !== file && numberOf(f) === numberOf(file) && !deleted.has(f));
+    if (!clash) continue;
+    const next = String(Math.max(...onBase.map(numberOf), ...added.map(numberOf)) + 1).padStart(4, "0");
+    return { rule_id: ADR_RULE, enforcement: "deny", file, reason: `${file} reuses the ADR number of ${clash}, which the base already has; the next free number is ${next}` };
+  }
+  return null;
+}