[DNM] test

.github/workflows/build-with-cody.yml

@@ -39,6 +39,8 @@ jobs:
           git fetch --prune --unshallow
           echo "RELEASE_VERSION=$(git describe --tags)-$CODY_COMMIT" >> $GITHUB_ENV
       - run: ./gradlew buildPlugin "-PpluginVersion=$RELEASE_VERSION" "-Pcody.commit=$CODY_COMMIT"
+        env:
+          GITHUB_TOKEN: ${{ secrets.CODY_GITHUB_TOKEN }}
       - run: ./gradlew --stop
       - name: Upload the plugin package
         uses: actions/upload-artifact@v4

.github/workflows/experimental-release.yml

@@ -33,3 +33,4 @@ jobs:
           ./gradlew "-PpluginVersion=${RELEASE_VERSION}" publishPlugin
         env:
           PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CODY_GITHUB_TOKEN }}

.github/workflows/nightly-release.yml

@@ -33,3 +33,4 @@ jobs:
           ./gradlew "-PpluginVersion=${RELEASE_VERSION}" publishPlugin
         env:
           PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CODY_GITHUB_TOKEN }}

.github/workflows/stable-release.yml

@@ -29,3 +29,4 @@ jobs:
       - run: ./gradlew "-PpluginVersion=$RELEASE_VERSION" publishPlugin
         env:
           PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CODY_GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -44,8 +44,24 @@ jobs:
           cache: gradle
       # Skip Code Search build in CI because it's slow, and we don't use it anyway for testing purposes.
       - run: echo "SKIP_CODE_SEARCH_BUILD=true" >> $GITHUB_ENV
+      # Checkout Cody and generate protocol files
+      - name: Checkout Cody
+        uses: actions/checkout@v4
+        with:
+          repository: sourcegraph/cody
+          token: ${{ secrets.CODY_GITHUB_TOKEN }}
+          path: .cody-repo
+      - name: Install Cody Dependencies
+        run: |
+          cd .cody-repo
+          pnpm install --prefer-offline
+      - run: echo "CODY_DIR=${{ github.workspace }}/.cody-repo" >> $GITHUB_ENV
       - run: ./gradlew spotlessCheck
+        env:
+          GITHUB_TOKEN: ${{ secrets.CODY_GITHUB_TOKEN }}
       - run: ./gradlew check
+        env:
+          GITHUB_TOKEN: ${{ secrets.CODY_GITHUB_TOKEN }}
       - name: Upload the test report
         if: always()
         uses: actions/upload-artifact@v4
@@ -54,6 +70,8 @@ jobs:
           path: build/reports/tests/
           compression-level: 9
       - run: ./gradlew buildPlugin
+        env:
+          GITHUB_TOKEN: ${{ secrets.CODY_GITHUB_TOKEN }}
       - run: ./gradlew --stop
       - name: Upload the plugin package
         uses: actions/upload-artifact@v4

README.md

@@ -129,7 +129,7 @@ The plugin works with all JetBrains IDEs, including:
 - To search with Sourcegraph, press <kbd>Alt+S</kbd> (<kbd>⌥S</kbd> on Mac).
 - To share a link to your code or search through the website, right-click in the editor, and choose an action under
   the `Sourcegraph` context menu item.
-- To use your private Sourcegraph instance, open `Settings | Tools | Sourcegraph` and enter your URL and access token.
+- To use your private Sourcegraph instance, ensure that you are logged in with Cody via your instance URL and access token (please ensure you use an access token during auth).
 
 ## Settings
 

build.gradle.kts

@@ -185,7 +185,18 @@ fun download(url: String, output: File) {
   }
   println("Downloading... $url")
   assert(output.parentFile.mkdirs()) { output.parentFile }
-  Files.copy(URL(url).openStream(), output.toPath())
+
+  val githubToken = System.getenv("GITHUB_TOKEN")
+  if (url.contains("github.com") && !githubToken.isNullOrEmpty()) {
+    val connection = URL(url).openConnection() as java.net.HttpURLConnection
+    connection.setRequestProperty("Authorization", "token $githubToken")
+    connection.setRequestProperty("User-Agent", "Gradle-Build")
+    connection.instanceFollowRedirects = true
+    connection.connect()
+    Files.copy(connection.inputStream, output.toPath())
+  } else {
+    Files.copy(URL(url).openStream(), output.toPath())
+  }
 }
 
 fun copyRecursively(input: File, output: File) {
@@ -383,7 +394,7 @@ tasks {
           }
       return Paths.get(pathString).toFile()
     }
-    val url = "https://github.com/sourcegraph/cody/archive/$codyCommit.zip"
+    val url = "https://api.github.com/repos/sourcegraph/cody/zipball/$codyCommit"
     val zipFile = githubArchiveCache.resolve("$codyCommit.zip")
     download(url, zipFile)
     val destination = githubArchiveCache.resolve("cody").resolve("cody-$codyCommit")
@@ -492,7 +503,7 @@ tasks {
 
   register("copyProtocol") { copyProtocol() }
   register("buildCodeSearch") { buildCodeSearch() }
-  register("buildCody") { buildCody() }
+  register("buildCody") { doLast { buildCody() } }
 
   processResources { dependsOn(":buildCodeSearch") }
 
@@ -508,13 +519,16 @@ tasks {
   buildPlugin {
     dependsOn(project.tasks.getByPath("buildCody"))
     composedJar.get().exclude("com/intellij/codeInsight/inline/completion/**")
-    from(
-        fileTree(buildCodyDir) {
-          include("*")
-          include("webviews/**")
-        },
-    ) {
-      into("agent/")
+
+    doFirst {
+      from(
+          fileTree(buildCodyDir) {
+            include("*")
+            include("webviews/**")
+          },
+      ) {
+        into("agent/")
+      }
     }
 
     doLast {

gradle.properties

@@ -25,4 +25,4 @@ org.gradle.jvmargs=-Xmx4g -Xms500m
 nodeBinaries.commit=8755ae4c05fd476cd23f2972049111ba436c86d4
 nodeBinaries.version=v20.12.2
 cody.autocomplete.enableFormatting=true
-cody.commit=bb818530bd1200f6a1b26977d9f51ca38c04b3c1
+cody.commit=746c7172772dba3a73796842ebc87c0538235d85

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/ApiVersionId.kt

@@ -0,0 +1,10 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+typealias ApiVersionId = String // One of: 
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Attribution_SearchParams.kt

@@ -0,0 +1,13 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Attribution_SearchParams(
+  val id: String,
+  val snippet: String,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Attribution_SearchResult.kt

@@ -0,0 +1,14 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Attribution_SearchResult(
+  val error: String? = null,
+  val repoNames: List<String>,
+  val limitHit: Boolean,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/AutocompleteItem.kt

@@ -0,0 +1,14 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class AutocompleteItem(
+  val id: String,
+  val insertText: String,
+  val range: Range,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/AutocompleteParams.kt

@@ -0,0 +1,24 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+import com.google.gson.annotations.SerializedName;
+
+data class AutocompleteParams(
+  val uri: String,
+  val filePath: String? = null,
+  val position: Position,
+  val triggerKind: TriggerKindEnum? = null, // Oneof: Automatic, Invoke
+  val selectedCompletionInfo: SelectedCompletionInfo? = null,
+) {
+
+  enum class TriggerKindEnum {
+    @SerializedName("Automatic") Automatic,
+    @SerializedName("Invoke") Invoke,
+  }
+}
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/AutocompleteResult.kt

@@ -0,0 +1,13 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class AutocompleteResult(
+  val items: List<AutocompleteItem>,
+  val completionEvent: CompletionBookkeepingEvent? = null,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/BillingMetadataParams.kt

@@ -0,0 +1,13 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class BillingMetadataParams(
+  val product: String,
+  val category: String,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/CancelParams.kt

@@ -0,0 +1,12 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class CancelParams(
+  val id: String,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/ChatError.kt

@@ -0,0 +1,30 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+import com.google.gson.annotations.SerializedName;
+
+data class ChatError(
+  val kind: String? = null,
+  val name: String,
+  val message: String,
+  val retryAfter: String? = null,
+  val limit: Long? = null,
+  val userMessage: String? = null,
+  val retryAfterDate: Date? = null,
+  val retryAfterDateString: String? = null,
+  val retryMessage: String? = null,
+  val feature: String? = null,
+  val upgradeIsAvailable: Boolean? = null,
+  val isChatErrorGuard: IsChatErrorGuardEnum, // Oneof: isChatErrorGuard
+) {
+
+  enum class IsChatErrorGuardEnum {
+    @SerializedName("isChatErrorGuard") IsChatErrorGuard,
+  }
+}
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/ChatExportResult.kt

@@ -0,0 +1,13 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class ChatExportResult(
+  val chatID: String,
+  val transcript: SerializedChatTranscript,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Chat_DeleteParams.kt

@@ -0,0 +1,12 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Chat_DeleteParams(
+  val chatId: String,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Chat_ExportParams.kt

@@ -0,0 +1,12 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Chat_ExportParams(
+  val fullHistory: Boolean,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Chat_ImportParams.kt

@@ -0,0 +1,13 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Chat_ImportParams(
+  val history: Map<String, Map<String, SerializedChatTranscript>>,
+  val merge: Boolean,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Chat_ModelsParams.kt

@@ -0,0 +1,12 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Chat_ModelsParams(
+  val modelUsage: ModelUsage, // Oneof: chat, edit, autocomplete
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Chat_ModelsResult.kt

@@ -0,0 +1,12 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Chat_ModelsResult(
+  val models: List<ModelAvailabilityStatus>,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Chat_SetModelParams.kt

@@ -0,0 +1,13 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Chat_SetModelParams(
+  val id: String,
+  val model: String,
+)
+

src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Chat_Sidebar_NewResult.kt

@@ -0,0 +1,13 @@
+/*
+ * Generated file - DO NOT EDIT MANUALLY
+ * They are copied from the cody agent project using the copyProtocol gradle task.
+ * This is only a temporary solution before we fully migrate to generated protocol messages.
+ */
+@file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
+package com.sourcegraph.cody.agent.protocol_generated;
+
+data class Chat_Sidebar_NewResult(
+  val panelId: String,
+  val chatId: String,
+)
+