Troubleshoot: Show auth connection issues

agent/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/Constants.kt

@@ -105,12 +105,12 @@ object Constants {
   const val gitlab = "gitlab"
   const val google = "google"
   const val abort = "abort"
-  const val reload = "reload"
   const val `web-sign-in-token` = "web-sign-in-token"
   const val getUserContext = "getUserContext"
   const val `show-search-result` = "show-search-result"
   const val reset = "reset"
   const val `attribution-search` = "attribution-search"
+  const val troubleshoot_reloadAuth = "troubleshoot/reloadAuth"
   const val `tree-sitter` = "tree-sitter"
   const val indentation = "indentation"
   const val Automatic = "Automatic"

agent/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/FixupTaskID.kt

@@ -0,0 +1,5 @@
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.protocol_generated
+
+typealias FixupTaskID = String // One of: 
+

agent/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/WebviewMessage.kt

@@ -37,13 +37,13 @@ sealed class WebviewMessage {
           "copy" -> context.deserialize<CopyWebviewMessage>(element, CopyWebviewMessage::class.java)
           "auth" -> context.deserialize<AuthWebviewMessage>(element, AuthWebviewMessage::class.java)
           "abort" -> context.deserialize<AbortWebviewMessage>(element, AbortWebviewMessage::class.java)
-          "reload" -> context.deserialize<ReloadWebviewMessage>(element, ReloadWebviewMessage::class.java)
           "simplified-onboarding" -> context.deserialize<`simplified-onboardingWebviewMessage`>(element, `simplified-onboardingWebviewMessage`::class.java)
           "getUserContext" -> context.deserialize<GetUserContextWebviewMessage>(element, GetUserContextWebviewMessage::class.java)
           "search" -> context.deserialize<SearchWebviewMessage>(element, SearchWebviewMessage::class.java)
           "show-search-result" -> context.deserialize<`show-search-resultWebviewMessage`>(element, `show-search-resultWebviewMessage`::class.java)
           "reset" -> context.deserialize<ResetWebviewMessage>(element, ResetWebviewMessage::class.java)
           "attribution-search" -> context.deserialize<`attribution-searchWebviewMessage`>(element, `attribution-searchWebviewMessage`::class.java)
+          "troubleshoot/reloadAuth" -> context.deserialize<Troubleshoot_reloadAuthWebviewMessage>(element, Troubleshoot_reloadAuthWebviewMessage::class.java)
           else -> throw Exception("Unknown discriminator ${element}")
         }
       }
@@ -316,15 +316,6 @@ data class AbortWebviewMessage(
   }
 }
 
-data class ReloadWebviewMessage(
-  val command: CommandEnum? = null, // Oneof: reload
-) : WebviewMessage() {
-
-  enum class CommandEnum {
-    @SerializedName("reload") Reload,
-  }
-}
-
 data class `simplified-onboardingWebviewMessage`(
   val command: CommandEnum? = null, // Oneof: simplified-onboarding
   val onboardingKind: OnboardingKindEnum? = null, // Oneof: web-sign-in-token
@@ -389,3 +380,12 @@ data class `attribution-searchWebviewMessage`(
   }
 }
 
+data class Troubleshoot_reloadAuthWebviewMessage(
+  val command: CommandEnum? = null, // Oneof: troubleshoot/reloadAuth
+) : WebviewMessage() {
+
+  enum class CommandEnum {
+    @SerializedName("troubleshoot/reloadAuth") Troubleshoot_reloadAuth,
+  }
+}
+

lib/shared/src/sourcegraph-api/graphql/client.ts

@@ -853,7 +853,7 @@ export class SourcegraphGraphQLAPIClient {
 
     // make an anonymous request to the Testing API
     private fetchSourcegraphTestingAPI<T>(body: Record<string, any>): Promise<T | Error> {
-        const url = 'http://localhost:49300/.api/testLogging'
+        const url = 'http://localhost:49300/.test/testLogging'
         const headers = new Headers({
             'Content-Type': 'application/json',
         })

lib/shared/src/sourcegraph-api/telemetry/MockServerTelemetryExporter.ts

@@ -4,11 +4,11 @@ import { logError } from '../../logger'
 import { isError } from '../../utils'
 
 const MOCK_URL = 'http://localhost:49300'
-const ENDPOINT = '/.api/mockEventRecording'
+const ENDPOINT = '/.test/mockEventRecording'
 
 /**
  * MockServerTelemetryExporter exports events to a mock endpoint at
- * http://localhost:49300/.api/mockEventRecording
+ * http://localhost:49300/.test/mockEventRecording
  */
 export class MockServerTelemetryExporter implements TelemetryExporter {
     constructor(private anonymousUserID: string) {}

vscode/.storybook/preview.ts

@@ -0,0 +1,28 @@
+// Replace your-framework with the framework you are using (e.g., react, vue3)
+import type { Preview } from '@storybook/react'
+
+const preview: Preview = {
+    parameters: {
+        viewport: {
+            viewports: [
+                {
+                    name: 'VSCode Normal Sidebar',
+                    styles: { width: '400px', height: '800px' },
+                    type: 'desktop',
+                },
+                {
+                    name: 'VSCode Wide Sidebar',
+                    styles: { width: '700px', height: '800px' },
+                    type: 'desktop',
+                },
+                {
+                    name: 'VSCode Tall Sidebar',
+                    styles: { width: '500px', height: '1200px' },
+                    type: 'desktop',
+                },
+            ],
+        },
+    },
+}
+
+export default preview

vscode/CHANGELOG.md

@@ -17,6 +17,8 @@ This is a log of all notable changes to Cody for VS Code. [Unreleased] changes a
 
 - Generate Unit Tests: Fixed an issue where Cody would generate tests for the wrong code in the file. [pull/3759](https://github.com/sourcegraph/cody/pull/3759)
 - Chat: Fixed an issue where changing the chat model did not update the token limit for the model. [pull/3762](https://github.com/sourcegraph/cody/pull/3762)
+- Troubleshoot: Don't show SignIn page if the authentication error is because of network connectivity issues [pull/3750](https://github.com/sourcegraph/cody/pull/3750)
+
 - Edit: Large file warnings for @-mentions are now updated dynamically as you add or remove them. [pull/3767](https://github.com/sourcegraph/cody/pull/3767)
 - Generate Unit Tests: Improved quality for creating file names. [pull/3763](https://github.com/sourcegraph/cody/pull/3763)
 - Custom Commands: Fixed an issue where newly added custom commands were not working when clicked in the sidebar tree view. [pull/3804](https://github.com/sourcegraph/cody/pull/3804)

vscode/src/chat/ContextProvider.ts

@@ -164,7 +164,12 @@ export class ContextProvider implements vscode.Disposable, ContextStatusProvider
         await this.onConfigurationChange(newConfig)
         // When logged out, user's endpoint will be set to null
         const isLoggedOut = !authStatus.isLoggedIn && !authStatus.endpoint
-        const eventValue = isLoggedOut ? 'disconnected' : authStatus.isLoggedIn ? 'connected' : 'failed'
+        const isAuthError = authStatus?.showNetworkError || authStatus?.showInvalidAccessTokenError
+        const eventValue = isLoggedOut
+            ? 'disconnected'
+            : authStatus.isLoggedIn && !isAuthError
+              ? 'connected'
+              : 'failed'
         switch (ContextEvent.Auth) {
             case 'auth':
                 telemetryService.log(`${logPrefix(newConfig.agentIDE)}:Auth:${eventValue}`, undefined, {

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

@@ -117,13 +117,6 @@ export class SidebarViewController implements vscode.WebviewViewProvider {
                 await vscode.commands.executeCommand(`cody.auth.${message.authKind}`)
                 break
             }
-            case 'reload':
-                await this.authProvider.reloadAuthStatus()
-                telemetryService.log('CodyVSCodeExtension:authReloadButton:clicked', undefined, {
-                    hasV2Event: true,
-                })
-                telemetryRecorder.recordEvent('cody.authReloadButton', 'clicked')
-                break
             case 'event':
                 telemetryService.log(message.eventName, message.properties)
                 break
@@ -151,6 +144,25 @@ export class SidebarViewController implements vscode.WebviewViewProvider {
             case 'show-page':
                 await vscode.commands.executeCommand('show-page', message.page)
                 break
+            case 'troubleshoot/reloadAuth': {
+                await this.authProvider.reloadAuthStatus()
+                const nextAuth = this.authProvider.getAuthStatus()
+                telemetryService.log(
+                    'CodyVSCodeExtension:troubleshoot:reloadAuth',
+                    {
+                        success: Boolean(nextAuth?.isLoggedIn),
+                    },
+                    {
+                        hasV2Event: true,
+                    }
+                )
+                telemetryRecorder.recordEvent('cody.troubleshoot', 'reloadAuth', {
+                    metadata: {
+                        success: nextAuth.isLoggedIn ? 1 : 0,
+                    },
+                })
+                break
+            }
             default:
                 this.handleError(new Error('Invalid request type from Webview'), 'system')
         }

vscode/src/chat/protocol.ts

@@ -71,7 +71,6 @@ export type WebviewMessage =
           authMethod?: AuthMethod
       }
     | { command: 'abort' }
-    | { command: 'reload' }
     | {
           command: 'simplified-onboarding'
           onboardingKind: 'web-sign-in-token'
@@ -90,6 +89,9 @@ export type WebviewMessage =
           command: 'attribution-search'
           snippet: string
       }
+    | {
+          command: 'troubleshoot/reloadAuth'
+      }
 
 /**
  * A message sent from the extension host to the webview.

vscode/src/services/AuthProvider.ts

@@ -56,6 +56,10 @@ export class AuthProvider {
     public async init(): Promise<void> {
         let lastEndpoint = localStorage?.getEndpoint() || this.config.serverEndpoint
         let token = (await secretStorage.get(lastEndpoint || '')) || this.config.accessToken
+        logDebug(
+            'AuthProvider:init',
+            token?.trim() ? 'Token recovered from secretStorage' : 'No token found in secretStorage'
+        )
         if (lastEndpoint === LOCAL_APP_URL.toString()) {
             // If the user last signed in to app, which talks to dotcom, try
             // signing them in to dotcom.

vscode/src/services/SecretStorageProvider.ts

@@ -19,6 +19,10 @@ export async function getAccessToken(): Promise<string | null> {
     }
 }
 
+export async function clearAccessToken(): Promise<void> {
+    await secretStorage.delete(CODY_ACCESS_TOKEN_SECRET)
+}
+
 interface SecretStorage {
     get(key: string): Promise<string | undefined>
     store(key: string, value: string): Promise<void>
@@ -120,12 +124,28 @@ export class VSCodeSecretStorage implements SecretStorage {
 }
 
 class InMemorySecretStorage implements SecretStorage {
-    private storage: Map<string, string>
-    private callbacks: ((key: string) => Promise<void>)[]
-
-    constructor() {
-        this.storage = new Map<string, string>()
-        this.callbacks = []
+    private storage: Map<string, string> = new Map<string, string>()
+    private callbacks: ((key: string) => Promise<void>)[] = []
+
+    constructor(initialState?: string | undefined, initialToken?: string | undefined) {
+        if (initialState) {
+            const parsedState = JSON.parse(initialState)
+            if (Array.isArray(parsedState)) {
+                for (const [key, value] of parsedState) {
+                    this.storage.set(key, value)
+                }
+            } else {
+                throw new Error('Initial secret storage state must be an array of (key, value) entries')
+            }
+        }
+        if (initialToken) {
+            const parsedToken = JSON.parse(initialToken)
+            if (Array.isArray(parsedToken) && parsedToken.length === 2) {
+                this.storeToken(parsedToken[0], parsedToken[1])
+            } else {
+                throw new Error('Initial token must be an array with [endpoint, value]')
+            }
+        }
     }
 
     public async get(key: string): Promise<string | undefined> {
@@ -202,5 +222,8 @@ interface ConfigJson {
  */
 export const secretStorage =
     process.env.CODY_TESTING === 'true' || process.env.CODY_PROFILE_TEMP === 'true'
-        ? new InMemorySecretStorage()
+        ? new InMemorySecretStorage(
+              process.env.CODY_TESTING === 'true' ? process.env.TESTING_SECRET_STORAGE_STATE : undefined,
+              process.env.CODY_TESTING === 'true' ? process.env.TESTING_SECRET_STORAGE_TOKEN : undefined
+          )
         : new VSCodeSecretStorage()

vscode/src/services/StatusBar.ts

@@ -263,11 +263,21 @@ export function createStatusBar(): CodyStatusBar {
         // Only show this if authStatus is present, otherwise you get a flash of
         // yellow status bar icon when extension first loads but login hasn't
         // initialized yet
-        if (authStatus && !authStatus.isLoggedIn) {
-            statusBarItem.text = '$(cody-logo-heavy) Sign In'
-            statusBarItem.tooltip = 'Sign in to get started with Cody'
-            statusBarItem.backgroundColor = new vscode.ThemeColor('statusBarItem.warningBackground')
-            return
+        if (authStatus) {
+            if (authStatus.showNetworkError) {
+                statusBarItem.text = '$(cody-logo-heavy) Connection Issues'
+                statusBarItem.tooltip = 'Resolve network issues for Cody to work again'
+                // statusBarItem.color = new vscode.ThemeColor('statusBarItem.errorForeground')
+                statusBarItem.backgroundColor = new vscode.ThemeColor('statusBarItem.errorBackground')
+                return
+            }
+            if (!authStatus.isLoggedIn) {
+                statusBarItem.text = '$(cody-logo-heavy) Sign In'
+                statusBarItem.tooltip = 'Sign in to get started with Cody'
+                // statusBarItem.color = new vscode.ThemeColor('statusBarItem.warningForeground')
+                statusBarItem.backgroundColor = new vscode.ThemeColor('statusBarItem.warningBackground')
+                return
+            }
         }
 
         if (errors.length > 0) {

vscode/test/e2e/auth.test.ts

@@ -1,5 +1,4 @@
 import { expect } from '@playwright/test'
-
 import { SERVER_URL, VALID_TOKEN } from '../fixtures/mock-server'
 
 import { type ExpectedEvents, signOut, test } from './helpers'
@@ -26,7 +25,7 @@ test.extend<ExpectedEvents>({
     ],
 })('requires a valid auth token and allows logouts', async ({ page, sidebar }) => {
     await expect(page.getByText('Authentication failed.')).not.toBeVisible()
-    await sidebar.getByRole('button', { name: 'Sign In to Your Enterprise Instance' }).click()
+    await sidebar?.getByRole('button', { name: 'Sign In to Your Enterprise Instance' }).click()
     await page.getByRole('option', { name: 'Sign In with URL and Access Token' }).click()
     await page.getByRole('combobox', { name: 'input' }).fill(SERVER_URL)
     await page.getByRole('combobox', { name: 'input' }).press('Enter')
@@ -35,7 +34,7 @@ test.extend<ExpectedEvents>({
 
     await expect(page.getByRole('alert').getByText('Authentication failed.')).toBeVisible()
 
-    await sidebar.getByRole('button', { name: 'Sign In to Your Enterprise Instance' }).click()
+    await sidebar?.getByRole('button', { name: 'Sign In to Your Enterprise Instance' }).click()
     await page.getByRole('option', { name: 'Sign In with URL and Access Token' }).click()
     await page.getByRole('combobox', { name: 'input' }).fill(SERVER_URL)
     await page.getByRole('combobox', { name: 'input' }).press('Enter')

vscode/test/e2e/common.ts

@@ -6,9 +6,12 @@ import { executeCommandInPalette } from './helpers'
 // Sign into Cody with valid auth from the sidebar
 export const sidebarSignin = async (
     page: Page,
-    sidebar: Frame,
+    sidebar: Frame | null,
     enableNotifications = false
 ): Promise<void> => {
+    if (sidebar === null) {
+        throw new Error('Sidebar is null, likely because preAuthenticate is `true`')
+    }
     await sidebar.getByRole('button', { name: 'Sign In to Your Enterprise Instance' }).click()
     await page.getByRole('option', { name: 'Sign In with URL and Access Token' }).click()
     await page.getByRole('combobox', { name: 'input' }).fill(SERVER_URL)
@@ -21,6 +24,10 @@ export const sidebarSignin = async (
         await disableNotifications(page)
     }
 
+    await expectAuthenticated(page)
+}
+
+export async function expectAuthenticated(page: Page) {
     await expect(page.getByText('Chat alongside your code, attach files,')).toBeVisible()
 }