fix: don't show welcome view between reloads (microsoft#195928)

* fix: rerender chat pane when provider is added * fix: don't show welcome view between reloads
anyscale · Oct 18, 2023 · 23234ef · 23234ef
1 parent 342a9e5
commit 23234ef
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -66,6 +66,11 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
  // View state for the ViewPane is currently global per-provider basically, but some other strictly per-model state will require a separate memento.
  this.memento = new Memento('interactive-session-view-' + this.chatViewOptions.providerId, this.storageService);
  this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE) as IViewPaneState;
+ this._register(this.chatService.onDidRegisterProvider(({ providerId }) => {
+ if (providerId === this.chatViewOptions.providerId && !this._widget?.viewModel) {
+ this.updateModel();
+ }
+ }));
  }
 
  private updateModel(model?: IChatModel | undefined): void {
@@ -83,7 +88,7 @@ export class ChatViewPane extends ViewPane implements IChatViewPane {
  }
 
  override shouldShowWelcome(): boolean {
- return !this.chatService.hasProviders();
+ return !this.chatService.hasSessions(this.chatViewOptions.providerId) && !this._widget?.viewModel;
  }
 
  protected override renderBody(parent: HTMLElement): void {

diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -265,8 +265,9 @@ export interface IChatService {
  transferredSessionData: IChatTransferredSessionData | undefined;
 
  onDidSubmitSlashCommand: Event<{ slashCommand: string; sessionId: string }>;
+ onDidRegisterProvider: Event<{ providerId: string }>;
  registerProvider(provider: IChatProvider): IDisposable;
- hasProviders(): boolean;
+ hasSessions(providerId: string): boolean;
  getProviderInfos(): IChatProviderInfo[];
  startSession(providerId: string, token: CancellationToken): ChatModel | undefined;
  getSession(sessionId: string): IChatModel | undefined;

diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -149,6 +149,9 @@ export class ChatService extends Disposable implements IChatService {
  private readonly _onDidDisposeSession = this._register(new Emitter<{ sessionId: string }>());
  public readonly onDidDisposeSession = this._onDidDisposeSession.event;
 
+ private readonly _onDidRegisterProvider = this._register(new Emitter<{ providerId: string }>());
+ public readonly onDidRegisterProvider = this._onDidRegisterProvider.event;
+
  constructor(
  @IStorageService private readonly storageService: IStorageService,
  @ILogService private readonly logService: ILogService,
@@ -742,6 +745,7 @@ export class ChatService extends Disposable implements IChatService {
 
  this._providers.set(provider.id, provider);
  this._hasProvider.set(true);
+ this._onDidRegisterProvider.fire({ providerId: provider.id });
 
  Array.from(this._sessionModels.values())
  .filter(model => model.providerId === provider.id)
@@ -759,8 +763,8 @@ export class ChatService extends Disposable implements IChatService {
  });
  }
 
- hasProviders(): boolean {
- return this._providers.size > 0;
+ public hasSessions(providerId: string): boolean {
+ return !!Object.values(this._persistedSessions).find((session) => session.providerId === providerId);
  }
 
  getProviderInfos(): IChatProviderInfo[] {