@fresh-editor/fresh-editor 0.3.7 → 0.3.8

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Release Notes
 
+## 0.3.8
+
+### Features / Improvements
+
+#### Environment Managers (venv / direnv / mise)
+
+New built-in **environment-manager** plugin: it detects a project's environment manager — `.venv`/`venv`, `.envrc` (direnv), or `mise.toml`/`.tool-versions` — and, via **Env: Activate**, injects that environment into every editor-spawned process (LSP, formatters, terminals, `spawnProcess`). **Env: Use System (Deactivate)** restores the system environment, and **Env: Show Status** reports the current state. Activation is on-demand (not automatic) and respects Workspace Trust. Adds an opt-in `env` status-bar element.
+
+#### Remote Development
+
+* **LSP over SSH** now runs the language server *on the remote host* instead of falling back to a host-local process, so completions and diagnostics reflect the remote toolchain.
+
+#### Workspace Trust (groundwork)
+
+Foundational **Workspace Trust** support — a per-project trust level (persisted in the project state dir), a *Set Workspace Trust Level* command-palette control, and a `workspaceTrustLevel()` plugin API. The enforcement gate is **off by default this release** (no prompt on open; undecided folders are treated as Trusted) while the trust UX is reworked around sandboxed execution — so there is no behavior change unless you set a trust level yourself.
+
+#### Orchestrator
+
+* The **Open** dialog is now scoped to the current project by default, with a visible scope toggle to reach other projects, a tabular picker, and `/` to filter.
+* New windows open atomically with their terminal (no `[No Name]` placeholder), and terminal output shows immediately.
+
+#### Settings UI
+
+A broad pass on the Settings editor: **number fields now accept direct typing** instead of `[-]`/`[+]` spinners; list editing gets inline `[+] Add new` / `[x]` rows, mouse support, and `Del` to remove; **`Ctrl+R` resets a field to its default**; the focused field's description is shown above the dialog buttons; and confirmations are required before deleting or discarding dirty edits.
+
+#### Editor
+
+* **Next / Previous Window** commands to cycle open windows without the Switch-Project picker (#2031).
+* **Move File Explorer to Other Side** command, persisted to config (#1468, requested by @asukaminato0721).
+* **Templ** (`.templ`) syntax highlighting (#463, requested by @TS22082).
+* New `editor.confirm_quit` setting (default off) to prompt before quitting a clean session.
+
+#### Plugins & API
+
+* Built-in `editor.httpFetch(url, path)` for downloading files — `curl` is no longer bundled.
+* "Install from URL" accepts direct `file://` URLs.
+
+### Bug Fixes
+
+* **Quit binding overrides honored** (#2030): binding `Ctrl+Q` to `noop`/`none` now actually disables it in every context.
+* **Terminals**: line-number gutter and current-line highlight no longer leak on terminal exit; scroll-back viewport anchors correctly; `Shift+Tab` is forwarded to the child as `ESC[Z` (#2029).
+* **File explorer keeps keyboard focus** when leaving a live terminal (#2029).
+* **Closed terminals no longer reappear**, and buffer groups stay visible when a split closes (#2027, reported by @SolarLune).
+* **Git Log**: selected commit stays aligned with the cursor; selection follows scrolling and row clicks.
+* **Adjacent tab indicators** no longer double up (#1997, reported by @brunnerh).
+* **Theming / Live Diff**: light-theme dim fixes, markdown popup body text inherits the terminal fg, and diff lines preserve syntax foreground.
+* Tree-sitter `.scm` query files are included in the Nix source filter, fixing a source-build failure (#2055, reported by @melekbadreddine).
+
 ## 0.3.7
 
 Introduces an experimental **multi-window orchestrator** command (`Alt+Q`) - a UI that manages multiple Fresh windows side by side in a single Fresh process.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fresh-editor/fresh-editor",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "A modern terminal-based text editor with plugin support",
   "repository": {
     "type": "git",

package/plugins/audit_mode.i18n.json

@@ -38,6 +38,8 @@
     "cmd.export_json": "Review: Export to JSON",
     "cmd.export_json_desc": "Export review to .review/session.json",
     "status.refreshing": "Refreshing review diff...",
+    "status.refreshing_range": "Refreshing %{range}... (working tree not included)",
+    "status.working_tree_not_included": "working tree not included",
     "status.updated": "Review diff updated. Found %{count} hunks.",
     "status.loading_diff": "Loading side-by-side diff...",
     "status.not_git_repo": "Not in a git repository",
@@ -120,6 +122,8 @@
     "cmd.export_json": "Revize: Exportovat do JSON",
     "cmd.export_json_desc": "Exportovat revizi do .review/session.json",
     "status.refreshing": "Obnovuji rozdily revize...",
+    "status.refreshing_range": "Obnovuji %{range}... (pracovni strom neni zahrnut)",
+    "status.working_tree_not_included": "pracovni strom neni zahrnut",
     "status.updated": "Rozdily revize aktualizovany. Nalezeno %{count} bloku.",
     "status.loading_diff": "Nacitam rozdily vedle sebe...",
     "status.not_git_repo": "Neni v git repozitari",
@@ -202,6 +206,8 @@
     "cmd.export_json": "Review: Als JSON exportieren",
     "cmd.export_json_desc": "Review nach .review/session.json exportieren",
     "status.refreshing": "Unterschiede werden aktualisiert...",
+    "status.refreshing_range": "Aktualisiere %{range}... (Arbeitsbaum nicht enthalten)",
+    "status.working_tree_not_included": "Arbeitsbaum nicht enthalten",
     "status.updated": "Unterschiede aktualisiert. %{count} Blocke gefunden.",
     "status.loading_diff": "Nebeneinander-Ansicht wird geladen...",
     "status.not_git_repo": "Kein Git-Repository",
@@ -284,6 +290,8 @@
     "cmd.export_json": "Revision: Exportar a JSON",
     "cmd.export_json_desc": "Exportar revision a .review/session.json",
     "status.refreshing": "Actualizando diferencias de revision...",
+    "status.refreshing_range": "Actualizando %{range}... (arbol de trabajo no incluido)",
+    "status.working_tree_not_included": "arbol de trabajo no incluido",
     "status.updated": "Diferencias actualizadas. Se encontraron %{count} bloques.",
     "status.loading_diff": "Cargando diferencias lado a lado...",
     "status.not_git_repo": "No esta en un repositorio git",
@@ -366,6 +374,8 @@
     "cmd.export_json": "Revue: Exporter en JSON",
     "cmd.export_json_desc": "Exporter la revue vers .review/session.json",
     "status.refreshing": "Actualisation des differences de revue...",
+    "status.refreshing_range": "Actualisation de %{range}... (arbre de travail non inclus)",
+    "status.working_tree_not_included": "arbre de travail non inclus",
     "status.updated": "Differences mises a jour. %{count} blocs trouves.",
     "status.loading_diff": "Chargement des differences cote a cote...",
     "status.not_git_repo": "Pas dans un depot git",
@@ -448,6 +458,8 @@
     "cmd.export_json": "Revisione: Esporta in JSON",
     "cmd.export_json_desc": "Esporta la revisione in .review/session.json",
     "status.refreshing": "Aggiornamento differenze revisione...",
+    "status.refreshing_range": "Aggiornamento %{range}... (albero di lavoro non incluso)",
+    "status.working_tree_not_included": "albero di lavoro non incluso",
     "status.updated": "Differenze revisione aggiornate. Trovati %{count} blocchi.",
     "status.loading_diff": "Caricamento diff affiancato...",
     "status.not_git_repo": "Non in un repository git",
@@ -530,6 +542,8 @@
     "cmd.export_json": "レビュー: JSONにエクスポート",
     "cmd.export_json_desc": "レビューを.review/session.jsonにエクスポート",
     "status.refreshing": "レビュー差分を更新中...",
+    "status.refreshing_range": "%{range}を更新中... (ワーキングツリーは含まれません)",
+    "status.working_tree_not_included": "ワーキングツリーは含まれません",
     "status.updated": "レビュー差分を更新しました。%{count}個のハンクが見つかりました。",
     "status.loading_diff": "サイドバイサイド差分を読み込み中...",
     "status.not_git_repo": "gitリポジトリではありません",
@@ -612,6 +626,8 @@
     "cmd.export_json": "검토: JSON으로 내보내기",
     "cmd.export_json_desc": "리뷰를 .review/session.json으로 내보내기",
     "status.refreshing": "리뷰 차이점 새로고침 중...",
+    "status.refreshing_range": "%{range} 새로고침 중... (작업 트리 미포함)",
+    "status.working_tree_not_included": "작업 트리 미포함",
     "status.updated": "리뷰 차이점이 업데이트되었습니다. %{count}개의 헝크를 찾았습니다.",
     "status.loading_diff": "나란히 비교 로딩 중...",
     "status.not_git_repo": "git 저장소가 아닙니다",
@@ -694,6 +710,8 @@
     "cmd.export_json": "Revisao: Exportar para JSON",
     "cmd.export_json_desc": "Exportar revisao para .review/session.json",
     "status.refreshing": "Atualizando diferencas de revisao...",
+    "status.refreshing_range": "Atualizando %{range}... (arvore de trabalho nao incluida)",
+    "status.working_tree_not_included": "arvore de trabalho nao incluida",
     "status.updated": "Diferencas de revisao atualizadas. Encontrados %{count} blocos.",
     "status.loading_diff": "Carregando diferencas lado a lado...",
     "status.not_git_repo": "Nao esta em um repositorio git",
@@ -776,6 +794,8 @@
     "cmd.export_json": "Ревью: Экспорт в JSON",
     "cmd.export_json_desc": "Экспортировать ревью в .review/session.json",
     "status.refreshing": "Обновление изменений ревью...",
+    "status.refreshing_range": "Обновление %{range}... (рабочее дерево не включено)",
+    "status.working_tree_not_included": "рабочее дерево не включено",
     "status.updated": "Изменения ревью обновлены. Найдено %{count} блоков.",
     "status.loading_diff": "Загрузка сравнения бок о бок...",
     "status.not_git_repo": "Не в git-репозитории",
@@ -858,6 +878,8 @@
     "cmd.export_json": "ตรวจสอบ: ส่งออกเป็น JSON",
     "cmd.export_json_desc": "ส่งออกการตรวจสอบไปยัง .review/session.json",
     "status.refreshing": "กำลังรีเฟรชความแตกต่างการตรวจสอบ...",
+    "status.refreshing_range": "กำลังรีเฟรช %{range}... (ไม่รวม working tree)",
+    "status.working_tree_not_included": "ไม่รวม working tree",
     "status.updated": "อัปเดตความแตกต่างการตรวจสอบแล้ว พบ %{count} บล็อก",
     "status.loading_diff": "กำลังโหลดการเปรียบเทียบแบบเคียงข้าง...",
     "status.not_git_repo": "ไม่อยู่ใน git repository",
@@ -940,6 +962,8 @@
     "cmd.export_json": "Рев'ю: Експорт у JSON",
     "cmd.export_json_desc": "Експортувати рев'ю до .review/session.json",
     "status.refreshing": "Оновлення змін рев'ю...",
+    "status.refreshing_range": "Оновлення %{range}... (робоче дерево не включено)",
+    "status.working_tree_not_included": "робоче дерево не включено",
     "status.updated": "Зміни рев'ю оновлено. Знайдено %{count} блоків.",
     "status.loading_diff": "Завантаження порівняння поруч...",
     "status.not_git_repo": "Не в git-репозиторії",
@@ -1022,6 +1046,8 @@
     "cmd.export_json": "Xem xét: Xuất ra JSON",
     "cmd.export_json_desc": "Xuất xem xét ra .review/session.json",
     "status.refreshing": "Đang làm mới khác biệt xem xét...",
+    "status.refreshing_range": "Đang làm mới %{range}... (không bao gồm cây làm việc)",
+    "status.working_tree_not_included": "không bao gồm cây làm việc",
     "status.updated": "Đã cập nhật khác biệt xem xét. Tìm thấy %{count} khối.",
     "status.loading_diff": "Đang tải so sánh song song...",
     "status.not_git_repo": "Không trong kho git",
@@ -1104,6 +1130,8 @@
     "cmd.export_json": "审查: 导出为JSON",
     "cmd.export_json_desc": "将审查导出到.review/session.json",
     "status.refreshing": "正在刷新审查差异...",
+    "status.refreshing_range": "正在刷新 %{range}... (不包含工作树)",
+    "status.working_tree_not_included": "不包含工作树",
     "status.updated": "审查差异已更新。找到%{count}个代码块。",
     "status.loading_diff": "正在加载并排差异...",
     "status.not_git_repo": "不在git仓库中",

package/plugins/audit_mode.ts

@@ -1743,7 +1743,30 @@ function applyCursorLineOverlay(panel: 'diff'): void {
     });
 }
 
-function review_refresh() { refreshMagitData(); }
+function review_refresh() {
+    // Synchronously acknowledge the keypress before kicking off the
+    // async `git status` + `git diff`. Those calls take long enough on
+    // a non-trivial repo that, without this immediate status update,
+    // the sticky-header totals visibly lag the new content: users
+    // press `r`, see the old `+N / -M`, conclude the keystroke was
+    // dropped, and press `r` again — which then "appears" to work
+    // because the first refresh has by then landed. See #2036.
+    //
+    // In range mode the refresh is intentionally a no-op for
+    // working-tree edits (the diff is always between two refs); the
+    // range-specific message explains that up front so the user
+    // doesn't think `r` is broken when their unstaged changes don't
+    // show up.
+    if (state.mode === 'range' && state.range) {
+        editor.setStatus(
+            editor.t("status.refreshing_range", { range: state.range.label }) ||
+                `Refreshing ${state.range.label}... (working tree not included)`
+        );
+    } else {
+        editor.setStatus(editor.t("status.refreshing") || "Refreshing review diff...");
+    }
+    void refreshMagitData();
+}
 registerHandler("review_refresh", review_refresh);
 
 // --- Cursor-driven navigation ---
@@ -3163,13 +3186,21 @@ function updateReviewStatus(): void {
     if (state.groupId === null) return;
     const total = state.hunkHeaderRows.length;
     const current = currentGlobalHunkIndex();
+    // Range reviews fundamentally don't include working-tree edits; the
+    // suffix makes that visible from the status bar at all times rather
+    // than only flashing past during a refresh. Without it users hit `r`,
+    // see their unsaved changes don't appear, and conclude the refresh is
+    // broken (#2036).
+    const rangeNote = state.mode === 'range' && state.range
+        ? ` · ${editor.t("status.working_tree_not_included") || "working tree not included"}`
+        : '';
     if (current !== null) {
         editor.setStatus(editor.t("status.review_summary_indexed", {
             current: String(current),
             count: String(total),
-        }));
+        }) + rangeNote);
     } else {
-        editor.setStatus(editor.t("status.review_summary", { count: String(total) }));
+        editor.setStatus(editor.t("status.review_summary", { count: String(total) }) + rangeNote);
     }
 }
 

package/plugins/config-schema.json

@@ -103,6 +103,7 @@
         "auto_save_enabled": false,
         "auto_save_interval_secs": 30,
         "hot_exit": true,
+        "confirm_quit": false,
         "restore_previous_session": true,
         "skip_session_restore_when_files_passed": true,
         "auto_create_empty_buffer_on_last_buffer_close": true,
@@ -655,6 +656,12 @@
           "default": true,
           "x-section": "Recovery"
         },
+        "confirm_quit": {
+          "description": "Whether to confirm before quitting Fresh. When enabled, pressing\nthe quit shortcut surfaces a confirmation prompt even when no\nbuffers are modified. Useful for users who frequently hit\n`Ctrl+Q` by mistake. Independent of the unsaved-changes prompt,\nwhich always fires regardless of this setting.\nDefault: false",
+          "type": "boolean",
+          "default": false,
+          "x-section": "Startup"
+        },
         "restore_previous_session": {
           "description": "Whether to auto-open previously opened files (session restore) when\nstarting Fresh in a directory.  When enabled (the default), tabs,\nsplits, cursor positions and the file explorer state are restored\nfrom the last clean exit in the same working directory.  When\ndisabled, Fresh starts with a clean workspace.  The workspace file\non disk is still written on exit, so re-enabling this setting picks\nup whatever state was saved at the most recent clean exit.  The\n`--no-restore` CLI flag is a stronger override: it skips both\nrestoring and saving the workspace.\nDefault: true",
           "type": "boolean",

package/plugins/env-manager.ts

@@ -0,0 +1,168 @@
+/// <reference path="./lib/fresh.d.ts" />
+
+/**
+ * Environment Manager
+ *
+ * Detects a project's environment manager (Python venv, direnv, mise) and
+ * activates it by handing core an activation **snippet** via `editor.setEnv`.
+ * Core captures the resulting environment on the active backend (local / SSH)
+ * and applies it to every editor-spawned process — language servers,
+ * formatters, `spawnProcess`.
+ *
+ * Detection is passive (reads files only). Activation runs repo-controlled
+ * code, so it is gated on Workspace Trust: the plugin only calls `setEnv` when
+ * `editor.workspaceTrustLevel() === "trusted"` (and core enforces the same).
+ *
+ * Freshness: one-shot spawns re-capture automatically when the env inputs
+ * change (core's cache is keyed on them). A long-running language server has
+ * its env fixed at spawn, so to pick up a changed `.envrc`/`mise.toml` the
+ * user runs **Env: Reload**, which re-captures and restarts servers. (Auto
+ * file-watching is intentionally not wired yet.)
+ */
+
+const editor = getEditor();
+
+const STATUS_TOKEN = "env";
+
+interface Detected {
+  /** Short label for the status pill, e.g. ".venv" / "direnv" / "mise". */
+  name: string;
+  /** The activation snippet handed to `editor.setEnv`. */
+  snippet: string;
+}
+
+function fileExists(p: string): boolean {
+  try {
+    return editor.fileExists(p);
+  } catch (_e) {
+    return false;
+  }
+}
+
+/**
+ * Detect the environment in the current workspace and return its activation
+ * snippet, or null if none. These are auto-detected default snippets; direnv
+ * and mise need their exporters (they're prompt-hook driven), venv sources its
+ * activate script, and anything else is a pure login shell / user snippet.
+ */
+function detect(): Detected | null {
+  const cwd = editor.getCwd();
+  if (!cwd) return null;
+
+  for (const name of [".venv", "venv"]) {
+    const dir = editor.pathJoin(cwd, name);
+    if (
+      fileExists(editor.pathJoin(dir, "bin", "python")) ||
+      fileExists(editor.pathJoin(dir, "bin", "python3")) ||
+      fileExists(editor.pathJoin(dir, "Scripts", "python.exe"))
+    ) {
+      return { name, snippet: `source ${editor.pathJoin(dir, "bin", "activate")}` };
+    }
+  }
+
+  if (fileExists(editor.pathJoin(cwd, ".envrc"))) {
+    return { name: "direnv", snippet: `eval "$(direnv export bash)"` };
+  }
+
+  for (const name of ["mise.toml", ".mise.toml", ".tool-versions"]) {
+    if (fileExists(editor.pathJoin(cwd, name))) {
+      return { name: "mise", snippet: `eval "$(mise env -s bash)"` };
+    }
+  }
+
+  return null;
+}
+
+function isTrusted(): boolean {
+  return editor.workspaceTrustLevel() === "trusted";
+}
+
+// === Commands ===
+
+/** Activate (or, when already active, reload) the detected environment. */
+function activate(): void {
+  if (!isTrusted()) {
+    editor.setStatus(
+      "Workspace not trusted — run “Workspace Trust: Trust This Folder” to activate the environment",
+    );
+    return;
+  }
+  const det = detect();
+  if (!det) {
+    editor.setStatus("No environment manager detected in this project");
+    return;
+  }
+  // Core captures `snippet` on the active backend and applies it to every
+  // spawn; it restarts so language servers re-spawn under the fresh env.
+  editor.setEnv(det.snippet, editor.getCwd());
+  editor.setStatus(
+    `${editor.envActive() ? "Reloading" : "Activating"} ${det.name} environment…`,
+  );
+}
+registerHandler("env_activate_handler", activate);
+
+function useSystem(): void {
+  editor.clearEnv();
+  editor.setStatus("Environment deactivated — using the system environment");
+}
+registerHandler("env_use_system_handler", useSystem);
+
+function showStatus(): void {
+  const det = detect();
+  const trust = editor.workspaceTrustLevel() || "unavailable";
+  if (editor.envActive()) {
+    editor.setStatus(`Environment active${det ? ` (${det.name})` : ""}`);
+  } else if (det) {
+    editor.setStatus(
+      `Detected ${det.name} (trust: ${trust}). Run “Env: Activate” to use it.`,
+    );
+  } else {
+    editor.setStatus(`No environment detected (trust: ${trust})`);
+  }
+}
+registerHandler("env_status_handler", showStatus);
+
+editor.registerCommand(
+  "env_activate",
+  "Env: Activate Detected Environment (venv / direnv / mise)",
+  "env_activate_handler",
+);
+editor.registerCommand(
+  "env_reload",
+  "Env: Reload Environment (re-capture after .envrc/mise.toml change)",
+  "env_activate_handler",
+);
+editor.registerCommand(
+  "env_use_system",
+  "Env: Use System (Deactivate Environment)",
+  "env_use_system_handler",
+);
+editor.registerCommand(
+  "env_status",
+  "Env: Show Environment Status",
+  "env_status_handler",
+);
+
+// === Status pill (opt-in to a user's status-bar layout) ===
+
+function refreshStatus(): void {
+  const bufferId = editor.getActiveBufferId();
+  if (bufferId === 0) return;
+  const det = detect();
+  let value: string;
+  if (editor.envActive()) {
+    value = det ? `${det.name} ✓` : "active";
+  } else {
+    value = det ? `${det.name}${isTrusted() ? "" : " (locked)"}` : "system";
+  }
+  editor.setStatusBarValue(bufferId, STATUS_TOKEN, value);
+}
+
+editor.registerStatusBarElement(STATUS_TOKEN, "Environment");
+
+registerHandler("env_refresh_status", refreshStatus);
+for (const event of ["buffer_activated", "after_file_open", "focus_gained"]) {
+  editor.on(event, "env_refresh_status");
+}
+
+refreshStatus();

package/plugins/git_log.ts

@@ -5,7 +5,7 @@ import {
   buildCommitLogEntries,
   fetchGitLog,
 } from "./lib/git_history.ts";
-import { button, flexSpacer, key, list, row, WidgetPanel } from "./lib/index.ts";
+import { button, flexSpacer, list, row, WidgetPanel } from "./lib/index.ts";
 
 const editor = getEditor();
 
@@ -105,20 +105,23 @@ const SELECT_DEBOUNCE_MS = 60;
 // the log, and opens the file at the cursor when pressed in the detail).
 // =============================================================================
 
-// j/k/Up/Down/PageUp/PageDown route to the log List widget so the host
-// owns selection + scroll + auto-scroll. The List's `select` event then
-// fires back into the plugin's `widget_event` handler for detail-pane
-// refresh. Other plugin actions (q/r/y/Tab/Return) stay as direct
-// bindings — they don't depend on which row is highlighted.
+// The log pane is cursor-driven: j/k/Up/Down/PageUp/PageDown move the
+// pane's real buffer cursor (normal editor movement), which scrolls via
+// the standard `ensure_cursor_visible` wheel — only when the cursor
+// crosses the top/bottom edge. The cursor is the source of truth for
+// which commit is selected; a `cursor_moved` subscription mirrors its
+// line into the List highlight + detail pane. On the detail pane the
+// same keys scroll the diff. Other actions (q/r/y/Tab/Return) are direct
+// bindings — they don't depend on the cursor row.
 editor.defineMode(
   "git-log",
   [
-    ["k", "git_log_select_up"],
-    ["j", "git_log_select_down"],
-    ["Up", "git_log_select_up"],
-    ["Down", "git_log_select_down"],
-    ["PageUp", "git_log_select_page_up"],
-    ["PageDown", "git_log_select_page_down"],
+    ["k", "move_up"],
+    ["j", "move_down"],
+    ["Up", "move_up"],
+    ["Down", "move_down"],
+    ["PageUp", "move_page_up"],
+    ["PageDown", "move_page_down"],
     ["Return", "git_log_enter"],
     ["Tab", "git_log_tab"],
     ["q", "git_log_q"],
@@ -130,52 +133,6 @@ editor.defineMode(
   true, // inherit Normal-context bindings for unbound keys
 );
 
-function git_log_select_up(): void {
-  if (isLogPanelActive()) {
-    state.logPanel?.command(key("Up"));
-  } else {
-    editor.executeAction("move_up");
-  }
-}
-function git_log_select_down(): void {
-  if (isLogPanelActive()) {
-    state.logPanel?.command(key("Down"));
-  } else {
-    editor.executeAction("move_down");
-  }
-}
-function git_log_select_page_up(): void {
-  if (isLogPanelActive()) {
-    state.logPanel?.command(key("PageUp"));
-  } else {
-    editor.executeAction("move_page_up");
-  }
-}
-function git_log_select_page_down(): void {
-  if (isLogPanelActive()) {
-    state.logPanel?.command(key("PageDown"));
-  } else {
-    editor.executeAction("move_page_down");
-  }
-}
-
-/** True iff the log panel is the focused buffer in the group. The
- * group's bindings (j/k/Up/Down/PageUp/PageDown) apply to all panels
- * uniformly; we only want navigation to drive the List widget when
- * the user is *on* the log panel. From the detail panel, the same
- * keys must move the buffer cursor (so users can scroll the diff
- * before pressing Enter on a diff line to open the file view). */
-function isLogPanelActive(): boolean {
-  return (
-    state.logBufferId !== null &&
-    editor.getActiveBufferId() === state.logBufferId
-  );
-}
-registerHandler("git_log_select_up", git_log_select_up);
-registerHandler("git_log_select_down", git_log_select_down);
-registerHandler("git_log_select_page_up", git_log_select_page_up);
-registerHandler("git_log_select_page_down", git_log_select_page_down);
-
 // =============================================================================
 // Panel layout
 // =============================================================================
@@ -268,19 +225,13 @@ editor.on("widget_event", (data) => {
     }
     return;
   }
-  // Log pane (List of commit rows) — `select` fires on j/k/Up/Down/
-  // PageUp/PageDown navigation and on row clicks; `activate` fires on
-  // Enter or double-click.
+  // Log pane (List of commit rows). Selection is cursor-driven (see the
+  // `cursor_moved` handler), so the List's `select` event is ignored —
+  // a row click places the buffer cursor, and `cursor_moved` mirrors it
+  // into the selection. `activate` (Enter / double-click) still opens.
   if (state.logPanel !== null && data.panel_id === state.logPanel.id()) {
-    if (data.event_type === "select") {
-      const idx =
-        typeof data.payload?.index === "number" ? data.payload.index : -1;
-      if (idx >= 0) void on_log_select(idx);
-      return;
-    }
     if (data.event_type === "activate") {
       void git_log_enter();
-      return;
     }
     return;
   }
@@ -300,6 +251,11 @@ function detailFooter(hash: string): string {
   return editor.t("status.commit_ready", { hash });
 }
 
+/** Stable widget key for the log List. The host keys selection +
+ * scroll instance state off this; the plugin re-pins selection
+ * through it after click/keyboard `select` events. */
+const LOG_LIST_KEY = "git-log-list";
+
 function renderLog(): void {
   if (state.logPanel === null) return;
   // List takes the per-row entries directly. selectedIndex: -1 on the
@@ -321,7 +277,7 @@ function renderLog(): void {
       // scroll handle viewport. Revisit if commit lists grow into the
       // tens of thousands.
       visibleRows: Math.max(1, state.commits.length),
-      key: "git-log-list",
+      key: LOG_LIST_KEY,
     }),
   );
 }
@@ -652,13 +608,20 @@ async function show_git_log(): Promise<void> {
 
   renderToolbar();
   renderLog();
-  // List widget's instance state is the source of truth for selection;
-  // no buffer-cursor positioning needed (the renderer auto-scrolls so
-  // the selected row stays visible).
+  // Cursor-driven selection: give the log pane a real, visible cursor and
+  // take ownership of it (`setBufferShowCursors` locks it so the widget
+  // runtime won't clear it on repaint). The cursor's line is the selected
+  // commit; `cursor_moved` mirrors it into the List highlight + detail.
+  // Start on HEAD (line 0). Scrolling is the normal cursor-follow wheel.
+  if (state.logBufferId !== null) {
+    editor.setBufferShowCursors(state.logBufferId, true);
+    editor.setBufferCursor(state.logBufferId, 0);
+  }
   await refreshDetail();
 
   editor.on("resize", on_git_log_resize);
   editor.on("buffer_closed", on_git_log_buffer_closed);
+  editor.on("cursor_moved", on_git_log_cursor_moved);
 
   editor.setStatus(
     editor.t("status.log_ready", { count: String(state.commits.length) })
@@ -673,6 +636,7 @@ function git_log_cleanup(): void {
   if (!state.isOpen) return;
   editor.off("resize", on_git_log_resize);
   editor.off("buffer_closed", on_git_log_buffer_closed);
+  editor.off("cursor_moved", on_git_log_cursor_moved);
   // Kill any still-running `git show` spawns — we no longer care.
   for (const [, handle] of state.inFlightSpawns) {
     handle.kill?.();
@@ -1114,15 +1078,34 @@ function git_log_file_view_close(): void {
 registerHandler("git_log_file_view_close", git_log_file_view_close);
 
 // =============================================================================
-// Selection tracking — live-update the detail panel as the user
-// navigates the List. Driven by `widget_event "select"` from the host.
+// Selection tracking — the log pane is cursor-driven. The buffer cursor's
+// line (set by arrow-key movement or a click) is the selected commit; this
+// `cursor_moved` subscription mirrors it into the List highlight and the
+// detail pane. Scrolling is handled by the normal cursor-follow wheel, so
+// the viewport only moves when the cursor crosses the top/bottom edge.
 // =============================================================================
 
-async function on_log_select(idx: number): Promise<void> {
+function on_git_log_cursor_moved(data: { buffer_id: number; line: number }): void {
+  if (!state.isOpen || state.logBufferId === null) return;
+  if (data.buffer_id !== state.logBufferId) return;
+  // `cursor_moved.line` is 1-based; commit rows are 0-based (no header),
+  // so the selected commit index is `line - 1`.
+  const idx = data.line - 1;
+  if (idx < 0 || idx >= state.commits.length) return;
+  void selectCommitLine(idx);
+}
+
+async function selectCommitLine(idx: number): Promise<void> {
   if (!state.isOpen) return;
   if (idx === state.selectedIndex) return;
   state.selectedIndex = idx;
 
+  // Move the List's highlight bar to the cursor's row. The cursor itself
+  // is the real (plugin-owned) buffer cursor, so it stays exactly where
+  // the user moved or clicked it — this only repaints the row styling,
+  // and the repaint preserves the cursor position.
+  state.logPanel?.setSelectedIndex(LOG_LIST_KEY, idx);
+
   const commit = state.commits[state.selectedIndex];
   if (commit) {
     editor.setStatus(