From f7ec7e6679c000e429d08153521b8123996f50c8 Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Wed, 3 Dec 2025 07:24:06 -0800
Subject: [PATCH] Fix: Create new main batch file if it doesn't exist during
 CMD startup setup

---
 src/features/terminal/shells/cmd/cmdStartup.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/features/terminal/shells/cmd/cmdStartup.ts b/src/features/terminal/shells/cmd/cmdStartup.ts
index 3b542ff4..821061a2 100644
--- a/src/features/terminal/shells/cmd/cmdStartup.ts
+++ b/src/features/terminal/shells/cmd/cmdStartup.ts
@@ -5,12 +5,12 @@ import * as path from 'path';
 import { promisify } from 'util';
 import which from 'which';
 import { traceError, traceInfo, traceVerbose } from '../../../../common/logging';
+import { StopWatch } from '../../../../common/stopWatch';
 import { isWindows } from '../../../../common/utils/platformUtils';
 import { ShellConstants } from '../../../common/shellConstants';
 import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils';
 import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider';
 import { CMD_ENV_KEY, CMD_SCRIPT_VERSION } from './cmdConstants';
-import { StopWatch } from '../../../../common/stopWatch';
 
 function execCommand(command: string) {
     const timer = new StopWatch();
@@ -222,6 +222,13 @@ async function setupCmdStartup(cmdFiles: CmdFilePaths, key: string): Promise<boo
                     `SHELL: Updated existing main batch file at: ${cmdFiles.mainBatchFile}\r\n${mainBatchContent}`,
                 );
             }
+        } else {
+            const mainBatchContent = getMainBatchFileContent(cmdFiles.regStartupFile);
+            await fs.writeFile(
+                cmdFiles.mainBatchFile,
+                insertStartupCode(getHeader(), regionStart, regionEnd, mainBatchContent),
+            );
+            traceInfo(`SHELL: Created new main batch file at: ${cmdFiles.mainBatchFile}\r\n${mainBatchContent}`);
         }
 
         // Step 4: Setup registry AutoRun to call our main batch file