add listeners to correct disposables (microsoft#254891)

fix microsoft#254890

Author: meganrogge

src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts

@@ -114,7 +114,6 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 
 	private _enableShellIntegration(instance: ITerminalInstance): void {
 		this._extensionService.activateByEvent('onTerminalShellIntegration:*');
-		this._register(instance.onDidChangeShellType(() => this._extensionService.activateByEvent(`onTerminalShellIntegration:${instance.shellType}`)));
 		if (instance.shellType) {
 			this._extensionService.activateByEvent(`onTerminalShellIntegration:${instance.shellType}`);
 		}

src/vs/workbench/contrib/terminal/browser/terminalService.ts

@@ -846,6 +846,12 @@ export class TerminalService extends Disposable implements ITerminalService {
 		}));
 		instanceDisposables.add(instance.onDidFocus(this._onDidChangeActiveInstance.fire, this._onDidChangeActiveInstance));
 		instanceDisposables.add(instance.onRequestAddInstanceToGroup(async e => await this._addInstanceToGroup(instance, e)));
+		instanceDisposables.add(instance.onDidChangeShellType(() => this._extensionService.activateByEvent(`onTerminal:${instance.shellType}`)));
+		instanceDisposables.add(Event.runAndSubscribe(instance.capabilities.onDidAddCapability, (() => {
+			if (instance.capabilities.has(TerminalCapability.CommandDetection)) {
+				this._extensionService.activateByEvent(`onTerminalShellIntegration:${instance.shellType}`);
+			}
+		})));
 		const disposeListener = this._register(instance.onDisposed(() => {
 			instanceDisposables.dispose();
 			this._store.delete(disposeListener);
@@ -1024,7 +1030,6 @@ export class TerminalService extends Disposable implements ITerminalService {
 		} else {
 			instance = this._createTerminal(shellLaunchConfig, location, options);
 		}
-		this._register(instance.onDidChangeShellType(() => this._extensionService.activateByEvent(`onTerminal:${instance.shellType}`)));
 		if (instance.shellType) {
 			this._extensionService.activateByEvent(`onTerminal:${instance.shellType}`);
 		}