Skip to content

Commit 4978dce

Browse files
authored
Unexpected chat message content type when running other tools in participant (#6395)
Fixes #6379
1 parent e0c70df commit 4978dce

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3686,7 +3686,7 @@
36863686
"@octokit/rest": "18.2.1",
36873687
"@octokit/types": "6.10.1",
36883688
"@vscode/extension-telemetry": "0.7.5",
3689-
"@vscode/prompt-tsx": "^0.3.0-alpha",
3689+
"@vscode/prompt-tsx": "^0.3.0-alpha.11",
36903690
"apollo-boost": "^0.4.9",
36913691
"apollo-link-context": "1.0.20",
36923692
"cockatiel": "^3.1.1",

src/lm/participants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class ChatParticipant implements vscode.Disposable {
100100
{ modelMaxPromptTokens: model.maxInputTokens },
101101
model);
102102

103-
this.state.addMessages(messages as any);
103+
this.state.addMessages(messages);
104104

105105
const toolReferences = [...request.toolReferences];
106106
const options: vscode.LanguageModelChatRequestOptions = {
@@ -165,6 +165,7 @@ export class ChatParticipant implements vscode.Disposable {
165165
const part = toolCallResult.content[i];
166166
if (!(part instanceof vscode.LanguageModelTextPart)) {
167167
// We only support text results for now, will change when we finish adopting prompt-tsx
168+
result = new vscode.LanguageModelToolResultPart(toolCall.call.callId, toolCallResult.content);
168169
continue;
169170
}
170171

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -791,10 +791,10 @@
791791
"@microsoft/applicationinsights-web-basic" "^2.8.9"
792792
applicationinsights "2.4.1"
793793

794-
"@vscode/prompt-tsx@^0.3.0-alpha":
795-
version "0.3.0-alpha.8"
796-
resolved "https://registry.yarnpkg.com/@vscode/prompt-tsx/-/prompt-tsx-0.3.0-alpha.8.tgz#94de46269bd054e6ad2f3dfe613f85d9c66e7f0c"
797-
integrity sha512-uhGZve/mhrSkFNU1zvhcbbPL8laT8Ytlk3q5sswE8XnveiCb7eANk7Ea4IkKI3KvbThX3p3cl3xOauHuqrhlSg==
794+
"@vscode/prompt-tsx@^0.3.0-alpha.11":
795+
version "0.3.0-alpha.11"
796+
resolved "https://registry.yarnpkg.com/@vscode/prompt-tsx/-/prompt-tsx-0.3.0-alpha.11.tgz#32b2e7df6263defd7da7a33a439b4259768a65c1"
797+
integrity sha512-ThJinCs/eIaAqof8GcI6VUuY16XWiiEST1+gZOlR0vJP6vg4HzM/sUWDHGWHk/jwiYpffiAFgDpbfzuhr4seRw==
798798

799799
"@vscode/test-electron@^2.3.8":
800800
version "2.3.8"

0 commit comments

Comments
 (0)