Fix Node deploy include dist folder and correct Oryx manifest

Author: mengyimicro

src/Microsoft.Agents.A365.DevTools.Cli/Services/NodeBuilder.cs

@@ -145,7 +145,7 @@ public async Task<string> BuildAsync(string projectDir, string outputPath, bool
             CopyDirectory(srcDir, Path.Combine(publishPath, "src"));
         }
 
-        // Copy server files (.js files in root)
+        // Copy server/entry files (.js/.ts files in root)
         foreach (var jsFile in Directory.GetFiles(projectDir, "*.js"))
         {
             File.Copy(jsFile, Path.Combine(publishPath, Path.GetFileName(jsFile)));
@@ -155,6 +155,17 @@ public async Task<string> BuildAsync(string projectDir, string outputPath, bool
             File.Copy(tsFile, Path.Combine(publishPath, Path.GetFileName(tsFile)));
         }
 
+        var distDir = Path.Combine(projectDir, "dist");
+        if (Directory.Exists(distDir))
+        {
+            _logger.LogInformation("Found dist folder, copying to publish output...");
+            CopyDirectory(distDir, Path.Combine(publishPath, "dist"));
+        }
+        else
+        {
+            _logger.LogInformation("No dist folder found in project; relying on Oryx build (if configured) to produce runtime output.");
+        }
+
         // Create .deployment file to force Oryx build during Azure deployment
         await CreateDeploymentFile(publishPath);
 
@@ -166,6 +177,11 @@ public async Task<OryxManifest> CreateManifestAsync(string projectDir, string pu
         _logger.LogInformation("Creating Oryx manifest for Node.js...");
 
         var packageJsonPath = Path.Combine(projectDir, "package.json");
+        if (!File.Exists(packageJsonPath))
+        {
+            throw new FileNotFoundException("package.json not found in project directory");
+        }
+
         var packageJson = await File.ReadAllTextAsync(packageJsonPath);
 
         // Parse package.json to detect start command and version
@@ -177,8 +193,7 @@ public async Task<OryxManifest> CreateManifestAsync(string projectDir, string pu
         if (root.TryGetProperty("engines", out var engines) && 
             engines.TryGetProperty("node", out var nodeVersionProp))
         {
-            var versionString = nodeVersionProp.GetString() ?? "18";
-            // Extract major version (e.g., "18.x" -> "18")
+            var versionString = nodeVersionProp.GetString() ?? "20";
             var match = System.Text.RegularExpressions.Regex.Match(versionString, @"(\d+)");
             if (match.Success)
             {
@@ -192,7 +207,13 @@ public async Task<OryxManifest> CreateManifestAsync(string projectDir, string pu
         if (root.TryGetProperty("scripts", out var scripts) && 
             scripts.TryGetProperty("start", out var startScript))
         {
-            startCommand = startScript.GetString() ?? startCommand;
+            var scriptValue = startScript.GetString();
+            if (!string.IsNullOrWhiteSpace(scriptValue))
+            {
+                // Use the script literally, same as package.json
+                startCommand = scriptValue;
+            }
+
             _logger.LogInformation("Detected start command from package.json: {Command}", startCommand);
         }
         else if (root.TryGetProperty("main", out var mainProp))
@@ -203,34 +224,47 @@ public async Task<OryxManifest> CreateManifestAsync(string projectDir, string pu
         }
         else
         {
-            // Look for common entry point files
+            // Look for common entry point files under publish path
             var commonEntryPoints = new[] { "server.js", "app.js", "index.js", "main.js" };
             foreach (var entryPoint in commonEntryPoints)
             {
                 if (File.Exists(Path.Combine(publishPath, entryPoint)))
                 {
                     startCommand = $"node {entryPoint}";
-                    _logger.LogInformation("Detected entry point: {Command}", startCommand);
+                    _logger.LogInformation("Detected entry point in publish folder: {Command}", startCommand);
                     break;
                 }
             }
         }
 
-        var buildCommand = "npm run build";
-        var hasBuildScript = scripts.TryGetProperty("build", out var buildScript);
-        if (hasBuildScript)
+        // Detect build command – strictly Node
+        string buildCommand = "";
+        bool buildRequired = false;
+
+        if (root.TryGetProperty("scripts", out var scriptsForBuild) &&
+            scriptsForBuild.TryGetProperty("build", out var buildScript))
+        {
+            var buildValue = buildScript.GetString();
+            if (!string.IsNullOrWhiteSpace(buildValue))
+            {
+                // We always call through npm so it picks up the script from package.json
+                buildCommand = "npm run build";
+                buildRequired = true;
+                _logger.LogInformation("Detected build script; using Oryx build command: {Command}", buildCommand);
+            }
+        }
+        else
         {
-            buildCommand = buildScript.GetString() ?? buildCommand;
-            _logger.LogInformation("Detected build command from package.json: {Command}", buildCommand);
+            _logger.LogInformation("No build script found; Oryx will only run npm install.");
         }
 
         return new OryxManifest
         {
             Platform = "nodejs",
             Version = nodeVersion,
             Command = startCommand,
-            BuildCommand = hasBuildScript ? buildCommand : "",
-            BuildRequired = hasBuildScript
+            BuildCommand = buildCommand,
+            BuildRequired = buildRequired
         };
     }