Merge remote-tracking branch 'origin/main' into bee/remove-search

Author: ichim-david

.github/workflows/ci.yml

@@ -43,43 +43,25 @@ jobs:
           - runner: ubuntu
             node: 18 # VS Code started using Node 18 in Aug 2023 in v1.82: https://code.visualstudio.com/updates/v1_82#_engineering
     runs-on: ${{ matrix.runner }}-latest
-    timeout-minutes: 10
+    timeout-minutes: 15
     permissions:
       id-token: write
       contents: read
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
+          cache: 'pnpm'
       - id: auth
         uses: google-github-actions/auth@v2
         # Skip auth if PR is from a fork
         if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           workload_identity_provider: ${{ secrets.DATA_TEAM_PROVIDER_NAME }}
           service_account: ${{ secrets.DATA_TEAM_SA_EMAIL }}
-      - uses: google-github-actions/setup-gcloud@v2
-      - run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-        shell: bash
-        id: pnpm-cache
-      - name: Restore cache pnpm store
-        id: restore-pnpm-cache
-        uses: actions/cache/restore@v4
-        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
-
-      - name: Save cache pnpm store
-        if: steps.restore-pnpm-cache.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
       - run: pnpm build
       - run: pnpm run test:unit --run
         env:
@@ -98,36 +80,19 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
       - uses: actions/setup-node@v4
         with:
           node-version-file: .tool-versions
-      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
+          cache: 'pnpm'
+      - run: pnpm install
       - id: auth
         uses: google-github-actions/auth@v2
         # Skip auth if PR is from a fork
         if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           workload_identity_provider: ${{ secrets.DATA_TEAM_PROVIDER_NAME }}
           service_account: ${{ secrets.DATA_TEAM_SA_EMAIL }}
-      - uses: google-github-actions/setup-gcloud@v2
-      - run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-        shell: bash
-        id: pnpm-cache
-      - name: Restore cache pnpm store
-        id: restore-pnpm-cache
-        uses: actions/cache@v4
-        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
-
-      - name: Save cache pnpm store
-        if: steps.restore-pnpm-cache.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
         # commands before `xvfb-run -a pnpm run test` avoid these ERROR messages:
         # - Failed to connect to the bus: Could not parse server address: Unknown address type (examples of valid types are "tcp" and on UNIX "unix")
         # - Exiting GPU process due to errors during initialization
@@ -184,36 +149,19 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
       - uses: actions/setup-node@v4
         with:
           node-version-file: .tool-versions
-      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
+          cache: 'pnpm'
+      - run: pnpm install
       - id: auth
         uses: google-github-actions/auth@v2
         # Skip auth if PR is from a fork
         if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           workload_identity_provider: ${{ secrets.DATA_TEAM_PROVIDER_NAME }}
           service_account: ${{ secrets.DATA_TEAM_SA_EMAIL }}
-      - uses: google-github-actions/setup-gcloud@v2
-      - run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-        shell: bash
-        id: pnpm-cache
-      - name: Restore cache pnpm store
-        id: restore-pnpm-cache
-        uses: actions/cache@v4
-        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
-
-      - name: Save cache pnpm store
-        if: steps.restore-pnpm-cache.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
       - run: GITHUB_REF=$BRANCH_NAME xvfb-run -a pnpm -C vscode run test:e2e --shard=${{ matrix.shard }}
         if: matrix.runner == 'ubuntu'
         env:
@@ -248,28 +196,12 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
       - uses: actions/setup-node@v4
         with:
           node-version-file: .tool-versions
-      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # SECURITY: pin third-party action hashes
-      - run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-        shell: bash
-        id: pnpm-cache
-      - name: Restore cache pnpm store
-        id: restore-pnpm-cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: ${{ runner.os }}-pnpm-store-
+          cache: 'pnpm'
       - run: pnpm install
-
-      - name: Save cache pnpm store
-        if: steps.restore-pnpm-cache.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
       # Run Biome and capture the output. If biome crashes, it still reports a
       # successful CI run (exit code 0) but that will ripple down to errors in
       # the Biome VS Code extension. This ensures that we don't accidentally

.github/workflows/release-jetbrains-stable.yml

@@ -37,6 +37,19 @@ jobs:
         env:
           PUBLISH_TOKEN: ${{ secrets.JETBRAINS_MARKETPLACE_PUBLISH_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.PRIVATE_SG_ACCESS_TOKEN }}
+      - run: pnpm run release-notes jb ${{ env.RELEASE_VERSION }}
+        env:
+          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+      - name: create release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Cody for JetBrains ${{ env.RELEASE_VERSION }}
+          draft: false
+          body_path: RELEASE_NOTES.md
       - name: Upload the report
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4

.github/workflows/release-vscode-stable.yml

@@ -62,7 +62,7 @@ jobs:
         env:
           VSCODE_MARKETPLACE_TOKEN: ${{ secrets.VSCODE_MARKETPLACE_TOKEN }}
           VSCODE_OPENVSX_TOKEN: ${{ secrets.VSCODE_OPENVSX_TOKEN }}
-      - run: pnpm -C vscode run release-notes
+      - run: pnpm run release-notes vscode ${{ env.EXT_VERSION }}
         env:
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
       - name: create release
@@ -74,7 +74,7 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: Cody for VS Code ${{ env.EXT_VERSION }}
           draft: false
-          body_path: vscode/GITHUB_CHANGELOG.md
+          body_path: RELEASE_NOTES.md
       - name: upload release asset
         uses: actions/upload-release-asset@v1
         env:

.github/workflows/test.yml

@@ -90,8 +90,6 @@ jobs:
       - name: Verify Plugin on IntelliJ Platforms
         id: verify
         uses: ChrisCarini/intellij-platform-plugin-verifier-action@v2.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           plugin-location: "*.zip"
           # TODO (pkukielka): Upper range should be bumped to 251.14649.49-EAP-SNAPSHOT

.sourcegraph/.ignore

@@ -10,6 +10,12 @@ This is a log of all notable changes to the Cody command-line tool. [Unreleased]
 
 ### Changed
 
+## 5.5.22
+
+### Fixed
+
+- `cody models list` now correctly lists models that are available for the current user.
+
 ## 5.5.15
 
 ### Fixed
@@ -82,6 +88,7 @@ This is a log of all notable changes to the Cody command-line tool. [Unreleased]
 - Running `cody help` should work now. It was previously crashing about a missing keytar dependencies.
 
 ## 0.1.1
+
 ### Fixed
 
 - Running `npm install -g @sourcegraph/cody-agent` should work now. It was previously crashing about a missing keytar dependency.

agent/CHANGELOG.md

@@ -9,20 +9,19 @@ data class ClientCapabilities(
   val autoedit: AutoeditEnum? = null, // Oneof: none, enabled
   val autoeditInlineDiff: AutoeditInlineDiffEnum? = null, // Oneof: none, insertions-only, deletions-only, insertions-and-deletions
   val autoeditAsideDiff: AutoeditAsideDiffEnum? = null, // Oneof: none, image, diff
-  val autoeditSuggestToEnroll: AutoeditSuggestToEnrollEnum? = null, // Oneof: none, enabled
   val chat: ChatEnum? = null, // Oneof: none, streaming
   val git: GitEnum? = null, // Oneof: none, enabled
   val progressBars: ProgressBarsEnum? = null, // Oneof: none, enabled
   val edit: EditEnum? = null, // Oneof: none, enabled
   val editWorkspace: EditWorkspaceEnum? = null, // Oneof: none, enabled
-  val untitledDocuments: UntitledDocumentsEnum? = null, // Oneof: none, enabled
   val showDocument: ShowDocumentEnum? = null, // Oneof: none, enabled
   val codeLenses: CodeLensesEnum? = null, // Oneof: none, enabled
   val showWindowMessage: ShowWindowMessageEnum? = null, // Oneof: notification, request
   val ignore: IgnoreEnum? = null, // Oneof: none, enabled
   val codeActions: CodeActionsEnum? = null, // Oneof: none, enabled
   val disabledMentionsProviders: List<ContextMentionProviderID>? = null,
   val accountSwitchingInWebview: AccountSwitchingInWebviewEnum? = null, // Oneof: none, enabled
+  val codeCopyOnlyAction: CodeCopyOnlyActionEnum? = null, // Oneof: none, enabled
   val shell: ShellEnum? = null, // Oneof: none, enabled
   val webviewMessages: WebviewMessagesEnum? = null, // Oneof: object-encoded, string-encoded
   val globalState: GlobalStateEnum? = null, // Oneof: stateless, server-managed, client-managed
@@ -58,11 +57,6 @@ data class ClientCapabilities(
     @SerializedName("diff") Diff,
   }
 
-  enum class AutoeditSuggestToEnrollEnum {
-    @SerializedName("none") None,
-    @SerializedName("enabled") Enabled,
-  }
-
   enum class ChatEnum {
     @SerializedName("none") None,
     @SerializedName("streaming") Streaming,
@@ -88,11 +82,6 @@ data class ClientCapabilities(
     @SerializedName("enabled") Enabled,
   }
 
-  enum class UntitledDocumentsEnum {
-    @SerializedName("none") None,
-    @SerializedName("enabled") Enabled,
-  }
-
   enum class ShowDocumentEnum {
     @SerializedName("none") None,
     @SerializedName("enabled") Enabled,
@@ -123,6 +112,11 @@ data class ClientCapabilities(
     @SerializedName("enabled") Enabled,
   }
 
+  enum class CodeCopyOnlyActionEnum {
+    @SerializedName("none") None,
+    @SerializedName("enabled") Enabled,
+  }
+
   enum class ShellEnum {
     @SerializedName("none") None,
     @SerializedName("enabled") Enabled,

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

@@ -16,8 +16,6 @@ interface CodyAgentClient {
   fun window_showSaveDialog(params: SaveDialogOptionsParams): CompletableFuture<String?>
   @JsonRequest("textDocument/edit")
   fun textDocument_edit(params: TextDocumentEditParams): CompletableFuture<Boolean>
-  @JsonRequest("textDocument/openUntitledDocument")
-  fun textDocument_openUntitledDocument(params: UntitledTextDocument): CompletableFuture<ProtocolTextDocument?>
   @JsonRequest("textDocument/show")
   fun textDocument_show(params: TextDocument_ShowParams): CompletableFuture<Boolean>
   @JsonRequest("textEditor/selection")

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

@@ -178,10 +178,14 @@ interface CodyAgentServer {
   fun autocomplete_completionAccepted(params: CompletionItemParams)
   @JsonNotification("progress/cancel")
   fun progress_cancel(params: Progress_CancelParams)
+  @JsonNotification("testing/runInAgent")
+  fun testing_runInAgent(params: String)
   @JsonNotification("webview/didDisposeNative")
   fun webview_didDisposeNative(params: Webview_DidDisposeNativeParams)
   @JsonNotification("secrets/didChange")
   fun secrets_didChange(params: Secrets_DidChangeParams)
   @JsonNotification("window/didChangeFocus")
   fun window_didChangeFocus(params: Window_DidChangeFocusParams)
+  @JsonNotification("testing/resetStorage")
+  fun testing_resetStorage(params: Null?)
 }