Update prompts

Author: rebelzach

samples/FizzBuzz.Generator.Basic/Program.cs

@@ -6,7 +6,8 @@
 using Wolder.Core;
 using Wolder.Core.Workspace;
 using Wolder.CSharp;
-using Wolder.CSharp.Actions;
+using Wolder.CSharp.CodeActions;
+using Wolder.CSharp.ProjectActions;
 
 var builder = Host.CreateApplicationBuilder();
 builder.Logging.AddConsole();

samples/FizzBuzz.Generator.OpenAI/Program.cs

@@ -1,6 +1,5 @@
 using Wolder.Core;
 using Wolder.CSharp;
-using Wolder.CSharp.Actions;
 using Wolder.CSharp.OpenAI;
 using Wolder.CSharp.OpenAI.Actions;
 using Microsoft.Extensions.DependencyInjection;
@@ -9,6 +8,7 @@
 using Wolder.CommandLine;
 using Wolder.CommandLine.Actions;
 using Wolder.Core.Workspace;
+using Wolder.CSharp.CodeActions;
 
 var builder = Host.CreateApplicationBuilder();
 builder.Logging.AddConsole();

samples/TodoList.Blazor.Generator/Program.cs

@@ -2,13 +2,14 @@
 using Wolder.CommandLine.Actions;
 using Wolder.Core;
 using Wolder.CSharp;
-using Wolder.CSharp.Actions;
 using Wolder.CSharp.OpenAI;
 using Wolder.CSharp.OpenAI.Actions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Wolder.Core.Workspace;
+using Wolder.CSharp.CodeActions;
+using Wolder.CSharp.ProjectActions;
 
 var builder = Host.CreateApplicationBuilder();
 builder.Logging.AddConsole();
@@ -27,6 +28,7 @@ await host.Services.GetRequiredService<GeneratorWorkspaceBuilder>()
 class GenerateTodoListApp(
     CommandLineActions commandLine,
     CSharpActions csharp,
+    CSharpProjectActions cSharpProject,
     CSharpGenerator csharpGenerator) : IVoidAction
 {
     public async Task InvokeAsync()
@@ -71,7 +73,11 @@ Make sure the services are registered before the app container is built.
                 "Services",
                 "ITodoService",
                 """
-                An interface for a service that provides CRUD actions for todo list items. Getting all items should return a list.
+                An interface for a service that provides these actions for todo list items. 
+                - Add item
+                - Remove item
+                - Update item 
+                - Get all items: should return a list
                 """)
             {
                 ContextMemoryItems = [todoItem]

src/Wolder.CSharp.OpenAI/Actions/GenerateBlazorComponent.cs

@@ -30,7 +30,7 @@ public class GenerateBlazorComponent(
         "written to a `.razor` file. Write terse but helpful comments to explain the code and its structure. " +
         "Add any usings for items used from the context. Ensure all comments use razor style comments @* comment *@. " +
         "It is crucial that the `@rendermode InteractiveServer` directive is included at the top of an interactive component/page " +
-        "so that it works correctly in an interactive server scenario.";
+        "so that it works correctly in an interactive server scenario. Nullable references are enabled.";
 
     public async Task<FileMemoryItem> InvokeAsync()
     {

src/Wolder.CSharp.OpenAI/Actions/GenerateClass.cs

@@ -1,12 +1,9 @@
-using System.Text.RegularExpressions;
+using Microsoft.Extensions.Logging;
+using System.Text.RegularExpressions;
 using Wolder.Core.Assistants;
 using Wolder.Core.Files;
 using Wolder.CSharp.Compilation;
-using Microsoft.Extensions.Logging;
-using Wolder.CommandLine;
-using Wolder.CommandLine.Actions;
 using Wolder.Core.Workspace;
-using Wolder.CSharp.Actions;
 
 namespace Wolder.CSharp.OpenAI.Actions;
 
@@ -25,6 +22,10 @@ public class GenerateClass(
     GenerateClassParameters parameters) 
     : IAction<GenerateClassParameters, FileMemoryItem>
 {
+    public const string CSharpPrompt =
+        "You are a helpful assistant that writes C# code to complete any task specified by me. " +
+        "Your output will be directly written to a file where it will be compiled as part of a " +
+        "larger C# project. Nullable references are enabled.";
     public async Task<FileMemoryItem> InvokeAsync()
     {
         var (project, classNamespace, className, behaviorPrompt) = parameters;
@@ -36,12 +37,13 @@ public async Task<FileMemoryItem> InvokeAsync()
 
         var tree = sourceFiles.GetDirectoryTree();
         var context = $$"""
+            
             Directory Tree:
             {{tree}}
             """;
         if (parameters.ContextMemoryItems.Any())
         {
-            context = "\nThe items may also provide helpful context:\n" + 
+            context = "\nThese items may also provide helpful context:\n" + 
                 string.Join("\n", parameters.ContextMemoryItems
                     .Select(i => $"File: {i.RelativePath}\n{i.Content}" ));
         }
@@ -50,12 +52,13 @@ public async Task<FileMemoryItem> InvokeAsync()
             ? ""
             : $".{classNamespace}";
         var response = await assistant.CompletePromptAsync($"""
-            You are a C# code generator. Output only C#, your output will be directly written to a `.cs` file.
-            Write terse but helpful explanatory comments.
+            {CSharpPrompt}
             {context}
 
             Create a class named `{className}` with namespace `{project.BaseNamespace}{namespaceEnd}` with the following behavior:
             {behaviorPrompt}
+            
+            Begin Output:
             """);
 
         var classMemoryItem = await SanitizeAndWriteClassAsync(response);
@@ -88,14 +91,18 @@ Write terse but helpful explanatory comments.
             var diagnosticMessages = lastResult.Output.Errors;
             var messagesText = string.Join(Environment.NewLine, diagnosticMessages);
             var response = await assistant.CompletePromptAsync($"""
-                You are a helpful assistant that writes C# code to complete any task specified by me. Your output will be directly written to a file where it will be compiled as part of a larger C# project.
+                {CSharpPrompt}
                 {context}
 
-                Given the following compilation diagnostic messages transform the following file to resolve the messages:
+                Given the following errors:
                 {messagesText}
                 
-                File Content:
+                Transform the following file to resolve the errors:
+                ```
                 {lastFile.Content}
+                ```
+                
+                Begin Output:
                 """);
 
             classMemoryItem = await SanitizeAndWriteClassAsync(response);

src/Wolder.CSharp.OpenAI/Actions/TransformClass.cs

@@ -22,8 +22,7 @@ public async Task<FileMemoryItem> InvokeAsync()
         var (projectRef, filePath, behaviorPrompt) = parameters;
         var content = await sourceFiles.ReadFileAsync(filePath);
         var response = await assistant.CompletePromptAsync($"""
-            You are a C# code generator. Output only C#, your output will be directly written to a `.cs` file.
-            Write terse but helpful comments. Any explanation must be written as C# comments.
+            {GenerateClass.CSharpPrompt}
 
             Using the code from this file:
             File: {filePath}
@@ -33,6 +32,8 @@ Write terse but helpful comments. Any explanation must be written as C# comments
 
             Update the code with the following behavior:
             {behaviorPrompt}
+            
+            Begin Output:
             """);
 
         logger.LogInformation(response);

src/Wolder.CSharp/Actions/CreateProject.cs

@@ -1,5 +1,6 @@
 using Wolder.Core.Workspace;
-using Wolder.CSharp.Actions;
+using Wolder.CSharp.CodeActions;
+using Wolder.CSharp.ProjectActions;
 
 namespace Wolder.CSharp;
 

src/Wolder.CSharp/CSharpActions.cs

@@ -0,0 +1,10 @@
+using Wolder.Core.Workspace;
+using Wolder.CSharp.ProjectActions;
+
+namespace Wolder.CSharp;
+
+[GenerateActionCall<SetNullability>]
+[GenerateActionCall<CompileProject>]
+public partial class CSharpProjectActions
+{
+}

src/Wolder.CSharp/CSharpProjectActions.cs

@@ -1,7 +1,7 @@
 using Wolder.Core.Files;
 using Wolder.Core.Workspace;
 
-namespace Wolder.CSharp.Actions;
+namespace Wolder.CSharp.CodeActions;
 
 public record CreateClassParameters(DotNetProjectReference Project, string ClassName, string ClassContent);
 

src/Wolder.CSharp/Actions/CreateClass.cs renamed to src/Wolder.CSharp/CodeActions/CreateClass.cs

@@ -1,7 +1,7 @@
 using Wolder.Core.Files;
 using Wolder.Core.Workspace;
 
-namespace Wolder.CSharp.Actions;
+namespace Wolder.CSharp.CodeActions;
 
 public enum DotNetSdkVersion
 {

src/Wolder.CSharp/Actions/CreateSdkGlobal.cs renamed to src/Wolder.CSharp/CodeActions/CreateSdkGlobal.cs

@@ -5,7 +5,7 @@
 using Wolder.Core.Workspace;
 using Wolder.CSharp.Compilation;
 
-namespace Wolder.CSharp.Actions;
+namespace Wolder.CSharp.ProjectActions;
 
 public record CompileProjectParameters(DotNetProjectReference Project);
 

src/Wolder.CSharp/Actions/CompileProject.cs renamed to src/Wolder.CSharp/ProjectActions/CompileProject.cs

@@ -0,0 +1,51 @@
+using Microsoft.Build.Construction;
+using Wolder.Core.Files;
+using Wolder.Core.Workspace;
+
+namespace Wolder.CSharp.ProjectActions;
+
+public enum ProjectNullability
+{
+    Enable,
+    Disable
+}
+
+public record SetNullabilityParameters(DotNetProjectReference Project, ProjectNullability Nullability);
+
+public class SetNullability(
+    ISourceFiles sourceFiles,
+    SetNullabilityParameters parameters)
+    : IVoidAction<SetNullabilityParameters>
+{
+    public Task InvokeAsync()
+    {
+        var csprojPath = sourceFiles.GetAbsolutePath(parameters.Project.RelativeFilePath);
+        var projectRoot = ProjectRootElement.Open(csprojPath);
+
+        var propertyGroup = projectRoot.PropertyGroups
+            .FirstOrDefault(x => x.Properties.Any(p => p.Name == "Nullable"))
+            ?? projectRoot.PropertyGroups
+                .FirstOrDefault(x => x.Properties.Any(p => p.Name == "TargetFramework"));
+
+        var nullability = parameters.Nullability switch
+        {
+            ProjectNullability.Enable => "enable",
+            ProjectNullability.Disable => "disable",
+            _ => throw new InvalidOperationException("Unknown nullability")
+        };
+    
+        if (propertyGroup != null)
+        {
+            propertyGroup.AddProperty("Nullable", nullability);
+        }
+        else
+        {
+            propertyGroup = projectRoot.AddPropertyGroup();
+            propertyGroup.AddProperty("Nullable", nullability);
+        }
+
+        projectRoot.Save();
+
+        return Task.CompletedTask;
+    }
+}

src/Wolder.CSharp/ProjectActions/SetNullability.cs

@@ -1,5 +1,4 @@
 using Wolder.Core;
-using Wolder.CSharp.Actions;
 using Wolder.CSharp.Compilation;
 using Microsoft.Extensions.DependencyInjection;
 using Wolder.Core.Workspace;
@@ -12,6 +11,7 @@ public static GeneratorWorkspaceBuilder AddCSharpActions(this GeneratorWorkspace
     {
         builder.Services.AddScoped<DotNetProjectFactory>();
         builder.AddActions<CSharpActions>();
+        builder.AddActions<CSharpProjectActions>();
 
         return builder;
     }