diffing 0.10.5 → 0.12.0

package/dist/session-url-sr7lXXVc.mjs

@@ -0,0 +1,100 @@
+import { g as SESSION_TOKEN_QUERY, x as isLoopbackHost } from "./server-lock-BNI8FKV1.mjs";
+import { randomUUID } from "node:crypto";
+import { join } from "node:path";
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+//#region src/lib/json-atomic.ts
+/** Write JSON via a temp file and rename so readers never see a partial file. */
+function writeJsonAtomically(path, value) {
+	mkdirSync(join(path, ".."), { recursive: true });
+	const temporary = `${path}.${process.pid}.${randomUUID()}.tmp`;
+	writeFileSync(temporary, JSON.stringify(value, null, 2), "utf-8");
+	renameSync(temporary, path);
+}
+//#endregion
+//#region src/lib/settings.ts
+const SETTINGS_FILE = join(join(homedir(), ".config", "diffing"), "settings.json");
+const DEFAULTS = {
+	defaultMode: "web",
+	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");
+		const settings = {
+			...DEFAULTS,
+			...JSON.parse(data)
+		};
+		if (settings.defaultMode !== "web" && settings.defaultMode !== "tui") settings.defaultMode = DEFAULTS.defaultMode;
+		return settings;
+	} catch {
+		return { ...DEFAULTS };
+	}
+}
+function saveSettings(settings) {
+	const merged = {
+		...loadSettings(),
+		...settings
+	};
+	writeJsonAtomically(SETTINGS_FILE, merged);
+	return merged;
+}
+//#endregion
+//#region src/lib/session-url.ts
+/** Loopback-safe review URL for web / gh-pr locks; null for TUI or invalid ports. */
+function reviewSessionBaseUrl(lock) {
+	if ((lock.mode ?? "web") === "tui" || !(lock.port > 0)) return null;
+	if (!isLoopbackHost(lock.host) && lock.host !== "0.0.0.0" && lock.host !== "::") return null;
+	const host = lock.host === "0.0.0.0" || lock.host === "::" ? "127.0.0.1" : lock.host;
+	const path = lock.mode === "gh-pr" ? "/gh/pr" : "";
+	return `http://${host}:${lock.port}${path}`;
+}
+/** Browseable review URL without auth query params (auth uses cookie + header). */
+function appendSessionToken(url, _token) {
+	try {
+		const parsed = new URL(url);
+		parsed.searchParams.delete(SESSION_TOKEN_QUERY);
+		const search = parsed.searchParams.toString();
+		return `${parsed.origin}${parsed.pathname}${search ? `?${search}` : ""}${parsed.hash}`;
+	} catch {
+		return url;
+	}
+}
+/** Public review URL for humans (no `?token=` — session cookie is set when HTML is served). */
+function reviewSessionUrl(lock) {
+	const base = reviewSessionBaseUrl(lock);
+	if (!base) return null;
+	return base;
+}
+/** Join an API path to a session base URL (origin only; strips any legacy `?token=`). */
+function joinSessionApiUrl(base, path) {
+	return `${new URL(base).origin}${path.startsWith("/") ? path : `/${path}`}`;
+}
+//#endregion
+export { loadSettings as a, reviewSessionUrl as i, joinSessionApiUrl as n, saveSettings as o, reviewSessionBaseUrl as r, appendSessionToken as t };

package/dist/tui-search-bridge-BGgLCwMF.mjs

@@ -0,0 +1,133 @@
+import { s as getFileContent } from "./git-BGj31GX-.mjs";
+import { randomUUID } from "node:crypto";
+import { createServer } from "node:http";
+//#region src/lib/tui-search-bridge.ts
+const MAX_REQUEST_BYTES = 8 * 1024 * 1024;
+const MAX_PREVIEW_BYTES = 2 * 1024 * 1024;
+function sendJson(response, status, value) {
+	const body = JSON.stringify(value);
+	response.writeHead(status, {
+		"content-type": "application/json; charset=utf-8",
+		"content-length": Buffer.byteLength(body),
+		connection: "close"
+	});
+	response.end(body);
+}
+async function readJson(request) {
+	const chunks = [];
+	let size = 0;
+	for await (const chunk of request) {
+		const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+		size += buffer.length;
+		if (size > MAX_REQUEST_BYTES) throw new Error("request body is too large");
+		chunks.push(buffer);
+	}
+	if (chunks.length === 0) return {};
+	return JSON.parse(Buffer.concat(chunks).toString("utf8"));
+}
+async function runSearch(body) {
+	const { searchAll, searchContent, searchFiles, searchSymbols } = await import("./search-CQ4nsjBX.mjs");
+	const scope = body.scope ?? "all";
+	const query = typeof body.query === "string" ? body.query : "";
+	const limit = typeof body.limit === "number" ? body.limit : void 0;
+	const paths = Array.isArray(body.changedPaths) ? body.changedPaths.filter((path) => typeof path === "string") : void 0;
+	if (scope === "text") return searchContent(query, {
+		limit,
+		regex: !!body.regex,
+		paths
+	});
+	if (scope === "symbols") return searchSymbols(query, {
+		limit,
+		paths
+	});
+	if (scope === "files") return searchFiles(query, {
+		limit,
+		paths
+	});
+	return searchAll(query, {
+		limit,
+		regex: !!body.regex,
+		paths
+	});
+}
+function loadTuiPreview(body) {
+	if (typeof body.path !== "string" || !body.path) throw new Error("preview path is required");
+	const buffer = getFileContent(body.path, "new");
+	if (!buffer) return {
+		path: body.path,
+		content: "",
+		missing: true,
+		binary: false,
+		truncated: false
+	};
+	if (buffer.subarray(0, Math.min(buffer.length, 8192)).includes(0)) return {
+		path: body.path,
+		content: "",
+		missing: false,
+		binary: true,
+		truncated: false
+	};
+	const truncated = buffer.length > MAX_PREVIEW_BYTES;
+	return {
+		path: body.path,
+		content: buffer.subarray(0, MAX_PREVIEW_BYTES).toString("utf8"),
+		missing: false,
+		binary: false,
+		truncated
+	};
+}
+/**
+* Exposes the web UI's long-lived fff search engine to the native TUI without
+* duplicating its native binding or its frecency database. The bridge is
+* loopback-only and protected by a per-process capability.
+*/
+async function startTuiSearchBridge() {
+	const capability = randomUUID();
+	const server = createServer(async (request, response) => {
+		if (request.headers["x-diffing-capability"] !== capability) {
+			sendJson(response, 401, { error: "invalid TUI search capability" });
+			return;
+		}
+		try {
+			if (request.method === "POST" && request.url === "/search") {
+				sendJson(response, 200, await runSearch(await readJson(request)));
+				return;
+			}
+			if (request.method === "POST" && request.url === "/preview") {
+				sendJson(response, 200, loadTuiPreview(await readJson(request)));
+				return;
+			}
+			if (request.method === "POST" && request.url === "/track") {
+				const body = await readJson(request);
+				if (typeof body.path === "string") {
+					const { trackSelection } = await import("./search-CQ4nsjBX.mjs");
+					await trackSelection(typeof body.query === "string" ? body.query : "", body.path);
+				}
+				sendJson(response, 200, { ok: true });
+				return;
+			}
+			sendJson(response, 404, { error: "not found" });
+		} catch (error) {
+			sendJson(response, 500, { error: error?.message ?? "TUI search failed" });
+		}
+	});
+	await new Promise((resolveP, reject) => {
+		server.once("error", reject);
+		server.listen(0, "127.0.0.1", () => {
+			server.off("error", reject);
+			resolveP();
+		});
+	});
+	const address = server.address();
+	if (!address || typeof address === "string") {
+		server.close();
+		throw new Error("could not resolve TUI search bridge address");
+	}
+	return {
+		endpoint: `http://127.0.0.1:${address.port}`,
+		capability,
+		close: () => new Promise((resolveP) => server.close(() => resolveP()))
+	};
+}
+//#endregion
+export { startTuiSearchBridge };

package/dist/{update-check-DUuHmPeZ.mjs → update-check-BUfh4Y6c.mjs}

@@ -32,15 +32,18 @@ async function checkForUpdates(currentVersion) {
 	try {
 		const controller = new AbortController();
 		const id = setTimeout(() => controller.abort(), 1e3);
-		const res = await fetch("https://registry.npmjs.org/diffing/latest", { signal: controller.signal });
-		clearTimeout(id);
-		if (!res.ok) return null;
-		const data = await res.json();
-		if (!data.version) return null;
-		return {
-			hasUpdate: isNewerVersion(currentVersion, data.version),
-			latestVersion: data.version
-		};
+		try {
+			const res = await fetch("https://registry.npmjs.org/diffing/latest", { signal: controller.signal });
+			if (!res.ok) return null;
+			const data = await res.json();
+			if (!data.version) return null;
+			return {
+				hasUpdate: isNewerVersion(currentVersion, data.version),
+				latestVersion: data.version
+			};
+		} finally {
+			clearTimeout(id);
+		}
 	} catch {
 		return null;
 	}
@@ -106,10 +109,7 @@ async function runUpdateCommand() {
 	} catch {}
 	console.log(`Running: ${cmd} ${args.join(" ")}\n`);
 	const exitCode = await new Promise((res) => {
-		const child = spawn(cmd, args, {
-			stdio: "inherit",
-			shell: true
-		});
+		const child = spawn(cmd, args, { stdio: "inherit" });
 		child.on("close", (code) => {
 			res(code ?? 0);
 		});
@@ -120,8 +120,9 @@ async function runUpdateCommand() {
 	});
 	if (exitCode === 0) console.log(`\n\x1b[38;5;82mSuccessfully updated diffing to v${latest}!\x1b[0m\n`);
 	else {
-		console.error(`\n\x1b[38;5;196mFailed to update diffing. Please try running the command manually with sudo if required:\x1b[0m`);
-		console.error(`  sudo ${cmd} ${args.join(" ")}\n`);
+		console.error(`\n\x1b[38;5;196mFailed to update diffing. Install into your user prefix instead of using sudo:\x1b[0m`);
+		console.error(`  npm config get prefix   # e.g. ~/.npm-global or ~/.local`);
+		console.error(`  ${cmd} ${args.join(" ")}\n`);
 	}
 	return exitCode;
 }

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "diffing",
-  "version": "0.10.5",
+  "version": "0.12.0",
   "description": "local-first CLI for reviewing, navigating, and discussing git diffs with AI",
   "type": "module",
   "license": "MIT",
+  "engines": {
+    "node": ">=20"
+  },
   "packageManager": "pnpm@11.6.0",
   "homepage": "https://github.com/ahmedragab20/diffing",
   "repository": {
@@ -26,10 +29,11 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsdown && vite build && pnpm run build:tui",
+    "build": "pnpm run build:ts && pnpm run build:tui && pnpm run bundle:tui",
     "build:ts": "tsdown && vite build",
     "build:tui": "cargo build --release --manifest-path crates/diffing-tui/Cargo.toml",
     "build:tui:debug": "cargo build --manifest-path crates/diffing-tui/Cargo.toml",
+    "bundle:tui": "node scripts/stage-tui-binary.mjs",
     "changeset": "changeset",
     "dev:client": "vite",
     "dev:server": "tsx src/cli.ts --no-open --port 3433",
@@ -38,8 +42,9 @@
     "test:ts": "vitest run",
     "test:tui": "cargo test --manifest-path crates/diffing-tui/Cargo.toml",
     "test:watch": "vitest",
-    "prepublishOnly": "pnpm run build",
-    "release": "pnpm run build && changeset publish",
+    "verify:tui-bundle": "vitest run src/__tests__/native-bundle.test.ts src/__tests__/find-tui-binary.test.ts",
+    "verify:release-bundle": "node scripts/verify-tui-bundle.mjs",
+    "prepublishOnly": "pnpm run verify:release-bundle",
     "version-packages": "changeset version"
   },
   "dependencies": {

package/dist/client/assets/channel-lsVHTuYR.js

@@ -1 +0,0 @@
-import{at as e,ot as t}from"./chunk-CSCIHK7Q-DuIWPyay.js";var n=(n,r)=>t.lang.round(e.parse(n)[r]);export{n as t};

package/dist/client/assets/chunk-QZHKN3VN-AHUiTM0z.js

@@ -1 +0,0 @@
-import{h as e}from"./src-CYYhkqTK.js";var t=class{constructor(e){this.init=e,this.records=this.init()}static{e(this,`ImperativeState`)}reset(){this.records=this.init()}};export{t};

package/dist/client/assets/chunk-WU5MYG2G-D41j4yxb.js

@@ -1 +0,0 @@
-import{h as e,p as t}from"./src-CYYhkqTK.js";import{x as n}from"./chunk-CSCIHK7Q-DuIWPyay.js";var r=e(e=>{let{securityLevel:r}=n(),i=t(`body`);return r===`sandbox`&&(i=t((t(`#i${e}`).node()?.contentDocument??document).body)),i.select(`#${e}`)},`selectSvgElement`);export{r as t};

package/dist/client/assets/classDiagram-4FO5ZUOK-D1Eo3kly.js

@@ -1 +0,0 @@
-import{h as e}from"./src-CYYhkqTK.js";import"./chunk-CSCIHK7Q-DuIWPyay.js";import"./chunk-5ZQYHXKU-BM60x82y.js";import"./chunk-O5CBEL6O-mlwCWs97.js";import"./chunk-FMBD7UC4-Du6rtd2k.js";import"./chunk-BSJP7CBP-Iip4uSio.js";import"./chunk-L5ZTLDWV-0DmB5Qp8.js";import"./chunk-ND2GUHAM-tX8cKEls.js";import"./chunk-55IACEB6-27pC5pKn.js";import"./chunk-2J33WTMH-DHOUGWx8.js";import"./chunk-NZK2D7GU-BoJGgPic.js";import"./chunk-3OPIFGDE-D8d2scLX.js";import"./chunk-KSCS5N6A-BBq105vI.js";import"./chunk-LZXEDZCA-CoRsjUfr.js";import{i as t,n,r,t as i}from"./chunk-727SXJPM-CHCF96vE.js";var a={parser:n,get db(){return new i},renderer:r,styles:t,init:e(e=>{e.class||={},e.class.arrowMarkerAbsolute=e.arrowMarkerAbsolute},`init`)};export{a as diagram};

package/dist/client/assets/classDiagram-v2-Q7XG4LA2-bAMsbsfB.js

@@ -1 +0,0 @@
-import{h as e}from"./src-CYYhkqTK.js";import"./chunk-CSCIHK7Q-DuIWPyay.js";import"./chunk-5ZQYHXKU-BM60x82y.js";import"./chunk-O5CBEL6O-mlwCWs97.js";import"./chunk-FMBD7UC4-Du6rtd2k.js";import"./chunk-BSJP7CBP-Iip4uSio.js";import"./chunk-L5ZTLDWV-0DmB5Qp8.js";import"./chunk-ND2GUHAM-tX8cKEls.js";import"./chunk-55IACEB6-27pC5pKn.js";import"./chunk-2J33WTMH-DHOUGWx8.js";import"./chunk-NZK2D7GU-BoJGgPic.js";import"./chunk-3OPIFGDE-D8d2scLX.js";import"./chunk-KSCS5N6A-BBq105vI.js";import"./chunk-LZXEDZCA-CoRsjUfr.js";import{i as t,n,r,t as i}from"./chunk-727SXJPM-CHCF96vE.js";var a={parser:n,get db(){return new i},renderer:r,styles:t,init:e(e=>{e.class||={},e.class.arrowMarkerAbsolute=e.arrowMarkerAbsolute},`init`)};export{a as diagram};