@jpkme/diff-review 0.1.5 → 0.1.6

package/README.md

@@ -55,7 +55,7 @@ npm start                # mismo que el bin global
 
 1. Pegá la ruta (o URL) del repo y elegí branch / base — o lanzá `diff-review` / `diff-review --ui` desde el repo.
 2. Copiá el prompt (o el comando de skill `/diff-review`).
-3. Corrélo en tu agente; que escriba `diff-rev_{branchTip}_{baseTip}.json` (también acepta nombres legacy).
+3. Corrélo en tu agente; que escriba `diff-rev_{branchTip}_{baseTip}.json` y lo valide con `npx --yes @jpkme/diff-review validate <archivo>` (también acepta nombres legacy).
 4. Arrastrá ese JSON a la dropzone (o dejá que el CLI lo importe solo). La UI hidrata los diffs con git.
 
 "Ver ejemplo" carga un reporte de muestra sin tocar un repo.

package/bin/diff-review.mjs

@@ -21,6 +21,7 @@ import { branchTips, getRemoteUrl, listBranches, tryResolveGitRoot } from '../li
 import { makeOutputFilename } from '../lib/output-name.mjs';
 import { buildPrompt } from '../lib/prompt.mjs';
 import { waitForReviewOutput } from '../lib/wait-output.mjs';
+import { runValidateCli } from '../lib/check-report.mjs';
 
 const here = dirname(fileURLToPath(import.meta.url));
 const packageRoot = join(here, '..');
@@ -50,9 +51,11 @@ function printHelp() {
 
 Usage:
   diff-review [options]
+  diff-review validate <file.json>
 
 Por defecto (desde un repo git): elegís branch/base en la terminal (Clack),
 copia el prompt, espera el JSON y abre el viewer.
+\`validate\` revisa el JSON y, si falla, dice cómo seguir (exit 0 = OK).
 Si pasás --branch y --base juntos, saltea los selects.
 Con --ui: abre la UI de inmediato (web-first).
 
@@ -403,7 +406,12 @@ async function runUiMode(opts, launch, launchCwd) {
 }
 
 async function main() {
-	const opts = parseArgs(process.argv.slice(2));
+	const rawArgv = process.argv.slice(2);
+	if (rawArgv[0] === 'validate') {
+		process.exit(runValidateCli(rawArgv.slice(1)));
+	}
+
+	const opts = parseArgs(rawArgv);
 	if (opts.help) {
 		printHelp();
 		process.exit(0);

package/lib/check-report.mjs

@@ -0,0 +1,213 @@
+/**
+ * Valida un JSON de review y arma un texto accionable para el agente.
+ */
+import { existsSync, readFileSync } from "node:fs";
+import { isAbsolute, resolve } from "node:path";
+import { globMatch } from "./config.mjs";
+import { extractBranchDiff } from "./extract.mjs";
+import { tryResolveGitRoot } from "./git.mjs";
+import { decodePayload } from "./json-payload.mjs";
+import { REVIEW_SCHEMA, reviewIssues, validateAgainst } from "./validate.mjs";
+
+const MISSING_LIMIT = 40;
+
+/**
+ * @param {unknown} payload
+ * @param {string[]} [paths] rutas del diff (sin ignorados)
+ * @returns {{ ok: boolean, errors: string[], notes: string[] }}
+ */
+export function checkPayload(payload, paths = []) {
+  const errors = [...validateAgainst(REVIEW_SCHEMA, payload), ...reviewIssues(payload)];
+  const notes = [];
+  const known = (paths || []).map((p) => String(p || "").replaceAll("\\", "/")).filter(Boolean);
+
+  if (known.length) {
+    const blocks = Array.isArray(payload?.blocks) ? payload.blocks : [];
+    const findings = Array.isArray(payload?.findings) ? payload.findings : [];
+    const skipped = Array.isArray(payload?.skipped) ? payload.skipped : [];
+    const skippedPatterns = skipped.map((s) => String(s?.file || "")).filter(Boolean);
+
+    const covers = (file) => {
+      const norm = String(file || "").replaceAll("\\", "/");
+      if (blocks.some((b) => String(b?.file || "").replaceAll("\\", "/") === norm)) return true;
+      return skippedPatterns.some((pattern) => {
+        const p = pattern.replaceAll("\\", "/");
+        return p === norm || globMatch(norm, p);
+      });
+    };
+
+    for (const block of blocks) {
+      const file = String(block?.file || "").replaceAll("\\", "/");
+      if (file && !known.includes(file)) {
+        errors.push(`el bloque ${block.id || file} apunta a un archivo que no está en el diff: ${file}`);
+      }
+    }
+    for (const finding of findings) {
+      const file = String(finding?.file || "").replaceAll("\\", "/");
+      if (file && !known.includes(file)) {
+        errors.push(
+          `el hallazgo ${finding.id || finding.what || file} apunta a un archivo fuera del diff: ${file}`
+        );
+      }
+    }
+
+    const missing = known.filter((file) => !covers(file));
+    if (missing.length) {
+      const shown = missing.slice(0, MISSING_LIMIT);
+      const rest = missing.length - shown.length;
+      errors.push(
+        `quedaron ${missing.length} archivo(s) del diff sin bloque ni skipped: ${shown.join(", ")}${
+          rest > 0 ? ` … y ${rest} más` : ""
+        }`
+      );
+    }
+  } else {
+    notes.push("No contrasté cobertura contra git (sin lista de paths del diff).");
+  }
+
+  return { ok: errors.length === 0, errors, notes };
+}
+
+/**
+ * @param {string} filePath
+ * @param {{ repo?: string, branch?: string, base?: string, cwd?: string }} [opts]
+ */
+export function checkReportFile(filePath, opts = {}) {
+  const cwd = opts.cwd || process.cwd();
+  const abs = isAbsolute(filePath) ? filePath : resolve(cwd, filePath);
+  if (!existsSync(abs)) {
+    return {
+      ok: false,
+      file: abs,
+      errors: [`No existe el archivo: ${abs}`],
+      notes: [],
+      usage: true,
+    };
+  }
+
+  let payload;
+  try {
+    payload = decodePayload(readFileSync(abs, "utf8"));
+  } catch (err) {
+    return {
+      ok: false,
+      file: abs,
+      errors: [err instanceof Error ? err.message : String(err)],
+      notes: [],
+    };
+  }
+
+  const meta = payload && typeof payload === "object" ? payload.meta || {} : {};
+  const branch = String(opts.branch || meta.branch || "").trim();
+  const base = String(opts.base || meta.base || "develop").trim();
+  const repoHint = String(opts.repo || meta.repo || "").trim();
+  const repo =
+    (repoHint && !/^(https?:\/\/|git@|ssh:\/\/)/i.test(repoHint) && tryResolveGitRoot(repoHint)) ||
+    tryResolveGitRoot(cwd);
+
+  /** @type {string[]} */
+  let paths = [];
+  /** @type {string[]} */
+  const errors = [];
+
+  if (!branch) {
+    errors.push("Falta meta.branch (o --branch) para contrastar el diff.");
+  } else if (!repo) {
+    errors.push(
+      "No encontré un repo git local (meta.repo o el directorio actual). Sin eso no puedo verificar cobertura."
+    );
+  } else {
+    try {
+      const extracted = extractBranchDiff({ repo, branch, base });
+      paths = (extracted.files || []).map((f) => f.path);
+    } catch (err) {
+      errors.push(
+        `No pude listar el diff con git (${err instanceof Error ? err.message : String(err)}). Revisá meta.repo, meta.branch y meta.base.`
+      );
+    }
+  }
+
+  const result = checkPayload(payload, paths);
+  const allErrors = [...result.errors, ...errors];
+  return { ok: allErrors.length === 0, errors: allErrors, notes: result.notes, file: abs };
+}
+
+/**
+ * @param {string} file
+ * @param {string} command
+ * @param {{ ok: boolean, errors: string[], notes: string[] }} result
+ */
+export function formatCheckReport(file, command, result) {
+  if (result.ok) {
+    const extra = result.notes?.length ? `\n${result.notes.map((n) => `Note: ${n}`).join("\n")}` : "";
+    return `OK: ${file}${extra}\nSchema and references passed. You can stop.`;
+  }
+
+  const problems = (result.errors || []).map((e) => `- ${e}`).join("\n");
+  const notes = (result.notes || []).map((n) => `Note: ${n}`).join("\n");
+  const lines = [
+    `INVALID: ${file}`,
+    "",
+    "The JSON is not ready. Edit this same file until the command prints OK. Do not create a new filename.",
+    "",
+    "Problems:",
+    problems || "- (unknown)",
+  ];
+  if (notes) lines.push("", notes);
+  lines.push(
+    "",
+    "How to continue:",
+    "- Fix every problem above in place. Keep existing meta/intent/groups/blocks/findings; only change what is wrong or missing.",
+    '- Every diff path must appear in "blocks" or "skipped" (a skipped glob counts).',
+    "- what/why/fix stay ≤120 chars; intent ≥40 chars; enums exactly as in the schema.",
+    "- Human-readable strings in Spanish.",
+    `- Re-run exactly: \`${command}\``,
+    "- Stop only when that command prints OK."
+  );
+  return lines.join("\n");
+}
+
+/**
+ * @param {string[]} argv args después de `validate`
+ * @param {{ stdout?: (s: string) => void, stderr?: (s: string) => void, cwd?: string }} [io]
+ * @returns {number} exit code
+ */
+export function runValidateCli(argv, io = {}) {
+  const stdout = io.stdout || ((s) => console.log(s));
+  const stderr = io.stderr || ((s) => console.error(s));
+  const fileFlag = [];
+  /** @type {{ repo?: string, branch?: string, base?: string }} */
+  const opts = { cwd: io.cwd };
+
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "-h" || a === "--help") {
+      stdout(`Usage: npx --yes @jpkme/diff-review validate <file.json> [--repo <path>] [--branch <b>] [--base <b>]
+
+Exit 0 and "OK" when the JSON matches the review contract (and diff coverage, when git can list paths).
+Exit 1 with problems and how to continue otherwise.`);
+      return 0;
+    }
+    if (a === "--repo") opts.repo = argv[++i];
+    else if (a === "--branch") opts.branch = argv[++i];
+    else if (a === "--base") opts.base = argv[++i];
+    else if (a.startsWith("-")) {
+      stderr(`Opción desconocida: ${a}`);
+      return 2;
+    } else fileFlag.push(a);
+  }
+
+  const file = fileFlag[0];
+  if (!file) {
+    stderr("Falta el archivo JSON. Uso: diff-review validate <file.json>");
+    return 2;
+  }
+
+  const command = `npx --yes @jpkme/diff-review validate ${file}`;
+  const result = checkReportFile(file, opts);
+  const text = formatCheckReport(result.file || file, command, result);
+  if (result.ok) stdout(text);
+  else stderr(text);
+  if (result.usage) return 2;
+  return result.ok ? 0 : 1;
+}

package/lib/check-report.test.mjs

@@ -0,0 +1,46 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { checkPayload, formatCheckReport } from "./check-report.mjs";
+
+const valid = () => ({
+  intent: "Agrega el ABM de depósitos locales end-to-end para dejar de administrarlos por SQL.",
+  groups: [{ id: "g1", kind: "feat", title: "CRUD de depósitos", intent: "base de todo" }],
+  blocks: [
+    {
+      id: "b1",
+      group: "g1",
+      file: "src/a.ts",
+      lines: "L1-20",
+      op: "add",
+      what: "controller nuevo",
+      why: "",
+      source: "code",
+    },
+  ],
+  findings: [],
+  skipped: [{ file: "**/*.lock", reason: "lockfile" }],
+});
+
+test("checkPayload acepta cobertura exacta y por glob", () => {
+  const result = checkPayload(valid(), ["src/a.ts", "bun.lock"]);
+  assert.equal(result.ok, true);
+  assert.deepEqual(result.errors, []);
+});
+
+test("checkPayload lista archivos del diff sin cubrir", () => {
+  const result = checkPayload(valid(), ["src/a.ts", "src/olvidado.ts"]);
+  assert.equal(result.ok, false);
+  assert.ok(result.errors.some((e) => e.includes("src/olvidado.ts")));
+});
+
+test("formatCheckReport explica cómo seguir", () => {
+  const text = formatCheckReport("diff-rev_a_b.json", "npx --yes @jpkme/diff-review validate diff-rev_a_b.json", {
+    ok: false,
+    errors: ["$.intent: texto demasiado corto"],
+    notes: [],
+  });
+  assert.match(text, /INVALID/);
+  assert.match(text, /How to continue/);
+  assert.match(text, /npx --yes @jpkme\/diff-review validate/);
+  assert.match(text, /same file/);
+});

package/lib/prompt.mjs

@@ -83,7 +83,14 @@ function workflowLocal(base, branch) {
 1. Resolve the merge-base of \`${base}\` and \`${branch}\`.
 2. Run exactly: \`git diff ${base}...${branch}\` (three-dot / merge-base diff). Do not use two-dot unless three-dot is impossible.
 3. Read enough surrounding code (types, callers, tests) to judge behavior — not only the hunk lines.
-4. Emit the JSON file. Do not modify the repo.`;
+4. Emit the JSON file. Do not modify the repo.
+5. Validate it with the command in the output section. If it prints INVALID, follow "How to continue" and re-run until it prints OK.`;
+}
+
+/** Comando que el agente debe correr; npx por si el bin no está en PATH. */
+export function validateCliCommand(filename) {
+  const file = String(filename || "diff-rev_<branchTip>_<baseTip>.json").trim();
+  return `npx --yes @jpkme/diff-review validate ${file}`;
 }
 
 function workflowUrl(base, branch) {
@@ -92,7 +99,8 @@ function workflowUrl(base, branch) {
 2. Resolve the merge-base of \`${base}\` and \`${branch}\`.
 3. Run exactly: \`git diff ${base}...${branch}\` (three-dot / merge-base diff). Do not use two-dot unless three-dot is impossible.
 4. Read enough surrounding code (types, callers, tests) to judge behavior — not only the hunk lines.
-5. Emit the JSON file.`;
+5. Emit the JSON file.
+6. Validate it with the command in the output section. If it prints INVALID, follow "How to continue" and re-run until it prints OK.`;
 }
 
 /**
@@ -156,5 +164,10 @@ Include "meta" with the source/repo/branch/base above (and origin "remoteUrl" wh
 
 Do NOT include diffs or a "files" array — the tool computes them with git when opening the report. Do not invent hunks or paste patches into the JSON.
 
-When done, tell me that \`${outputFilename}\` was written.`;
+After writing the file, validate it (npx so it works even if \`diff-review\` is not on PATH):
+
+\`${validateCliCommand(outputFilename)}\`
+
+- Exit 0 and a line starting with \`OK\` means the JSON is acceptable. Then tell me that \`${outputFilename}\` was written.
+- Exit 1 prints \`INVALID\`, the problems, and how to continue. Fix the same file and re-run that exact command until it prints OK. Do not stop before OK.`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpkme/diff-review",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Local UI to prompt a coding agent for a branch review and browse the result.",
   "type": "module",
   "bin": {

package/web/build/client/_app/immutable/chunks/{CO0mUwMJ.js → Ber_0nz7.js}

@@ -1 +1 @@
-import"./Dur-vdUf.js";import{c as e}from"./DzqTpz7_.js";var t={get data(){return e.data},get error(){return e.error},get form(){return e.form},get params(){return e.params},get route(){return e.route},get state(){return e.state},get status(){return e.status},get url(){return e.url}};export{t};
+import"./Dur-vdUf.js";import{c as e}from"./zvcaSoGP.js";var t={get data(){return e.data},get error(){return e.error},get form(){return e.form},get params(){return e.params},get route(){return e.route},get state(){return e.state},get status(){return e.status},get url(){return e.url}};export{t};

package/web/build/client/_app/immutable/chunks/Ber_0nz7.js.br

@@ -0,0 +1,2 @@
+%
@��\��'��ǚU��)d�"*�ߎ�0�,�4=�=�Ȧ�+3���_��澨#�
+�Y	��M!^!�ƙ�9�8W"����:�|G����=�������<��`,�Z�Fxc��j��˾���K7�����an?