fix(codegen): Adds special cases for AuthStatus to re-enable codegen

.github/workflows/agent-bindings.yml

@@ -0,0 +1,38 @@
+# Please post in #team-cody-clients if you need help getting this CI check to pass.
+# Worst-case: feel free to disable this workflow here https://github.com/sourcegraph/cody/actions/workflows/agent-bindings.yml
+name: agent-bindings
+on:
+
+  pull_request:
+    paths:
+      - '**.ts'
+      - '**.tsx'
+      - '**.js'
+
+jobs:
+  kotlin:
+    if: github.repository == 'sourcegraph/cody'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
+        id: pnpm-install
+        with:
+          version: 8.6.7
+          run_install: false
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm generate-agent-kotlin-bindings
+      - run: ./agent/scripts/error-if-diff.sh
+      - run: ./agent/scripts/compile-bindings-if-diff.sh

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

@@ -1,7 +1,6 @@
 @file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
 package com.sourcegraph.cody.agent.protocol_generated;
 
-import com.google.gson.annotations.SerializedName;
 import com.google.gson.Gson;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -12,11 +11,10 @@ sealed class AuthStatus {
   companion object {
     val deserializer: JsonDeserializer<AuthStatus> =
       JsonDeserializer { element: JsonElement, _: Type, context: JsonDeserializationContext ->
-          if (element.getAsJsonObject().get("username") == null) {
-              context.deserialize<UnauthenticatedAuthStatus>(element, UnauthenticatedAuthStatus::class.java)
-          } else {
-              context.deserialize<AuthenticatedAuthStatus>(element, AuthenticatedAuthStatus::class.java)
-          }
+        when (element.getAsJsonObject().get("authenticated").getAsBoolean()) {
+          false -> context.deserialize<UnauthenticatedAuthStatus>(element, UnauthenticatedAuthStatus::class.java)
+          true -> context.deserialize<AuthenticatedAuthStatus>(element, AuthenticatedAuthStatus::class.java)
+        }
       }
   }
 }
@@ -27,8 +25,7 @@ data class UnauthenticatedAuthStatus(
   val showNetworkError: Boolean? = null,
   val showInvalidAccessTokenError: Boolean? = null,
   val pendingValidation: Boolean,
-) : AuthStatus() {
-}
+) : AuthStatus()
 
 data class AuthenticatedAuthStatus(
   val endpoint: String,
@@ -41,6 +38,6 @@ data class AuthenticatedAuthStatus(
   val displayName: String? = null,
   val avatarURL: String? = null,
   val pendingValidation: Boolean,
-) : AuthStatus() {
-}
+  val organizations: List<OrganizationsParams>? = null,
+) : AuthStatus()
 

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

@@ -120,6 +120,8 @@ interface CodyAgentServer {
   fun testing_autocomplete_awaitPendingVisibilityTimeout(params: Null?): CompletableFuture<CompletionItemID?>
   @JsonRequest("testing/autocomplete/setCompletionVisibilityDelay")
   fun testing_autocomplete_setCompletionVisibilityDelay(params: Testing_Autocomplete_SetCompletionVisibilityDelayParams): CompletableFuture<Null?>
+  @JsonRequest("testing/autocomplete/providerConfig")
+  fun testing_autocomplete_providerConfig(params: Null?): CompletableFuture<Testing_Autocomplete_ProviderConfigResult>
   @JsonRequest("extensionConfiguration/change")
   fun extensionConfiguration_change(params: ExtensionConfiguration): CompletableFuture<AuthStatus?>
   @JsonRequest("extensionConfiguration/status")

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

@@ -41,7 +41,6 @@ object Constants {
   const val function = "function"
   const val gateway = "gateway"
   const val history = "history"
-  const val `https-example-com` = "https://example.com"
   const val human = "human"
   const val ignore = "ignore"
   const val indentation = "indentation"

agent/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Chat_RestoreParams.kt → agent/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/OrganizationsParams.kt

@@ -1,9 +1,8 @@
 @file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
 package com.sourcegraph.cody.agent.protocol_generated;
 
-data class Chat_RestoreParams(
-  val modelID: String? = null,
-  val messages: List<SerializedChatMessage>,
-  val chatID: String,
+data class OrganizationsParams(
+  val name: String,
+  val id: String,
 )
 

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

@@ -10,12 +10,18 @@ data class SerializedChatMessage(
   val speaker: SpeakerEnum, // Oneof: human, assistant, system
   val text: String? = null,
   val model: String? = null,
+  val intent: IntentEnum? = null, // Oneof: search, chat
 ) {
 
   enum class SpeakerEnum {
     @SerializedName("human") Human,
     @SerializedName("assistant") Assistant,
     @SerializedName("system") System,
   }
+
+  enum class IntentEnum {
+    @SerializedName("search") Search,
+    @SerializedName("chat") Chat,
+  }
 }
 

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

@@ -0,0 +1,9 @@
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Testing_Autocomplete_ProviderConfigResult(
+  val id: String,
+  val legacyModel: String,
+  val configSource: String,
+)
+

agent/src/agent.ts

@@ -994,7 +994,7 @@ export class Agent extends MessageHandler implements ExtensionClient {
 
         this.registerAuthenticatedRequest('testing/autocomplete/providerConfig', async () => {
             const provider = await vscode_shim.completionProvider()
-            return provider.config
+            return provider.config.provider
         })
 
         this.registerAuthenticatedRequest('graphql/getRepoIds', async ({ names, first }) => {

agent/src/cli/scip-codegen/BaseCodegen.ts

@@ -21,8 +21,18 @@ export interface ProtocolSymbol {
     kind: ProtocolMethodKind
 }
 
+export type ConstantType = string | boolean | number
+export type ConstantTypeType = 'string' | 'boolean' | 'number'
+
+export function typeOfUnion(union: DiscriminatedUnion): ConstantTypeType {
+    if (union.members.length === 0) {
+        throw new TypeError(`Union ${JSON.stringify(union, null, 2)} has no members`)
+    }
+    return typeof union.members[0].value as ConstantTypeType
+}
+
 export interface DiscriminatedUnionMember {
-    value: string
+    value: ConstantType
     type: scip.Type
 }
 export interface DiscriminatedUnion {