Fix ttyFd leak, remove dead params, restore comments, export helpers

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
banga · armanarutiunov · Feb 11, 2026 · Feb 11, 2026 · Feb 11, 2026 · Feb 11, 2026
commit a60803361f82b0b026da2daa0f701668f60fbd84
diff --git a/src/iterSideBySideDiffs.ts b/src/iterSideBySideDiffs.ts
@@ -197,6 +197,8 @@ export async function* iterSideBySideDiffEvents(
                     fileNameB = line.slice('+++ b/'.length);
                 } else if (line.startsWith('--- ')) {
                     fileNameA = line.slice('--- '.length);
+                    // /dev/null indicates file creation/deletion
+                    // per git diff-format spec
                     if (fileNameA === '/dev/null') {
                         fileNameA = '';
                     }
@@ -282,6 +284,10 @@ export async function* iterSideBySideDiffEvents(
                 break;
             }
             case 'combined-diff-hunk-body': {
+                // Combined diffs have N+1 columns: first N show changes
+                // relative to each parent, last shows the merge result.
+                // Prefix chars: + (added), - (removed), space (unchanged).
+                // See: https://git-scm.com/docs/git-diff#_combined_diff_format
                 const linePrefix = line.slice(0, hunkParts.length - 1);
                 const lineSuffix = line.slice(hunkParts.length - 1);
                 const isLineAdded = linePrefix.includes('+');
@@ -307,6 +313,7 @@ export async function* iterSideBySideDiffEvents(
                     }
                     i++;
                 }
+                // Final part: the merge result (current commit state)
                 if (isLineRemoved) {
                     hunkParts[i].lines.push('-' + lineSuffix);
                     fileDeletions++;

diff --git a/src/tui/FileTreePanel.ts b/src/tui/FileTreePanel.ts
@@ -27,10 +27,10 @@ type FileNode = {
 type TreeNode = DirNode | FileNode;
 
 type VisibleNode =
-    | { type: 'dir'; node: DirNode; depth: number }
-    | { type: 'file'; node: FileNode; fileIndex: number; depth: number };
+    | { type: 'dir'; node: DirNode }
+    | { type: 'file'; node: FileNode; fileIndex: number };
 
-function buildTree(files: DiffFile[]): TreeNode[] {
+export function buildTree(files: DiffFile[]): TreeNode[] {
     const root: TreeNode[] = [];
 
     for (let i = 0; i < files.length; i++) {
@@ -72,20 +72,19 @@ function buildTree(files: DiffFile[]): TreeNode[] {
     return root;
 }
 
-function flattenVisible(nodes: TreeNode[], depth: number = 0): VisibleNode[] {
+export function flattenVisible(nodes: TreeNode[]): VisibleNode[] {
     const result: VisibleNode[] = [];
     for (const node of nodes) {
         if (node.type === 'dir') {
-            result.push({ type: 'dir', node, depth });
+            result.push({ type: 'dir', node });
             if (node.expanded) {
-                result.push(...flattenVisible(node.children, depth + 1));
+                result.push(...flattenVisible(node.children));
             }
         } else {
             result.push({
                 type: 'file',
                 node,
                 fileIndex: node.fileIndex,
-                depth,
             });
         }
     }
@@ -281,8 +280,7 @@ export class FileTreePanel {
     render(
         screen: Screen,
         startCol: number,
-        startRow: number,
-        focused: boolean
+        startRow: number
     ): void {
         const {
             FILE_TREE_COLOR,
@@ -314,7 +312,7 @@ export class FileTreePanel {
 
             const vn = this.visibleNodes[visIdx];
             const isSelected = visIdx === this.selectedIndex;
-            const indent = '  '.repeat(vn.depth);
+            const indent = '  '.repeat(vn.node.depth);
 
             if (vn.type === 'dir') {
                 const icon = vn.node.expanded ? FOLDER_OPEN : FOLDER_CLOSED;

diff --git a/src/tui/InputHandler.ts b/src/tui/InputHandler.ts
@@ -6,15 +6,16 @@ export type KeyHandler = (key: string, ctrl: boolean) => void;
 
 export class InputHandler {
     private ttyStream: tty.ReadStream | null = null;
+    private ttyFd: number = -1;
     private handler: KeyHandler;
 
     constructor(handler: KeyHandler) {
         this.handler = handler;
     }
 
     start(): void {
-        const fd = fs.openSync('/dev/tty', 'r');
-        this.ttyStream = new tty.ReadStream(fd);
+        this.ttyFd = fs.openSync('/dev/tty', 'r');
+        this.ttyStream = new tty.ReadStream(this.ttyFd);
         this.ttyStream.setEncoding('utf-8');
         this.ttyStream.setRawMode(true);
 
@@ -36,5 +37,9 @@ export class InputHandler {
             this.ttyStream.destroy();
             this.ttyStream = null;
         }
+        if (this.ttyFd >= 0) {
+            try { fs.closeSync(this.ttyFd); } catch {}
+            this.ttyFd = -1;
+        }
     }
 }
diff --git a/src/tui/sync.ts b/src/tui/sync.ts
@@ -37,7 +37,7 @@ export function syncDiffToTree(
 /**
  * Binary search: find the last boundary <= topLine.
  */
-function binarySearchBoundary(
+export function binarySearchBoundary(
     boundaries: number[],
     topLine: number
 ): number {