Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/vs/workbench/api/browser/mainThreadChatProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export class MainThreadChatProvider implements MainThreadChatProviderShape {

task.catch(err => {
this._logService.error('[CHAT] extension request ERRORED', err, extension.value, requestId);
throw err;
}).finally(() => {
this._logService.debug('[CHAT] extension request DONE', extension.value, requestId);
});
Expand Down
31 changes: 23 additions & 8 deletions src/vs/workbench/api/common/extHostChatProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { Emitter, Event } from 'vs/base/common/event';
import { ExtHostAuthentication } from 'vs/workbench/api/common/extHostAuthentication';
import { localize } from 'vs/nls';
import { INTERNAL_AUTH_PROVIDER_PREFIX } from 'vs/workbench/services/authentication/common/authentication';
import { toErrorMessage } from 'vs/base/common/errorMessage';

type LanguageModelData = {
readonly extension: ExtensionIdentifier;
Expand Down Expand Up @@ -54,18 +55,32 @@ class LanguageModelRequest {
// responses: AsyncIterable<string>[] // FUTURE responses per N
};

promise.finally(() => {
this._isDone = true;
if (this._responseStreams.size > 0) {
for (const [, value] of this._responseStreams) {
value.stream.resolve();
}
} else {
this._defaultStream.resolve();
promise.then(() => {
for (const stream of this._streams()) {
stream.resolve();
}
}).catch(err => {
if (!(err instanceof Error)) {
err = new Error(toErrorMessage(err), { cause: err });
}
for (const stream of this._streams()) {
stream.reject(err);
}
}).finally(() => {
this._isDone = true;
});
}

private * _streams() {
if (this._responseStreams.size > 0) {
for (const [, value] of this._responseStreams) {
yield value.stream;
}
} else {
yield this._defaultStream;
}
}

handleFragment(fragment: IChatResponseFragment): void {
if (this._isDone) {
return;
Expand Down