work in progress apphost debug

Author: adamint

extension/src/server/interactionService.ts

@@ -5,6 +5,7 @@ import { yesLabel, noLabel, directLink, codespacesLink, openAspireDashboard, fai
 import { ICliRpcClient } from './rpcClient';
 import { formatText } from '../utils/strings';
 import { IOutputChannelWriter } from '../utils/logging';
+import { runNewSession, RunSessionRequest } from '../dcp/processRunner';
 
 export interface IInteractionService {
     showStatus: (statusText: string | null) => void;
@@ -22,6 +23,7 @@ export interface IInteractionService {
     displayCancellationMessage: (message: string) => void;
     openProject: (projectPath: string) => void;
     logMessage: (logLevel: string, message: string) => void;
+    runSession: (request: RunSessionRequest) => Promise<boolean>;
 }
 
 type DashboardUrls = {
@@ -226,6 +228,11 @@ export class InteractionService implements IInteractionService {
         this._outputChannelWriter.appendLine('cli', `[${logLevel}] ${formatText(message)}`);
     }
 
+    runSession(request: RunSessionRequest): Promise<boolean> {
+        this._outputChannelWriter.appendLine('interaction', `Running session with request: ${JSON.stringify(request)}`);
+        return runNewSession(request);
+    }
+
     clearStatusBar() {
         if (this._statusBarItem) {
             this._statusBarItem.hide();
@@ -251,4 +258,5 @@ export function addInteractionServiceEndpoints(connection: MessageConnection, in
     connection.onRequest("displayCancellationMessage", withAuthentication(interactionService.displayCancellationMessage.bind(interactionService)));
     connection.onRequest("openProject", withAuthentication(interactionService.openProject.bind(interactionService)));
     connection.onRequest("logMessage", withAuthentication(interactionService.logMessage.bind(interactionService)));
+    connection.onRequest("runSession", withAuthentication(interactionService.runSession.bind(interactionService)));
 }

extension/src/server/rpcClient.ts

@@ -4,6 +4,7 @@ import { logAsyncOperation } from '../utils/logging';
 export interface ICliRpcClient {
     getCliVersion(): Promise<string>;
     validatePromptInputString(input: string): Promise<ValidationResult | null>;
+    processExited(id: string, exitCode: number): Promise<void>;
 }
 
 export type ValidationResult = {
@@ -44,4 +45,19 @@ export class RpcClient implements ICliRpcClient {
             }
         );
     }
+
+    processExited(id: string, exitCode: number): Promise<void> {
+        return logAsyncOperation(
+            "interaction",
+            `Notifying that process has exited`,
+            () => `Process exit notification sent successfully`,
+            async () => {
+                return await this._messageConnection.sendRequest<void>('processExited', {
+                    token: this._token,
+                    id,
+                    exitCode
+                });
+            }
+        );
+    }
 }

extension/src/test/rpc/interactionServiceTests.test.ts

@@ -212,6 +212,9 @@ class TestOutputChannelWriter implements IOutputChannelWriter {
 }
 
 class TestCliRpcClient implements ICliRpcClient {
+	processExited(id: string, exitCode: number): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
 	getCliVersion(): Promise<string> {
 		return Promise.resolve('1.0.0');
 	}

src/Aspire.Cli/Backchannel/BackchannelDataTypes.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Text.Json.Serialization;
+
 namespace Aspire.Cli.Backchannel;
 
 /// <summary>
@@ -45,3 +47,18 @@ internal enum InputType
     /// </summary>
     Number
 }
+
+internal class RunSessionRequest
+{
+    [JsonPropertyName("id")]
+    public required string Id { get; init; }
+
+    [JsonPropertyName("launch_configurations")]
+    public required ProjectLaunchConfiguration[] LaunchConfigurations { get; init; }
+
+    [JsonPropertyName("env")]
+    public required EnvVar[]? Env { get; init; }
+
+    [JsonPropertyName("args")]
+    public required string[] Args { get; init; }
+}

src/Aspire.Cli/Backchannel/BackchannelJsonSerializerContext.cs

@@ -24,6 +24,7 @@ namespace Aspire.Cli.Backchannel;
 [JsonSerializable(typeof(RequestId))]
 [JsonSerializable(typeof(IEnumerable<DisplayLineState>))]
 [JsonSerializable(typeof(ValidationResult))]
+[JsonSerializable(typeof(RunSessionRequest))]
 internal partial class BackchannelJsonSerializerContext : JsonSerializerContext
 {
     [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Using the Json source generator.")]

src/Aspire.Cli/Backchannel/ExtensionBackchannel.cs

@@ -37,10 +37,23 @@ internal interface IExtensionBackchannel
     Task OpenProjectAsync(string projectPath, CancellationToken cancellationToken);
     Task LogMessageAsync(LogLevel logLevel, string message, CancellationToken cancellationToken);
     Task<IReadOnlyList<VersionedCapability>> GetCapabilitiesAsync(CancellationToken cancellationToken);
+    bool TryGetProcessExitCode(string id, [NotNullWhen(true)] out int? exitCode);
+    Task<bool> RunExecutableAsync(RunSessionRequest runSessionRequest, CancellationToken cancellationToken);
 }
 
 internal record VersionedCapability(string Name, Version Version)
 {
+    public bool IsCompatible(VersionedCapability other)
+    {
+        if (Name != other.Name)
+        {
+            return false;
+        }
+
+        // If the version is the same or higher, it is compatible.
+        return Version.CompareTo(other.Version) >= 0;
+    }
+
     public override string ToString()
     {
         return $"{Name}.v{Version}";
@@ -238,7 +251,7 @@ static void AddLocalRpcTarget(JsonRpc rpc, ExtensionRpcTarget target)
                     Capabilities.Add(new VersionedCapability(capabilityName, version));
                 }
 
-                if (!Capabilities.Any(capability => capability.Name == s_baselineCapability.Name && capability.Version.CompareTo(s_baselineCapability.Version) <= 0))
+                if (!Capabilities.Any(capability => capability.Name == s_baselineCapability.Name && s_baselineCapability.IsCompatible(capability)))
                 {
                     throw new ExtensionIncompatibleException(
                         string.Format(CultureInfo.CurrentCulture, ErrorStrings.ExtensionIncompatibleWithCli, s_baselineCapability.ToString()),
@@ -534,6 +547,36 @@ public async Task<IReadOnlyList<VersionedCapability>> GetCapabilitiesAsync(Cance
         return Capabilities;
     }
 
+    public bool TryGetProcessExitCode(string id, [NotNullWhen(true)] out int? exitCode)
+    {
+        if (target.ProcessExitCodes.TryGetValue(id, out var code))
+        {
+            exitCode = code;
+            return true;
+        }
+
+        exitCode = null;
+        return false;
+    }
+
+    public async Task<bool> RunExecutableAsync(RunSessionRequest runSessionRequest, CancellationToken cancellationToken)
+    {
+        await ConnectAsync(cancellationToken);
+
+        using var activity = _activitySource.StartActivity();
+
+        var rpc = await _rpcTaskCompletionSource.Task;
+
+        logger.LogDebug("Sending executable run session request: {RequestId}", runSessionRequest.Id);
+
+        var result = await rpc.InvokeWithCancellationAsync<bool>(
+            "runSession",
+            [_token, runSessionRequest],
+            cancellationToken);
+
+        return result;
+    }
+
     private X509Certificate2 GetCertificate()
     {
         var serverCertificate = configuration[KnownConfigNames.ExtensionCert];

src/Aspire.Cli/Backchannel/ExtensionCapabilities.cs

@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Aspire.Cli.Backchannel;
+
+internal static class ExtensionCapabilities
+{
+    public static readonly VersionedCapability CSharpRunner = new("csharp", new Version(1, 0));
+}

src/Aspire.Cli/Backchannel/ExtensionRpcTarget.cs

@@ -19,6 +19,19 @@ internal interface IExtensionRpcTarget
 internal class ExtensionRpcTarget(IConfiguration configuration) : IExtensionRpcTarget
 {
     public Func<string, ValidationResult>? ValidationFunction { get; set; }
+    public Dictionary<string, int> ProcessExitCodes { get; } = [];
+
+    [JsonRpcMethod("processExited")]
+    public Task ProcessExitedAsync(string id, int exitCode)
+    {
+        if (string.IsNullOrEmpty(id) || exitCode < 0)
+        {
+            return Task.CompletedTask;
+        }
+
+        ProcessExitCodes[id] = exitCode;
+        return Task.CompletedTask;
+    }
 
     [JsonRpcMethod("getCliVersion")]
     public Task<string> GetCliVersionAsync(string token)

src/Aspire.Cli/Backchannel/FailedToConnectBackchannelConnection.cs

@@ -1,11 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics;
-
 namespace Aspire.Cli.Backchannel;
 
-internal sealed class FailedToConnectBackchannelConnection(string message, Process process, Exception innerException) : Exception(message, innerException)
-{
-    public Process Process => process;
-}
+internal sealed class FailedToConnectBackchannelConnection(string message, Exception innerException) : Exception(message, innerException);

src/Aspire.Cli/Configuration/ConfigurationService.cs

@@ -63,7 +63,7 @@ public async Task<bool> DeleteConfigurationAsync(string key, bool isGlobal = fal
 
             // Delete using dot notation support and return whether deletion occurred
             var deleted = DeleteNestedValue(settings, key);
-            
+
             if (deleted)
             {
                 // Write the updated settings
@@ -79,7 +79,7 @@ public async Task<bool> DeleteConfigurationAsync(string key, bool isGlobal = fal
         }
     }
 
-    private string GetSettingsFilePath(bool isGlobal)
+    public string GetSettingsFilePath(bool isGlobal)
     {
         if (isGlobal)
         {
@@ -129,7 +129,7 @@ private static async Task LoadConfigurationFromFileAsync(string filePath, Dictio
         {
             var content = await File.ReadAllTextAsync(filePath, cancellationToken);
             var settings = JsonNode.Parse(content)?.AsObject();
-            
+
             if (settings is not null)
             {
                 FlattenJsonObject(settings, config, string.Empty);
@@ -154,13 +154,13 @@ private static void SetNestedValue(JsonObject settings, string key, string value
         for (int i = 0; i < keyParts.Length - 1; i++)
         {
             var part = keyParts[i];
-            
+
             // If the property doesn't exist or isn't an object, replace it with a new object
             if (!currentObject.ContainsKey(part) || currentObject[part] is not JsonObject)
             {
                 currentObject[part] = new JsonObject();
             }
-            
+
             currentObject = currentObject[part]!.AsObject();
         }
 
@@ -184,17 +184,17 @@ private static bool DeleteNestedValue(JsonObject settings, string key)
         {
             var part = keyParts[i];
             objectPath.Add((currentObject, part));
-            
+
             if (!currentObject.ContainsKey(part) || currentObject[part] is not JsonObject)
             {
                 return false; // Path doesn't exist
             }
-            
+
             currentObject = currentObject[part]!.AsObject();
         }
 
         var finalKey = keyParts[keyParts.Length - 1];
-        
+
         // Check if the final key exists
         if (!currentObject.ContainsKey(finalKey))
         {
@@ -208,7 +208,7 @@ private static bool DeleteNestedValue(JsonObject settings, string key)
         for (int i = objectPath.Count - 1; i >= 0; i--)
         {
             var (parentObject, parentKey) = objectPath[i];
-            
+
             // If the current object is empty, remove it from its parent
             if (currentObject.Count == 0)
             {
@@ -232,7 +232,7 @@ private static void FlattenJsonObject(JsonObject obj, Dictionary<string, string>
         foreach (var kvp in obj)
         {
             var key = string.IsNullOrEmpty(prefix) ? kvp.Key : $"{prefix}.{kvp.Key}";
-            
+
             if (kvp.Value is JsonObject nestedObj)
             {
                 FlattenJsonObject(nestedObj, result, key);