[Backport vscode-v1.64.x] Release Omnibox: remove feature flag

agent/src/index.test.ts

@@ -404,7 +404,7 @@ describe('Agent', () => {
             )
         }, 30_000)
 
-        it('webview/receiveMessage (type: reset)', async () => {
+        it.skip('webview/receiveMessage (type: reset)', async () => {
             const id = await client.request('chat/new', null)
             await client.request('chat/setModel', {
                 id,
@@ -441,7 +441,7 @@ describe('Agent', () => {
         }, 30_000)
 
         describe('chat/editMessage', () => {
-            it(
+            it.skip(
                 'edits the last human chat message',
                 async () => {
                     const id = await client.request('chat/new', null)

lib/shared/src/experimentation/FeatureFlagProvider.ts

@@ -74,8 +74,6 @@ export enum FeatureFlag {
 
     GitMentionProvider = 'git-mention-provider',
 
-    /** Enable experimental One Box feature in Cody */
-    CodyExperimentalOneBox = 'cody-experimental-one-box',
     /** Enable debug mode for One Box feature in Cody */
     CodyExperimentalOneBoxDebug = 'cody-experimental-one-box-debug',
     /** Enable use of new prosemirror prompt editor */

lib/shared/src/sourcegraph-api/clientConfig.test.ts

@@ -19,6 +19,8 @@ const CLIENT_CONFIG_FIXTURE: CodyClientConfig = {
     intentDetection: 'enabled',
     notices: [],
     temporarySettings: {},
+    omniBoxEnabled: false,
+    siteVersion: '5.5.0',
 }
 
 describe('ClientConfigSingleton', () => {

lib/shared/src/sourcegraph-api/clientConfig.ts

@@ -70,6 +70,12 @@ export interface CodyClientConfig {
     notices: CodyNotice[]
 
     temporarySettings: Partial<TemporarySettings>
+
+    // The version of the Sourcegraph instance.
+    siteVersion?: string
+
+    // Whether the user should be able to use the omnibox feature.
+    omniBoxEnabled: boolean
 }
 
 export const dummyClientConfigForTest: CodyClientConfig = {
@@ -83,6 +89,8 @@ export const dummyClientConfigForTest: CodyClientConfig = {
     intentDetection: 'enabled',
     temporarySettings: {},
     notices: [],
+    siteVersion: undefined,
+    omniBoxEnabled: false,
 }
 
 /**
@@ -175,92 +183,93 @@ export class ClientConfigSingleton {
     private async fetchConfig(signal?: AbortSignal): Promise<CodyClientConfig> {
         logDebug('ClientConfigSingleton', 'refreshing configuration')
 
-        // Determine based on the site version if /.api/client-config is available.
-        return graphqlClient
-            .getSiteVersion(signal)
-            .then(siteVersion => {
-                signal?.throwIfAborted()
-                if (isError(siteVersion)) {
-                    if (isAbortError(siteVersion)) {
-                        throw siteVersion
-                    }
-                    logError(
-                        'ClientConfigSingleton',
-                        'Failed to determine site version, GraphQL error',
-                        siteVersion
-                    )
-                    return false // assume /.api/client-config is not supported
-                }
+        try {
+            // Determine based on the site version if /.api/client-config is available.
+            const siteVersion = await graphqlClient.getSiteVersion(signal)
 
+            signal?.throwIfAborted()
+
+            let supportsClientConfig = false
+
+            let omniBoxEnabled = false
+
+            if (isError(siteVersion)) {
+                if (isAbortError(siteVersion)) {
+                    throw siteVersion
+                }
+                logError(
+                    'ClientConfigSingleton',
+                    'Failed to determine site version, GraphQL error',
+                    siteVersion
+                )
+
+                supportsClientConfig = false
+            } else {
                 // Insiders and dev builds support the new /.api/client-config endpoint
                 const insiderBuild = siteVersion.length > 12 || siteVersion.includes('dev')
-                if (insiderBuild) {
-                    return true
-                }
 
                 // Sourcegraph instances before 5.5.0 do not support the new /.api/client-config endpoint.
-                if (semver.lt(siteVersion, '5.5.0')) {
-                    return false
+                supportsClientConfig = insiderBuild || !semver.lt(siteVersion, '5.5.0')
+
+                // Enable OmniBox for Sourcegraph instances 6.0.0 and above or dev instances
+                omniBoxEnabled = insiderBuild || semver.gte(siteVersion, '6.0.0')
+            }
+
+            signal?.throwIfAborted()
+
+            // If /.api/client-config is not available, fallback to the myriad of GraphQL
+            // requests that we previously used to determine the client configuration
+            const clientConfig = await (supportsClientConfig
+                ? this.fetchConfigEndpoint(signal)
+                : this.fetchClientConfigLegacy(signal))
+
+            signal?.throwIfAborted()
+            logDebug('ClientConfigSingleton', 'refreshed', JSON.stringify(clientConfig))
+
+            return Promise.all([
+                graphqlClient.viewerSettings(signal),
+                graphqlClient.temporarySettings(signal),
+            ]).then(([viewerSettings, temporarySettings]) => {
+                const config: CodyClientConfig = {
+                    ...clientConfig,
+                    intentDetection: 'enabled',
+                    notices: [],
+                    temporarySettings: {},
+                    siteVersion: isError(siteVersion) ? undefined : siteVersion,
+                    omniBoxEnabled,
                 }
-                return true
-            })
-            .then(supportsClientConfig => {
-                signal?.throwIfAborted()
 
-                // If /.api/client-config is not available, fallback to the myriad of GraphQL
-                // requests that we previously used to determine the client configuration
-                if (!supportsClientConfig) {
-                    return this.fetchClientConfigLegacy(signal)
+                // Don't fail the whole chat because of viewer setting (used only to show banners)
+                if (!isError(viewerSettings)) {
+                    config.intentDetection = ['disabled', 'enabled', 'opt-in'].includes(
+                        viewerSettings['omnibox.intentDetection']
+                    )
+                        ? viewerSettings['omnibox.intentDetection']
+                        : 'enabled'
+                    // Make sure that notice object will have all important field (notices come from
+                    // instance global JSONC configuration so they can have any arbitrary field values.
+                    config.notices = Array.from<Partial<CodyNotice>, CodyNotice>(
+                        viewerSettings['cody.notices'] ?? [],
+                        (notice, index) => ({
+                            key: notice?.key ?? index.toString(),
+                            title: notice?.title ?? '',
+                            message: notice?.message ?? '',
+                        })
+                    )
                 }
 
-                return this.fetchConfigEndpoint(signal)
-            })
-            .then(clientConfig => {
-                signal?.throwIfAborted()
-                logDebug('ClientConfigSingleton', 'refreshed', JSON.stringify(clientConfig))
-                return Promise.all([
-                    graphqlClient.viewerSettings(signal),
-                    graphqlClient.temporarySettings(signal),
-                ]).then(([viewerSettings, temporarySettings]) => {
-                    const config: CodyClientConfig = {
-                        ...clientConfig,
-                        intentDetection: 'enabled',
-                        notices: [],
-                        temporarySettings: {},
-                    }
-
-                    // Don't fail the whole chat because of viewer setting (used only to show banners)
-                    if (!isError(viewerSettings)) {
-                        config.intentDetection = ['disabled', 'enabled', 'opt-in'].includes(
-                            viewerSettings['omnibox.intentDetection']
-                        )
-                            ? viewerSettings['omnibox.intentDetection']
-                            : 'enabled'
-                        // Make sure that notice object will have all important field (notices come from
-                        // instance global JSONC configuration so they can have any arbitrary field values.
-                        config.notices = Array.from<Partial<CodyNotice>, CodyNotice>(
-                            viewerSettings['cody.notices'] ?? [],
-                            (notice, index) => ({
-                                key: notice?.key ?? index.toString(),
-                                title: notice?.title ?? '',
-                                message: notice?.message ?? '',
-                            })
-                        )
-                    }
-
-                    if (!isError(temporarySettings)) {
-                        config.temporarySettings = temporarySettings
-                    }
-
-                    return config
-                })
-            })
-            .catch(e => {
-                if (!isAbortError(e)) {
-                    logError('ClientConfigSingleton', 'failed to refresh client config', e)
+                if (!isError(temporarySettings)) {
+                    config.temporarySettings = temporarySettings
                 }
-                throw e
+
+                return config
             })
+        } catch (e) {
+            if (!isAbortError(e)) {
+                logError('ClientConfigSingleton', 'failed to refresh client config', e)
+            }
+            throw e
+        }
     }
 
     private async fetchClientConfigLegacy(signal?: AbortSignal): Promise<CodyClientConfig> {
@@ -284,6 +293,7 @@ export class ClientConfigSingleton {
             userShouldUseEnterprise: false,
             notices: [],
             temporarySettings: {},
+            omniBoxEnabled: false,
         }
     }
 

vscode/src/chat/chat-view/ChatController.ts

@@ -15,7 +15,6 @@ import {
     DOTCOM_URL,
     type DefaultChatCommands,
     type EventSource,
-    FeatureFlag,
     type Guardrails,
     ModelUsage,
     type NLSSearchDynamicFilter,
@@ -60,7 +59,6 @@ import {
     skip,
     skipPendingOperation,
     startWith,
-    storeLastValue,
     subscriptionDisposable,
     telemetryRecorder,
     tracer,
@@ -196,7 +194,6 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
 
     public dispose(): void {
         vscode.Disposable.from(...this.disposables).dispose()
-        this.featureCodyExperimentalOneBox.subscription.unsubscribe()
         this.disposables = []
     }
 
@@ -538,10 +535,6 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
         return this.extensionClient.capabilities?.edit === 'enabled'
     }
 
-    private featureCodyExperimentalOneBox = storeLastValue(
-        featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.CodyExperimentalOneBox)
-    )
-
     private async getConfigForWebview(): Promise<ConfigurationSubsetForWebview & LocalEnv> {
         const { configuration, auth } = await currentResolvedConfig()
         const sidebarViewOnly = this.extensionClient.capabilities?.webviewNativeConfig?.view === 'single'
@@ -706,6 +699,12 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
         })
     }
 
+    private async isOmniBoxEnabled(): Promise<boolean> {
+        const config = await ClientConfigSingleton.getInstance().getConfig()
+
+        return !!config?.omniBoxEnabled
+    }
+
     private async getIntentAndScores({
         requestID,
         input,
@@ -725,7 +724,7 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
         detectedIntent: ChatMessage['intent'] | undefined | null
         detectedIntentScores: { intent: string; score: number }[]
     }> {
-        if (!this.featureCodyExperimentalOneBox) {
+        if (!(await this.isOmniBoxEnabled())) {
             return { intent: 'chat', detectedIntent: null, detectedIntentScores: [] }
         }
 
@@ -830,9 +829,10 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
             chatClient: this.chatClient,
         })
 
+        const omniBoxEnabled = await this.isOmniBoxEnabled()
+
         recorder.setIntentInfo({
-            userSpecifiedIntent:
-                manuallySelectedIntent ?? this.featureCodyExperimentalOneBox ? 'auto' : 'chat',
+            userSpecifiedIntent: manuallySelectedIntent ?? omniBoxEnabled ? 'auto' : 'chat',
             detectedIntent: detectedIntent,
             detectedIntentScores: detectedIntentScores,
         })
@@ -962,6 +962,10 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
           }
         | undefined
     > {
+        if (process.env.CODY_SHIM_TESTING === 'true') {
+            return
+        }
+
         const response = await wrapInActiveSpan('chat.detectChatIntent', () => {
             return this.chatIntentAPIClient?.detectChatIntent(requestID || '', text).catch(() => null)
         })

vscode/src/chat/context/chatIntentAPIClient.ts

@@ -1,33 +1,9 @@
-import {
-    FeatureFlag,
-    type SourcegraphGraphQLAPIClient,
-    featureFlagProvider,
-    storeLastValue,
-} from '@sourcegraph/cody-shared'
-import * as vscode from 'vscode'
+import type { SourcegraphGraphQLAPIClient } from '@sourcegraph/cody-shared'
 
 export class ChatIntentAPIClient {
-    private featureCodyExperimentalOneBox = storeLastValue(
-        featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.CodyExperimentalOneBox)
-    )
-
     constructor(private readonly apiClient: SourcegraphGraphQLAPIClient) {}
 
-    public dispose(): void {
-        this.featureCodyExperimentalOneBox.subscription.unsubscribe()
-    }
-
     public async detectChatIntent(interactionID: string, query: string) {
-        if (!this.isIntentDetectionAPIEnabled()) {
-            return
-        }
         return this.apiClient.chatIntent(interactionID, query)
     }
-
-    private isIntentDetectionAPIEnabled(): boolean {
-        if (vscode.workspace.getConfiguration().get<boolean>('cody.internal.intentDetectionAPI')) {
-            return true
-        }
-        return !!this.featureCodyExperimentalOneBox.value.last
-    }
 }

vscode/src/context/openctx.test.ts

@@ -9,6 +9,7 @@ import {
     mockClientCapabilities,
     mockResolvedConfig,
 } from '@sourcegraph/cody-shared'
+import { dummyClientConfigForTest } from '@sourcegraph/cody-shared/src/sourcegraph-api/clientConfig'
 import { Observable } from 'observable-fns'
 import { beforeAll, describe, expect, test, vi } from 'vitest'
 import { getOpenCtxProviders } from './openctx'
@@ -31,18 +32,24 @@ describe('getOpenCtxProviders', () => {
         return Observable.of({ endpoint: isDotCom ? DOTCOM_URL.toString() : 'https://example.com' })
     }
 
+    const mockClientConfig = Observable.of(dummyClientConfigForTest)
+
     test('dotcom user', async () => {
         vi.spyOn(featureFlagProvider, 'evaluatedFeatureFlag').mockReturnValue(Observable.of(false))
 
-        const providers = await firstValueFrom(getOpenCtxProviders(mockAuthStatus(true), true))
+        const providers = await firstValueFrom(
+            getOpenCtxProviders(mockAuthStatus(true), mockClientConfig, true)
+        )
 
         expect(providers.map(p => p.providerUri)).toEqual([WEB_PROVIDER_URI])
     })
 
     test('enterprise user', async () => {
         vi.spyOn(featureFlagProvider, 'evaluatedFeatureFlag').mockReturnValue(Observable.of(false))
 
-        const providers = await firstValueFrom(getOpenCtxProviders(mockAuthStatus(false), true))
+        const providers = await firstValueFrom(
+            getOpenCtxProviders(mockAuthStatus(false), mockClientConfig, true)
+        )
 
         expect(providers.map(p => p.providerUri)).toEqual([
             WEB_PROVIDER_URI,
@@ -55,7 +62,9 @@ describe('getOpenCtxProviders', () => {
     test('should include gitMentionsProvider when feature flag is true', async () => {
         vi.spyOn(featureFlagProvider, 'evaluatedFeatureFlag').mockReturnValue(Observable.of(true))
 
-        const providers = await firstValueFrom(getOpenCtxProviders(mockAuthStatus(false), true))
+        const providers = await firstValueFrom(
+            getOpenCtxProviders(mockAuthStatus(false), mockClientConfig, true)
+        )
 
         expect(providers.map(p => p.providerUri)).toContain(GIT_OPENCTX_PROVIDER_URI)
     })