refactor(acp/editor/ui): remove runtime ACP permission mode switch and stabilize diff/editor behavior

Summary:

- Remove frontend/backend runtime API for ACP permission mode switching (acp:set_permission_mode).

- Keep backend startup-level permission mode via ANYCODE_ACP_PERMISSION_MODE (full_access by default, ask optional at process start).

- Consolidate editor diff-mode ownership inside useEditors and persist per-pane diff mode in local storage.

- Improve Changes panel active/selected state handling and keyboard navigation semantics.

- Clean up debug logs and minor focus/activation behavior in editor UI.

Detailed changes (bugs/fixes/refactors):

1) ACP permission mode pipeline simplification

   - Removed App-level forced emit for acp:set_permission_mode on reconnect.

   - Removed backend socket handler registration for acp:set_permission_mode.

   - Removed ACP permission-mode request handler and related request type from acp_handler.

   - Removed now-unused frontend permission-mode storage helpers and AcpPermissionMode type wiring in settings flow.

   - Behavior after change: permission mode is determined at backend startup from env only.

2) Diff mode architecture refactor (App -> useEditors)

   - Moved per-pane diff mode state and mode-cycling logic into useEditors.

   - Added persisted editorDiffModeByPane state and helper API: getEditorDiffMode / setEditorDiffMode / cycleEditorDiffMode.

   - Updated openFile flow to accept explicit diffMode and consistently apply mode when restoring/reopening files.

   - Added guarded re-application of pane/file diff state to avoid redundant updates.

3) Changes panel behavior and UX updates

   - Introduced explicit selectedFilePath separate from activeFilePath (active editor file).

   - Improved arrow key navigation + Enter activation against selected item.

   - Added active-file mapping from editor active file to git changed file (normalized path compare).

   - Updated styles for selected row treatment and tighter file-stat spacing.

4) Editor interaction and rendering tweaks

   - Ensure pane activation on wheel capture in EditorPanel (better focus ownership in multi-pane setups).

   - Ensure cursor/selection visual refresh after focus restoration in editor base.

   - Removed leftover debug console logs from click/selection handlers.

   - Adjusted renderer bottom padding behavior in scroll-into-view routine.

5) ACP settings/agents cleanup

   - Removed permission mode controls from ACP settings UI and related prop plumbing in AgentPanel/App.

   - Simplified useAgents dependencies by removing disabled follow-mode/open-file coupling.

Notes:

- Frontend build and backend cargo check pass after these changes.

Author: vipmax

AGENTS.md

@@ -1,4 +1,4 @@
-# AGENTS.md test
+# AGENTS.md
 
 This file provides guidance for AI coding agents working with the Anycode codebase.
 

anycode-backend/src/handlers/acp_handler.rs

@@ -1,5 +1,5 @@
 use crate::acp::AcpSelectOption;
-use crate::acp::{AcpMessage, AcpPermissionMode};
+use crate::acp::AcpMessage;
 use crate::app_state::AppState;
 use crate::error_ack;
 use serde::{Deserialize, Serialize};
@@ -316,11 +316,6 @@ pub struct AcpPermissionResponseRequest {
     pub option_id: String,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct AcpPermissionModeRequest {
-    pub mode: String,
-}
-
 pub async fn handle_acp_permission_response(
     Data(request): Data<AcpPermissionResponseRequest>,
     ack: AckSender,
@@ -367,29 +362,6 @@ pub async fn handle_acp_permission_response(
     }
 }
 
-pub async fn handle_acp_permission_mode(
-    Data(request): Data<AcpPermissionModeRequest>,
-    ack: AckSender,
-    state: State<AppState>,
-) {
-    info!("handle_acp_permission_mode {:?}", request);
-    let AcpPermissionModeRequest { mode } = request;
-
-    let permission_mode = match AcpPermissionMode::from_str(&mode) {
-        Some(mode) => mode,
-        None => {
-            error!("Invalid ACP permission mode requested: {}", mode);
-            error_ack!(ack, &mode, "Invalid ACP permission mode: {}", mode);
-        }
-    };
-
-    let acp_manager = state.acp_manager.lock().await;
-    acp_manager.set_permission_mode(permission_mode);
-
-    ack.send(&json!({ "success": true, "mode": permission_mode.as_str() }))
-        .ok();
-}
-
 pub async fn handle_acp_reconnect(socket: SocketRef, ack: AckSender, state: State<AppState>) {
     info!("handle_acp_reconnect for socket {}", socket.id);
 

anycode-backend/src/main.rs

@@ -80,7 +80,6 @@ async fn on_connect(socket: SocketRef, _state: State<AppState>) {
     socket.on("acp:sessions_list", handle_acp_sessions_list);
     socket.on("acp:reconnect", handle_acp_reconnect);
     socket.on("acp:permission_response", handle_acp_permission_response);
-    socket.on("acp:set_permission_mode", handle_acp_permission_mode);
     socket.on("acp:undo", handle_acp_undo);
 
     socket.on("git:status", handle_git_status);

anycode-base/src/editor.ts

@@ -526,14 +526,14 @@ export class AnycodeEditor {
             this.container.scrollTop = prevScrollTop;
             if (!this.readOnly) {
                 this.codeContent.focus({ preventScroll: true });
+                this.renderer.renderCursorOrSelection(this.getEditorState(), false);
             }
         }
 
         return true;
     }
 
     private handleClick(e: MouseEvent): void {
-        console.log("click", e);
         this.clearPendingHover();
         this.closeHover();
 
@@ -896,7 +896,6 @@ export class AnycodeEditor {
         this.selection = new Selection(start, end);
 
         this.offset = end;
-        console.log('selectWord', end);
         this.renderer.renderSelection(this.code, this.selection);
     }
 
@@ -908,7 +907,6 @@ export class AnycodeEditor {
         this.selection = new Selection(start, end);
 
         this.offset = end;
-        console.log('selectLine', end);
         this.renderer.renderSelection(this.code, this.selection);
     }
 

anycode-base/src/renderer/Renderer.ts

@@ -769,7 +769,7 @@ export class Renderer {
         const viewportTop = this.container.scrollTop;
         const viewportBottom = viewportTop + this.container.clientHeight;
 
-        const bottomPaddingLines = 3;
+        const bottomPaddingLines = 0;
         const padding = settings.lineHeight * bottomPaddingLines;
         let targetScrollTop = viewportTop;
 

anycode-base/src/styles.css

@@ -274,6 +274,14 @@
   -webkit-user-select: none;
   margin: 0;
   padding: 0;
+  outline: none;
+  box-shadow: none;
+}
+
+.diff-gap-expand-btn:focus,
+.diff-gap-expand-btn:focus-visible {
+  outline: none;
+  box-shadow: none;
 }
 
 .diff-gap-expand-btn-label {

anycode/App.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import 'dockview/dist/styles/dockview.css';
-import { ChangesPanel } from './components';
+import { ChangesPanel, type ChangedFile } from './components';
 import Search from './components/Search';
 import { Layout, type LayoutActions, type PanelId } from './components/layout/Layout';
 import { Toolbar } from './components/toolbar/Toolbar';
@@ -13,10 +13,6 @@ import {
 import { AcpAgent, type SearchMatch } from './types';
 import './App.css';
 import {
-    loadDiffEnabled,
-    // loadFollowEnabled,
-    loadAcpPermissionMode,
-    saveAcpPermissionMode,
     saveItem,
 } from './storage';
 import { useSocket } from './hooks/useSocket';
@@ -27,36 +23,21 @@ import { useTerminals } from './hooks/useTerminals';
 import { useEditors } from './hooks/useEditors';
 import { useAgents } from './hooks/useAgents';
 import { useLayout } from './hooks/useLayout';
-import { type AcpPermissionMode } from './types';
 import { useTerminalPanes } from './features/terminal/useTerminalPanes';
 import { useAgentPanes } from './features/agents/useAgentPanes';
 import { FilesPanel } from './features/files/FilesPanel';
 import { EditorPanel } from './features/editor/EditorPanel';
 import { TerminalPanel } from './features/terminal/TerminalPanel';
 import { AgentPanel } from './features/agents/AgentPanel';
 import { BrowserPanel } from './features/browser/BrowserPanel';
-import {
-    DEFAULT_DIFF_VIEW_MODE,
-    getNextDiffMode,
-    type DiffMode,
-} from './types/diffMode';
+import { type DiffMode } from './types/diffMode';
+import { normalizePath } from './utils';
 
 const App: React.FC = () => {
-    const [diffEnabled, setDiffEnabled] = useState<boolean>(loadDiffEnabled());
-    const [editorDiffModeByPane, setEditorDiffModeByPane] = useState<Record<string, DiffMode>>({});
-    const layoutActionsRef = useRef<LayoutActions | null>(null);
-    // const [followEnabled, setFollowEnabled] = useState<boolean>(loadFollowEnabled());
-    const [permissionMode, setPermissionMode] = useState<AcpPermissionMode>(loadAcpPermissionMode());
-
     const { wsRef, isConnected } = useSocket({});
 
     const fileTree = useFileTree();
-    const editors = useEditors({
-        wsRef,
-        isConnected,
-        diffEnabled,
-    });
-
+    const editors = useEditors({ wsRef, isConnected });
     const terminals = useTerminals({ wsRef, isConnected });
     const terminalPanes = useTerminalPanes({
         terminals: terminals.terminals,
@@ -66,17 +47,8 @@ const App: React.FC = () => {
     const git = useGit({ wsRef, isConnected });
     const search = useSearch({ wsRef, isConnected });
     const wasConnectedRef = useRef<boolean>(false);
-    const agents = useAgents({
-        wsRef,
-        isConnected,
-        // followEnabled,
-        followEnabled: false,
-        openFile: editors.openFile,
-        onAgentStarted: () => {
-            setDiffEnabled(true);
-            // setFollowEnabled(true);
-        },
-    });
+    const agents = useAgents({ wsRef, isConnected });
+    const layoutActionsRef = useRef<LayoutActions | null>(null);
 
     const openFolder = useMemo(() => {
         return (path: string) => {
@@ -157,24 +129,6 @@ const App: React.FC = () => {
         fileTree.selectNode(node.id);
     }, [editors.activeFileId, fileTree.fileTree, fileTree.findNodeByPath, fileTree.selectNode]);
 
-    useEffect(() => {
-        saveItem('diffEnabled', diffEnabled);
-    }, [diffEnabled]);
-
-    // useEffect(() => {
-    //     saveItem('followEnabled', followEnabled);
-    // }, [followEnabled]);
-
-    useEffect(() => {
-        saveAcpPermissionMode(permissionMode);
-    }, [permissionMode]);
-
-    useEffect(() => {
-        if (!isConnected || !wsRef.current) return;
-
-        wsRef.current.emit('acp:set_permission_mode', { mode: permissionMode });
-    }, [isConnected, permissionMode, wsRef]);
-
     useEffect(() => {
         saveItem('terminals', terminals.terminals);
     }, [terminals.terminals]);
@@ -188,19 +142,12 @@ const App: React.FC = () => {
         return layoutActionsRef.current?.ensureEditorPanel(editors.activeEditorPaneId);
     }, [editors]);
 
-    const handleOpenFile = useCallback((path: string, line?: number, column?: number) => {
+    const handleOpenFile = useCallback((path: string, line?: number, column?: number, mode?: DiffMode) => {
         const paneId = resolveEditorPaneId();
         if (!paneId) return;
-        editors.openFile(path, line, column, paneId);
+        editors.openFile(path, line, column, paneId, mode);
     }, [editors, resolveEditorPaneId]);
 
-    const handleOpenFileDiff = useCallback((path: string, line?: number, column?: number) => {
-        const paneId = resolveEditorPaneId();
-        if (!paneId) return;
-        const mode = editorDiffModeByPane[paneId] ?? (diffEnabled ? 'combine' : DEFAULT_DIFF_VIEW_MODE);
-        editors.openFile(path, line, column, paneId, { originalContentMode: mode });
-    }, [diffEnabled, editorDiffModeByPane, editors, resolveEditorPaneId]);
-
     const handleSelectFile = useCallback((fileId: string) => {
         const paneId = resolveEditorPaneId();
         if (!paneId) return;
@@ -211,57 +158,25 @@ const App: React.FC = () => {
         handleOpenFile(filePath, match.line, match.column);
     };
 
-    const getEditorDiffMode = useCallback((panelKey: string): DiffMode => {
-        return editorDiffModeByPane[panelKey] ?? (diffEnabled ? 'combine' : DEFAULT_DIFF_VIEW_MODE);
-    }, [diffEnabled, editorDiffModeByPane]);
-
-    const isEditorDiffEnabled = useCallback((panelKey: string) => {
-        return getEditorDiffMode(panelKey) !== 'plain';
-    }, [getEditorDiffMode]);
-
-    const applyDiffModeToPaneEditor = useCallback((panelKey: string, mode: DiffMode) => {
-        const fileId = editors.getActiveFileIdForPane(panelKey);
-        if (!fileId) {
-            return false;
-        }
+    const handleOpenFileDiff = useCallback((path: string, line?: number, column?: number) => {
+        handleOpenFile(path, line, column, editors.getEditorDiffMode(editors.activeEditorPaneId));
+    }, [editors, handleOpenFile]);
 
-        const editor = editors.getEditorState(fileId);
-        if (!editor) {
-            return false;
+    const activeChangedFile = useMemo<ChangedFile | null>(() => {
+        if (!editors.activeFileId) {
+            return null;
         }
+        const normalizedActivePath = normalizePath(editors.activeFileId).replace(/^\.\/+/, '');
+        return git.changedFiles.find((file) => normalizePath(file.path).replace(/^\.\/+/, '') === normalizedActivePath) ?? null;
+    }, [editors.activeFileId, git.changedFiles]);
 
-        editor.setDiffEnabled(mode !== 'plain');
-        editor.setFocusedDiffMode(mode === 'diff', 3);
-        return true;
+    const isEditorDiffEnabled = useCallback((panelKey: string) => {
+        return editors.getEditorDiffMode(panelKey) !== 'plain';
     }, [editors]);
 
     const handleCycleEditorDiffMode = useCallback((panelKey: string) => {
-        const currentMode = getEditorDiffMode(panelKey);
-        const nextMode = getNextDiffMode(currentMode);
-
-        if (!applyDiffModeToPaneEditor(panelKey, nextMode)) {
-            return;
-        }
-
-        setEditorDiffModeByPane((prev) => ({ ...prev, [panelKey]: nextMode }));
-
-        if (panelKey === editors.activeEditorPaneId) {
-            setDiffEnabled(nextMode !== 'plain');
-        }
-    }, [applyDiffModeToPaneEditor, editors.activeEditorPaneId, getEditorDiffMode]);
-
-    useEffect(() => {
-        const paneId = editors.activeEditorPaneId;
-        if (!paneId) {
-            return;
-        }
-        const mode = getEditorDiffMode(paneId);
-        applyDiffModeToPaneEditor(paneId, mode);
-    }, [applyDiffModeToPaneEditor, editors.activeEditorPaneId, editors.activeFileId, getEditorDiffMode]);
-
-    // const toggleFollowMode = useCallback(() => {
-    //     setFollowEnabled((prev) => !prev);
-    // }, []);
+        editors.cycleEditorDiffMode(panelKey);
+    }, [editors]);
 
     const sessionsArray = useMemo(() => Array.from(agents.acpSessions.values()), [agents.acpSessions]);
     const availableAgents = useMemo<AcpAgent[]>(() => getAllAgents(), [agents.agentsVersion]);
@@ -362,9 +277,8 @@ const App: React.FC = () => {
         agents.resumeSession(agent, sessionId);
     }, [agents.resumeSession, agents.setIsAgentSettingsOpen]);
 
-    const handleSaveAgents = useCallback((agentList: AcpAgent[], defaultAgentId: string | null, nextPermissionMode: AcpPermissionMode) => {
+    const handleSaveAgents = useCallback((agentList: AcpAgent[], defaultAgentId: string | null) => {
         updateAgents(agentList, defaultAgentId);
-        setPermissionMode(nextPermissionMode);
         agents.setAgentsVersion((prev) => prev + 1);
     }, [agents.setAgentsVersion]);
 
@@ -409,6 +323,7 @@ const App: React.FC = () => {
                 return (
                     <ChangesPanel
                         files={git.changedFiles}
+                        active={activeChangedFile}
                         branch={git.gitBranch}
                         branches={git.branches}
                         isSwitchingBranch={git.isSwitchingBranch}
@@ -449,7 +364,6 @@ const App: React.FC = () => {
                         availableAgents={availableAgents}
                         settingsAgents={settingsAgents}
                         settingsDefaultAgentId={settingsDefaultAgentId}
-                        permissionMode={permissionMode}
                         onSaveAgents={handleSaveAgents}
                         onCloseSettings={handleCloseAgentSettings}
                         onResumeSettingsSession={handleResumeSettingsSession}
@@ -566,7 +480,7 @@ const App: React.FC = () => {
                     onPanelActivated={handlePanelActivated}
                     onCycleEditorDiffMode={handleCycleEditorDiffMode}
                     isEditorDiffEnabled={isEditorDiffEnabled}
-                    getEditorDiffMode={getEditorDiffMode}
+                    getEditorDiffMode={editors.getEditorDiffMode}
                     onActionsReady={(actions) => {
                         layoutActionsRef.current = actions;
                     }}