@jpkme/diff-review 0.1.12 → 0.1.14

package/web/build/server/chunks/{agent-sessions-DSqGavSn.js → agent-sessions-D0WwtWgR.js}

@@ -1,5 +1,5 @@
-import { g as getRemoteUrl, e as ensureReviewDir, w as writeDiffCache, p as readDiffCache, q as extractBranchDiff, u as loadReviewConfig, v as outputRelPath, m as makeOutputFilename, O as OUTPUT_DIR, x as writeSessionRef, h as companionPaths, d as decodePayload, t as tryResolveGitRoot, j as loadBranchDiff, y as validateAgainst, z as reviewIssues, R as REVIEW_SCHEMA, A as globMatch, C as writeDiffText } from './validate-BsTKyhsq.js';
-import { existsSync, readFileSync, statSync, accessSync, constants, readdirSync, mkdirSync, writeFileSync, copyFileSync, rmSync } from 'node:fs';
+import { o as getRemoteUrl, e as ensureReviewDir, w as writeDiffCache, p as readDiffCache, q as extractBranchDiff, u as loadReviewConfig, v as outputRelPath, m as makeOutputFilename, O as OUTPUT_DIR, x as writeSessionRef, c as companionPaths, d as decodePayload, t as tryResolveGitRoot, f as loadBranchDiff, y as validateAgainst, z as reviewIssues, R as REVIEW_SCHEMA, A as globMatch, C as writeDiffText } from './validate-CAQ31C7k.js';
+import { existsSync, readFileSync, statSync, accessSync, constants, readdirSync, mkdirSync, writeFileSync, copyFileSync, rmSync, realpathSync } from 'node:fs';
 import { spawn } from 'node:child_process';
 import { homedir, tmpdir } from 'node:os';
 import { join, delimiter, isAbsolute, resolve, basename, dirname, normalize } from 'node:path';
@@ -492,17 +492,46 @@ var DISCARD = /* @__PURE__ */ new Set([
 	"nul",
 	"$null"
 ]);
-/** `/c/Users/...` (Git Bash) → `C:/Users/...` en Windows. */
+/**
+* Paths de shell Unix → forma Windows cuando la política corre en win32:
+* - Git Bash: `/c/Users/...` → `C:/Users/...`
+* - WSL: `/mnt/c/Users/...` → `C:/Users/...`
+*/
 function toNativePath(p, platform) {
 	if (platform === "win32") {
+		const wsl = /^\/mnt\/([a-zA-Z])(\/|$)(.*)$/.exec(p);
+		if (wsl) return `${wsl[1].toUpperCase()}:/${wsl[3]}`;
 		const msys = /^\/([a-zA-Z])(\/|$)(.*)$/.exec(p);
 		if (msys) return `${msys[1].toUpperCase()}:/${msys[3]}`;
 	}
 	return p;
 }
+/**
+* Resuelve symlinks cuando el path (o un ancestro) existe. Sin eso, un link
+* dentro del repo puede apuntar fuera y pasar `isInside` con solo `normalize`.
+* @param {string} path
+*/
+function canonicalPath$1(path) {
+	try {
+		return realpathSync(path);
+	} catch {
+		const parts = [];
+		let cur = normalize(path);
+		for (;;) {
+			const parent = dirname(cur);
+			if (!parent || parent === cur) return normalize(path);
+			parts.unshift(basename(cur));
+			try {
+				return resolve(realpathSync(parent), ...parts);
+			} catch {
+				cur = parent;
+			}
+		}
+	}
+}
 function isInside$1(child, root, platform) {
-	const c = normalize(child).replace(/[\\/]+$/, "");
-	const r = normalize(root).replace(/[\\/]+$/, "");
+	const c = normalize(canonicalPath$1(child)).replace(/[\\/]+$/, "");
+	const r = normalize(canonicalPath$1(root)).replace(/[\\/]+$/, "");
 	const [cc, rr] = platform === "win32" ? [c.toLowerCase(), r.toLowerCase()] : [c, r];
 	return cc === rr || cc.startsWith(`${rr}\\`) || cc.startsWith(`${rr}/`);
 }
@@ -727,13 +756,11 @@ function isValidate(argv) {
 */
 function checkReviewDirMkdir(argv, ctx) {
 	const name = argv[0].toLowerCase();
-	const reviewRoot = normalize(resolve(ctx.repo, ".diff-review")).replace(/[\\/]+$/, "");
+	const reviewRoot = resolve(ctx.repo, ".diff-review");
 	/** @param {string} arg */
 	const underReviewDir = (arg) => {
 		const native = toNativePath(String(arg || "").replace(/^~(?=[\\/]|$)/, "/__home__"), ctx.platform);
-		const abs = normalize(isAbsolute(native) ? native : resolve(ctx.repo, native)).replace(/[\\/]+$/, "");
-		const [a, r] = ctx.platform === "win32" ? [abs.toLowerCase(), reviewRoot.toLowerCase()] : [abs, reviewRoot];
-		return a === r || a.startsWith(`${r}\\`) || a.startsWith(`${r}/`);
+		return isInside$1(isAbsolute(native) ? native : resolve(ctx.repo, native), reviewRoot, ctx.platform);
 	};
 	if (name === "mkdir" || name === "md") {
 		const paths = argv.slice(1).filter((a) => !a.startsWith("-"));
@@ -802,7 +829,7 @@ function checkShell(command, { repo, platform = process.platform } = {}) {
 /**
 * Qué puede hacer el agente cuando corre por ACP. Cada `session/request_permission` pasa por acá: no hay nadie
 * mirando la terminal para aprobar, así que la política es una allowlist (leer, comandos de solo lectura y escribir
-* dentro de `.diff-review/`) y todo lo demás se rechaza.
+* el JSON de salida en `.diff-review/`) y todo lo demás se rechaza.
 *
 * Ojo: el agente solo pide permiso para lo que *su* configuración no aprueba sola (p. ej. Claude Code aplica la
 * allowlist de `~/.claude/settings.json` antes de preguntar). Esto acota lo que pide, no lo que el usuario ya
@@ -827,10 +854,33 @@ function samePath(a, b, platform = process.platform) {
 	const nb = normalize(b);
 	return platform === "win32" ? na.toLowerCase() === nb.toLowerCase() : na === nb;
 }
+/**
+* Resuelve symlinks cuando el path (o un ancestro) existe. Sin eso, un link dentro del repo
+* puede apuntar fuera y pasar `isInside` con solo `resolve`.
+* @param {string} path
+*/
+function canonicalPath(path) {
+	try {
+		return realpathSync(path);
+	} catch {
+		const parts = [];
+		let cur = normalize(path);
+		for (;;) {
+			const parent = dirname(cur);
+			if (!parent || parent === cur) return normalize(path);
+			parts.unshift(basename(cur));
+			try {
+				return resolve(realpathSync(parent), ...parts);
+			} catch {
+				cur = parent;
+			}
+		}
+	}
+}
 /** @param {string} child @param {string} root */
 function isInside(child, root, platform = process.platform) {
-	const c = normalize(child);
-	const r = normalize(root).replace(/[\\/]+$/, "");
+	const c = normalize(canonicalPath(child));
+	const r = normalize(canonicalPath(root)).replace(/[\\/]+$/, "");
 	const [cc, rr] = platform === "win32" ? [c.toLowerCase(), r.toLowerCase()] : [c, r];
 	return cc === rr || cc.startsWith(`${rr}\\`) || cc.startsWith(`${rr}/`);
 }
@@ -861,6 +911,52 @@ function commandOf(rawInput) {
 	return typeof cmd === "string" ? cmd : "";
 }
 /**
+* Comando de shell que la política evalúa (rawInput, backticks o título entero).
+* Cursor a veces envuelve el script con `@…@` en el título.
+* @param {ToolCallLike} toolCall
+*/
+function toolCallCommand(toolCall) {
+	const fromRaw = commandOf(toolCall.rawInput).trim();
+	if (fromRaw) return fromRaw;
+	const title = String(toolCall.title ?? "").trim();
+	const tick = /^`([\s\S]+)`$/.exec(title);
+	if (tick) return tick[1].trim();
+	const at = /^@\s*([\s\S]*?)\s*@$/.exec(title);
+	if (at) return at[1].trim();
+	return title;
+}
+/**
+* Etiqueta corta del agente si el título no es el comando mismo.
+* @param {ToolCallLike} toolCall
+* @param {string} [command]
+*/
+function toolCallLabel(toolCall, command = toolCallCommand(toolCall)) {
+	const title = String(toolCall.title ?? "").trim();
+	if (!title) return "";
+	if (/^`[\s\S]+`$/.test(title) || /^@\s*[\s\S]*?\s*@$/.test(title)) return "";
+	const norm = (s) => s.replace(/\s+/g, " ").trim();
+	if (command && norm(title) === norm(command)) return "";
+	if (command && command.length >= 24 && title.includes(command.slice(0, 24))) return "";
+	return title;
+}
+/**
+* Motivo de denegación legible en la UI de permisos.
+* @param {string} reason
+*/
+function humanizePolicyReason(reason) {
+	const r = String(reason || "").trim();
+	if (!r) return "La política bloqueó este pedido.";
+	let m;
+	if (m = /^(.+?) no está permitido$/.exec(r)) return `La política bloqueó «${m[1]}» (no está en la allowlist de comandos).`;
+	if (m = /^variables de entorno en el comando:\s*(.*)$/s.exec(r)) return `La política interpretó parte del comando como variable de entorno (${String(m[1] || "?").trim().slice(0, 40)}) y lo bloqueó.`;
+	if (m = /^path fuera del repo:\s*(.*)$/s.exec(r)) return `El path queda fuera del repo: ${m[1]}`;
+	if (m = /^lectura fuera del repo:\s*(.*)$/s.exec(r)) return `Lectura fuera del repo: ${m[1]}`;
+	if (m = /^opción global de git no permitida:\s*(.*)$/s.exec(r)) return `Opción de git no permitida: ${m[1]}`;
+	if (r.startsWith("git ")) return `Comando git no permitido por la política: ${r}`;
+	if (r.startsWith("solo se puede escribir") || r.includes("sin path") || r.startsWith("modo pregunta")) return r;
+	return `La política bloqueó el pedido: ${r}`;
+}
+/**
 * @param {ToolCallLike} toolCall
 * @param {PolicyContext} ctx
 * @returns {Decision}
@@ -869,6 +965,10 @@ function decidePermission(toolCall, { repo, outputFilename, mode }) {
 	const kind = toolCall.kind ?? "other";
 	const paths = toolCallPaths(toolCall, repo);
 	if (kind === "read" || kind === "search") {
+		if (!paths.length) return {
+			allow: false,
+			reason: `${kind === "search" ? "búsqueda" : "lectura"} sin path`
+		};
 		const outside = paths.find((p) => !isInside(p, repo));
 		return outside ? {
 			allow: false,
@@ -883,8 +983,7 @@ function decidePermission(toolCall, { repo, outputFilename, mode }) {
 		reason: "pensar"
 	};
 	if (kind === "execute") {
-		const title = String(toolCall.title ?? "").trim();
-		const check = checkShell(commandOf(toolCall.rawInput) || (/^`([\s\S]+)`$/.exec(title)?.[1] ?? title), { repo });
+		const check = checkShell(toolCallCommand(toolCall), { repo });
 		return check.ok ? {
 			allow: true,
 			reason: "comando de solo lectura"
@@ -902,14 +1001,14 @@ function decidePermission(toolCall, { repo, outputFilename, mode }) {
 			allow: false,
 			reason: `${kind === "delete" ? "borrado" : "edición"} sin path`
 		};
-		const reviewRoot = resolve(repo, OUTPUT_DIR);
-		const outside = paths.find((p) => !isInside(p, reviewRoot) && !samePath(p, reviewRoot));
+		const target = resolve(repo, outputRelPath(outputFilename));
+		const outside = paths.find((p) => !samePath(canonicalPath(p), canonicalPath(target)));
 		return outside ? {
 			allow: false,
-			reason: `solo se puede escribir en ${OUTPUT_DIR}/ (no ${outside})`
+			reason: `solo se puede escribir ${outputRelPath(outputFilename)} (no ${outside})`
 		} : {
 			allow: true,
-			reason: `escritura en ${OUTPUT_DIR}/`
+			reason: `escritura de ${outputRelPath(outputFilename)}`
 		};
 	}
 	return {
@@ -1560,7 +1659,7 @@ function formatCheckReport(file, command, result) {
 		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).", "- meta.agent and meta.model are required (product name and the exact model id you are running).", "- 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.");
+	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).", "- If a problem lists missing paths: ADD a block or a skipped entry for each exact path. Do not only bump meta.generatedAt, notes, or claim the file is already complete.", "- meta.agent and meta.model are required (product name and the exact model id you are running).", "- 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");
 }
 //#endregion
@@ -1670,7 +1769,7 @@ var RULES = `- Ids: themes use \`t1\`, \`t2\`, …; findings use \`f1\`, \`f2\`,
 /** @param {{ hasDiff?: boolean }} [ctx] */
 function workflowLocal(base, branch, ctx = {}) {
 	if (ctx.hasDiff) return `Workflow:
-1. Read the three-dot diff from the path given in "Precomputed git context" below. Do not re-run \`git diff\` unless that file is missing.
+1. The host already computed the three-dot diff and wrote it to disk (see "Precomputed git context"). Read that file with your file tools. Do not run \`git diff\`, \`git merge-base\`, or rebuild the patch yourself unless that file is missing.
 2. Read enough surrounding code (types, callers, tests) to judge behavior, not only the hunk lines.
 3. Emit the JSON file. Do not modify the repo.
 4. Validate it with the command in the output section. If it prints INVALID, follow "How to continue" and re-run until it prints OK.`;
@@ -1688,7 +1787,7 @@ function validateCliCommand(filename) {
 /** Workflow sin paso de validate por CLI (sesiones ACP: valida el server). */
 function workflowLocalAcp(ctx = {}) {
 	if (ctx.hasDiff) return `Workflow:
-1. Read the three-dot diff from the path given in "Precomputed git context" below. Do not re-run \`git diff\` unless that file is missing.
+1. The host already computed the three-dot diff and wrote it to disk (see "Precomputed git context"). Read that file with your file tools. Do not run \`git diff\`, \`git merge-base\`, or rebuild the patch yourself unless that file is missing.
 2. Read enough surrounding code (types, callers, tests) to judge behavior, not only the hunk lines.
 3. Write the JSON with your file Write/Edit tool (never shell redirection). Do not modify other repo files. The host validates when your turn ends — do not run the validate CLI.`;
 	return `Workflow:
@@ -1729,11 +1828,11 @@ function outputSchemaBlock(meta) {
 * }} ctx
 */
 function formatPrecomputedContext(ctx) {
-	const lines = ["Precomputed git context (do not rediscover):"];
+	const lines = ["Precomputed git context (provided by the host — do not rediscover or recompute):"];
 	if (ctx.mergeBase) lines.push(`- Merge-base SHA: \`${ctx.mergeBase}\``);
 	if (ctx.branchSha) lines.push(`- Branch tip SHA: \`${ctx.branchSha}\``);
 	if (ctx.baseSha) lines.push(`- Base tip SHA: \`${ctx.baseSha}\``);
-	if (ctx.diffRelPath) lines.push(`- Diff file (relative to repo root): \`${ctx.diffRelPath}\` — read this file; do not re-run \`git diff\` unless it is missing.`);
+	if (ctx.diffRelPath) lines.push(`- Diff file (relative to repo root): \`${ctx.diffRelPath}\` — Read this file for the full patch. Do not run \`git diff\` / \`git merge-base\` to rebuild it unless the file is missing.`);
 	const files = Array.isArray(ctx.files) ? ctx.files : [];
 	if (files.length) {
 		lines.push(`- Files in the diff (${files.length}):`);
@@ -2057,14 +2156,20 @@ function askUserPermission(entry, toolCall, decision) {
 		always: false
 	});
 	const requestId = crypto.randomUUID();
-	const title = toolCall.title || toolCall.kind || "herramienta";
 	const kind = toolCall.kind || "";
-	emit(entry, {
-		type: "permission",
+	const command = toolCallCommand(toolCall);
+	const title = toolCallLabel(toolCall, command) || (command ? "" : toolCall.title || kind || "herramienta");
+	const reason = humanizePolicyReason(decision.reason);
+	const base = {
 		requestId,
 		title,
 		kind,
-		reason: decision.reason,
+		reason,
+		command: command || void 0
+	};
+	emit(entry, {
+		type: "permission",
+		...base,
 		allow: false,
 		pending: true
 	});
@@ -2073,9 +2178,7 @@ function askUserPermission(entry, toolCall, decision) {
 			entry.pendingPermissions.delete(requestId);
 			emit(entry, {
 				type: "permission",
-				requestId,
-				title,
-				kind,
+				...base,
 				reason: "tiempo agotado",
 				allow: false,
 				pending: false
@@ -2091,10 +2194,8 @@ function askUserPermission(entry, toolCall, decision) {
 				if (allow && (scope === "session" || scope === "always")) entry.sessionAllowDenied = true;
 				emit(entry, {
 					type: "permission",
-					requestId,
-					title,
-					kind,
-					reason: permissionReasonLabel(allow, scope, decision.reason),
+					...base,
+					reason: permissionReasonLabel(allow, scope, reason),
 					allow,
 					pending: false,
 					quiet: opts?.quiet
@@ -2284,16 +2385,42 @@ function mtime(path) {
 		return 0;
 	}
 }
+/** Cuántas veces el server le pide solo al agente corregir/escribir el JSON antes de cortar con Reintentar. */
+var OUTPUT_AUTO_RETRIES = 2;
 /**
 * Después de un turno que podía escribir el JSON: validarlo, estamparle la sesión y, si quedó mal, pedirle al
-* agente que lo corrija (una vez).
+* agente que lo corrija (hasta `OUTPUT_AUTO_RETRIES` veces).
 */
+function checkEntryReport(entry) {
+	const path = companionPaths(entry.repo, entry.outputFilename).json;
+	if (!existsSync(path)) return null;
+	return {
+		path,
+		result: checkReportFile(path, {
+			repo: entry.repo,
+			branch: entry.branch,
+			base: entry.base,
+			...entry.diffPaths?.length ? { paths: entry.diffPaths } : {}
+		})
+	};
+}
+/** Prompt cuando el JSON existe pero no pasa validación (auto-fix o Reintentar). */
+function invalidJsonFixPrompt(entry, path, result) {
+	return `${formatCheckReport(path, validateCliCommand(entry.outputFilename), result)}
+
+Critical: do NOT only bump meta.generatedAt or rewrite notes. Edit \`${outputRelPath(entry.outputFilename).replace(/\\/g, "/")}\` so every problem above is fixed (add blocks or skipped for each missing path). Do not claim success until coverage is complete.
+
+${TOOL_RULES}
+
+${SERVER_VALIDATES}`;
+}
 function noWriteFollowUpPrompt(entry) {
 	const rel = outputRelPath(entry.outputFilename);
 	const rejected = entry.rejections.length ? `These commands were rejected by diff-review's policy and did not run:\n${entry.rejections.slice(-5).map((r) => `- ${r}`).join("\n")}\n\n` : "";
 	const posixRel = rel.replace(/\\/g, "/");
+	const existing = checkEntryReport(entry);
 	return `${rejected}Your turn ended without writing \`${posixRel}\` in this turn (mtime must change now). The user did not stop you.
-
+${existing && !existing.result.ok ? `\nThe file on disk is also INVALID — fix these when you Write/Edit (do not only bump generatedAt):\n${(existing.result.errors || []).map((e) => `- ${e}`).join("\n")}\n` : ""}
 Do this now:
 1. Read \`${posixRel}\` if it exists (required before Write/Edit on an existing file).
 2. Edit or Write the full review JSON to that same path (forward slashes only).
@@ -2303,11 +2430,16 @@ ${TOOL_RULES}
 
 ${SERVER_VALIDATES}`;
 }
-async function checkOutput(entry, since, retry) {
+async function checkOutput(entry, since, retriesLeft) {
+	if (entry.cancelled) return;
 	const path = companionPaths(entry.repo, entry.outputFilename).json;
 	if (!(existsSync(path) && mtime(path) >= since)) {
-		if (retry) return checkOutput(entry, await followUp(entry, noWriteFollowUpPrompt(entry), entry.rejections.length ? "Seguí: hubo comandos rechazados; escribí el JSON con la tool de archivos." : "Seguí: el JSON no se escribió en este turno."), false);
-		if (entry.mode === "review") emit(entry, {
+		if (retriesLeft > 0) {
+			const again = await followUp(entry, noWriteFollowUpPrompt(entry), entry.rejections.length ? "Seguí: hubo comandos rechazados; escribí el JSON con la tool de archivos." : "Seguí: el JSON no se escribió en este turno.");
+			if (entry.cancelled || again == null) return;
+			return checkOutput(entry, again, retriesLeft - 1);
+		}
+		if (entry.mode === "review" && !entry.cancelled) emit(entry, {
 			type: "review",
 			ok: false,
 			filename: entry.outputFilename,
@@ -2341,24 +2473,33 @@ async function checkOutput(entry, since, retry) {
 		});
 		return;
 	}
+	if (entry.cancelled) return;
+	const canRetry = retriesLeft > 0;
 	emit(entry, {
 		type: "review",
 		ok: false,
 		filename: entry.outputFilename,
 		errors: result.errors,
-		final: !retry
+		final: !canRetry
 	});
-	if (!retry) return;
-	await checkOutput(entry, await followUp(entry, `${formatCheckReport(path, validateCliCommand(entry.outputFilename), result)}\n\n${SERVER_VALIDATES}`, "Corregí los errores de validación del JSON."), false);
+	if (!canRetry) return;
+	const again = await followUp(entry, invalidJsonFixPrompt(entry, path, result), "Corregí los errores de validación del JSON.");
+	if (entry.cancelled || again == null) return;
+	await checkOutput(entry, again, retriesLeft - 1);
 }
-/** Turno extra que pide el server (corregir el JSON, seguir después de un rechazo). Devuelve cuándo empezó. */
+/**
+* Turno extra que pide el server (corregir el JSON, seguir después de un rechazo).
+* Devuelve cuándo empezó, o `null` si el usuario canceló (no hay que seguir reintentando).
+*/
 async function followUp(entry, prompt, shown) {
+	if (entry.cancelled) return null;
 	emit(entry, {
 		type: "user",
 		text: shown,
 		mode: "fix"
 	});
 	const acp = await ensureAcp(entry);
+	if (entry.cancelled) return null;
 	const started = Date.now();
 	entry.rejections = [];
 	const { stopReason } = await acp.prompt(prompt);
@@ -2366,10 +2507,15 @@ async function followUp(entry, prompt, shown) {
 		type: "turn",
 		stopReason
 	});
+	if (entry.cancelled || stopReason === "cancelled") {
+		entry.cancelled = true;
+		return null;
+	}
 	return started;
 }
 async function runTurn(entry, text, mode, opts) {
 	if (entry.busy) throw new Error("El agente todavía está trabajando en el pedido anterior.");
+	entry.cancelled = false;
 	entry.busy = true;
 	entry.mode = mode;
 	if (entry.idleTimer) clearTimeout(entry.idleTimer);
@@ -2381,6 +2527,11 @@ async function runTurn(entry, text, mode, opts) {
 	try {
 		if (!entry.acp) setStatus(entry, "starting", `Lanzando ${entry.agentLabel}…`);
 		const acp = await ensureAcp(entry, opts.model);
+		if (entry.cancelled) {
+			entry.busy = false;
+			setStatus(entry, "idle", "Cancelado.");
+			return;
+		}
 		setStatus(entry, "working", "El agente está revisando…");
 		const since = Date.now();
 		entry.rejections = [];
@@ -2389,11 +2540,22 @@ async function runTurn(entry, text, mode, opts) {
 			type: "turn",
 			stopReason
 		});
-		if (mode !== "ask" && stopReason !== "cancelled") await checkOutput(entry, since, true);
+		if (entry.cancelled || stopReason === "cancelled") {
+			entry.cancelled = true;
+			entry.busy = false;
+			setStatus(entry, "idle", "Cancelado.");
+			return;
+		}
+		if (mode !== "ask") await checkOutput(entry, since, OUTPUT_AUTO_RETRIES);
 		entry.busy = false;
-		setStatus(entry, "idle");
+		if (entry.cancelled) setStatus(entry, "idle", "Cancelado.");
+		else setStatus(entry, "idle");
 	} catch (err) {
 		entry.busy = false;
+		if (entry.cancelled) {
+			setStatus(entry, "idle", "Cancelado.");
+			return;
+		}
 		const raw = err instanceof Error ? err.message : String(err);
 		setStatus(entry, "error", authFailureMessage(entry.agentId, entry.agentLabel, raw) || raw);
 	} finally {
@@ -2559,17 +2721,20 @@ function sendMessage(id, text, mode, opts) {
 /**
 * Reintento manual tras un turno de review que no dejó el JSON válido (p. ej. redirect bloqueado o JSON viejo).
 * Misma sesión ACP; no recalcula el diff.
+* Si el JSON ya existe e inválido, reenvía los errores concretos (cobertura faltante, etc.) — no un “escribí de nuevo” genérico.
 */
 function retryReview(id) {
 	const entry = sessions.get(String(id || ""));
 	if (!entry) throw new Error("La sesión del agente ya no existe. Recargá la página.");
 	if (entry.busy) throw new Error("El agente todavía está trabajando en el pedido anterior.");
 	if (entry.status === "error") throw new Error(entry.statusMessage || "La sesión está en error; iniciá una nueva review.");
-	runTurn(entry, `Continue the code review. For \`${outputRelPath(entry.outputFilename).replace(/\\/g, "/")}\`: Read it first if it exists, then Edit/Write the full JSON (forward slashes only). Do not mkdir. Never use shell redirection.
+	const posixRel = outputRelPath(entry.outputFilename).replace(/\\/g, "/");
+	const existing = checkEntryReport(entry);
+	runTurn(entry, existing && !existing.result.ok ? invalidJsonFixPrompt(entry, existing.path, existing.result) : `Continue the code review. For \`${posixRel}\`: Read it first if it exists, then Edit/Write the full JSON (forward slashes only). Do not mkdir. Never use shell redirection.
 
 ${TOOL_RULES}
 
-${SERVER_VALIDATES}`, "review", { shown: "Reintentar: escribir el JSON de la review" });
+${SERVER_VALIDATES}`, "review", { shown: existing && !existing.result.ok ? "Reintentar: corregir el JSON inválido" : "Reintentar: escribir el JSON de la review" });
 	return info(entry);
 }
 /**
@@ -2654,12 +2819,19 @@ async function cancelTurn(id) {
 	const entry = sessions.get(id);
 	if (!entry) return;
 	entry.cancelled = true;
+	for (const [requestId, pending] of [...entry.pendingPermissions]) {
+		clearTimeout(pending.timer);
+		entry.pendingPermissions.delete(requestId);
+		pending.resolve(false, { quiet: true });
+	}
 	if (entry.acp && entry.busy) {
-		await entry.acp.cancel();
+		try {
+			await entry.acp.cancel();
+		} catch {}
 		return;
 	}
 	entry.busy = false;
-	setStatus(entry, "error", "Cancelado.");
+	setStatus(entry, "idle", "Cancelado.");
 }
 function subscribe(id, listener) {
 	const entry = sessions.get(id);
@@ -2684,5 +2856,5 @@ function startPendingAgentRun() {
 	}
 }
 
-export { sendMessage as a, setPermissionTrust as b, cancelTurn as c, retryReview as d, openAgentLogin as e, listAcpAgents as f, agentModels as g, sessionInfo as h, subscribe as i, startPendingAgentRun as j, loginCommand as l, openChat as o, respondPermission as r, startReview as s };
-//# sourceMappingURL=agent-sessions-DSqGavSn.js.map
+export { agentModels as a, startReview as b, sendMessage as c, setPermissionTrust as d, cancelTurn as e, retryReview as f, openAgentLogin as g, loginCommand as h, subscribe as i, startPendingAgentRun as j, listAcpAgents as l, openChat as o, respondPermission as r, sessionInfo as s };
+//# sourceMappingURL=agent-sessions-D0WwtWgR.js.map