diffing 0.3.0 → 0.4.1

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { C as toSafeRelativePath, S as isSafePath, _ as getUntrackedFilePathsAsync, a as formatComments, b as listRepoFiles, c as getFileContent, d as getMergeStatus, f as getProjectStorageDir, g as getTabSizeForFiles, h as getShowDiff, i as writeServerLock, l as getGitDiffAsync, m as getRepoRoot, o as getBranchName, p as getRepoName, r as removeServerLock, s as getCustomGitDiffAsync, u as getHunkHistory, v as gitAddFile, x as revertHunk, y as isGitRepo } from "./server-lock-Dj9fG9md.mjs";
-import { n as formatPlanReview, r as sectionTitleForLine, t as extractPlanLines } from "./plan-format-f62JWFI-.mjs";
+import { C as toSafeRelativePath, S as isSafePath, _ as getUntrackedFilePathsAsync, a as formatComments, b as listRepoFiles, c as getFileContent, d as getMergeStatus, f as getProjectStorageDir, g as getTabSizeForFiles, h as getShowDiff, i as writeServerLock, l as getGitDiffAsync, m as getRepoRoot, o as getBranchName, p as getRepoName, r as removeServerLock, s as getCustomGitDiffAsync, u as getHunkHistory, v as gitAddFile, x as revertHunk, y as isGitRepo } from "./server-lock-D73NKKbn.mjs";
+import { n as formatPlanReview, r as sectionTitleForLine, t as extractPlanLines } from "./plan-format-mSDtsPcC.mjs";
 import { execFile, execFileSync, spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { dirname, extname, isAbsolute, join, resolve } from "node:path";
@@ -1331,6 +1331,42 @@ var FileCommentStore = class {
 function newId() {
 	return crypto.randomUUID();
 }
+/**
+* Backfill / repair a plan loaded from disk so it matches the current schema.
+* Older persisted plans may be missing `versions` and `createdAtPlanVersion`;
+* we synthesize sensible values so callers can always rely on the new fields.
+*/
+function backfillPlan(plan) {
+	const currentVersion = plan.version ?? 1;
+	const have = Array.isArray(plan.versions) ? plan.versions.length : 0;
+	if (!plan.versions || have === 0 || have < currentVersion) {
+		const createdAt = plan.updatedAt ?? plan.createdAt ?? Date.now();
+		const haveEntries = Array.isArray(plan.versions) ? plan.versions : [];
+		const present = new Set(haveEntries.map((v) => v.version));
+		const next = [];
+		for (let i = 1; i <= currentVersion; i++) {
+			const existing = haveEntries.find((v) => v.version === i);
+			if (existing) next.push(existing);
+			else next.push({
+				version: i,
+				body: plan.body,
+				title: plan.title,
+				source: plan.source,
+				model: plan.model,
+				createdAt
+			});
+		}
+		plan.versions = next.filter((v) => v.version >= 1 && v.version <= currentVersion);
+		if (have < currentVersion || !present.has(currentVersion)) markBackfilled(plan);
+	}
+	if (plan.comments) {
+		for (const c of plan.comments) if (typeof c.createdAtPlanVersion !== "number") c.createdAtPlanVersion = plan.version ?? 1;
+	}
+	if (!plan.comments) plan.comments = [];
+}
+function markBackfilled(plan) {
+	plan.__backfilledVersions = true;
+}
 /** Shared mutation helpers so both stores behave identically. */
 function applyUpsert(plans, input, now) {
 	if (input.id) {
@@ -1342,6 +1378,15 @@ function applyUpsert(plans, input, now) {
 			if (input.model !== void 0) existing.model = input.model;
 			existing.version += 1;
 			existing.updatedAt = now;
+			if (!existing.versions) existing.versions = [];
+			existing.versions.push({
+				version: existing.version,
+				body: existing.body,
+				title: existing.title,
+				source: existing.source,
+				model: existing.model,
+				createdAt: now
+			});
 			existing.decision = "pending";
 			existing.decisionComment = void 0;
 			existing.decidedAt = void 0;
@@ -1358,11 +1403,43 @@ function applyUpsert(plans, input, now) {
 		updatedAt: now,
 		version: 1,
 		decision: "pending",
-		comments: []
+		comments: [],
+		versions: [{
+			version: 1,
+			body: input.body,
+			title: input.title,
+			source: input.source,
+			model: input.model,
+			createdAt: now
+		}]
 	};
 	plans.push(plan);
 	return plan;
 }
+/**
+* Keep the most-recent `PlanVersion` snapshot in sync with the current `Plan`
+* fields after a non-resubmit edit (PUT). Doesn't add a new entry — that only
+* happens via `upsert` (the resubmit flow).
+*/
+function syncCurrentVersion(plan) {
+	if (!plan.versions || plan.versions.length === 0) plan.versions = [];
+	if (plan.versions.length === 0) {
+		plan.versions.push({
+			version: plan.version,
+			body: plan.body,
+			title: plan.title,
+			source: plan.source,
+			model: plan.model,
+			createdAt: plan.updatedAt
+		});
+		return;
+	}
+	const last = plan.versions[plan.versions.length - 1];
+	last.body = plan.body;
+	last.title = plan.title;
+	last.source = plan.source;
+	last.model = plan.model;
+}
 var FilePlanStore = class {
 	dirPath;
 	filePath;
@@ -1380,7 +1457,19 @@ var FilePlanStore = class {
 	async getAll() {
 		try {
 			const data = await readFile(this.filePath, "utf-8");
-			return JSON.parse(data);
+			const plans = JSON.parse(data);
+			let anyBackfilled = false;
+			for (const p of plans) {
+				const before = Array.isArray(p.versions) ? p.versions.length : 0;
+				const beforeValid = Array.isArray(p.versions) && p.versions.length > 0;
+				backfillPlan(p);
+				const after = Array.isArray(p.versions) ? p.versions.length : 0;
+				if ((!beforeValid || before < (p.version ?? 1)) && after > before) anyBackfilled = true;
+			}
+			if (anyBackfilled) try {
+				await this.save(plans);
+			} catch {}
+			return plans;
 		} catch {
 			return [];
 		}
@@ -1388,6 +1477,11 @@ var FilePlanStore = class {
 	async get(id) {
 		return (await this.getAll()).find((p) => p.id === id) ?? null;
 	}
+	async getVersion(id, version) {
+		const plan = await this.get(id);
+		if (!plan) return null;
+		return plan.versions.find((v) => v.version === version) ?? null;
+	}
 	async save(plans) {
 		try {
 			await mkdir(this.dirPath, { recursive: true });
@@ -1395,7 +1489,12 @@ var FilePlanStore = class {
 				const repoRoot = getRepoRoot();
 				await writeFile(join(this.dirPath, "repo_path.txt"), repoRoot, "utf-8");
 			} catch {}
-			await writeFile(this.filePath, JSON.stringify(plans, null, 2), "utf-8");
+			const clean = plans.map((p) => {
+				const copy = { ...p };
+				delete copy.__backfilledVersions;
+				return copy;
+			});
+			await writeFile(this.filePath, JSON.stringify(clean, null, 2), "utf-8");
 		} catch (err) {
 			console.error("Failed to save plans to file:", err);
 		}
@@ -1403,6 +1502,7 @@ var FilePlanStore = class {
 	async upsert(input) {
 		const plans = await this.getAll();
 		const plan = applyUpsert(plans, input, Date.now());
+		backfillPlan(plan);
 		await this.save(plans);
 		return plan;
 	}
@@ -1415,6 +1515,8 @@ var FilePlanStore = class {
 		if (fields.source !== void 0) plan.source = fields.source;
 		if (fields.model !== void 0) plan.model = fields.model;
 		plan.updatedAt = Date.now();
+		syncCurrentVersion(plan);
+		backfillPlan(plan);
 		await this.save(plans);
 		return plan;
 	}
@@ -1443,11 +1545,13 @@ var FilePlanStore = class {
 		if (!plan) return null;
 		if (!plan.comments) plan.comments = [];
 		if (!fn(plan)) return null;
+		backfillPlan(plan);
 		await this.save(plans);
 		return plan;
 	}
 	async addComment(planId, comment) {
 		return this.mutate(planId, (plan) => {
+			if (typeof comment.createdAtPlanVersion !== "number") comment.createdAtPlanVersion = plan.version ?? 1;
 			plan.comments.push(comment);
 			return true;
 		});
@@ -1473,6 +1577,7 @@ var FilePlanStore = class {
 		return this.mutate(planId, (plan) => {
 			const c = plan.comments.find((x) => x.id === commentId);
 			if (!c) return false;
+			if (typeof c.createdAtPlanVersion === "number" && typeof reply.createdAtPlanVersion !== "number") reply.createdAtPlanVersion = c.createdAtPlanVersion;
 			if (!c.replies) c.replies = [];
 			c.replies.push(reply);
 			return true;
@@ -1653,7 +1758,8 @@ var ReviewSession = class {
 			commentXml: input.commentXml,
 			openCount: input.openCount,
 			comments: input.comments,
-			decision: input.decision
+			decision: input.decision,
+			mode: input.mode ?? "standard"
 		};
 		this.lastPayload = payload;
 		const waiters = [...this.waiters];
@@ -1747,7 +1853,8 @@ var PlanReviewSession = class {
 			decisionComment: input.decisionComment,
 			reviewXml: input.reviewXml,
 			openCommentCount: input.openCommentCount,
-			plan: input.plan
+			plan: input.plan,
+			mode: input.mode ?? "standard"
 		};
 		this.lastPayload = payload;
 		const waiters = [...this.waiters];
@@ -2277,7 +2384,7 @@ const MIME_TYPES = {
 function isCustomMode(opts) {
 	return opts.revisions.length > 0 || opts.pathspecs.length > 0 || opts.showMode;
 }
-function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, prSessionStore) {
+function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, prSessionStore, prMode = false) {
 	const app = new Hono();
 	const customMode = isCustomMode(diffOpts);
 	const store = commentStore ?? new FileCommentStore();
@@ -2376,33 +2483,35 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 	app.get("/api/diff", async (c) => {
 		const staged = c.req.query("staged") === "true";
 		const untracked = c.req.query("untracked") === "true";
-		const prSession = await prStore.get();
-		if (prSession) {
-			const binaryFiles = [];
-			const filePaths = [];
-			for (const line of prSession.diff.split("\n")) {
-				const m = /^diff --git a\/.+ b\/(.+)$/.exec(line);
-				if (m) filePaths.push(m[1]);
+		if (prMode) {
+			const prSession = await prStore.get();
+			if (prSession) {
+				const binaryFiles = [];
+				const filePaths = [];
+				for (const line of prSession.diff.split("\n")) {
+					const m = /^diff --git a\/.+ b\/(.+)$/.exec(line);
+					if (m) filePaths.push(m[1]);
+				}
+				return c.json({
+					patch: prSession.diff,
+					repoName: prSession.repo,
+					branch: `#${prSession.pullNumber}`,
+					customMode: true,
+					binaryFiles,
+					tabSizeMap: {},
+					untrackedFiles: [],
+					prMode: true,
+					prRef: prSession.ref,
+					prOwner: prSession.owner,
+					prRepo: prSession.repo,
+					prPullNumber: prSession.pullNumber,
+					prUrl: prSession.url,
+					prTitle: prSession.title,
+					prAuthor: prSession.author,
+					prHeadSha: prSession.headSha,
+					prBaseSha: prSession.baseSha
+				});
 			}
-			return c.json({
-				patch: prSession.diff,
-				repoName: prSession.repo,
-				branch: `#${prSession.pullNumber}`,
-				customMode: true,
-				binaryFiles,
-				tabSizeMap: {},
-				untrackedFiles: [],
-				prMode: true,
-				prRef: prSession.ref,
-				prOwner: prSession.owner,
-				prRepo: prSession.repo,
-				prPullNumber: prSession.pullNumber,
-				prUrl: prSession.url,
-				prTitle: prSession.title,
-				prAuthor: prSession.author,
-				prHeadSha: prSession.headSha,
-				prBaseSha: prSession.baseSha
-			});
 		}
 		const optsForDiff = customMode ? diffOpts : {
 			...diffOpts,
@@ -2703,6 +2812,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 		prMode: false
 	}, 404);
 	app.get("/api/gh/session", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
 		return c.json({
@@ -2728,6 +2838,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 	});
 	/** Re-fetch PR metadata (head SHA, diff, existing comments) and persist. */
 	app.post("/api/gh/pr/refresh", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
 		try {
@@ -2743,6 +2854,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 	});
 	/** Initialize a PR session from a ref like `1234`, `o/r#42`, or a GitHub URL. */
 	app.post("/api/gh/pr/init", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const body = await c.req.json().catch(() => ({}));
 		const ref = typeof body?.ref === "string" ? body.ref : "";
 		if (!ref.trim()) return c.json({ error: "ref is required" }, 400);
@@ -2763,11 +2875,13 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 		}
 	});
 	app.get("/api/gh/pr-session/comments", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
 		return c.json(session.comments ?? []);
 	});
 	app.post("/api/gh/pr-session/comments", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const body = await c.req.json();
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
@@ -2791,6 +2905,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 		return c.json(comment, 201);
 	});
 	app.put("/api/gh/pr-session/comments/:id", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const id = c.req.param("id");
 		const { body, status } = await c.req.json();
 		const session = await prStore.get();
@@ -2809,6 +2924,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 		return c.json(updated);
 	});
 	app.delete("/api/gh/pr-session/comments/:id", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const id = c.req.param("id");
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
@@ -2820,6 +2936,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 		return c.json({ ok: true });
 	});
 	app.post("/api/gh/pr-session/comments/:id/replies", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const id = c.req.param("id");
 		const { body, role, model } = await c.req.json();
 		const session = await prStore.get();
@@ -2846,6 +2963,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 	});
 	/** Submit the current PR session's review (new comments + verdict + body) to GitHub. */
 	app.post("/api/gh/submit", async (c) => {
+		if (!prMode) return notInPrMode(c);
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
 		const body = await c.req.json().catch(() => ({}));
@@ -2887,21 +3005,24 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 	app.post("/api/review/send", async (c) => {
 		const body = await c.req.json().catch(() => ({}));
 		const generalComment = typeof body?.generalComment === "string" ? body.generalComment : void 0;
-		const decision = body?.decision === "approved" || body?.decision === "changes-requested" || body?.decision === "rejected" ? body.decision : void 0;
+		const decision = body?.decision === "approved" || body?.decision === "changes-requested" || body?.decision === "rejected" || body?.decision === "comment-only" ? body.decision : void 0;
+		const mode = body?.mode === "comment-only" || body?.mode === "standard" ? body.mode : "standard";
 		const all = await store.getAll();
 		const openCount = all.filter((x) => x.status === "open").length;
 		const payload = reviewSession.send({
 			sentAt: Date.now(),
-			commentXml: formatComments(all, generalComment, decision),
+			commentXml: formatComments(all, generalComment, decision, mode),
 			openCount,
 			comments: all,
-			decision
+			decision,
+			mode
 		});
 		return c.json({
 			ok: true,
 			round: payload.round,
 			openCount: payload.openCount,
 			decision: payload.decision,
+			mode: payload.mode,
 			waiters: reviewSession.snapshot().waiters
 		});
 	});
@@ -2928,6 +3049,29 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 		if (!plan) return c.json({ error: "Plan not found" }, 404);
 		return c.json(plan);
 	});
+	app.get("/api/plans/:id/versions", async (c) => {
+		const plan = await plans.get(c.req.param("id"));
+		if (!plan) return c.json({ error: "Plan not found" }, 404);
+		return c.json(plan.versions ?? []);
+	});
+	app.get("/api/plans/:id/versions/:n", async (c) => {
+		const id = c.req.param("id");
+		const n = Number(c.req.param("n"));
+		if (!Number.isFinite(n) || n < 1) return c.json({ error: "version must be a positive integer" }, 400);
+		const plan = await plans.get(id);
+		if (!plan) return c.json({ error: "Plan not found" }, 404);
+		const version = (plan.versions ?? []).find((v) => v.version === n);
+		if (!version) return c.json({ error: `Version ${n} not found` }, 404);
+		return c.json({
+			version,
+			plan: {
+				id: plan.id,
+				title: plan.title,
+				decision: plan.decision,
+				currentVersion: plan.version
+			}
+		});
+	});
 	app.post("/api/plans", async (c) => {
 		const body = await c.req.json().catch(() => ({}));
 		if (typeof body.body !== "string" || !body.body.trim()) return c.json({ error: "A plan body (markdown) is required" }, 400);
@@ -2967,6 +3111,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 		const anchorStart = startLineNumber ?? lineNumber;
 		const lineContent = typeof body.lineContent === "string" && body.lineContent ? body.lineContent : lineNumber > 0 ? extractPlanLines(plan.body, anchorStart, lineNumber) : "";
 		const sectionTitle = typeof body.sectionTitle === "string" && body.sectionTitle ? body.sectionTitle : lineNumber > 0 ? sectionTitleForLine(plan.body, anchorStart) : void 0;
+		const createdAtPlanVersion = Number.isFinite(body.createdAtPlanVersion) ? Number(body.createdAtPlanVersion) : plan.version;
 		const comment = {
 			id: crypto.randomUUID(),
 			lineNumber,
@@ -2976,6 +3121,7 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 			body: body.body,
 			status: "open",
 			createdAt: Date.now(),
+			createdAtPlanVersion,
 			replies: []
 		};
 		const updated = await plans.addComment(planId, comment);
@@ -3025,8 +3171,9 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 		const planId = c.req.param("id");
 		const body = await c.req.json().catch(() => ({}));
 		const decision = body.decision;
-		if (decision !== "approved" && decision !== "rejected" && decision !== "changes-requested") return c.json({ error: "decision must be one of: approved, rejected, changes-requested" }, 400);
+		if (decision !== "approved" && decision !== "rejected" && decision !== "changes-requested" && decision !== "comment-only") return c.json({ error: "decision must be one of: approved, rejected, changes-requested, comment-only" }, 400);
 		const decisionComment = typeof body.decisionComment === "string" ? body.decisionComment : void 0;
+		const mode = body?.mode === "comment-only" || body?.mode === "standard" ? body.mode : "standard";
 		const plan = await plans.setDecision(planId, decision, decisionComment);
 		if (!plan) return c.json({ error: "Plan not found" }, 404);
 		const openCommentCount = (plan.comments ?? []).filter((x) => x.status === "open").length;
@@ -3035,14 +3182,16 @@ function createApp(clientDir, diffOpts = DEFAULTS$1, commentStore, planStore, pr
 			planId,
 			decision,
 			decisionComment: plan.decisionComment,
-			reviewXml: formatPlanReview(plan),
+			reviewXml: formatPlanReview(plan, { mode }),
 			openCommentCount,
-			plan
+			plan,
+			mode
 		});
 		return c.json({
 			ok: true,
 			round: payload.round,
 			decision,
+			mode: payload.mode,
 			openCommentCount,
 			waiters: planReviewSession.snapshot().waiters
 		});
@@ -3177,13 +3326,12 @@ async function cleanupStaleProjects() {
 		console.error("Failed to cleanup stale projects:", err);
 	}
 }
-function startServer(options) {
+async function startServer(options) {
 	cleanupStaleProjects().catch((err) => {
 		console.error("Failed to clean up stale projects:", err);
 	});
 	let prMode = false;
-	const prReady = (async () => {
-		if (!options.prRef) return;
+	if (options.prRef) {
 		console.error(`Building PR session for ${options.prRef}...`);
 		try {
 			const store = new FilePrSessionStore();
@@ -3196,19 +3344,17 @@ function startServer(options) {
 		} catch (err) {
 			console.error(`[pr-session] failed to build session for ${options.prRef}: ${err?.message ?? err}`);
 		}
-	})();
-	const app = createApp(options.clientDir, options.diffOpts);
+	}
+	const app = createApp(options.clientDir, options.diffOpts, void 0, void 0, void 0, prMode);
 	return new Promise((resolve) => {
-		prReady.then(() => {
-			serve({
-				fetch: app.fetch,
-				port: options.port,
-				hostname: options.host
-			}, (info) => {
-				resolve({
-					port: info.port,
-					prMode
-				});
+		serve({
+			fetch: app.fetch,
+			port: options.port,
+			hostname: options.host
+		}, (info) => {
+			resolve({
+				port: info.port,
+				prMode
 			});
 		});
 	});
@@ -3346,7 +3492,7 @@ const QUOTES = [
 		author: "Unknown"
 	},
 	{
-		text: "A QA engineer walks into a bar. Orders 0 beers. Orders 999999 beers. Orders NULL beers. Walks in through the window.",
+		text: "A QA engineer walks into a coffie shop. Orders 0 cups. Orders 999999 cups. Orders NULL cups. Walks in through the window.",
 		author: "Unknown"
 	},
 	{
@@ -3671,11 +3817,11 @@ if (new Set([
 	"gh"
 ]).has(args[0])) {
 	if (args[0] === "mcp") {
-		const { startMcpServer } = await import("./mcp-BWeWR4yd.mjs");
+		const { startMcpServer } = await import("./mcp-DNZQvKKF.mjs");
 		await startMcpServer();
 		await new Promise(() => {});
 	}
-	const { runSubcommand } = await import("./cli-agent-KxNAFIPf.mjs");
+	const { runSubcommand } = await import("./cli-agent-B4hU6Xay.mjs");
 	process.exit(await runSubcommand(args[0], args.slice(1)));
 }
 let showSubcommand = false;