Refactor to use runPostMcpProjectCreateSteps pattern similar to runPostFunctionCreateSteps

Co-authored-by: motm32 <59709511+motm32@users.noreply.github.com>

Author: Copilot

src/commands/createNewProject/NewProjectLanguageStep.ts

@@ -26,7 +26,6 @@ import { DotnetRuntimeStep } from './dotnetSteps/DotnetRuntimeStep';
 import { addJavaCreateProjectSteps } from './javaSteps/addJavaCreateProjectSteps';
 import { MCPDownloadSnippetsExecuteStep } from './mcpServerSteps/MCPDownloadSnippetsExecuteStep';
 import { MCPDownloadSnippetsPromptStep } from './mcpServerSteps/MCPDownloadSnippetsPromptStep';
-import { MCPOpenFileStep } from './mcpServerSteps/MCPOpenFileStep';
 import { MCPProjectCreateStep } from './mcpServerSteps/MCPProjectCreateStep';
 import { MCPServerLanguagePromptStep } from './mcpServerSteps/MCPServerLanguagePromptStep';
 
@@ -128,7 +127,7 @@ export class NewProjectLanguageStep extends AzureWizardPromptStep<IProjectWizard
                 break;
             case ProjectLanguage.SelfHostedMCPServer:
                 promptSteps.push(new MCPServerLanguagePromptStep(), new MCPDownloadSnippetsPromptStep());
-                executeSteps.push(new MCPDownloadSnippetsExecuteStep(), new MCPProjectCreateStep(), new MCPOpenFileStep());
+                executeSteps.push(new MCPDownloadSnippetsExecuteStep(), new MCPProjectCreateStep());
                 break;
             default:
                 executeSteps.push(new ScriptProjectCreateStep());

src/commands/createNewProject/mcpServerSteps/MCPOpenFileStep.ts

@@ -3,15 +3,51 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { nonNullProp } from "@microsoft/vscode-azext-utils";
+import { AzExtFsExtra, callWithTelemetryAndErrorHandling, nonNullProp, type IActionContext } from "@microsoft/vscode-azext-utils";
 import * as path from 'path';
-import { l10n, type Progress } from "vscode";
+import { l10n, Uri, window, workspace, type Progress } from "vscode";
 import { McpProjectType, ProjectLanguage, type GitHubFileMetadata } from "../../../constants";
+import { ext } from "../../../extensionVariables";
 import { feedUtils } from "../../../utils/feedUtils";
 import { addLocalMcpServer, checkIfMcpServerExists, getLocalServerName, getOrCreateMcpJson, saveMcpJson } from "../../../utils/mcpUtils";
+import { getContainingWorkspace } from "../../../utils/workspace";
 import { type MCPProjectWizardContext } from "../IProjectWizardContext";
 import { ProjectCreateStepBase } from "../ProjectCreateStep/ProjectCreateStepBase";
 import { MCPDownloadSnippetsExecuteStep } from "./MCPDownloadSnippetsExecuteStep";
+
+interface ICachedMcpProject {
+    projectPath: string;
+}
+
+const mcpProjectCacheKey: string = 'azFuncPostMcpProjectCreate';
+
+export async function runPostMcpProjectCreateStepsFromCache(): Promise<void> {
+    const cachedProject: ICachedMcpProject | undefined = ext.context.globalState.get(mcpProjectCacheKey);
+    if (cachedProject) {
+        try {
+            runPostMcpProjectCreateSteps(cachedProject);
+        } finally {
+            await ext.context.globalState.update(mcpProjectCacheKey, undefined);
+        }
+    }
+}
+
+function runPostMcpProjectCreateSteps(project: ICachedMcpProject): void {
+    // Don't wait
+    void callWithTelemetryAndErrorHandling('postMcpProjectCreate', async (context: IActionContext) => {
+        context.telemetry.suppressIfSuccessful = true;
+
+        // Open mcp.json file in an editor
+        if (getContainingWorkspace(project.projectPath)) {
+            const mcpJsonFilePath: string = path.join(project.projectPath, '.vscode', 'mcp.json');
+            if (await AzExtFsExtra.pathExists(mcpJsonFilePath)) {
+                const mcpJsonFile = await workspace.openTextDocument(Uri.file(mcpJsonFilePath));
+                await window.showTextDocument(mcpJsonFile, { preview: false });
+            }
+        }
+    });
+}
+
 export class MCPProjectCreateStep extends ProjectCreateStepBase {
     public async executeCore(context: MCPProjectWizardContext, _progress: Progress<{ message?: string | undefined; increment?: number | undefined; }>): Promise<void> {
         context.mcpProjectType = McpProjectType.SelfHostedMcpServer;
@@ -36,6 +72,18 @@ export class MCPProjectCreateStep extends ProjectCreateStepBase {
                 });
             }
         }
+        
+        const cachedProject: ICachedMcpProject = { projectPath: context.projectPath };
+        
+        if (context.openBehavior) {
+            // OpenFolderStep sometimes restarts the extension host, so we will cache this to run on the next extension activation
+            await ext.context.globalState.update(mcpProjectCacheKey, cachedProject);
+            // Delete cached information if the extension host was not restarted after 5 seconds
+            setTimeout(() => { void ext.context.globalState.update(mcpProjectCacheKey, undefined); }, 5 * 1000);
+        }
+
+        runPostMcpProjectCreateSteps(cachedProject);
+        
         return;
     }
 

src/commands/createNewProject/mcpServerSteps/MCPProjectCreateStep.ts

@@ -17,6 +17,7 @@ import { downloadAppSettingsFromApi } from './commands/api/downloadAppSettingsFr
 import { revealTreeItem } from './commands/api/revealTreeItem';
 import { uploadAppSettingsFromApi } from './commands/api/uploadAppSettingsFromApi';
 import { runPostFunctionCreateStepsFromCache } from './commands/createFunction/FunctionCreateStepBase';
+import { runPostMcpProjectCreateStepsFromCache } from './commands/createNewProject/mcpServerSteps/MCPProjectCreateStep';
 import { startFuncProcessFromApi } from './commands/pickFuncProcess';
 import { registerCommands } from './commands/registerCommands';
 import { func } from './constants';
@@ -62,6 +63,7 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta
         activateContext.telemetry.measurements.mainFileLoad = (perfStats.loadEndTime - perfStats.loadStartTime) / 1000;
 
         void runPostFunctionCreateStepsFromCache();
+        void runPostMcpProjectCreateStepsFromCache();
 
         void validateFuncCoreToolsIsLatest();