tmux-fuzzy-motion 0.0.9 → 0.0.10

package/dist/cli.js

@@ -40,19 +40,6 @@ const createTmuxClient = () => ({
 		return (await runProcess("tmux", args)).stdout;
 	}
 });
-const focusClientPane = async (tmux, paneId, clientTty) => {
-	try {
-		await tmux.run([
-			"switch-client",
-			"-c",
-			clientTty,
-			"-t",
-			paneId
-		]);
-	} catch (error) {
-		throw new Error("tmux-fuzzy-motion: client not found", { cause: error });
-	}
-};
 const enterCopyMode = async (tmux, paneId) => {
 	try {
 		await tmux.run([
@@ -117,20 +104,26 @@ const listWindowPanes = async (tmux, paneId) => {
 			"-t",
 			paneId,
 			"-F",
-			"#{pane_id}	#{pane_in_mode}	#{pane_width}	#{pane_height}	#{pane_current_path}	#{pane_left}	#{pane_top}	#{?pane_active,1,0}	#{window_zoomed_flag}"
+			"#{pane_id}	#{pane_in_mode}	#{pane_width}	#{pane_height}	#{pane_current_path}	#{pane_left}	#{pane_top}	#{?pane_active,1,0}	#{window_zoomed_flag}	#{pane-border-lines}"
 		])).trim();
 	} catch (error) {
 		throw new Error("tmux-fuzzy-motion: pane not found", { cause: error });
 	}
 	const panes = output.split("\n").filter((line) => line.length > 0).map((line) => {
-		const [resolvedPaneId, paneInMode, width, height, currentPath, left, top, active, zoomed] = line.split("	");
+		const [resolvedPaneId, paneInMode, width, height, currentPath, left, top, active, zoomed, borderLines] = line.split("	");
 		const numeric = [
 			width,
 			height,
 			left,
 			top
 		].map((value) => Number(value));
-		if (!resolvedPaneId || !paneInMode || !currentPath || [active, zoomed].some((value) => value === void 0) || numeric.some((value) => !Number.isFinite(value))) throw new Error("tmux-fuzzy-motion: failed to resolve window panes");
+		if (!resolvedPaneId || !paneInMode || !currentPath || [
+			active,
+			zoomed,
+			borderLines
+		].some((value) => value === void 0) || numeric.some((value) => !Number.isFinite(value))) throw new Error("tmux-fuzzy-motion: failed to resolve window panes");
+		if (borderLines !== "single" && borderLines !== "double" && borderLines !== "heavy" && borderLines !== "simple" && borderLines !== "number" && borderLines !== "spaces") throw new Error("tmux-fuzzy-motion: failed to resolve window panes");
+		const resolvedBorderLines = borderLines;
 		return {
 			paneId: resolvedPaneId,
 			inCopyMode: paneInMode === "1",
@@ -140,6 +133,7 @@ const listWindowPanes = async (tmux, paneId) => {
 			left: Number(left),
 			top: Number(top),
 			active: active === "1",
+			borderLines: resolvedBorderLines,
 			zoomed: zoomed === "1"
 		};
 	});
@@ -150,23 +144,6 @@ const listWindowPanes = async (tmux, paneId) => {
 		return rest;
 	});
 };
-const getPaneBorderLines = async (tmux, paneId) => {
-	let output = "";
-	try {
-		output = (await tmux.capture([
-			"show-options",
-			"-A",
-			"-wv",
-			"-t",
-			paneId,
-			"pane-border-lines"
-		])).trim();
-	} catch (error) {
-		throw new Error("tmux-fuzzy-motion: failed to resolve pane border lines", { cause: error });
-	}
-	if (output === "single" || output === "double" || output === "heavy" || output === "simple" || output === "number" || output === "spaces") return output;
-	throw new Error("tmux-fuzzy-motion: failed to resolve pane border lines");
-};
 const getTmuxVersion = async () => {
 	return (await runProcess("tmux", ["-V"])).stdout.trim();
 };
@@ -5901,10 +5878,19 @@ const measureCellWidth = (cells, start) => {
 	return width;
 };
 const createOverlayRenderer = (lines) => {
-	const baseCellsByLine = lines.map((line) => createStyledDisplayCells(line));
-	const baseLines = baseCellsByLine.map((cells) => cells.join(""));
+	const baseLines = [...lines];
+	const baseCellsByLine = /* @__PURE__ */ new Map();
 	const targetLine = (target) => (target.screenLine ?? target.line) - 1;
 	const targetCol = (target) => target.screenCol ?? target.col;
+	const baseCellsForLine = (lineIndex) => {
+		const line = lines[lineIndex];
+		if (line === void 0) return;
+		const existing = baseCellsByLine.get(lineIndex);
+		if (existing) return existing;
+		const cells = createStyledDisplayCells(line);
+		baseCellsByLine.set(lineIndex, cells);
+		return cells;
+	};
 	return (targets) => {
 		const rendered = [...baseLines];
 		const mutableCells = /* @__PURE__ */ new Map();
@@ -5913,7 +5899,7 @@ const createOverlayRenderer = (lines) => {
 		const sorted = [...targets].sort((left, right) => targetLine(left) - targetLine(right) || targetCol(left) + left.primary - (targetCol(right) + right.primary));
 		for (const target of sorted) {
 			const lineIndex = targetLine(target);
-			const baseCells = baseCellsByLine[lineIndex];
+			const baseCells = baseCellsForLine(lineIndex);
 			if (!baseCells) continue;
 			let cells = mutableCells.get(lineIndex);
 			if (!cells) {
@@ -6116,10 +6102,15 @@ const createFrame = (state, query, matches, renderOverlay) => {
 	body[lastLineIndex] = renderQueryOnBottomLine(body[lastLineIndex] ?? "", state.width, query);
 	return { body };
 };
+const createInitialFrameOutput = (frame) => {
+	const full = frame.body.map((line) => line.trimEnd()).join("\n");
+	const sparse = frame.body.map((line, index) => [index, line.trimEnd()]).filter(([, line]) => line.length > 0).map(([index, line]) => `\u001B[${index + 1};1H${line}`).join("");
+	return sparse.length < full.length ? sparse : full;
+};
 const writeFullFrame = (output, frame) => {
 	output.write("\x1B[?7l");
 	clearScreen(output);
-	output.write(frame.body.join("\n"));
+	output.write(createInitialFrameOutput(frame));
 	output.write("\x1B[H\x1B[?7h");
 };
 const renderFrame = (output, frame, previousFrame) => {
@@ -6609,7 +6600,7 @@ const composeDisplayLines = (panes, width, height, borderLines) => {
 		});
 	});
 	drawPaneBorders(rows, occupied, borderLines);
-	return rows.map((row) => row.join(""));
+	return rows.map((row) => row.join("").trimEnd());
 };
 const buildCurrentState = async (tmux, pane, paneId, clientTty) => {
 	if (!pane.inCopyMode) await enterCopyMode(tmux, paneId);
@@ -6627,9 +6618,11 @@ const buildCurrentState = async (tmux, pane, paneId, clientTty) => {
 		}
 	};
 };
-const buildAllPaneState = async (tmux, pane, paneId, clientTty) => {
+const buildAllPaneState = async (tmux, paneId, clientTty) => {
 	const panes = await listWindowPanes(tmux, paneId);
-	const borderLines = await getPaneBorderLines(tmux, paneId);
+	const targetPane = panes.find((item) => item.paneId === paneId) ?? panes.find((item) => item.active) ?? panes[0];
+	if (!targetPane) throw new Error("tmux-fuzzy-motion: pane not found");
+	const borderLines = targetPane.borderLines;
 	const bounds = panes.reduce((accumulator, item) => ({
 		left: Math.min(accumulator.left, item.left),
 		top: Math.min(accumulator.top, item.top),
@@ -6663,11 +6656,11 @@ const buildAllPaneState = async (tmux, pane, paneId, clientTty) => {
 		paneId,
 		clientTty,
 		targetPane: {
-			paneId: pane.paneId,
-			width: pane.width,
-			height: pane.height,
-			inCopyMode: pane.inCopyMode,
-			currentPath: pane.currentPath
+			paneId: targetPane.paneId,
+			width: targetPane.width,
+			height: targetPane.height,
+			inCopyMode: targetPane.inCopyMode,
+			currentPath: targetPane.currentPath
 		},
 		bounds,
 		size: {
@@ -6690,7 +6683,7 @@ const buildAllPaneState = async (tmux, pane, paneId, clientTty) => {
 		}))
 	});
 	return {
-		currentPath: pane.currentPath,
+		currentPath: targetPane.currentPath,
 		x,
 		y,
 		state: {
@@ -6724,9 +6717,7 @@ const runStart = async (args) => {
 	const resultFile = join(tempDir, "result.json");
 	const socketPath = createDaemonSocketPath();
 	try {
-		const pane = await getPaneStartContext(tmux, paneId);
-		await focusClientPane(tmux, paneId, clientTty);
-		const popupState = scope === "all" ? await buildAllPaneState(tmux, pane, paneId, clientTty) : await buildCurrentState(tmux, pane, paneId, clientTty);
+		const popupState = scope === "all" ? await buildAllPaneState(tmux, paneId, clientTty) : await buildCurrentState(tmux, await getPaneStartContext(tmux, paneId), paneId, clientTty);
 		const state = popupState.state;
 		await writeFile(stateFile, JSON.stringify(state), "utf8");
 		await ensureDaemon(socketPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmux-fuzzy-motion",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Fuzzy hint motion for tmux copy-mode",
   "type": "module",
   "files": [