AgentClient - preparation for changes in the initialization process

src/Cody.AgentTester/Cody.AgentTester.csproj

@@ -57,11 +57,10 @@
       <Project>{9ff2cc40-78e9-46c8-b2ef-30a1f1be82f2}</Project>
       <Name>Cody.Core</Name>
     </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="StreamJsonRpc">
-      <Version>2.9.85</Version>
-    </PackageReference>
+    <ProjectReference Include="..\Cody.VisualStudio\Cody.VisualStudio.csproj">
+      <Project>{3bb34f98-f069-4a38-bc4d-cf407d59b863}</Project>
+      <Name>Cody.VisualStudio</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/Cody.AgentTester/Program.cs

@@ -1,37 +1,40 @@
 using Cody.Core.Agent;
-using Cody.Core.Agent.Connector;
 using Cody.Core.Agent.Protocol;
+using Cody.VisualStudio.Client;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 
 namespace Cody.AgentTester
 {
     internal class Program
     {
-        private static AgentConnector connector;
+        private static AgentClient client;
         private static ConsoleLogger logger = new ConsoleLogger();
-        private static IAgentClient agentClient;
+        private static IAgentService agentService;
 
         static async Task Main(string[] args)
         {
             // Set the env var to 3113 when running with local agent.
-            var portNumber = int.TryParse(Environment.GetEnvironmentVariable("CODY_VS_DEV_PORT"), out int port) ? port : (int?)null;
+            var devPort = Environment.GetEnvironmentVariable("CODY_VS_DEV_PORT");
+            var portNumber = int.TryParse(devPort, out int port) ? port : 3113;
 
-            var options = new AgentConnectorOptions
+            var options = new AgentClientOptions
             {
-                NotificationsTarget = new NotificationHandlers(),
+                NotificationHandlers = new List<INotificationHandler> { new NotificationHandlers() },
                 AgentDirectory = "../../../Cody.VisualStudio/Agent",
                 RestartAgentOnFailure = true,
                 Debug = true,
-                Port = portNumber,
+                ConnectToRemoteAgent = devPort != null,
+                RemoteAgentPort = portNumber,
             };
 
-            connector = new AgentConnector(options, logger);
+            client = new AgentClient(options, logger);
 
-            await connector.Connect();
+            client.Start();
 
-            agentClient = connector.CreateClient();
+            agentService = client.CreateAgentService<IAgentService>();
 
             await Initialize();
 
@@ -76,9 +79,9 @@ private static async Task Initialize()
                 }
             };
 
-            await agentClient.Initialize(clientInfo);
+            await agentService.Initialize(clientInfo);
 
-            agentClient.Initialized();
+            agentService.Initialized();
         }
 
 

src/Cody.Core/Agent/AgentMethodAttribute.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Cody.Core.Agent
+{
+    public class AgentMethodAttribute : Attribute
+    {
+        public AgentMethodAttribute(string name)
+        {
+            Name = name;
+        }
+
+        public string Name { get; private set; }
+    }
+}

src/Cody.Core/Agent/AgentNotificationAttribute.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Cody.Core.Agent
+{
+    public class AgentNotificationAttribute : Attribute
+    {
+        public AgentNotificationAttribute(string name, bool deserializeToSingleObject = false)
+        {
+            Name = name;
+            DeserializeToSingleObject = deserializeToSingleObject;
+        }
+
+        public string Name { get; private set; }
+
+        public bool DeserializeToSingleObject { get; private set; }
+    }
+}