From 845ab116b4eb6a6bd6b395afc1222e76810038f7 Mon Sep 17 00:00:00 2001
From: Andrew Devasia <andrew.devasia@gmail.com>
Date: Thu, 29 Jan 2026 09:03:01 +0530
Subject: [PATCH] Add close option for compose group commands

---
 src/commands/compose/compose.ts                  |  1 +
 src/commands/containers/composeGroup.ts          | 12 +++++++-----
 src/commands/images/buildImage.ts                |  1 +
 src/commands/images/pullImage.ts                 |  3 ++-
 src/commands/images/pushImage/ImagePushStep.ts   |  3 ++-
 src/commands/images/runImage.ts                  |  1 +
 src/commands/registries/logOutOfDockerCli.ts     |  3 ++-
 src/commands/registries/pullImages.ts            |  1 +
 src/runtimes/runners/TaskCommandRunnerFactory.ts | 14 ++++++++++----
 9 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/commands/compose/compose.ts b/src/commands/compose/compose.ts
index 0338c2a7..068667b1 100644
--- a/src/commands/compose/compose.ts
+++ b/src/commands/compose/compose.ts
@@ -77,6 +77,7 @@ async function compose(context: IActionContext, commands: ('up' | 'down' | 'upSu
             const taskCRF = new TaskCommandRunnerFactory({
                 taskName: client.displayName,
                 workspaceFolder: folder,
+                close: true,
             });
 
             await taskCRF.getCommandRunner()(terminalCommand);
diff --git a/src/commands/containers/composeGroup.ts b/src/commands/containers/composeGroup.ts
index 6aa86382..01bd41d0 100644
--- a/src/commands/containers/composeGroup.ts
+++ b/src/commands/containers/composeGroup.ts
@@ -18,19 +18,19 @@ export async function composeGroupLogs(context: IActionContext, node: ContainerG
 }
 
 export async function composeGroupStart(context: IActionContext, node: ContainerGroupTreeItem): Promise<void> {
-    return composeGroup(context, (client, options) => client.start(options), node);
+    return composeGroup(context, (client, options) => client.start(options), node, undefined, true);
 }
 
 export async function composeGroupStop(context: IActionContext, node: ContainerGroupTreeItem): Promise<void> {
-    return composeGroup(context, (client, options) => client.stop(options), node);
+    return composeGroup(context, (client, options) => client.stop(options), node, undefined, true);
 }
 
 export async function composeGroupRestart(context: IActionContext, node: ContainerGroupTreeItem): Promise<void> {
-    return composeGroup(context, (client, options) => client.restart(options), node);
+    return composeGroup(context, (client, options) => client.restart(options), node, undefined, true);
 }
 
 export async function composeGroupDown(context: IActionContext, node: ContainerGroupTreeItem): Promise<void> {
-    return composeGroup(context, (client, options) => client.down(options), node);
+    return composeGroup(context, (client, options) => client.down(options), node, undefined, true);
 }
 
 type AdditionalOptions<TOptions extends CommonOrchestratorCommandOptions> = Omit<TOptions, keyof CommonOrchestratorCommandOptions>;
@@ -39,7 +39,8 @@ async function composeGroup<TOptions extends CommonOrchestratorCommandOptions>(
     context: IActionContext,
     composeCommandCallback: (client: IContainerOrchestratorClient, options: TOptions) => Promise<VoidCommandResponse>,
     node: ContainerGroupTreeItem,
-    additionalOptions?: AdditionalOptions<TOptions>
+    additionalOptions?: AdditionalOptions<TOptions>,
+    close?: boolean
 ): Promise<void> {
     if (!node) {
         await ext.containersTree.refresh(context);
@@ -70,6 +71,7 @@ async function composeGroup<TOptions extends CommonOrchestratorCommandOptions>(
     const taskCRF = new TaskCommandRunnerFactory({
         taskName: client.displayName,
         cwd: workingDirectory,
+        ...(close !== undefined && { close }),
     });
 
     await taskCRF.getCommandRunner()(composeCommandCallback(client, options));
diff --git a/src/commands/images/buildImage.ts b/src/commands/images/buildImage.ts
index 59e6f3f9..d587bc45 100644
--- a/src/commands/images/buildImage.ts
+++ b/src/commands/images/buildImage.ts
@@ -100,6 +100,7 @@ export async function buildImage(context: IActionContext, dockerFileUri: vscode.
             taskName: client.displayName,
             workspaceFolder: rootFolder,
             focus: true,
+            close: true,
         });
 
         await taskCRF.getCommandRunner()(terminalCommand);
diff --git a/src/commands/images/pullImage.ts b/src/commands/images/pullImage.ts
index b52aba70..561e1e02 100644
--- a/src/commands/images/pullImage.ts
+++ b/src/commands/images/pullImage.ts
@@ -24,7 +24,8 @@ export async function pullImage(context: IActionContext, node?: ImageTreeItem, n
     const client = await ext.runtimeManager.getClient();
     const taskCRF = new TaskCommandRunnerFactory(
         {
-            taskName: l10n.t('Pull images')
+            taskName: l10n.t('Pull images'),
+            close: true,
         }
     );
 
diff --git a/src/commands/images/pushImage/ImagePushStep.ts b/src/commands/images/pushImage/ImagePushStep.ts
index 5ff5164f..bfef997a 100644
--- a/src/commands/images/pushImage/ImagePushStep.ts
+++ b/src/commands/images/pushImage/ImagePushStep.ts
@@ -18,7 +18,8 @@ export class ImagePushStep extends AzureWizardExecuteStep<PushImageWizardContext
         const client = await ext.runtimeManager.getClient();
         const taskCRF = new TaskCommandRunnerFactory(
             {
-                taskName: wizardContext.finalTag
+                taskName: wizardContext.finalTag,
+                close: true,
             }
         );
 
diff --git a/src/commands/images/runImage.ts b/src/commands/images/runImage.ts
index b28d418c..f6f8e034 100644
--- a/src/commands/images/runImage.ts
+++ b/src/commands/images/runImage.ts
@@ -45,6 +45,7 @@ async function runImageCore(context: IActionContext, node: ImageTreeItem | undef
         {
             taskName: node.fullTag === '<none>' ? node.imageId : node.fullTag,
             alwaysRunNew: interactive,
+            close: !interactive,
         }
     );
 
diff --git a/src/commands/registries/logOutOfDockerCli.ts b/src/commands/registries/logOutOfDockerCli.ts
index b803f02a..c82c08bc 100644
--- a/src/commands/registries/logOutOfDockerCli.ts
+++ b/src/commands/registries/logOutOfDockerCli.ts
@@ -23,7 +23,8 @@ export async function logOutOfDockerCli(context: IActionContext, node?: UnifiedR
     const client = await ext.runtimeManager.getClient();
     const taskCRF = new TaskCommandRunnerFactory(
         {
-            taskName: 'Container Tools'
+            taskName: 'Container Tools',
+            close: true,
         }
     );
 
diff --git a/src/commands/registries/pullImages.ts b/src/commands/registries/pullImages.ts
index fdd258e8..babe8e24 100644
--- a/src/commands/registries/pullImages.ts
+++ b/src/commands/registries/pullImages.ts
@@ -35,6 +35,7 @@ async function pullImages(context: IActionContext, node: UnifiedRegistryItem<unk
     const client = await ext.runtimeManager.getClient();
     const taskCRF = new TaskCommandRunnerFactory({
         taskName: client.displayName,
+        close: true,
     });
 
     await taskCRF.getCommandRunner()(
diff --git a/src/runtimes/runners/TaskCommandRunnerFactory.ts b/src/runtimes/runners/TaskCommandRunnerFactory.ts
index 66ccd0cc..d630f8d0 100644
--- a/src/runtimes/runners/TaskCommandRunnerFactory.ts
+++ b/src/runtimes/runners/TaskCommandRunnerFactory.ts
@@ -15,6 +15,7 @@ interface TaskCommandRunnerOptions {
     alwaysRunNew?: boolean;
     rejectOnError?: boolean;
     focus?: boolean;
+    close?: boolean; // When true, auto-close the terminal when the task completes. Default is false.
     env?: never; // Environment is not needed and should not be used, because VSCode adds it already (due to using `ExtensionContext.environmentVariableCollection`)
 }
 
@@ -57,10 +58,15 @@ async function executeAsTask(options: TaskCommandRunnerOptions, command: string,
         task.definition.idRandomizer = Math.random();
     }
 
-    if (options.focus) {
-        task.presentationOptions = {
-            focus: true,
-        };
+    if (options.focus || options.close) {
+        const presentationOptions: vscode.TaskPresentationOptions = {};
+        if (options.focus) {
+            presentationOptions.focus = true;
+        }
+        if (options.close) {
+            presentationOptions.close = true;
+        }
+        task.presentationOptions = presentationOptions;
     }
 
     const taskExecution = await vscode.tasks.executeTask(task);