Merge pull request #9 from clement-lucas/C#fix

Fix issue with C# conversion

Author: jkordick

CobolToQuarkusMigration.csproj

@@ -26,4 +26,8 @@
     <Content Remove="McpChatWeb.Tests\**\*" />
   </ItemGroup>
 
+<ItemGroup>
+  <Compile Remove="output\**" />
+</ItemGroup>
+
 </Project>

Models/Settings.cs

@@ -1,10 +1,12 @@
 using System.IO;
+using System.Text.Json.Serialization;
 
 namespace CobolToQuarkusMigration.Models;
 
 /// <summary>
 /// Represents the target language for code conversion.
 /// </summary>
+[JsonConverter(typeof(JsonStringEnumConverter))]
 public enum TargetLanguage
 {
     /// <summary>

Processes/MigrationProcess.cs

@@ -119,10 +119,12 @@ public async Task RunAsync(
         string javaOutputFolder,
         Action<string, int, int>? progressCallback = null)
     {
-        _enhancedLogger.ShowSectionHeader("COBOL TO JAVA QUARKUS MIGRATION", "AI-Powered Legacy Code Modernization");
+        var migrationTargetLang = _settings.ApplicationSettings.TargetLanguage;
+        var targetName = migrationTargetLang == TargetLanguage.CSharp ? "C# .NET" : "JAVA QUARKUS";
+        _enhancedLogger.ShowSectionHeader($"COBOL TO {targetName} MIGRATION", "AI-Powered Legacy Code Modernization");
 
         _logger.LogInformation("COBOL source folder: {CobolSourceFolder}", cobolSourceFolder);
-        _logger.LogInformation("Java output folder: {JavaOutputFolder}", javaOutputFolder);
+        _logger.LogInformation("{TargetLanguage} output folder: {OutputFolder}", targetName, javaOutputFolder);
 
         if (_cobolAnalyzerAgent == null || _codeConverterAgent == null || _dependencyMapperAgent == null)
         {

Program.cs

@@ -507,11 +507,7 @@ private static void LoadEnvironmentVariables()
             string localConfigFile = Path.Combine(configDir, "ai-config.local.env");
             string templateConfigFile = Path.Combine(configDir, "ai-config.env");
 
-            if (File.Exists(templateConfigFile))
-            {
-                LoadEnvFile(templateConfigFile);
-            }
-
+            // Load local config first (highest priority among config files)
             if (File.Exists(localConfigFile))
             {
                 LoadEnvFile(localConfigFile);
@@ -521,6 +517,12 @@ private static void LoadEnvironmentVariables()
                 Console.WriteLine("💡 Consider creating Config/ai-config.local.env for your personal settings");
                 Console.WriteLine("   You can copy from Config/ai-config.local.env.template");
             }
+
+            // Then load template config to fill in any missing values
+            if (File.Exists(templateConfigFile))
+            {
+                LoadEnvFile(templateConfigFile);
+            }
         }
         catch (Exception ex)
         {
@@ -544,7 +546,12 @@ private static void LoadEnvFile(string filePath)
             {
                 string key = parts[0].Trim();
                 string value = parts[1].Trim().Trim('"', '\'');
-                Environment.SetEnvironmentVariable(key, value);
+
+                // Only set if not already set (allows shell script to override)
+                if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable(key)))
+                {
+                    Environment.SetEnvironmentVariable(key, value);
+                }
             }
         }
     }

doctor.sh

@@ -486,9 +486,9 @@ generate_migration_report() {
         sqlite3 "$db_path" <<SQL
 .mode markdown
 .headers off
-SELECT '- **Total COBOL Files:** ' || COUNT(DISTINCT source_file) FROM cobol_files WHERE run_id = $run_id;
-SELECT '- **Programs (.cbl):** ' || COUNT(DISTINCT source_file) FROM cobol_files WHERE run_id = $run_id AND source_file LIKE '%.cbl';
-SELECT '- **Copybooks (.cpy):** ' || COUNT(DISTINCT source_file) FROM cobol_files WHERE run_id = $run_id AND source_file LIKE '%.cpy';
+SELECT '- **Total COBOL Files:** ' || COUNT(DISTINCT file_name) FROM cobol_files WHERE run_id = $run_id;
+SELECT '- **Programs (.cbl):** ' || COUNT(DISTINCT file_name) FROM cobol_files WHERE run_id = $run_id AND file_name LIKE '%.cbl';
+SELECT '- **Copybooks (.cpy):** ' || COUNT(DISTINCT file_name) FROM cobol_files WHERE run_id = $run_id AND file_name LIKE '%.cpy';
 SQL
 
         echo ""
@@ -517,7 +517,7 @@ SQL
         sqlite3 "$db_path" <<SQL
 .mode markdown
 .headers on
-SELECT file_name AS 'File Name', file_path AS 'Path', line_count AS 'Lines'
+SELECT file_name AS 'File Name', file_path AS 'Path', is_copybook AS 'Is Copybook'
 FROM cobol_files 
 WHERE run_id = $run_id
 ORDER BY file_name;
@@ -895,6 +895,8 @@ run_migration() {
     fi
 
     # Run the application with updated folder structure
+    # Export TARGET_LANGUAGE so it's available to the dotnet process
+    export TARGET_LANGUAGE
     "$DOTNET_CMD" run -- --source ./source $skip_reverse_eng
     local migration_exit=$?