change: disable inline chat by default (#1797)

PART OF #1796

Requested by product.

This PR updates to disable inline chat when chat panel is enabled.
Inline chat is also now disabled by default.

The inline chat feature is deprecated in favor of the experimental chat
panel. This change disables inline chat when the chat panel is enabled.

## Test plan

<!-- Required. See
https://docs.sourcegraph.com/dev/background-information/testing_principles.
-->

- Try to enable inline chat in new UI
- Try to disable new chat UI and enable Inline Chat again 
- etc

## Demo


https://github.com/sourcegraph/cody/assets/68532117/aab58017-f766-420d-88df-eb4f2ebd9f21

vscode/CHANGELOG.md

@@ -19,6 +19,7 @@ Starting from `0.2.0`, Cody is using `major.EVEN_NUMBER.patch` for release versi
 
 ### Changed
 
+- Inline Chat will soon be deprecated in favor of the improved chat and command experience. It is now disabled by default and does not work when the new chat panel is enabled. [pull/1797](https://github.com/sourcegraph/cody/pull/1797)
 - Chat: Updated the design and location for the `chat submit` button and `stop generating` button. [pull/1782](https://github.com/sourcegraph/cody/pull/1782)
 - Commands: The Custom Commands Menu now closes on click outside of the menu. [pull/1854](https://github.com/sourcegraph/cody/pull/1854)
 

vscode/package.json

@@ -975,7 +975,7 @@
           "title": "Cody Inline Chat",
           "type": "boolean",
           "markdownDescription": "Enables asking questions and requesting code changes directly from within the code editor. Use the + button next to any line of code to start an inline chat.",
-          "default": true
+          "default": false
         },
         "cody.editorTitleCommandIcon": {
           "order": 7,

vscode/src/configuration.test.ts

@@ -29,7 +29,7 @@ describe('getConfiguration', () => {
             experimentalGuardrails: false,
             experimentalLocalSymbols: false,
             experimentalSearchPanel: false,
-            inlineChat: true,
+            inlineChat: false,
             codeActions: true,
             isRunningInsideAgent: false,
             agentIDE: undefined,
@@ -151,7 +151,7 @@ describe('getConfiguration', () => {
             editorTitleCommandIcon: true,
             experimentalGuardrails: true,
             experimentalLocalSymbols: true,
-            inlineChat: true,
+            inlineChat: false,
             codeActions: true,
             isRunningInsideAgent: false,
             agentIDE: undefined,

vscode/src/configuration.ts

@@ -83,8 +83,6 @@ export function getConfiguration(config: ConfigGetter = vscode.workspace.getConf
         experimentalChatPanel: config.get(CONFIG_KEY.experimentalChatPanel, isTesting),
         experimentalChatPredictions: config.get(CONFIG_KEY.experimentalChatPredictions, isTesting),
         experimentalSearchPanel: config.get(CONFIG_KEY.experimentalNewSearch, isTesting),
-        inlineChat: config.get(CONFIG_KEY.inlineChatEnabled, true),
-        codeActions: config.get(CONFIG_KEY.codeActionsEnabled, true),
         chatPreInstruction: config.get(CONFIG_KEY.chatPreInstruction),
         experimentalGuardrails: config.get(CONFIG_KEY.experimentalGuardrails, isTesting),
         experimentalNonStop: config.get(CONFIG_KEY.experimentalNonStop, isTesting),
@@ -108,6 +106,11 @@ export function getConfiguration(config: ConfigGetter = vscode.workspace.getConf
         ),
         autocompleteExperimentalGraphContext,
 
+        // NOTE: Inline Chat will be deprecated soon - Do not enable inline-chat when experimental.chatPanel is enabled
+        inlineChat:
+            config.get(CONFIG_KEY.inlineChatEnabled, false) !== config.get(CONFIG_KEY.experimentalChatPanel, isTesting),
+        codeActions: config.get(CONFIG_KEY.codeActionsEnabled, true),
+
         /**
          * UNDOCUMENTED FLAGS
          */

vscode/src/editor/EditorCodeLenses.ts

@@ -13,7 +13,7 @@ interface EditorCodeLens {
  */
 export class EditorCodeLenses implements vscode.CodeLensProvider {
     private isEnabled = false
-    private isInlineChatEnabled = true
+    private isInlineChatEnabled = false
 
     private _disposables: vscode.Disposable[] = []
     private _onDidChangeCodeLenses: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
@@ -55,8 +55,11 @@ export class EditorCodeLenses implements vscode.CodeLensProvider {
     private updateConfig(): void {
         const config = vscode.workspace.getConfiguration('cody')
         this.isEnabled = config.get('experimental.commandLenses') as boolean
-        this.isInlineChatEnabled =
-            (config.get('inlineChat.enabled') as boolean) && (config.get('inlineChat.codeLenses') as boolean)
+
+        // NOTE: Do not enable inline-chat when experimental.chatPanel is enabled
+        const isInlineChatEnabled =
+            (config.get('inlineChat.enabled') as boolean) && !(config.get('experimental.chatPanel') as boolean)
+        this.isInlineChatEnabled = isInlineChatEnabled && (config.get('inlineChat.codeLenses') as boolean)
         if (this.isEnabled && !this._disposables.length) {
             this.init()
         }

vscode/src/services/InlineController.ts

@@ -67,19 +67,21 @@ export class InlineController implements VsCodeInlineController {
         this.userIcon = getIconPath('user', this.extensionPath)
 
         const config = vscode.workspace.getConfiguration('cody')
-        const enableInlineChat = config.get('inlineChat.enabled') as boolean
 
-        if (enableInlineChat) {
+        // NOTE: Do not enable inline-chat when experimental.chatPanel is enabled
+        const isNewChatUiEnabled = config.get('experimental.chatPanel') as boolean
+        const enableInlineChat = config.get('inlineChat.enabled') as boolean
+        if (!isNewChatUiEnabled && enableInlineChat) {
             this.commentController = this.init()
         }
 
         // Toggle Inline Chat on Config Change
         vscode.workspace.onDidChangeConfiguration(e => {
             const config = vscode.workspace.getConfiguration('cody')
             if (e.affectsConfiguration('cody')) {
-                // Inline Chat
+                const isNewChatUiEnabled = config.get('experimental.chatPanel') as boolean
                 const enableInlineChat = config.get('inlineChat.enabled') as boolean
-                if (enableInlineChat) {
+                if (!isNewChatUiEnabled && enableInlineChat) {
                     this.commentController = this.init()
                     return
                 }

vscode/src/services/StatusBar.ts

@@ -100,13 +100,6 @@ export function createStatusBar(): CodyStatusBar {
                     'cody.editorTitleCommandIcon',
                     c => c.editorTitleCommandIcon
                 ),
-                createFeatureToggle(
-                    'Inline Chat',
-                    undefined,
-                    'Enable chatting and editing with Cody, directly in your code',
-                    'cody.inlineChat.enabled',
-                    c => c.inlineChat
-                ),
                 createFeatureToggle(
                     'Code Actions',
                     undefined,

vscode/test/e2e/inline-assist.test.ts

@@ -17,7 +17,7 @@ const expectedEvents = [
 test.beforeEach(() => {
     resetLoggedEvents()
 })
-test('start a fixup job from inline chat with valid auth', async ({ page, sidebar }) => {
+test.skip('start a fixup job from inline chat with valid auth', async ({ page, sidebar }) => {
     // Sign into Cody
     await sidebarSignin(page, sidebar)
 

vscode/test/e2e/inline-chat.test.ts

@@ -13,7 +13,7 @@ const expectedEvents = [
 test.beforeEach(() => {
     resetLoggedEvents()
 })
-test('start a fixup job from inline chat with valid auth', async ({ page, sidebar }) => {
+test.skip('start a fixup job from inline chat with valid auth', async ({ page, sidebar }) => {
     // Sign into Cody
     await sidebarSignin(page, sidebar)
 

vscode/test/fixtures/.vscode/settings.json

@@ -2,4 +2,6 @@
   "cody.codebase": "http://localhost:49300",
   "cody.debug.enable": true,
   "cody.debug.verbose": true,
+  "cody.inlineChat.enabled": true,
+  "cody.experimental.chatPanel": false,
 }