Review comment: return a disposables array when creating the statusbar

EhabY · EhabY · commit 9d0d6104e67b · 2025-07-22T21:50:32.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
   update notifications.
 - Coder output panel enhancements: All log entries now include timestamps, and you
   can filter messages by log level in the panel.
+- Added an agent metadata monitor status bar item, so you can view your active
+  agent metadata at a glance.
 
 ## [v1.9.2](https://github.com/coder/vscode-coder/releases/tag/v1.9.2) 2025-06-25
 
diff --git a/src/remote.ts b/src/remote.ts
@@ -630,7 +630,9 @@ export class Remote {
 			}),
 		);
 
-		this.createAgentMetadataStatusBar(agent, workspaceRestClient, disposables);
+		disposables.push(
+			...this.createAgentMetadataStatusBar(agent, workspaceRestClient),
+		);
 
 		this.storage.output.info("Remote setup complete");
 
@@ -982,38 +984,33 @@ export class Remote {
 	private createAgentMetadataStatusBar(
 		agent: WorkspaceAgent,
 		restClient: Api,
-		disposables: vscode.Disposable[],
-	): void {
+	): vscode.Disposable[] {
 		const statusBarItem = vscode.window.createStatusBarItem(
 			"agentMetadata",
 			vscode.StatusBarAlignment.Left,
 		);
-		disposables.push(statusBarItem);
 
 		const agentWatcher = createAgentMetadataWatcher(agent.id, restClient);
-		disposables.push(agentWatcher);
 
-		agentWatcher.onChange(
-			() => {
-				if (agentWatcher.error) {
-					this.storage.output.warn(formatMetadataError(agentWatcher.error));
-					statusBarItem.hide();
-					return;
-				}
+		const onChangeDisposable = agentWatcher.onChange(() => {
+			if (agentWatcher.error) {
+				this.storage.output.warn(formatMetadataError(agentWatcher.error));
+				statusBarItem.hide();
+				return;
+			}
 
-				if (agentWatcher.metadata && agentWatcher.metadata.length > 0) {
-					statusBarItem.text = getEventValue(agentWatcher.metadata[0]);
-					statusBarItem.tooltip = agentWatcher.metadata
-						.map((metadata) => formatEventLabel(metadata))
-						.join("\n");
-					statusBarItem.show();
-				} else {
-					statusBarItem.hide();
-				}
-			},
-			undefined,
-			disposables,
-		);
+			if (agentWatcher.metadata && agentWatcher.metadata.length > 0) {
+				statusBarItem.text = getEventValue(agentWatcher.metadata[0]);
+				statusBarItem.tooltip = agentWatcher.metadata
+					.map((metadata) => formatEventLabel(metadata))
+					.join("\n");
+				statusBarItem.show();
+			} else {
+				statusBarItem.hide();
+			}
+		});
+
+		return [statusBarItem, agentWatcher, onChangeDisposable];
 	}
 
 	// closeRemote ends the current remote session.
