change: disable inline chat by default

vscode/CHANGELOG.md

@@ -14,6 +14,8 @@ 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)
+
 ## [0.16.0]
 
 ### Added

vscode/package.json

@@ -976,7 +976,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,
@@ -146,7 +146,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,