Allow disabling copilot commit generation

Closes #179

Author: pol-rivero

app/src/lib/stores/app-store.ts

@@ -51,6 +51,7 @@ import {
   UpstreamRemoteName,
 } from '.'
 import type { CopilotFeature, CopilotModelSelections } from './copilot-store'
+import { DisabledCopilotModel } from './copilot-store'
 import {
   IBYOKProvider,
   loadBYOKProviders,
@@ -10714,6 +10715,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
       if (raw === undefined) {
         continue
       }
+      // The sentinel that disables a feature isn't a real model, so it would
+      // otherwise be scrubbed as "missing". Preserve it verbatim.
+      if (raw === DisabledCopilotModel) {
+        updated[feature as CopilotFeature] = raw
+        continue
+      }
       const key = parseModelKey(raw)
       if (key.kind === 'byok') {
         const provider = this.byokProviders.find(p => p.id === key.providerId)

app/src/lib/stores/copilot-store.ts

@@ -87,6 +87,11 @@ export type CopilotModelRequest =
 /** Copilot features that support per-model selection. */
 export type CopilotFeature = 'commit-message-generation'
 
+/**
+ * Sentinel value for hiding the Copilot button
+ */
+export const DisabledCopilotModel = 'hide-copilot-button'
+
 /**
  * Per-feature model selections. An absent key means the default model
  * will be used for that feature.

app/src/ui/app.tsx

@@ -12,6 +12,7 @@ import {
 } from '../lib/app-state'
 import { Dispatcher } from './dispatcher'
 import { AppStore, GitHubUserStore, IssuesStore } from '../lib/stores'
+import { DisabledCopilotModel } from '../lib/stores/copilot-store'
 import { assertNever } from '../lib/fatal-error'
 import { shell } from '../lib/app-shell'
 import { updateStore, UpdateStatus } from './lib/update-store'
@@ -3991,6 +3992,10 @@ export class App extends React.Component<IAppProps, IAppState> {
           shouldShowGenerateCommitMessageCallOut={
             !this.state.commitMessageGenerationButtonClicked
           }
+          commitMessageGenerationDisabled={
+            this.state.selectedCopilotModels['commit-message-generation'] ===
+            DisabledCopilotModel
+          }
           skipCommitHooks={selectedState.state.skipCommitHooks}
           signOffCommits={selectedState.state.signOffCommits}
           allowEmptyCommit={selectedState.state.allowEmptyCommit}

app/src/ui/changes/filter-changes-list.tsx

@@ -171,6 +171,7 @@ interface IFilterChangesListProps {
   readonly onShowCommitProgress?: (() => void) | undefined
   readonly isGeneratingCommitMessage: boolean
   readonly shouldShowGenerateCommitMessageCallOut: boolean
+  readonly commitMessageGenerationDisabled: boolean
   readonly commitToAmend: Commit | null
   readonly currentBranchProtected: boolean
   readonly currentRepoRulesInfo: RepoRulesInfo
@@ -1073,7 +1074,11 @@ export class FilterChangesList extends React.Component<
           this.onConfirmCommitWithUnknownCoAuthors
         }
         onPersistCommitMessage={this.onPersistCommitMessage}
-        onGenerateCommitMessage={this.onGenerateCommitMessage}
+        onGenerateCommitMessage={
+          this.props.commitMessageGenerationDisabled
+            ? undefined
+            : this.onGenerateCommitMessage
+        }
         onCommitMessageFocusSet={this.onCommitMessageFocusSet}
         onRefreshAuthor={this.onRefreshAuthor}
         onShowPopup={this.onShowPopup}

app/src/ui/changes/sidebar.tsx

@@ -63,6 +63,7 @@ interface IChangesSidebarProps {
   readonly onShowCommitProgress: (() => void) | undefined
   readonly isGeneratingCommitMessage: boolean
   readonly shouldShowGenerateCommitMessageCallOut: boolean
+  readonly commitMessageGenerationDisabled: boolean
   readonly commitToAmend: Commit | null
   readonly isPushPullFetchInProgress: boolean
   // Used in receiveProps, no-unused-prop-types doesn't know that
@@ -481,6 +482,9 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
           shouldShowGenerateCommitMessageCallOut={
             this.props.shouldShowGenerateCommitMessageCallOut
           }
+          commitMessageGenerationDisabled={
+            this.props.commitMessageGenerationDisabled
+          }
           commitToAmend={this.props.commitToAmend}
           showCoAuthoredBy={showCoAuthoredBy}
           coAuthors={coAuthors}

app/src/ui/preferences/copilot.tsx

@@ -10,6 +10,7 @@ import { TabBar } from '../tab-bar'
 import type { ModelInfo } from '@github/copilot-sdk'
 import {
   DefaultCopilotModel,
+  DisabledCopilotModel,
   type CopilotFeature,
   type CopilotModelSelections,
 } from '../../lib/stores/copilot-store'
@@ -159,6 +160,9 @@ export class CopilotPreferences extends React.Component<
           value={value}
           onChange={this.onCommitMessageModelChanged}
         >
+          <option value={DisabledCopilotModel}>
+            None (hide Copilot button)
+          </option>
           {copilotModels.length > 0 && (
             <optgroup label="GitHub Copilot">
               {copilotModels.map(m => (
@@ -204,6 +208,10 @@ export class CopilotPreferences extends React.Component<
     byokProviders: ReadonlyArray<IBYOKProvider>,
     raw: string | null
   ): string {
+    if (raw === DisabledCopilotModel) {
+      return DisabledCopilotModel
+    }
+
     if (raw !== null) {
       const key = parseModelKey(raw)
       if (key.kind === 'byok') {

app/src/ui/repository.tsx

@@ -70,6 +70,12 @@ interface IRepositoryViewProps {
   readonly accounts: ReadonlyArray<Account>
   readonly shouldShowGenerateCommitMessageCallOut: boolean
 
+  /**
+   * Whether the user has disabled Copilot commit message generation by
+   * selecting "None" as the model. When true, the Copilot button is hidden.
+   */
+  readonly commitMessageGenerationDisabled: boolean
+
   /**
    * A value indicating whether or not the application is currently presenting
    * a modal dialog such as the preferences, or an error dialog
@@ -361,6 +367,9 @@ export class RepositoryView extends React.Component<
         shouldShowGenerateCommitMessageCallOut={
           this.props.shouldShowGenerateCommitMessageCallOut
         }
+        commitMessageGenerationDisabled={
+          this.props.commitMessageGenerationDisabled
+        }
         commitToAmend={this.props.state.commitToAmend}
         isPushPullFetchInProgress={this.props.state.isPushPullFetchInProgress}
         focusCommitMessage={this.props.focusCommitMessage}

app/test/unit/ui/copilot-preferences-test.tsx

@@ -5,6 +5,7 @@ import { render, screen, fireEvent } from '../../helpers/ui/render'
 import { CopilotPreferences } from '../../../src/ui/preferences/copilot'
 import {
   DefaultCopilotModel,
+  DisabledCopilotModel,
   type CopilotFeature,
 } from '../../../src/lib/stores/copilot-store'
 import type { ModelInfo } from '@github/copilot-sdk'
@@ -103,8 +104,50 @@ describe('CopilotPreferences', () => {
     assert.strictEqual(optgroups[0].label, 'GitHub Copilot')
 
     const options = view.container.querySelectorAll('option')
-    assert.strictEqual(options[0].textContent, 'GPT-5 mini (default)')
-    assert.strictEqual(options[1].textContent, 'Claude Sonnet')
+    assert.strictEqual(options[0].textContent, 'None (hide Copilot button)')
+    assert.strictEqual(options[1].textContent, 'GPT-5 mini (default)')
+    assert.strictEqual(options[2].textContent, 'Claude Sonnet')
+  })
+
+  it('offers a "None" option to disable commit message generation', () => {
+    const view = render(<CopilotPreferences {...defaults()} />)
+    const options = Array.from(view.container.querySelectorAll('option'))
+    const none = options.find(o => o.value === DisabledCopilotModel)
+    assert.ok(none)
+    assert.strictEqual(none!.textContent, 'None (hide Copilot button)')
+  })
+
+  it('selects the None option when generation is disabled', () => {
+    const view = render(
+      <CopilotPreferences
+        {...defaults()}
+        selectedCopilotModels={{
+          'commit-message-generation': DisabledCopilotModel,
+        }}
+      />
+    )
+    const select = view.container.querySelector('select') as HTMLSelectElement
+    assert.strictEqual(select.value, DisabledCopilotModel)
+  })
+
+  it('emits the None value when generation is disabled', () => {
+    const changed: Array<{ feature: CopilotFeature; model: string | null }> = []
+    const view = render(
+      <CopilotPreferences
+        {...defaults()}
+        onSelectedCopilotModelChanged={(f, m) =>
+          changed.push({ feature: f, model: m })
+        }
+      />
+    )
+    const select = view.container.querySelector('select') as HTMLSelectElement
+    fireEvent.change(select, { target: { value: DisabledCopilotModel } })
+    assert.deepStrictEqual(changed, [
+      {
+        feature: 'commit-message-generation',
+        model: DisabledCopilotModel,
+      },
+    ])
   })
 
   it('renders a BYOK optgroup per provider', () => {