Add a commentOnLineClick setting to keep line clicks from opening comment drafts

README.md

@@ -133,6 +133,9 @@ is running so changes apply to open windows.
 Set `settings.showWhitespace` to `true` to show whitespace-only changes in diffs and file line
 counts; when it is `false`, Codiff hides those changes from the working-tree review state.
 
+Set `settings.commentOnLineClick` to `false` to stop clicks and drags on diff lines from opening a
+review comment draft. The comment button in the gutter still opens one.
+
 ```jsonc
 {
   "$schema": "https://raw.githubusercontent.com/nkzw-tech/codiff/main/core/config/codiff-config.schema.json",
@@ -141,6 +144,7 @@ counts; when it is `false`, Codiff hides those changes from the working-tree rev
     "claudeModel": "claude-sonnet-4-6",
     "codeFontFamily": "",
     "codeFontSize": 13,
+    "commentOnLineClick": true,
     "copyCommentsOnClose": false,
     "diffStyle": "split",
     "editorCommand": "",

config/defaults.json

@@ -5,6 +5,7 @@
     "claudeModel": "claude-sonnet-4-6",
     "codeFontFamily": "",
     "codeFontSize": 13,
+    "commentOnLineClick": true,
     "copyCommentsOnClose": false,
     "diffStyle": "split",
     "editorCommand": "",

core/App.tsx

@@ -1714,6 +1714,7 @@ export default function App() {
     agentLabel,
     codeQualityFindings: state.codeQualityFindings,
     collapsed,
+    commentOnLineClick: preferences.commentOnLineClick,
     comments: visibleReviewComments,
     commitMetadata,
     diffLineHeight,

core/__tests__/App-render.test.tsx

@@ -178,6 +178,7 @@ const createCodiffMock = (overrides: Partial<Window['codiff']> = {}): Window['co
     claudeModel: defaultSettings.claudeModel,
     codeFontFamily: defaultSettings.codeFontFamily,
     codeFontSize: defaultSettings.codeFontSize,
+    commentOnLineClick: true,
     copyCommentsOnClose: true,
     diffStyle: 'split' as const,
     editorCommand: '',

core/__tests__/ReviewCodeView-scroll.test.tsx

@@ -2510,3 +2510,46 @@ test('line content clicks create review comments unless text is selected', async
   });
   expect(onCreateComment).toHaveBeenCalledTimes(3);
 });
+
+test('commentOnLineClick=false leaves comment creation to the gutter button', async () => {
+  const onCreateComment = vi.fn();
+  const file = createChangedFileWithPatch(
+    'src/click.ts',
+    'diff --git a/src/click.ts b/src/click.ts\n@@ -1 +1 @@\n-old\n+new\n',
+  );
+  await using _view = await renderReact(
+    <ReviewCodeViewHarness
+      commentOnLineClick={false}
+      files={[file]}
+      onCreateComment={onCreateComment}
+    />,
+  );
+  const { item, onGutterUtilityClick, onLineClick, onLineSelectionEnd } =
+    getReviewCodeViewHandlers();
+  const range = { end: 1, side: 'additions' as const, start: 1 };
+  await act(async () => {
+    onLineClick(
+      {
+        annotationSide: 'additions',
+        event: nonInteractivePointerEvent,
+        lineNumber: 1,
+      },
+      { item },
+    );
+    onLineSelectionEnd(range, { item });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+  });
+  expect(onCreateComment).not.toHaveBeenCalled();
+  expect(codeViewMock.lastOptions?.enableLineSelection).toBe(false);
+  await act(async () => {
+    onGutterUtilityClick(range, { item });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+  });
+  expect(onCreateComment).toHaveBeenCalledTimes(1);
+  expect(onCreateComment).toHaveBeenLastCalledWith({
+    filePath: 'src/click.ts',
+    lineNumber: 1,
+    sectionId: 'src/click.ts:unstaged',
+    side: 'additions',
+  });
+});

core/__tests__/config-defaults.test.ts

@@ -88,6 +88,16 @@ test('electron config normalizes sidebar position', () => {
   ).toBe('left');
 });
 
+test('electron config keeps commentOnLineClick only when it is a boolean', () => {
+  expect(readElectronConfig({}).settings.commentOnLineClick).toBe(true);
+  expect(
+    readElectronConfig({ settings: { commentOnLineClick: false } }).settings.commentOnLineClick,
+  ).toBe(false);
+  expect(
+    readElectronConfig({ settings: { commentOnLineClick: 'no' } }).settings.commentOnLineClick,
+  ).toBe(true);
+});
+
 test('electron config keeps custom walkthrough prompt text only when it is a string', () => {
   expect(
     readElectronConfig({

core/app/components/ReviewCodeView.tsx

@@ -2499,6 +2499,7 @@ export function ReviewCodeView({
   bottomInset = codeViewLayout.paddingBottom,
   codeQualityFindings = [],
   collapsed,
+  commentOnLineClick = true,
   comments,
   commitMetadata,
   diffLineHeight = DIFF_LINE_HEIGHT,
@@ -2561,6 +2562,7 @@ export function ReviewCodeView({
   bottomInset?: number;
   codeQualityFindings?: ReadonlyArray<PullRequestCodeQualityFinding>;
   collapsed: ReadonlySet<string>;
+  commentOnLineClick?: boolean;
   comments: ReadonlyArray<ReviewComment>;
   commitMetadata: CommitMetadata | null;
   diffLineHeight?: number;
@@ -3286,7 +3288,7 @@ export function ReviewCodeView({
         diffIndicators: 'bars',
         diffStyle,
         enableGutterUtility: !isReadOnly,
-        enableLineSelection: !isReadOnly,
+        enableLineSelection: !isReadOnly && commentOnLineClick,
         expandUnchanged: false,
         expansionLineCount: diffContextExpansionLineCount,
         hunkSeparators: 'line-info-basic',
@@ -3377,7 +3379,7 @@ export function ReviewCodeView({
             return;
           }
 
-          if (hasActiveTextSelection()) {
+          if (!commentOnLineClick || hasActiveTextSelection()) {
             return;
           }
 
@@ -3403,7 +3405,7 @@ export function ReviewCodeView({
             return;
           }
 
-          if (!range) {
+          if (!range || !commentOnLineClick) {
             return;
           }
 
@@ -3455,6 +3457,7 @@ export function ReviewCodeView({
     [
       bottomInset,
       cancelPendingEmptyCommentDeletes,
+      commentOnLineClick,
       createCommentForRange,
       diffStyle,
       isReadOnly,

core/config/codiff-config.schema.json

@@ -42,6 +42,11 @@
           "default": 13,
           "description": "Font size in pixels used for diff and code rendering."
         },
+        "commentOnLineClick": {
+          "type": "boolean",
+          "default": true,
+          "description": "Open a review comment draft when clicking or dragging across diff lines. The gutter comment button keeps working when this is false."
+        },
         "copyCommentsOnClose": {
           "type": "boolean",
           "default": false,

core/config/types.ts

@@ -8,6 +8,7 @@ export type CodiffSettings = {
   claudeModel: string;
   codeFontFamily: string;
   codeFontSize: number;
+  commentOnLineClick: boolean;
   copyCommentsOnClose: boolean;
   diffStyle: CodiffDiffStyle;
   editorCommand: string;

core/types.ts

@@ -780,6 +780,7 @@ export type CodiffPreferences = {
   claudeModel: string;
   codeFontFamily: string;
   codeFontSize: number;
+  commentOnLineClick: boolean;
   copyCommentsOnClose: boolean;
   diffStyle: CodiffDiffStyle;
   editorCommand: string;

electron/config.cjs

@@ -285,6 +285,10 @@ const mergeConfig = (raw) => {
           : defaults.settings.claudeModel,
       codeFontFamily: normalizeCodeFontFamily(rawSettings.codeFontFamily),
       codeFontSize: normalizeCodeFontSize(rawSettings.codeFontSize),
+      commentOnLineClick:
+        typeof rawSettings.commentOnLineClick === 'boolean'
+          ? rawSettings.commentOnLineClick
+          : defaults.settings.commentOnLineClick,
       copyCommentsOnClose:
         typeof rawSettings.copyCommentsOnClose === 'boolean'
           ? rawSettings.copyCommentsOnClose