Merge branch 'main' into ni/streaming-kmp

* main:
  VSCODE-640: Adapt message content access to latest vscode API (#857)
  Update changelog (#856)

Author: nirinchev

.vscode/launch.json

@@ -40,6 +40,20 @@
       "outFiles": [
         "${workspaceFolder}/dist/**/*.js"
       ]
+    },
+    {
+      "name": "Run Tests",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+        "${workspaceFolder}/out/test/suite", // TODO: VSCODE-641 - remove suite
+        "--disable-extensions",
+        "--extensionDevelopmentPath=${workspaceFolder}",
+        "--extensionTestsPath=${workspaceFolder}/out/test/suite"
+      ],
+      "outFiles": ["${workspaceFolder}/out/**/*.js"],
+      "preLaunchTask": "npm: compile:extension",
     }
   ],
   "compounds": [

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## [v1.9.2](https://github.com/mongodb-js/vscode/releases/tag/v1.9.2) - 2024-10-21
+
+## What's Changed
+* fix(chat): show empty docs msg, schema set msg content correctly VSCODE-628 by @Anemy in https://github.com/mongodb-js/vscode/pull/851
+* chore(participant): move docs references after content VSCODE-629 by @Anemy in https://github.com/mongodb-js/vscode/pull/852
+* fix: use new connection form by @paula-stacho in https://github.com/mongodb-js/vscode/pull/815
+* chore(chat): update docs chatbot request headers VSCODE-634 by @Anemy in https://github.com/mongodb-js/vscode/pull/853
+* chore: use the latest vsce that adds the chat-participant tag VSCODE-638 by @alenakhineika in https://github.com/mongodb-js/vscode/pull/855
+
+
+**Full Changelog**: https://github.com/mongodb-js/vscode/compare/v1.9.1...v1.9.2
+
+
 ## [v1.9.1](https://github.com/mongodb-js/vscode/releases/tag/v1.9.1) - 2024-09-30
 
 ## What's Changed
@@ -401,14 +414,3 @@ To dig deeper please feel free to follow the links mentioned below:
 - Fix launching mongodb shell with ssl in bash (VSCODE-227, #270)
 
 
-## [v0.4.2](https://github.com/mongodb-js/vscode/releases/tag/v0.4.2) - 2021-02-17
-
-### Added
-
-- Add icon to refresh collection documents list (#264)
-
-### Changed
-
-- Updated the Atlas link to have https (#259)
-
-

src/participant/participant.ts

@@ -10,7 +10,7 @@ import type { LoadedConnection } from '../storage/connectionStorage';
 import EXTENSION_COMMANDS from '../commands';
 import type { StorageController } from '../storage';
 import { StorageVariables } from '../storage';
-import { Prompts } from './prompts';
+import { getContentLength, Prompts } from './prompts';
 import type { ChatResult } from './constants';
 import {
   askToConnectChatResult,
@@ -189,7 +189,7 @@ export default class ParticipantController {
         (message: vscode.LanguageModelChatMessage) =>
           util.inspect({
             role: message.role,
-            contentLength: message.content.length,
+            contentLength: getContentLength(message),
           })
       ),
     });
@@ -790,15 +790,18 @@ export default class ParticipantController {
       // it currently errors (not on insiders, only main VSCode).
       // Here we're defaulting to have some content as a workaround.
       // TODO: Remove this when the issue is fixed.
-      messagesWithNamespace.messages[
-        messagesWithNamespace.messages.length - 1
-        // eslint-disable-next-line new-cap
-      ] = vscode.LanguageModelChatMessage.User(
+      if (
+        !Prompts.doMessagesContainUserInput([
+          messagesWithNamespace.messages[
+            messagesWithNamespace.messages.length - 1
+          ],
+        ])
+      ) {
         messagesWithNamespace.messages[
           messagesWithNamespace.messages.length - 1
-        ].content.trim() || 'see previous messages'
-      );
-
+          // eslint-disable-next-line new-cap
+        ] = vscode.LanguageModelChatMessage.User('see previous messages');
+      }
       const responseContentWithNamespace = await this.getChatResponseContent({
         modelInput: messagesWithNamespace,
         token,

src/participant/prompts/index.ts

@@ -5,6 +5,9 @@ import { IntentPrompt } from './intent';
 import { NamespacePrompt } from './namespace';
 import { QueryPrompt } from './query';
 import { SchemaPrompt } from './schema';
+import { isContentEmpty } from './promptBase';
+
+export { getContentLength } from './promptBase';
 
 export class Prompts {
   public static generic = new GenericPrompt();
@@ -26,7 +29,7 @@ export class Prompts {
     for (const message of messages) {
       if (
         message.role === vscode.LanguageModelChatMessageRole.User &&
-        message.content.trim().length > 0
+        !isContentEmpty(message)
       ) {
         return true;
       }

src/participant/prompts/promptBase.ts

@@ -24,6 +24,52 @@ export interface ModelInput {
   stats: ParticipantPromptProperties;
 }
 
+export function getContentLength(
+  message: vscode.LanguageModelChatMessage
+): number {
+  const content = message.content as any;
+  if (typeof content === 'string') {
+    return content.trim().length;
+  }
+
+  // TODO: https://github.com/microsoft/vscode/pull/231788 made it so message.content is no longer a string,
+  // but an array of things that a message can contain. This will eventually be reflected in the type definitions
+  // but until then, we're manually checking the array contents to ensure we don't break when this PR gets released
+  // in the stable channel.
+  if (Array.isArray(content)) {
+    return content.reduce((acc: number, element) => {
+      const value = element?.value ?? element?.content?.value;
+      if (typeof value === 'string') {
+        return acc + value.length;
+      }
+
+      return acc;
+    }, 0);
+  }
+
+  return 0;
+}
+
+export function isContentEmpty(
+  message: vscode.LanguageModelChatMessage
+): boolean {
+  const content = message.content as any;
+  if (typeof content === 'string') {
+    return content.trim().length === 0;
+  }
+
+  if (Array.isArray(content)) {
+    for (const element of content) {
+      const value = element?.value ?? element?.content?.value;
+      if (typeof value === 'string' && value.trim().length > 0) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
 export abstract class PromptBase<TArgs extends PromptArgsBase> {
   protected abstract getAssistantPrompt(args: TArgs): string;
 
@@ -92,7 +138,7 @@ export abstract class PromptBase<TArgs extends PromptArgsBase> {
   ): ParticipantPromptProperties {
     return {
       total_message_length: messages.reduce(
-        (acc, message) => acc + message.content.length,
+        (acc, message) => acc + getContentLength(message),
         0
       ),
       user_input_length: request.prompt.length,