From 58143c4b0725c6bc8fe1dce170d8d91d81995ed9 Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Wed, 20 May 2026 16:04:45 -0400
Subject: [PATCH] feat(tui): focus first file in file tree (#28513)

---
 .../src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx
index b6dd872cee..8eb9d91955 100644
--- a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx
+++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/diff-viewer.tsx
@@ -127,7 +127,7 @@ function DiffViewer(props: { api: TuiPluginApi }) {
     const next =
       lastHighlighted !== undefined && fileRows().some((row) => row.id === lastHighlighted)
         ? lastHighlighted
-        : fileRows()[0]?.id
+        : fileRows().find((row) => row.fileIndex !== undefined)?.id
     setHighlightedFileNode(next)
   }