diffing 0.16.0 → 0.17.0

package/dist/{server-BmQqrWy4.mjs → server-CEbp7K-k.mjs}

@@ -1784,6 +1784,7 @@ function resolveEditorCommand(editor, absolutePath, platform = process.platform,
 		case "zed": return guiEditorCommand("zed", absolutePath, platform);
 		case "vim": return terminalEditorCommand("vim", absolutePath, platform, env);
 		case "neovim": return terminalEditorCommand("nvim", absolutePath, platform, env);
+		case "ghostty": return ghosttyEditorCommand(absolutePath, platform);
 		default: return null;
 	}
 }
@@ -1797,6 +1798,28 @@ function guiEditorCommand(bin, absolutePath, platform) {
 		args: [absolutePath]
 	};
 }
+function ghosttyEditorCommand(absolutePath, platform) {
+	if (platform === "darwin") return {
+		cmd: "open",
+		args: [
+			"-na",
+			"Ghostty",
+			"--args",
+			"-e",
+			"nvim",
+			absolutePath
+		]
+	};
+	if (platform === "linux") return {
+		cmd: "ghostty",
+		args: [
+			"-e",
+			"nvim",
+			absolutePath
+		]
+	};
+	return null;
+}
 function terminalEditorCommand(bin, absolutePath, platform, env) {
 	if (platform === "darwin") return {
 		cmd: "osascript",
@@ -2178,6 +2201,113 @@ var FilePrSessionStore = class {
 		} catch {}
 	}
 };
+const PATH_MATCH_CAP = 20;
+function compilePathspecGlob(pattern) {
+	const source = pattern.trim();
+	if (!source) return {
+		error: "invalid path glob: empty pattern",
+		status: 400,
+		path: pattern
+	};
+	try {
+		return {
+			source,
+			test: compileGlobTester(source)
+		};
+	} catch (error) {
+		return {
+			error: error instanceof Error ? error.message : "invalid path glob",
+			status: 400,
+			path: pattern
+		};
+	}
+}
+function fileMatchesPath(matcher, oldPath, newPath) {
+	if (newPath && matcher.test(newPath)) return true;
+	if (oldPath && matcher.test(oldPath)) return true;
+	return false;
+}
+function parseExcludeList(raw) {
+	if (raw == null) return [];
+	const values = (Array.isArray(raw) ? raw : raw.split(",")).map((value) => value.trim()).filter(Boolean);
+	for (const value of values) if (value !== "lockfiles") return {
+		error: `unknown exclude: ${value}`,
+		status: 400
+	};
+	return [...new Set(values)];
+}
+function isLockfileNoise(path) {
+	const base = path.split("/").pop() ?? path;
+	if (base === "package-lock.json" || base === "pnpm-lock.yaml") return true;
+	if (base.endsWith(".lock")) return true;
+	if (base.endsWith(".min.js")) return true;
+	return false;
+}
+function displayPath(oldPath, newPath) {
+	return newPath ?? oldPath ?? "";
+}
+function capPathMatches(matches) {
+	return matches.slice(0, PATH_MATCH_CAP);
+}
+function compileGlobTester(pattern) {
+	const parts = (pattern.includes("/") ? pattern : `**/${pattern}`).split("/");
+	for (const part of parts) {
+		if (part !== "**" && part.includes("**")) throw new Error(`invalid path glob: ${pattern}`);
+		validateGlobSegment(part, pattern);
+	}
+	return (path) => matchParts(parts, path.split("/"));
+}
+function matchParts(pat, path) {
+	if (pat.length === 0) return path.length === 0;
+	if (pat[0] === "**") return matchParts(pat.slice(1), path) || path.length > 0 && matchParts(pat, path.slice(1));
+	if (path.length === 0) return false;
+	return globSegment(pat[0], path[0]) && matchParts(pat.slice(1), path.slice(1));
+}
+function validateGlobSegment(segment, pattern) {
+	for (let i = 0; i < segment.length; i++) {
+		if (segment[i] === "[") {
+			const close = segment.indexOf("]", i + 1);
+			if (close < 0 || close === i + 1) throw new Error(`invalid path glob: ${pattern}`);
+			i = close;
+			continue;
+		}
+		if (segment[i] === "\\") {
+			if (segment[i + 1] == null) throw new Error(`invalid path glob: ${pattern}`);
+			i++;
+		}
+	}
+}
+function globSegment(pattern, value) {
+	return globChars([...pattern], [...value]);
+}
+function globChars(pattern, value) {
+	if (pattern.length === 0) return value.length === 0;
+	const [head, ...rest] = pattern;
+	if (head === "*") return globChars(rest, value) || value.length > 0 && globChars(pattern, value.slice(1));
+	if (head === "?") return value.length > 0 && globChars(rest, value.slice(1));
+	if (head === "[") {
+		const close = rest.indexOf("]");
+		if (close < 0 || value.length === 0) return false;
+		const classBody = rest.slice(0, close);
+		const negated = classBody[0] === "!" || classBody[0] === "^";
+		if (classMatches(negated ? classBody.slice(1) : classBody, value[0]) === negated) return false;
+		return globChars(rest.slice(close + 1), value.slice(1));
+	}
+	if (head === "\\") return rest.length > 0 && value.length > 0 && rest[0] === value[0] && globChars(rest.slice(1), value.slice(1));
+	return value.length > 0 && head === value[0] && globChars(rest, value.slice(1));
+}
+function classMatches(body, value) {
+	for (let i = 0; i < body.length;) {
+		if (i + 2 < body.length && body[i + 1] === "-") {
+			if (body[i] <= value && value <= body[i + 2]) return true;
+			i += 3;
+			continue;
+		}
+		if (body[i] === value) return true;
+		i++;
+	}
+	return false;
+}
 //#endregion
 //#region src/lib/agent-diff-index.ts
 /**
@@ -2406,33 +2536,140 @@ function buildAgentDiffIndex(patch, generation = nextGeneration++) {
 		patchBytes
 	};
 }
-function indexSummary(index) {
+const DIRECTORY_CAP = 20;
+function indexSummary(index, excludeRaw) {
+	const exclude = parseExcludeList(excludeRaw);
+	if ("error" in exclude) return exclude;
+	const counted = exclude.includes("lockfiles") ? index.files.filter((file) => !isLockfileNoise(displayPath(file.oldPath, file.newPath))) : index.files;
 	const changes = {};
-	for (const file of index.files) changes[file.kind] = (changes[file.kind] ?? 0) + 1;
-	return {
+	let hunks = 0;
+	let rows = 0;
+	let additions = 0;
+	let deletions = 0;
+	for (const file of counted) {
+		changes[file.kind] = (changes[file.kind] ?? 0) + 1;
+		hunks += file.hunks.length;
+		rows += file.rowCount;
+		additions += file.additions;
+		deletions += file.deletions;
+	}
+	const summary = {
 		generation: index.generation,
 		complete: index.complete,
-		files: index.files.length,
-		hunks: index.totalHunks,
-		rows: index.totalRows,
-		additions: index.additions,
-		deletions: index.deletions,
+		files: counted.length,
+		hunks,
+		rows,
+		additions,
+		deletions,
 		patchBytes: index.patchBytes,
 		changes,
+		directories: summarizeDirectories(counted),
 		next: [
 			"diff_files",
 			"diff_search",
 			"diff_slice"
 		]
 	};
+	if (exclude.length > 0) summary.exclude = exclude;
+	return summary;
+}
+function summarizeDirectories(files) {
+	const buckets = /* @__PURE__ */ new Map();
+	for (const file of files) {
+		const path = displayPath(file.oldPath, file.newPath);
+		const slash = path.indexOf("/");
+		const dir = slash < 0 ? "." : path.slice(0, slash);
+		const bucket = buckets.get(dir) ?? {
+			path: dir,
+			files: 0,
+			hunks: 0,
+			additions: 0,
+			deletions: 0
+		};
+		bucket.files += 1;
+		bucket.hunks += file.hunks.length;
+		bucket.additions += file.additions;
+		bucket.deletions += file.deletions;
+		buckets.set(dir, bucket);
+	}
+	const ranked = [...buckets.values()].sort((a, b) => {
+		if (b.files !== a.files) return b.files - a.files;
+		return b.additions + b.deletions - (a.additions + a.deletions);
+	});
+	if (ranked.length <= DIRECTORY_CAP) return ranked;
+	const head = ranked.slice(0, DIRECTORY_CAP);
+	const rest = ranked.slice(DIRECTORY_CAP);
+	const other = {
+		path: "+other",
+		files: 0,
+		hunks: 0,
+		additions: 0,
+		deletions: 0
+	};
+	for (const bucket of rest) {
+		other.files += bucket.files;
+		other.hunks += bucket.hunks;
+		other.additions += bucket.additions;
+		other.deletions += bucket.deletions;
+	}
+	head.push(other);
+	return head;
+}
+function scopedFiles(index, path) {
+	if (path == null || path === "") return { entries: index.files.map((file, i) => ({
+		index: i,
+		file
+	})) };
+	const matcher = compilePathspecGlob(path);
+	if ("error" in matcher) return matcher;
+	return {
+		matcher,
+		entries: index.files.flatMap((file, i) => fileMatchesPath(matcher, file.oldPath, file.newPath) ? [{
+			index: i,
+			file
+		}] : [])
+	};
 }
-function indexFiles(index, cursor = 0, limit = 100) {
+function resolveInspectFile(index, file, path) {
+	const hasFile = file != null;
+	const hasPath = path != null && path !== "";
+	if (hasFile && hasPath) return {
+		error: "path and file are mutually exclusive",
+		status: 400,
+		path
+	};
+	if (!hasFile && !hasPath) return {
+		error: "file or path is required",
+		status: 400
+	};
+	if (hasFile) return { fileIndex: file };
+	const scoped = scopedFiles(index, path);
+	if ("error" in scoped) return scoped;
+	if (scoped.entries.length === 0) return {
+		error: "path matched no files",
+		status: 404,
+		path
+	};
+	if (scoped.entries.length > 1) return {
+		error: "path matched multiple files; narrow the glob or pass file",
+		status: 409,
+		path,
+		matches: capPathMatches(scoped.entries.map(({ index, file }) => ({
+			index,
+			path: displayPath(file.oldPath, file.newPath)
+		})))
+	};
+	return { fileIndex: scoped.entries[0].index };
+}
+function indexFiles(index, cursor = 0, limit = 100, path) {
+	const scoped = scopedFiles(index, path);
+	if ("error" in scoped) return scoped;
 	const safeLimit = clamp(limit, 1, MAX_PAGE_LINES);
 	const start = Math.max(0, cursor);
-	const end = Math.min(index.files.length, start + safeLimit);
-	const files = index.files.slice(start, end).map((file, offset) => ({
-		index: start + offset,
-		path: file.newPath ?? file.oldPath ?? "",
+	const end = Math.min(scoped.entries.length, start + safeLimit);
+	const files = scoped.entries.slice(start, end).map(({ index, file }) => ({
+		index,
+		path: displayPath(file.oldPath, file.newPath),
 		oldPath: file.oldPath,
 		newPath: file.newPath,
 		kind: file.kind,
@@ -2442,13 +2679,16 @@ function indexFiles(index, cursor = 0, limit = 100) {
 		additions: file.additions,
 		deletions: file.deletions
 	}));
-	return {
+	const page = {
 		generation: index.generation,
 		returned: files.length,
 		total: index.files.length,
-		nextCursor: end < index.files.length ? end : null,
+		matched: scoped.entries.length,
+		nextCursor: end < scoped.entries.length ? end : null,
 		files
 	};
+	if (path) page.path = path;
+	return page;
 }
 function indexHunks(index, fileIndex, cursor = 0, limit = 100, generation) {
 	if (generation !== void 0 && generation !== index.generation) return {
@@ -2519,11 +2759,17 @@ function indexSlice(index, fileIndex, startRow = 0, maxLines = DEFAULT_SLICE_LIN
 		rows
 	};
 }
-function indexSearch(index, query, fileStart = 0, rowStart = 0, limit = 100, maxBytes = DEFAULT_MAX_BYTES, generation) {
+function indexSearch(index, query, fileStart = 0, rowStart = 0, limit = 100, maxBytes = DEFAULT_MAX_BYTES, generation, path) {
 	if (generation !== void 0 && generation !== index.generation) return {
 		error: `stale generation ${generation}; current generation is ${index.generation}`,
 		status: 409
 	};
+	let matcher;
+	if (path) {
+		const compiled = compilePathspecGlob(path);
+		if ("error" in compiled) return compiled;
+		matcher = compiled;
+	}
 	const q = query.toLowerCase();
 	if (!q) return {
 		generation: index.generation,
@@ -2542,6 +2788,7 @@ function indexSearch(index, query, fileStart = 0, rowStart = 0, limit = 100, max
 	let nextRow = null;
 	outer: for (let fi = Math.max(0, fileStart); fi < index.files.length; fi++) {
 		const file = index.files[fi];
+		if (matcher && !fileMatchesPath(matcher, file.oldPath, file.newPath)) continue;
 		const path = file.newPath ?? file.oldPath ?? "";
 		const pathMatch = path.toLowerCase().includes(q);
 		const rowBegin = fi === fileStart ? Math.max(0, rowStart) : 0;
@@ -3146,9 +3393,21 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		const n = Number(value);
 		return Number.isFinite(n) && n >= 0 ? Math.trunc(n) : fallback;
 	}
+	function optionalUInt(value) {
+		if (value == null || value === "") return void 0;
+		const n = Number(value);
+		return Number.isFinite(n) && n >= 0 ? Math.trunc(n) : void 0;
+	}
+	function inspectError(c, result) {
+		const body = { error: result.error };
+		if (result.path != null) body.path = result.path;
+		if (result.matches != null) body.matches = result.matches;
+		return c.json(body, result.status);
+	}
 	app.get("/api/diff/summary", async (c) => {
 		const patch = await resolveAgentPatch();
-		const summary = indexSummary(agentDiffCache.getOrBuild(patch));
+		const summary = indexSummary(agentDiffCache.getOrBuild(patch), c.req.query("exclude"));
+		if ("status" in summary) return inspectError(c, summary);
 		if (!prMode) return c.json(summary);
 		const session = await prStore.get();
 		if (!session) return c.json(summary);
@@ -3166,32 +3425,33 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 	});
 	app.get("/api/diff/files", async (c) => {
 		const patch = await resolveAgentPatch();
-		const index = agentDiffCache.getOrBuild(patch);
-		const cursor = parseUInt(c.req.query("cursor"), 0);
-		const limit = parseUInt(c.req.query("limit"), 100);
-		return c.json(indexFiles(index, cursor, limit));
+		const result = indexFiles(agentDiffCache.getOrBuild(patch), parseUInt(c.req.query("cursor"), 0), parseUInt(c.req.query("limit"), 100), c.req.query("path"));
+		if ("status" in result) return inspectError(c, result);
+		return c.json(result);
 	});
 	app.get("/api/diff/hunks", async (c) => {
 		const patch = await resolveAgentPatch();
 		const index = agentDiffCache.getOrBuild(patch);
-		const file = parseUInt(c.req.query("file"), 0);
+		const resolved = resolveInspectFile(index, optionalUInt(c.req.query("file")), c.req.query("path"));
+		if ("status" in resolved) return inspectError(c, resolved);
 		const cursor = parseUInt(c.req.query("cursor"), 0);
 		const limit = parseUInt(c.req.query("limit"), 100);
 		const generationRaw = c.req.query("generation");
-		const result = indexHunks(index, file, cursor, limit, generationRaw != null && generationRaw !== "" ? parseUInt(generationRaw, 0) : void 0);
-		if ("status" in result) return c.json({ error: result.error }, result.status);
+		const result = indexHunks(index, resolved.fileIndex, cursor, limit, generationRaw != null && generationRaw !== "" ? parseUInt(generationRaw, 0) : void 0);
+		if ("status" in result) return inspectError(c, result);
 		return c.json(result);
 	});
 	app.get("/api/diff/slice", async (c) => {
 		const patch = await resolveAgentPatch();
 		const index = agentDiffCache.getOrBuild(patch);
-		const file = parseUInt(c.req.query("file"), 0);
+		const resolved = resolveInspectFile(index, optionalUInt(c.req.query("file")), c.req.query("path"));
+		if ("status" in resolved) return inspectError(c, resolved);
 		const start = parseUInt(c.req.query("start"), 0);
 		const maxLines = parseUInt(c.req.query("maxLines"), 120);
 		const maxBytes = parseUInt(c.req.query("maxBytes"), 256 * 1024);
 		const generationRaw = c.req.query("generation");
-		const result = indexSlice(index, file, start, maxLines, maxBytes, generationRaw != null && generationRaw !== "" ? parseUInt(generationRaw, 0) : void 0);
-		if ("status" in result) return c.json({ error: result.error }, result.status);
+		const result = indexSlice(index, resolved.fileIndex, start, maxLines, maxBytes, generationRaw != null && generationRaw !== "" ? parseUInt(generationRaw, 0) : void 0);
+		if ("status" in result) return inspectError(c, result);
 		return c.json(result);
 	});
 	app.get("/api/diff/search", async (c) => {
@@ -3203,8 +3463,8 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		const limit = parseUInt(c.req.query("limit"), 100);
 		const maxBytes = parseUInt(c.req.query("maxBytes"), 256 * 1024);
 		const generationRaw = c.req.query("generation");
-		const result = indexSearch(index, q, file, row, limit, maxBytes, generationRaw != null && generationRaw !== "" ? parseUInt(generationRaw, 0) : void 0);
-		if ("status" in result) return c.json({ error: result.error }, result.status);
+		const result = indexSearch(index, q, file, row, limit, maxBytes, generationRaw != null && generationRaw !== "" ? parseUInt(generationRaw, 0) : void 0, c.req.query("path"));
+		if ("status" in result) return inspectError(c, result);
 		return c.json(result);
 	});
 	const resolveFileVersion = async (path, version) => {