From 885c8312f987b56bdf2e50ef9e5ffb18935c7da9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Mar 2026 18:06:19 +0000
Subject: [PATCH 1/2] Initial plan


From 063c3c24f5664bbb4be070088d29d0fbdb9d715e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Mar 2026 18:16:39 +0000
Subject: [PATCH 2/2] Improve Azure activity log clarity for
 editEnvironmentVariables command

Co-authored-by: motm32 <59709511+motm32@users.noreply.github.com>
---
 .../EnvironmentVariablesEditDraftStep.ts      | 49 +++++++++++++++++--
 .../editEnvironmentVariables.ts               | 12 ++++-
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/commands/environmentVariables/editEnvironmentVariables/EnvironmentVariablesEditDraftStep.ts b/src/commands/environmentVariables/editEnvironmentVariables/EnvironmentVariablesEditDraftStep.ts
index 3373cc48..545c72c6 100644
--- a/src/commands/environmentVariables/editEnvironmentVariables/EnvironmentVariablesEditDraftStep.ts
+++ b/src/commands/environmentVariables/editEnvironmentVariables/EnvironmentVariablesEditDraftStep.ts
@@ -4,18 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { type Container, type EnvironmentVar } from "@azure/arm-appcontainers";
-import { nonNullProp } from "@microsoft/vscode-azext-utils";
-import { type Progress } from "vscode";
+import { ActivityChildItem, ActivityChildType, activityFailContext, activityFailIcon, activityProgressContext, activityProgressIcon, activitySuccessContext, activitySuccessIcon, createContextValue, nonNullProp, type ExecuteActivityOutput } from "@microsoft/vscode-azext-utils";
+import { TreeItemCollapsibleState, type Progress } from "vscode";
 import { type ContainerAppItem } from "../../../tree/ContainerAppItem";
 import { type RevisionsItemModel } from "../../../tree/revisionManagement/RevisionItem";
 import { localize } from "../../../utils/localize";
 import { RevisionDraftUpdateBaseStep } from "../../revisionDraft/RevisionDraftUpdateBaseStep";
 import { type EnvironmentVariablesEditContext } from "./EnvironmentVariablesEditContext";
 
+export type EnvironmentVariablesEditDraftStepOutputs = {
+    treeItemLabel?: string;
+    outputLogFailMessage?: string;
+};
+
+const environmentVariablesEditDraftStepContext: string = 'environmentVariablesEditDraftStepItem';
+
 export class EnvironmentVariablesEditDraftStep<T extends EnvironmentVariablesEditContext> extends RevisionDraftUpdateBaseStep<T> {
     public priority: number = 920;
 
-    constructor(baseItem: ContainerAppItem | RevisionsItemModel) {
+    constructor(baseItem: ContainerAppItem | RevisionsItemModel, readonly outputs: EnvironmentVariablesEditDraftStepOutputs = {}) {
         super(baseItem);
     }
 
@@ -41,4 +48,40 @@ export class EnvironmentVariablesEditDraftStep<T extends EnvironmentVariablesEdi
     public shouldExecute(context: T): boolean {
         return !!context.environmentVariables;
     }
+
+    public createSuccessOutput(): ExecuteActivityOutput {
+        return {
+            item: new ActivityChildItem({
+                label: this.outputs.treeItemLabel ?? localize('editEnvironmentVariables', 'Edit environment variables (draft)'),
+                contextValue: createContextValue([environmentVariablesEditDraftStepContext, activitySuccessContext]),
+                activityType: ActivityChildType.Success,
+                iconPath: activitySuccessIcon,
+            }),
+        };
+    }
+
+    public createProgressOutput(): ExecuteActivityOutput {
+        return {
+            item: new ActivityChildItem({
+                label: this.outputs.treeItemLabel ?? localize('editEnvironmentVariables', 'Edit environment variables (draft)'),
+                contextValue: createContextValue([environmentVariablesEditDraftStepContext, activityProgressContext]),
+                activityType: ActivityChildType.Progress,
+                iconPath: activityProgressIcon,
+            }),
+        };
+    }
+
+    public createFailOutput(): ExecuteActivityOutput {
+        return {
+            item: new ActivityChildItem({
+                label: this.outputs.treeItemLabel ?? localize('editEnvironmentVariables', 'Edit environment variables (draft)'),
+                contextValue: createContextValue([environmentVariablesEditDraftStepContext, activityFailContext]),
+                initialCollapsibleState: TreeItemCollapsibleState.Expanded,
+                activityType: ActivityChildType.Fail,
+                iconPath: activityFailIcon,
+                isParent: true,
+            }),
+            message: this.outputs.outputLogFailMessage ?? localize('editEnvironmentVariablesFail', 'Failed to edit environment variables (draft).'),
+        };
+    }
 }
diff --git a/src/commands/environmentVariables/editEnvironmentVariables/editEnvironmentVariables.ts b/src/commands/environmentVariables/editEnvironmentVariables/editEnvironmentVariables.ts
index cade4f46..f79dfd2d 100644
--- a/src/commands/environmentVariables/editEnvironmentVariables/editEnvironmentVariables.ts
+++ b/src/commands/environmentVariables/editEnvironmentVariables/editEnvironmentVariables.ts
@@ -16,7 +16,7 @@ import { getParentResourceFromItem, isTemplateItemEditable, TemplateItemNotEdita
 import { EnvFileListStep } from "../../image/imageSource/EnvFileListStep";
 import { RevisionDraftDeployPromptStep } from "../../revisionDraft/RevisionDraftDeployPromptStep";
 import { type EnvironmentVariablesEditContext } from "./EnvironmentVariablesEditContext";
-import { EnvironmentVariablesEditDraftStep } from "./EnvironmentVariablesEditDraftStep";
+import { EnvironmentVariablesEditDraftStep, type EnvironmentVariablesEditDraftStepOutputs } from "./EnvironmentVariablesEditDraftStep";
 
 export async function editEnvironmentVariables(context: IActionContext, node?: EnvironmentVariablesItem): Promise<void> {
     const item: EnvironmentVariablesItem = node ?? await pickEnvironmentVariables(context, { autoSelectDraft: true });
@@ -41,6 +41,9 @@ export async function editEnvironmentVariables(context: IActionContext, node?: E
     };
     wizardContext.telemetry.properties.revisionMode = containerApp.revisionsMode;
 
+    // Create an output reference to pass to the draft step so we can edit after prompting
+    const editDraftStepOutputs: EnvironmentVariablesEditDraftStepOutputs = {};
+
     const wizard = new AzureWizard<EnvironmentVariablesEditContext>(wizardContext, {
         title: localize('editEnvironmentVariables', 'Edit environment variables for "{0}" (draft)', parentResource.name),
         promptSteps: [
@@ -49,10 +52,15 @@ export async function editEnvironmentVariables(context: IActionContext, node?: E
         ],
         executeSteps: [
             getVerifyProvidersStep<EnvironmentVariablesEditContext>(),
-            new EnvironmentVariablesEditDraftStep(item),
+            new EnvironmentVariablesEditDraftStep(item, editDraftStepOutputs),
         ],
     });
 
     await wizard.prompt();
+    if (wizardContext.envPath) {
+        wizardContext.activityTitle = localize('editEnvVarsFromFileActivityTitle', 'Edit environment variables for "{0}" from provided .env file (draft)', parentResource.name);
+        editDraftStepOutputs.treeItemLabel = localize('saveEnvVarsToDraftLabel', 'Save environment variables from provided .env file to draft');
+        editDraftStepOutputs.outputLogFailMessage = localize('editEnvVarsFileFail', 'Failed to edit environment variables for "{0}" from provided .env file (draft).', parentResource.name);
+    }
     await wizard.execute();
 }