From 8b355f85671239bfe11bea7f4c3cb6683c041a34 Mon Sep 17 00:00:00 2001
From: Sam Clark <sam.clark@posit.co>
Date: Tue, 21 Jan 2025 21:27:15 -0600
Subject: [PATCH 1/5] Adds indicator in console when extension host is
 disconnected

---
 .../browser/components/consoleInstance.css    |  7 +++
 .../components/consoleInstanceItems.tsx       | 53 +++++++++++++------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstance.css b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstance.css
index 0de791fc950..71b663a1742 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstance.css
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstance.css
@@ -57,3 +57,10 @@
 .console-core .console-instance:focus {
 	outline: none !important;
 }
+
+.console-core .console-instance .console-instance-container .console-item-reconnecting {
+	display: flex;
+	flex-direction: row;
+	justify-items: center;
+	gap: 0.25rem;
+}
diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
index 65cbd508bbd..22db1f11aba 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
@@ -14,7 +14,6 @@ import React, { Component } from 'react';
 import { FontInfo } from '../../../../../editor/common/config/fontInfo.js';
 import { ConsoleInput } from './consoleInput.js';
 import { RuntimeTrace } from './runtimeTrace.js';
-import { RuntimeExited } from './runtimeExited.js';
 import { RuntimeStartup } from './runtimeStartup.js';
 import { RuntimeStarted } from './runtimeStarted.js';
 import { RuntimeOffline } from './runtimeOffline.js';
@@ -25,7 +24,6 @@ import { RuntimeItemExited } from '../../../../services/positronConsole/browser/
 import { RuntimeItemStartup } from '../../../../services/positronConsole/browser/classes/runtimeItemStartup.js';
 import { RuntimeItemStarted } from '../../../../services/positronConsole/browser/classes/runtimeItemStarted.js';
 import { RuntimeItemOffline } from '../../../../services/positronConsole/browser/classes/runtimeItemOffline.js';
-import { RuntimeReconnected } from './runtimeReconnected.js';
 import { RuntimeItemStarting } from '../../../../services/positronConsole/browser/classes/runtimeItemStarting.js';
 import { RuntimeItemActivity } from '../../../../services/positronConsole/browser/classes/runtimeItemActivity.js';
 import { RuntimePendingInput } from './runtimePendingInput.js';
@@ -65,6 +63,41 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 	 * @returns The rendered component.
 	 */
 	override render() {
+
+		let extensionHostDisconnected = false;
+
+		const reversedItems = this.props.positronConsoleInstance.runtimeItems.slice().reverse();
+		for (const item of reversedItems) {
+			if (item instanceof RuntimeItemStartup) {
+				break;
+			} else if (item instanceof RuntimeItemExited) {
+				extensionHostDisconnected = true;
+				break;
+			}
+
+		}
+
+		let promptComponent = null;
+
+		if (extensionHostDisconnected) {
+			promptComponent = (
+				<div className='console-item-reconnecting'>
+					<span className='codicon codicon-loading codicon-modifier-spin'></span>
+					<span>Extensions restarting...</span>
+				</div>
+			)
+		} else if (!this.props.positronConsoleInstance.promptActive && this.props.runtimeAttached) {
+			promptComponent = (<ConsoleInput
+				width={this.props.consoleInputWidth}
+				positronConsoleInstance={this.props.positronConsoleInstance}
+				onSelectAll={this.props.onSelectAll}
+				onCodeExecuted={() =>
+					// Update the component to eliminate flickering.
+					flushSync(() => this.forceUpdate()
+					)}
+			/>);
+		}
+
 		return (
 			<>
 				<div className='top-spacer' />
@@ -76,7 +109,7 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 					} else if (runtimeItem instanceof RuntimeItemStartup) {
 						return <RuntimeStartup key={runtimeItem.id} runtimeItemStartup={runtimeItem} />;
 					} else if (runtimeItem instanceof RuntimeItemReconnected) {
-						return <RuntimeReconnected key={runtimeItem.id} runtimeItemReconnected={runtimeItem} />;
+						return null;
 					} else if (runtimeItem instanceof RuntimeItemStarting) {
 						return <RuntimeStarting key={runtimeItem.id} runtimeItemStarting={runtimeItem} />;
 					} else if (runtimeItem instanceof RuntimeItemStarted) {
@@ -84,7 +117,7 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 					} else if (runtimeItem instanceof RuntimeItemOffline) {
 						return <RuntimeOffline key={runtimeItem.id} runtimeItemOffline={runtimeItem} />;
 					} else if (runtimeItem instanceof RuntimeItemExited) {
-						return <RuntimeExited key={runtimeItem.id} runtimeItemExited={runtimeItem} />;
+						return null;
 					} else if (runtimeItem instanceof RuntimeItemRestartButton) {
 						return <RuntimeRestartButton key={runtimeItem.id} runtimeItemRestartButton={runtimeItem} positronConsoleInstance={this.props.positronConsoleInstance} />;
 					} else if (runtimeItem instanceof RuntimeItemStartupFailure) {
@@ -96,17 +129,7 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 						return null;
 					}
 				})}
-				{!this.props.positronConsoleInstance.promptActive && this.props.runtimeAttached &&
-					<ConsoleInput
-						width={this.props.consoleInputWidth}
-						positronConsoleInstance={this.props.positronConsoleInstance}
-						onSelectAll={this.props.onSelectAll}
-						onCodeExecuted={() =>
-							// Update the component to eliminate flickering.
-							flushSync(() => this.forceUpdate()
-							)}
-					/>
-				}
+				{promptComponent}
 			</>
 		);
 	}

From f6bcae0e97cfa57833f900935a61fee6ddbcb553 Mon Sep 17 00:00:00 2001
From: Sam Clark <sam.clark@posit.co>
Date: Thu, 23 Jan 2025 09:06:40 -0600
Subject: [PATCH 2/5] Adds logic to save prompt input during extension host
 restarts

Also fixes ext. host indicator showing during unrelated disconnections
---
 .../browser/components/consoleInput.css       |  6 +++
 .../browser/components/consoleInput.tsx       |  3 +-
 .../components/consoleInstanceItems.tsx       | 42 +++++++++----------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.css b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.css
index 80a367c4907..4cc65942046 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.css
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.css
@@ -8,3 +8,9 @@
 	padding-bottom: 10px;
 	position: relative;
 }
+
+
+.console-input.hidden {
+	display: none;
+	background-color: red;
+}
diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.tsx b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.tsx
index 7272c42d15a..6c5ab5d36a9 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.tsx
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.tsx
@@ -59,6 +59,7 @@ type ILineNumbersOptions = Pick<IEditorOptions, 'lineNumbers' | 'lineNumbersMinC
 // ConsoleInputProps interface.
 interface ConsoleInputProps {
 	readonly width: number;
+	readonly hidden: boolean;
 	readonly positronConsoleInstance: IPositronConsoleInstance;
 	readonly onSelectAll: () => void;
 	readonly onCodeExecuted: () => void;
@@ -960,7 +961,7 @@ export const ConsoleInput = (props: ConsoleInputProps) => {
 
 	// Render.
 	return (
-		<div className='console-input' tabIndex={0} onFocus={focusHandler}>
+		<div className={props.hidden ? 'console-input hidden' : 'console-input'} tabIndex={0} onFocus={focusHandler}>
 			<div ref={codeEditorWidgetContainerRef} />
 			{historyBrowserActive &&
 				<HistoryBrowserPopup
diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
index 22db1f11aba..dac52dd8c7c 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
@@ -70,34 +70,13 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 		for (const item of reversedItems) {
 			if (item instanceof RuntimeItemStartup) {
 				break;
-			} else if (item instanceof RuntimeItemExited) {
+			} else if (item instanceof RuntimeItemExited && item.reason == "extensionHost") {
 				extensionHostDisconnected = true;
 				break;
 			}
 
 		}
 
-		let promptComponent = null;
-
-		if (extensionHostDisconnected) {
-			promptComponent = (
-				<div className='console-item-reconnecting'>
-					<span className='codicon codicon-loading codicon-modifier-spin'></span>
-					<span>Extensions restarting...</span>
-				</div>
-			)
-		} else if (!this.props.positronConsoleInstance.promptActive && this.props.runtimeAttached) {
-			promptComponent = (<ConsoleInput
-				width={this.props.consoleInputWidth}
-				positronConsoleInstance={this.props.positronConsoleInstance}
-				onSelectAll={this.props.onSelectAll}
-				onCodeExecuted={() =>
-					// Update the component to eliminate flickering.
-					flushSync(() => this.forceUpdate()
-					)}
-			/>);
-		}
-
 		return (
 			<>
 				<div className='top-spacer' />
@@ -129,7 +108,24 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 						return null;
 					}
 				})}
-				{promptComponent}
+				{extensionHostDisconnected ?
+					(<div className='console-item-reconnecting'>
+						<span className='codicon codicon-loading codicon-modifier-spin'></span>
+						<span>Extensions restarting...</span>
+					</div>) :
+					null
+				}
+
+				<ConsoleInput
+					hidden={this.props.positronConsoleInstance.promptActive || !this.props.runtimeAttached}
+					width={this.props.consoleInputWidth}
+					positronConsoleInstance={this.props.positronConsoleInstance}
+					onSelectAll={this.props.onSelectAll}
+					onCodeExecuted={() =>
+						// Update the component to eliminate flickering.
+						flushSync(() => this.forceUpdate()
+						)}
+				/>
 			</>
 		);
 	}

From 88c47baabf8554b69794addbe0e8295fd1f8af24 Mon Sep 17 00:00:00 2001
From: Sam Clark <sam.clark@posit.co>
Date: Mon, 27 Jan 2025 09:08:36 -0600
Subject: [PATCH 3/5] Fixes inefficient calculation of condition for console
 extension host indicator

---
 .../browser/components/consoleInstanceItems.tsx  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
index dac52dd8c7c..5d1174257cb 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
@@ -66,17 +66,6 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 
 		let extensionHostDisconnected = false;
 
-		const reversedItems = this.props.positronConsoleInstance.runtimeItems.slice().reverse();
-		for (const item of reversedItems) {
-			if (item instanceof RuntimeItemStartup) {
-				break;
-			} else if (item instanceof RuntimeItemExited && item.reason == "extensionHost") {
-				extensionHostDisconnected = true;
-				break;
-			}
-
-		}
-
 		return (
 			<>
 				<div className='top-spacer' />
@@ -86,8 +75,10 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 					} else if (runtimeItem instanceof RuntimeItemPendingInput) {
 						return <RuntimePendingInput key={runtimeItem.id} fontInfo={this.props.editorFontInfo} runtimeItemPendingInput={runtimeItem} />;
 					} else if (runtimeItem instanceof RuntimeItemStartup) {
+						extensionHostDisconnected = false;
 						return <RuntimeStartup key={runtimeItem.id} runtimeItemStartup={runtimeItem} />;
 					} else if (runtimeItem instanceof RuntimeItemReconnected) {
+						extensionHostDisconnected = true;
 						return null;
 					} else if (runtimeItem instanceof RuntimeItemStarting) {
 						return <RuntimeStarting key={runtimeItem.id} runtimeItemStarting={runtimeItem} />;
@@ -96,6 +87,9 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 					} else if (runtimeItem instanceof RuntimeItemOffline) {
 						return <RuntimeOffline key={runtimeItem.id} runtimeItemOffline={runtimeItem} />;
 					} else if (runtimeItem instanceof RuntimeItemExited) {
+						if (runtimeItem.reason === 'extensionHost') {
+							extensionHostDisconnected = true;
+						}
 						return null;
 					} else if (runtimeItem instanceof RuntimeItemRestartButton) {
 						return <RuntimeRestartButton key={runtimeItem.id} runtimeItemRestartButton={runtimeItem} positronConsoleInstance={this.props.positronConsoleInstance} />;

From cf1067a94d8e79f198d695cd6d85d06eb07b03c2 Mon Sep 17 00:00:00 2001
From: Sam Clark <sam.clark@posit.co>
Date: Mon, 27 Jan 2025 09:14:48 -0600
Subject: [PATCH 4/5] Adds localization for console extension host indicator

---
 .../browser/components/consoleInstanceItems.tsx             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
index 5d1174257cb..77a56f34d58 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
@@ -34,6 +34,7 @@ import { RuntimeItemPendingInput } from '../../../../services/positronConsole/br
 import { RuntimeItemRestartButton } from '../../../../services/positronConsole/browser/classes/runtimeItemRestartButton.js';
 import { IPositronConsoleInstance } from '../../../../services/positronConsole/browser/interfaces/positronConsoleService.js';
 import { RuntimeItemStartupFailure } from '../../../../services/positronConsole/browser/classes/runtimeItemStartupFailure.js';
+import { localize } from '../../../../../nls.js';
 
 /**
  * ConsoleInstanceItemsProps interface.
@@ -105,7 +106,10 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 				{extensionHostDisconnected ?
 					(<div className='console-item-reconnecting'>
 						<span className='codicon codicon-loading codicon-modifier-spin'></span>
-						<span>Extensions restarting...</span>
+						<span>{localize(
+							"positron.console.extensionsRestarting",
+							"Extensions restarting..."
+						)}</span>
 					</div>) :
 					null
 				}

From 3dd0b6dce52580bb28a0b641e85f86dd6b3eaf64 Mon Sep 17 00:00:00 2001
From: Sam Clark <sam.clark@posit.co>
Date: Mon, 27 Jan 2025 16:48:49 -0600
Subject: [PATCH 5/5] Adds back appropriate message when user initiates runtime
 shutdown

---
 .../browser/components/consoleInstanceItems.tsx             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
index 77a56f34d58..26f0e774c1f 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInstanceItems.tsx
@@ -17,6 +17,7 @@ import { RuntimeTrace } from './runtimeTrace.js';
 import { RuntimeStartup } from './runtimeStartup.js';
 import { RuntimeStarted } from './runtimeStarted.js';
 import { RuntimeOffline } from './runtimeOffline.js';
+import { RuntimeExited } from './runtimeExited.js';
 import { RuntimeItemTrace } from '../../../../services/positronConsole/browser/classes/runtimeItemTrace.js';
 import { RuntimeStarting } from './runtimeStarting.js';
 import { RuntimeActivity } from './runtimeActivity.js';
@@ -79,7 +80,7 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 						extensionHostDisconnected = false;
 						return <RuntimeStartup key={runtimeItem.id} runtimeItemStartup={runtimeItem} />;
 					} else if (runtimeItem instanceof RuntimeItemReconnected) {
-						extensionHostDisconnected = true;
+						extensionHostDisconnected = false;
 						return null;
 					} else if (runtimeItem instanceof RuntimeItemStarting) {
 						return <RuntimeStarting key={runtimeItem.id} runtimeItemStarting={runtimeItem} />;
@@ -90,8 +91,9 @@ export class ConsoleInstanceItems extends Component<ConsoleInstanceItemsProps> {
 					} else if (runtimeItem instanceof RuntimeItemExited) {
 						if (runtimeItem.reason === 'extensionHost') {
 							extensionHostDisconnected = true;
+							return null;
 						}
-						return null;
+						return <RuntimeExited key={runtimeItem.id} runtimeItemExited={runtimeItem} />;
 					} else if (runtimeItem instanceof RuntimeItemRestartButton) {
 						return <RuntimeRestartButton key={runtimeItem.id} runtimeItemRestartButton={runtimeItem} positronConsoleInstance={this.props.positronConsoleInstance} />;
 					} else if (runtimeItem instanceof RuntimeItemStartupFailure) {