diffing 0.10.5 → 0.12.0

package/dist/{github-DKT0lJXv.mjs → github-DXiEeHzk.mjs}

@@ -1,2 +1,2 @@
-import { C as replyToPrComment, d as fetchPrChecks, n as buildReviewPayload, w as resolvedFromSession } from "./github-CEjtGd41.mjs";
+import { C as replyToPrComment, d as fetchPrChecks, n as buildReviewPayload, w as resolvedFromSession } from "./github-DpzqNrUh.mjs";
 export { buildReviewPayload, fetchPrChecks, replyToPrComment, resolvedFromSession };

package/dist/{github-CEjtGd41.mjs → github-DpzqNrUh.mjs}

@@ -533,7 +533,7 @@ async function submitReview(input) {
 async function prepareSubmitInputWithAttachments(input) {
 	const comments = input.comments ?? [];
 	const bodies = [input.body ?? "", ...comments.map((c) => c.body ?? "")];
-	const { rewriteLocalAttachmentsInBodies } = await import("./github-attachments-Cf17YWp4.mjs");
+	const { rewriteLocalAttachmentsInBodies } = await import("./github-attachments-DgOf7BhP.mjs");
 	const result = await rewriteLocalAttachmentsInBodies(input.resolved, bodies);
 	if (result.error) return { error: result.error };
 	if (result.uploaded === 0 && Object.keys(result.urlMap).length === 0) return { input };
@@ -740,7 +740,7 @@ async function fetchPrChecks(resolved, headSha) {
 * POST /repos/{owner}/{repo}/pulls/{pull_number}/comments with in_reply_to.
 */
 async function replyToPrComment(input) {
-	const { rewriteLocalAttachmentsInBodies } = await import("./github-attachments-Cf17YWp4.mjs");
+	const { rewriteLocalAttachmentsInBodies } = await import("./github-attachments-DgOf7BhP.mjs");
 	const rewritten = await rewriteLocalAttachmentsInBodies(input.resolved, [input.body]);
 	if (rewritten.error) return {
 		ok: false,
@@ -793,7 +793,7 @@ async function replyToPrComment(input) {
 	}
 }
 async function updatePrReviewComment(input) {
-	const { rewriteLocalAttachmentsInBodies } = await import("./github-attachments-Cf17YWp4.mjs");
+	const { rewriteLocalAttachmentsInBodies } = await import("./github-attachments-DgOf7BhP.mjs");
 	const rewritten = await rewriteLocalAttachmentsInBodies(input.resolved, [input.body]);
 	if (rewritten.error) return {
 		ok: false,

package/dist/{github-attachments-Cf17YWp4.mjs → github-attachments-DgOf7BhP.mjs}

@@ -1,5 +1,5 @@
-import { d as getProjectStorageDir, w as toSafeRelativePath } from "./git-Czo96ymM.mjs";
-import { _ as isGithubDotCom, g as githubApiBase, m as ghHostnameArgs, o as detectGhCli, s as execWithInput, x as readGithubToken } from "./github-CEjtGd41.mjs";
+import { D as toSafeRelativePath, f as getProjectStorageDir } from "./git-BGj31GX-.mjs";
+import { _ as isGithubDotCom, g as githubApiBase, m as ghHostnameArgs, o as detectGhCli, s as execWithInput, x as readGithubToken } from "./github-DpzqNrUh.mjs";
 import { createHash } from "node:crypto";
 import { extname, join } from "node:path";
 import { readFile, stat } from "node:fs/promises";

package/dist/{mcp-Dq7J5QOP.mjs → mcp-zDVzU1vl.mjs}

@@ -1,8 +1,9 @@
-import { i as buildGitDiffArgs, o as parseDiffOptions, t as startServer } from "./server-C9i4V36o.mjs";
-import { t as formatComments } from "./comment-format-B5AcGcR-.mjs";
-import { n as formatPlanReview } from "./plan-format-BQyx--mp.mjs";
-import { a as removeServerLock, i as readServerLock, n as diffScopeKey, o as removeServerLockIfOwned, r as isLockAlive, s as writeServerLock, t as acquireServerStartupLease } from "./server-lock-Dd_ss_Il.mjs";
-import { n as AWAIT_REVIEW_TIMEOUT_NEXT_ACTION, r as AWAIT_TOOL_DESCRIPTION_SUFFIX, s as PLAN_SUBMIT_NEXT_ACTION, t as AWAIT_PLAN_TIMEOUT_NEXT_ACTION } from "./handoff-DPoIyeWn.mjs";
+import { i as buildGitDiffArgs, s as parseDiffOptions, t as startServer } from "./server-Dw3lkQ5q.mjs";
+import { i as reviewSessionUrl, n as joinSessionApiUrl, r as reviewSessionBaseUrl, t as appendSessionToken } from "./session-url-sr7lXXVc.mjs";
+import { t as formatComments } from "./comment-format-B85NHZnG.mjs";
+import { n as formatPlanReview } from "./plan-format-BwJh5JSE.mjs";
+import { c as removeServerLockIfOwned, h as SESSION_TOKEN_HEADER, i as isLockAlive, p as writeServerLock, r as diffScopeKey, s as removeServerLock, t as acquireServerStartupLease, u as resolveActiveServerLock, x as isLoopbackHost, y as generateSessionToken } from "./server-lock-BNI8FKV1.mjs";
+import { n as AWAIT_REVIEW_TIMEOUT_NEXT_ACTION, r as AWAIT_TOOL_DESCRIPTION_SUFFIX, s as PLAN_SUBMIT_NEXT_ACTION, t as AWAIT_PLAN_TIMEOUT_NEXT_ACTION } from "./handoff-LAFtmnHf.mjs";
 import { execFileSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
@@ -105,25 +106,18 @@ function resolveMcpRepository(repoPath = process.cwd(), explicit = false) {
 		throw new Error(`diffing mcp: path is not inside a Git repository: ${candidate}`);
 	}
 }
-function isLoopbackHost(host) {
-	const normalized = host.toLowerCase();
-	if (normalized === "localhost" || normalized === "::1" || normalized === "[::1]") return true;
-	const octets = normalized.split(".");
-	return octets.length === 4 && octets[0] === "127" && octets.every((part) => {
-		if (!/^\d{1,3}$/.test(part)) return false;
-		const value = Number(part);
-		return value >= 0 && value <= 255;
-	});
-}
 function lockUrl(lock) {
-	if (lock.port <= 0) return null;
-	if (!isLoopbackHost(lock.host)) return null;
-	return `http://${lock.host === "::1" ? "[::1]" : lock.host}:${lock.port}`;
+	return reviewSessionUrl(lock);
 }
-async function requestJson(base, path, init) {
+async function requestJson(base, path, init, authToken) {
 	let response;
 	try {
-		response = await fetch(`${base}${path}`, init);
+		const headers = new Headers(init?.headers);
+		if (authToken) headers.set(SESSION_TOKEN_HEADER, authToken);
+		response = await fetch(joinSessionApiUrl(base, path), {
+			...init,
+			headers
+		});
 	} catch (error) {
 		if (error instanceof Error && error.name === "AbortError") throw new Error(`Request to ${path} was cancelled. Retry the MCP tool when ready.`);
 		const detail = error instanceof Error ? error.message : String(error);
@@ -338,7 +332,7 @@ function createMcpServer(options) {
 	const repoRoot = resolveMcpRepository(options.repoRoot, true);
 	const startServerFn = options.startServerFn ?? startServer;
 	const now = options.now ?? Date.now;
-	const readLock = options.readLock ?? readServerLock;
+	const readLock = options.readLock ?? resolveActiveServerLock;
 	const writeLock = options.writeLock ?? writeServerLock;
 	const removeLock = options.removeLock ?? removeServerLock;
 	const lockIsAlive = options.lockIsAlive ?? isLockAlive;
@@ -353,7 +347,10 @@ function createMcpServer(options) {
 	}, { instructions });
 	let reviewCursor = null;
 	let planCursor = null;
+	let selectedLock = null;
 	function liveLock() {
+		if (selectedLock && lockIsAlive(selectedLock, repoRoot)) return selectedLock;
+		selectedLock = null;
 		const lock = readLock(repoRoot);
 		return lock && lockIsAlive(lock, repoRoot) ? lock : null;
 	}
@@ -365,11 +362,11 @@ function createMcpServer(options) {
 		const lock = liveLock();
 		if (!lock) throw new Error(`No diffing review session is running for ${repoRoot}. Start one with start_review_session, \`diffing --web\`, or \`diffing "gh pr <ref>"\`, then retry.`);
 		ensureReusableLock(lock);
-		const url = lockUrl(lock);
-		if (!url) throw new Error("The active diffing session does not expose a reachable loopback API.");
+		const apiOrigin = reviewSessionBaseUrl(lock);
+		if (!apiOrigin) throw new Error("The active diffing session does not expose a reachable loopback API.");
 		return {
 			lock,
-			url,
+			apiOrigin,
 			identity: `${lock.pid}:${lock.startedAt}:${lock.port}:${lock.ownerId ?? ""}`
 		};
 	}
@@ -388,11 +385,11 @@ function createMcpServer(options) {
 		if (session.lock.mode === "tui") {
 			if (!session.lock.capability) throw new Error("The TUI lock is missing its API capability.");
 			headers.set("X-Diffing-Capability", session.lock.capability);
-		}
-		return requestJson(session.url, path, {
+		} else if (session.lock.authToken) headers.set(SESSION_TOKEN_HEADER, session.lock.authToken);
+		return requestJson(session.apiOrigin, path, {
 			...init,
 			headers
-		});
+		}, session.lock.authToken);
 	}
 	function requestBaseJson(path, init) {
 		return requestSessionJson(requireWebSession(), path, init);
@@ -509,6 +506,7 @@ function createMcpServer(options) {
 				if (!sameScope(existing, requestedScope, diffArgs)) throw new Error(`A live diffing web session already shows a different diff scope. Requested arguments: ${JSON.stringify(diffArgs)}. Use the existing session or end it manually; diffing will not replace it.`);
 				const url = lockUrl(existing);
 				if (!url) throw new Error("The active diffing web session has no safe loopback URL.");
+				selectedLock = existing;
 				return {
 					status: "reused",
 					repository: repoRoot,
@@ -526,12 +524,17 @@ function createMcpServer(options) {
 			try {
 				const afterLease = liveLock();
 				if (afterLease) return reuse(afterLease);
+				const authToken = generateSessionToken();
 				const lock = {
 					port: (await startServerFn({
 						port: 0,
 						host: "127.0.0.1",
 						clientDir,
-						diffOpts: parsed
+						diffOpts: parsed,
+						security: {
+							bindHost: "127.0.0.1",
+							authToken
+						}
 					})).port,
 					host: "127.0.0.1",
 					pid: process.pid,
@@ -542,7 +545,9 @@ function createMcpServer(options) {
 					scope: requestedScope,
 					diffArgs: [...diffArgs],
 					owner: "mcp",
-					ownerId
+					ownerId,
+					sessionId: ownerId,
+					authToken
 				};
 				try {
 					writeLock(lock);
@@ -552,6 +557,7 @@ function createMcpServer(options) {
 					const detail = error instanceof Error ? error.message : String(error);
 					throw new Error(`The review server bound locally but its discovery lock could not be written: ${detail}. No MCP session was claimed; retry after fixing lock storage. The unadvertised loopback listener will close when this MCP process exits.`);
 				}
+				selectedLock = lock;
 				return {
 					status: "started",
 					repository: repoRoot,
@@ -743,7 +749,9 @@ function createMcpServer(options) {
 		if (author) params.set("author", author);
 		if (fullBody) params.set("fullBody", "true");
 		if (format === "xml") {
-			const res = await fetch(`${session.url}/api/gh/threads?${params}`);
+			const headers = new Headers();
+			if (session.lock.authToken) headers.set(SESSION_TOKEN_HEADER, session.lock.authToken);
+			const res = await fetch(joinSessionApiUrl(session.apiOrigin, `/api/gh/threads?${params}`), { headers });
 			const text = await res.text();
 			if (!res.ok) throw new Error(text || res.statusText);
 			return textResult(text, { result: {
@@ -778,7 +786,9 @@ function createMcpServer(options) {
 		if (fullBody) params.set("fullBody", "true");
 		if (state) params.set("state", state);
 		if (format === "xml") {
-			const res = await fetch(`${session.url}/api/gh/reviews?${params}`);
+			const headers = new Headers();
+			if (session.lock.authToken) headers.set(SESSION_TOKEN_HEADER, session.lock.authToken);
+			const res = await fetch(joinSessionApiUrl(session.apiOrigin, `/api/gh/reviews?${params}`), { headers });
 			const text = await res.text();
 			if (!res.ok) throw new Error(text || res.statusText);
 			return textResult(text, { result: {
@@ -1247,7 +1257,6 @@ function createMcpServer(options) {
 		annotations: MUTATING
 	}, async ({ title, body, source, model, planId }) => {
 		const session = requireWebSession();
-		const base = session.url;
 		await seedPlanCursor(session, void 0, true);
 		const plan = await requestSessionJson(session, "/api/plans", {
 			method: "POST",
@@ -1260,7 +1269,7 @@ function createMcpServer(options) {
 				model
 			})
 		});
-		const url = `${base}/plan/${plan.id}`;
+		const url = appendSessionToken(`${session.apiOrigin}/plan/${plan.id}`, session.lock.authToken);
 		return textResult(`Submitted plan ${plan.id} (v${plan.version}) at ${url}. ${PLAN_SUBMIT_NEXT_ACTION}`, {
 			status: "submitted",
 			planId: plan.id,

package/dist/{review-export-BBDWvftT.mjs → review-export-B63eRAVa.mjs}

@@ -1,4 +1,4 @@
-import { n as reviewDecisionSummary } from "./comment-format-B5AcGcR-.mjs";
+import { n as reviewDecisionSummary } from "./comment-format-B85NHZnG.mjs";
 //#region src/lib/review-export.ts
 /**
 * Export a review as human-readable Markdown (clipboard / download / CLI).

package/dist/{settings-bwe7yQ8U.mjs → search-3R2E5xxr.mjs}

@@ -1,16 +1,15 @@
-import { d as getProjectStorageDir, p as getRepoRoot } from "./git-Czo96ymM.mjs";
+import { f as getProjectStorageDir, h as getRepoRoot } from "./git-BGj31GX-.mjs";
 import { join } from "node:path";
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
+import { mkdirSync } from "node:fs";
 //#region src/lib/symbols.ts
 const SYMBOL_PATTERNS = [
 	{
-		pattern: /^\s*(?:export\s+)?(?:async\s+)?function\s+(\w[\w$]*)\s*[<(]/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*(?:default\s+)?(?:async\s+)?function\s+(\w[\w$]*)\s*[<(]/i,
 		kind: "function",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?(?:const|let|var)\s+(\w[\w$]*)\s*=\s*(?:async\s*)?\(/i,
+		pattern: /^\s*(?:export\s+)?(?:const|let|var)\s+(\w[\w$]*)\s*=\s*(?:async\s*)?(?:\([^)]*\)|\w[\w$]*)\s*=>/i,
 		kind: "function",
 		nameGroup: 1
 	},
@@ -20,58 +19,108 @@ const SYMBOL_PATTERNS = [
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?class\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*(?:default\s+)?(?:abstract\s+)?class\s+(\w[\w$]*)/i,
 		kind: "class",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?interface\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*interface\s+(\w[\w$]*)/i,
 		kind: "interface",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?type\s+(\w[\w$]*)\s*=/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*type\s+(\w[\w$]*)\s*=/i,
 		kind: "type",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:export\s+)?enum\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:(?:export|declare)\s+)*(?:const\s+)?enum\s+(\w[\w$]*)/i,
 		kind: "enum",
 		nameGroup: 1
 	},
+	{
+		pattern: /^\s*namespace\s+((?:\w[\w$]*(?:\\\w[\w$]*)*)+)\s*;/i,
+		kind: "namespace",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:(?:export|declare)\s+)*namespace\s+(\w[\w$]*)/i,
+		kind: "namespace",
+		nameGroup: 1
+	},
 	{
 		pattern: /^\s*(?:export\s+)?(?:const|let|var)\s+(\w[\w$]*)\s*=/i,
 		kind: "variable",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*def\s+(\w[\w$]*)\s*\(/i,
+		pattern: /^\s*(?:(?:public|private|protected|static|abstract|final)\s+)+function\s+(\w[\w$]*)\s*\(/i,
 		kind: "function",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?fn\s+(\w[\w$]*)\s*[<(]/i,
+		pattern: /^\s*(?:(?:abstract|final|readonly)\s+)+class\s+(\w[\w$]*)/i,
+		kind: "class",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?!(?:if|for|while|switch|catch)\b)(?:(?:public|private|protected|static|async|abstract|readonly|override|get|set)\s+)*(\w[\w$]*)\s*(?:<[^>]+>)?\s*\([^)]*\)\s*(?:\{|:[^={]+[;{])/i,
+		kind: "method",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:async\s+)?def\s+(\w[\w$]*)\s*\(/i,
 		kind: "function",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?struct\s+(\w[\w$]*)/i,
+		pattern: /^\s*class\s+(\w[\w$]*)\s*(?:\(|:)/i,
+		kind: "class",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?(?:(?:async|const|unsafe)\s+|extern(?:\s+"[^"]+")?\s+)*fn\s+(\w[\w$]*)\s*[<(]/i,
+		kind: "function",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?struct\s+(\w[\w$]*)/i,
 		kind: "struct",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?enum\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?enum\s+(\w[\w$]*)/i,
 		kind: "enum",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?impl\s+(\w[\w$]*)/i,
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?trait\s+(\w[\w$]*)/i,
+		kind: "trait",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?(?:type|mod)\s+(\w[\w$]*)/i,
+		kind: "type",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?impl(?:<[^>]+>)?\s+[^\s]+\s+for\s+(\w[\w$]*)/i,
 		kind: "impl",
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:pub(?:\s*\(\w+\))?\s+)?trait\s+(\w[\w$]*)/i,
-		kind: "trait",
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?impl(?:<[^>]+>)?\s+(\w[\w$]*)/i,
+		kind: "impl",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:pub(?:\s*\([^)]*\))?\s+)?(?:const|static)\s+(\w[\w$]*)\s*[:=]/i,
+		kind: "variable",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*func\s+\([^)]*\)\s+(\w[\w$]*)\s*\(/i,
+		kind: "method",
 		nameGroup: 1
 	},
 	{
@@ -80,9 +129,14 @@ const SYMBOL_PATTERNS = [
 		nameGroup: 1
 	},
 	{
-		pattern: /^\s*(?:func\s+)?\((\w[\w$]*)\s+\*?\w+\)\s+(\w[\w$]*)\s*\(/i,
-		kind: "method",
-		nameGroup: 2
+		pattern: /^\s*type\s+(\w[\w$]*)\s+(?:struct|interface|=)/i,
+		kind: "type",
+		nameGroup: 1
+	},
+	{
+		pattern: /^\s*(?:var|const)\s+(\w[\w$]*)\b/i,
+		kind: "variable",
+		nameGroup: 1
 	}
 ];
 /**
@@ -206,10 +260,13 @@ async function searchFiles(query, opts = {}) {
 		error: res.error
 	};
 	const items = [];
+	let filteredTotal = 0;
 	const { items: raw, scores } = res.value;
-	for (let i = 0; i < raw.length && items.length < limit; i++) {
+	for (let i = 0; i < raw.length; i++) {
 		const it = raw[i];
 		if (pathSet && !pathSet.has(it.relativePath)) continue;
+		filteredTotal++;
+		if (items.length >= limit) continue;
 		const score = scores[i];
 		items.push({
 			path: it.relativePath,
@@ -222,7 +279,7 @@ async function searchFiles(query, opts = {}) {
 	return {
 		scope: "files",
 		items,
-		total: res.value.totalMatched,
+		total: pathSet ? filteredTotal : res.value.totalMatched,
 		indexing: isIndexing(f)
 	};
 }
@@ -259,15 +316,17 @@ async function searchContent(query, opts = {}) {
 		error: res.error
 	};
 	const items = [];
+	let filteredTotal = 0;
 	for (const m of res.value.items) {
-		if (items.length >= limit) break;
 		if (pathSet && !pathSet.has(m.relativePath)) continue;
+		filteredTotal++;
+		if (items.length >= limit) continue;
 		items.push(toContentHit(m));
 	}
 	return {
 		scope: "text",
 		items,
-		total: res.value.totalMatched,
+		total: pathSet ? filteredTotal : res.value.totalMatched,
 		indexing: isIndexing(f),
 		regexError: res.value.regexFallbackError || void 0
 	};
@@ -318,8 +377,8 @@ async function searchSymbols(query, opts = {}) {
 	const items = [];
 	const ql = query.toLowerCase();
 	const seen = /* @__PURE__ */ new Set();
+	let total = 0;
 	for (const m of res.value.items) {
-		if (items.length >= limit) break;
 		if (pathSet && !pathSet.has(m.relativePath)) continue;
 		const sym = classifySymbolLine(m.lineContent);
 		if (!sym) continue;
@@ -327,6 +386,8 @@ async function searchSymbols(query, opts = {}) {
 		const key = `${m.relativePath}:${m.lineNumber}:${sym.name}`;
 		if (seen.has(key)) continue;
 		seen.add(key);
+		total++;
+		if (items.length >= limit) continue;
 		const nameIdx = m.lineContent.indexOf(sym.name);
 		const matchRanges = nameIdx >= 0 ? [[nameIdx, nameIdx + sym.name.length]] : m.matchRanges ?? [];
 		items.push({
@@ -343,7 +404,7 @@ async function searchSymbols(query, opts = {}) {
 	return {
 		scope: "symbols",
 		items,
-		total: items.length,
+		total,
 		indexing: isIndexing(f)
 	};
 }
@@ -363,30 +424,57 @@ async function searchAll(query, opts = {}) {
 			limit
 		})
 	]);
-	const items = [];
-	for (const hit of filesRes.items) items.push({
+	return mergeSearchResponses(filesRes, contentRes, symbolsRes, limit);
+}
+/** Merge the three engines into the All scope without duplicating definition
+* lines as both Symbol and Text rows. Exported to keep the result contract
+* independently testable without loading the native fff addon. */
+function mergeSearchResponses(filesRes, contentRes, symbolsRes, limit = DEFAULT_LIMIT) {
+	const boundedLimit = clampLimit(limit);
+	const fileItems = filesRes.items.map((hit) => ({
 		kind: "file",
 		hit
+	}));
+	const symbolLocations = /* @__PURE__ */ new Set();
+	const symbolItems = symbolsRes.items.map((hit) => {
+		symbolLocations.add(`${hit.path}:${hit.line}`);
+		return {
+			kind: "symbol",
+			hit
+		};
 	});
-	for (const hit of symbolsRes.items) items.push({
-		kind: "symbol",
-		hit
-	});
-	for (const hit of contentRes.items) items.push({
-		kind: "text",
-		hit
-	});
-	const total = (filesRes.total || 0) + (contentRes.total || 0) + (symbolsRes.total || 0);
-	const indexing = filesRes.indexing || contentRes.indexing || symbolsRes.indexing;
-	const error = filesRes.error || contentRes.error || symbolsRes.error;
-	const regexError = contentRes.regexError;
+	const textItems = [];
+	for (const hit of contentRes.items) {
+		if (symbolLocations.has(`${hit.path}:${hit.line}`)) continue;
+		textItems.push({
+			kind: "text",
+			hit
+		});
+	}
+	const items = [];
+	const groups = [
+		fileItems,
+		symbolItems,
+		textItems
+	];
+	for (let row = 0; items.length < boundedLimit; row++) {
+		let appended = false;
+		for (const group of groups) {
+			const item = group[row];
+			if (!item) continue;
+			items.push(item);
+			appended = true;
+			if (items.length === boundedLimit) break;
+		}
+		if (!appended) break;
+	}
 	return {
 		scope: "all",
-		items: items.slice(0, limit),
-		total,
-		indexing,
-		error,
-		regexError
+		items,
+		total: (filesRes.total || 0) + (contentRes.total || 0),
+		indexing: filesRes.indexing || contentRes.indexing || symbolsRes.indexing,
+		error: filesRes.error || contentRes.error || symbolsRes.error,
+		regexError: contentRes.regexError
 	};
 }
 async function getSearchStatus() {
@@ -422,57 +510,4 @@ async function trackSelection(query, path) {
 	} catch {}
 }
 //#endregion
-//#region src/lib/settings.ts
-const CONFIG_DIR = join(homedir(), ".config", "diffing");
-const SETTINGS_FILE = join(CONFIG_DIR, "settings.json");
-const DEFAULTS = {
-	staged: true,
-	untracked: true,
-	diffStyle: "split",
-	defaultTabSize: 4,
-	theme: "rose-pine",
-	editorIDE: "default",
-	lineDiffType: "word",
-	lineWrap: false,
-	diffIndicators: "classic",
-	showLineNumbers: true,
-	hunkSeparators: "line-info",
-	lineHoverHighlight: "both",
-	fontSize: 13,
-	expandContextByDefault: false,
-	collapsedContextThreshold: 10,
-	expansionLineCount: 20,
-	haptics: true,
-	sounds: true,
-	uiFont: null,
-	monoFont: null,
-	density: "comfortable",
-	autoCollapseLineThreshold: 400,
-	requireViewAllBeforeSend: false,
-	showStatusBar: true,
-	savedReplies: [],
-	ignoreSpaceChange: false,
-	ignoreAllSpace: false
-};
-function loadSettings() {
-	try {
-		const data = readFileSync(SETTINGS_FILE, "utf-8");
-		return {
-			...DEFAULTS,
-			...JSON.parse(data)
-		};
-	} catch {
-		return { ...DEFAULTS };
-	}
-}
-function saveSettings(settings) {
-	const merged = {
-		...loadSettings(),
-		...settings
-	};
-	mkdirSync(CONFIG_DIR, { recursive: true });
-	writeFileSync(SETTINGS_FILE, JSON.stringify(merged, null, 2));
-	return merged;
-}
-//#endregion
-export { searchContent as a, trackSelection as c, searchAll as i, saveSettings as n, searchFiles as o, getSearchStatus as r, searchSymbols as s, loadSettings as t };
+export { searchFiles as a, searchContent as i, mergeSearchResponses as n, searchSymbols as o, searchAll as r, trackSelection as s, getSearchStatus as t };

package/dist/search-CQ4nsjBX.mjs

@@ -0,0 +1,2 @@
+import { a as searchFiles, i as searchContent, o as searchSymbols, r as searchAll, s as trackSelection } from "./search-3R2E5xxr.mjs";
+export { searchAll, searchContent, searchFiles, searchSymbols, trackSelection };