Merge remote changes and resolve namespace conflict

Author: sharpninja

.claude/launch.json

@@ -0,0 +1,28 @@
+{
+  "version": "0.0.1",
+  "configurations": [
+    {
+      "name": "McpServer.Web",
+      "runtimeExecutable": "dotnet",
+      "runtimeArgs": ["run", "--project", "src/McpServer.Web"],
+      "port": 39984
+    },
+    {
+      "name": "McpServer.Director",
+      "runtimeExecutable": "dotnet",
+      "runtimeArgs": ["run", "--project", "src/McpServer.Director"]
+    },
+    {
+      "name": "McpServerManager.Desktop",
+      "runtimeExecutable": "dotnet",
+      "runtimeArgs": ["run", "--project", "src/McpServerManager.Desktop"],
+      "autoPort": true
+    },
+    {
+      "name": "McpServerManager.Desktop (WSL)",
+      "runtimeExecutable": "wsl",
+      "runtimeArgs": ["dotnet", "run", "--project", "src/McpServerManager.Desktop"],
+      "autoPort": true
+    }
+  ]
+}

.claude/settings.local.json

@@ -0,0 +1,36 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(find /f/GitHub/McpServerManager/.claude/worktrees/magical-ritchie -type f -name *auth* -o -name *Auth*)",
+      "mcp__Claude_Preview__preview_start",
+      "Bash(curl -s http://localhost:7147/auth/config)",
+      "Bash(curl -s http://localhost:39984/auth/config)",
+      "Bash(find F:GitHubMcpServerManagersrc F:GitHubMcpServerManagertests -name *.cs -type f)",
+      "Bash(xargs grep:*)",
+      "Bash(find F:GitHubMcpServerManagertests -name *.cs -type f)",
+      "Bash(find F:GitHubMcpServerManager -name *.json -o -name *.xml -o -name *.yaml -o -name *.yml)",
+      "Bash(grep -r '^namespace McpServer\\\\.' F:GitHubMcpServerManagertests --include=*.cs)",
+      "Bash(find F:GitHubMcpServerManagersrc -name *.csproj -exec grep -H McpServer. {})",
+      "Bash(2)",
+      "Bash(find F:GitHubMcpServerManagersrc -name *.csproj)",
+      "Bash(find F:GitHubMcpServerManagertests -name *.csproj)",
+      "Bash(xargs -0 sed -i -e s/McpServer.Director/McpServerManager.Director/g -e s/McpServer.UI/McpServerManager.UI/g -e s/McpServer.Web/McpServerManager.Web/g -e s/McpServer.VsExtension/McpServerManager.VsExtension/g echo 'Done. Checking for double-renames...' grep -r McpServerManagerManager src tests --include=*.cs -l)",
+      "Bash(echo \"Exit: $?\")",
+      "Bash(dotnet build:*)",
+      "Bash(while read:*)",
+      "Bash(do grep:*)",
+      "Bash(done)",
+      "Bash(xargs -0 sed -i -e 's/McpServer\\\\.Director/McpServerManager.Director/g' -e 's/McpServer\\\\.UI/McpServerManager.UI/g' -e 's/McpServer\\\\.Web/McpServerManager.Web/g' -e 's/McpServer\\\\.VsExtension/McpServerManager.VsExtension/g' echo \"AXAML files updated\")",
+      "Bash(do echo:*)",
+      "Read(//f/GitHub/McpServerManager/.claude/worktrees/magical-ritchie/**)",
+      "Bash(find /f/GitHub/McpServerManager -type f -name Build.cs -o -name Build.csproj -o -name *.nuke)",
+      "Bash(grep -n \"void RunDeploy\\\\|void RunPackDirector\\\\|void RunUpdateDirector\\\\|void RunUpdateWebUi\\\\|void RunBuildDesktop\\\\|void RunDeployAll\" /f/GitHub/McpServerManager/build/*.cs)",
+      "Bash(grep -n \"private.*DeployDirectorCore\\\\|private.*DeployWebUiCore\\\\|private.*DeployDesktopMsixCore\\\\|private.*DeployDesktopDebCore\" /f/GitHub/McpServerManager/build/*.cs)",
+      "Bash(grep -n \"BuildDesktopDebCore\" /f/GitHub/McpServerManager/build/*.cs)",
+      "Bash(grep -n \"BuildDesktopMsixCore\" /f/GitHub/McpServerManager/build/*.cs)",
+      "Bash(dotnet run:*)",
+      "Bash(find F:GitHubMcpServerManager -type f -name *.yaml -o -name *.yml)",
+      "Bash(git submodule:*)"
+    ]
+  }
+}

.gitignore

@@ -21,6 +21,7 @@ artifacts/
 
 AGENTS-README-FIRST.yaml
 *.nupkg
+*.vsix
 *.py
 /.codex/session-log-buffer.backfilled-20260306T184008Z.md
 /.codex/session-log-buffer.md

build/Build.BuildAndDeployTargets.cs

@@ -128,7 +128,7 @@ private string ExecuteDotnetToolPipeline(
         var outputDirectory = Path.IsPathRooted(nupkgDirectory) ? nupkgDirectory : Path.Combine(RepoRootPath, nupkgDirectory);
         EnsureDirectoryExists(outputDirectory);
 
-        var targetFramework = ResolveTargetFramework(projectPath, "net9.0");
+        var targetFramework = ResolveTargetFramework(projectPath, "net10.0");
         var publishDirectory = Path.Combine(Path.GetDirectoryName(projectPath)!, "bin", Configuration, targetFramework, "publish");
         var projectDocument = XDocument.Load(projectPath);
         var propertyGroups = projectDocument.Root?.Elements().Where(x => x.Name.LocalName == "PropertyGroup").ToList() ?? new List<XElement>();
@@ -280,7 +280,7 @@ private string ExecuteDotnetToolPipeline(
     private string BuildAndroidPackageCore()
     {
         var projectPath = Path.Combine(RepoRootPath, "src", "McpServerManager.Android", "McpServerManager.Android.csproj");
-        var targetFramework = ResolveTargetFramework(projectPath, "net9.0-android");
+        var targetFramework = ResolveTargetFramework(projectPath, "net10.0-android");
         var version = ResolveVersionDetails(PackageVersion);
         var artifactsDirectory = ArtifactsDirectoryPath;
         EnsureDirectoryExists(artifactsDirectory);
@@ -354,14 +354,14 @@ private string BuildAndroidPackageCore()
     private void DeployAndroidCore(string deviceSerial)
     {
         var projectPath = Path.Combine(RepoRootPath, "src", "McpServerManager.Android", "McpServerManager.Android.csproj");
-        var targetFramework = ResolveTargetFramework(projectPath, "net9.0-android");
+        var targetFramework = ResolveTargetFramework(projectPath, "net10.0-android");
 
         if (!ShouldExecuteAction($"Deploy Android app to {deviceSerial}"))
         {
             return;
         }
 
-        var devices = InvokeProcess("adb", new List<string> { "devices", "-l" }, RepoRootPath, true);
+        var devices = InvokeProcess(ResolveAdbPath(), new List<string> { "devices", "-l" }, RepoRootPath, true);
         foreach (var line in devices.StandardOutputLines)
         {
             Info(line);
@@ -430,7 +430,7 @@ private string BuildDesktopDebCore(bool installAfterBuild)
                     "-r",
                     runtimeId,
                     "-f",
-                    "net9.0",
+                    "net10.0",
                     "--self-contained",
                     "true",
                     "-p:PublishSingleFile=true",
@@ -662,9 +662,9 @@ private DeploymentResult DeployAndroidSelection(string targetName, bool expectEm
     {
         try
         {
-            if (!CommandExists("adb"))
+            if (!CommandExists("adb") && ResolveAdbPath() == "adb")
             {
-                return CreateDeploymentResult(targetName, "Skipped", "adb was not found in PATH.");
+                return CreateDeploymentResult(targetName, "Skipped", "adb was not found in PATH or Android SDK.");
             }
 
             var resolution = ResolveAndroidDevice(expectEmulator, requestedSerial);

build/Build.Common.cs

@@ -472,10 +472,41 @@ private void ApplyMarkdownAvaloniaLinuxPatchIfNeeded()
         File.WriteAllText(propsPath, updated);
     }
 
+    private string ResolveAdbPath()
+    {
+        // Check if adb is already on the system PATH.
+        if (CommandExists("adb"))
+            return "adb";
+
+        // Try ANDROID_HOME / ANDROID_SDK_ROOT environment variables.
+        foreach (var envVar in new[] { "ANDROID_HOME", "ANDROID_SDK_ROOT" })
+        {
+            var sdkRoot = Environment.GetEnvironmentVariable(envVar);
+            if (!string.IsNullOrWhiteSpace(sdkRoot))
+            {
+                var candidate = Path.Combine(sdkRoot, "platform-tools", "adb.exe");
+                if (File.Exists(candidate))
+                    return candidate;
+            }
+        }
+
+        // Try the default Windows SDK install location.
+        var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+        if (!string.IsNullOrWhiteSpace(localAppData))
+        {
+            var candidate = Path.Combine(localAppData, "Android", "Sdk", "platform-tools", "adb.exe");
+            if (File.Exists(candidate))
+                return candidate;
+        }
+
+        // Fallback — let the caller handle the missing-adb error.
+        return "adb";
+    }
+
     private List<AndroidDeviceInfo> GetAndroidDevicesCore()
     {
         var devices = new List<AndroidDeviceInfo>();
-        var adbCheck = InvokeProcess("adb", new List<string> { "devices", "-l" }, RepoRootPath, false);
+        var adbCheck = InvokeProcess(ResolveAdbPath(), new List<string> { "devices", "-l" }, RepoRootPath, false);
         if (adbCheck.ExitCode != 0)
         {
             return devices;

build/Build.MsixPackaging.cs

@@ -17,7 +17,7 @@ private sealed class MsixDesktopConfiguration
         public string PackageDisplayName { get; set; } = "McpServerManager";
         public string Publisher { get; set; } = string.Empty;
         public string DesktopProjectPath { get; set; } = Path.Combine("src", "McpServerManager.Desktop", "McpServerManager.Desktop.csproj");
-        public string DesktopFramework { get; set; } = "net9.0";
+        public string DesktopFramework { get; set; } = "net10.0";
         public string DesktopSubDirectory { get; set; } = "desktop";
         public string DesktopAppId { get; set; } = "McpServerManagerDesktop";
         public string DesktopDescription { get; set; } = "Avalonia desktop app for browsing and analyzing Copilot request/session logs";

build/Build.UtilityTargets.cs

@@ -551,7 +551,7 @@ string InvokeAdbCapture(IReadOnlyList<string> arguments, bool allowFailure = fal
         {
             var commandArguments = new List<string> { "-s", serial };
             commandArguments.AddRange(arguments);
-            var result = InvokeProcess("adb", commandArguments, RepoRootPath, false);
+            var result = InvokeProcess(ResolveAdbPath(), commandArguments, RepoRootPath, false);
             if (!allowFailure && result.ExitCode != 0)
             {
                 throw new InvalidOperationException($"adb {string.Join(" ", commandArguments)} failed.{Environment.NewLine}{result.GetCombinedOutput()}");
@@ -573,7 +573,7 @@ void WriteArtifact(string name, string content)
         }
 
         EnsureDirectoryExists(effectiveOutputRoot);
-        InvokeProcess("adb", new List<string> { "devices" }, RepoRootPath, true);
+        InvokeProcess(ResolveAdbPath(), new List<string> { "devices" }, RepoRootPath, true);
 
         WriteArtifact("session-metadata.json", JsonSerializer.Serialize(new
         {
@@ -584,7 +584,7 @@ void WriteArtifact(string name, string content)
             capturedAtUtc = DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture)
         }, new JsonSerializerOptions { WriteIndented = true }));
 
-        WriteArtifact("adb-devices.txt", InvokeProcess("adb", new List<string> { "devices", "-l" }, RepoRootPath, false).GetCombinedOutput());
+        WriteArtifact("adb-devices.txt", InvokeProcess(ResolveAdbPath(), new List<string> { "devices", "-l" }, RepoRootPath, false).GetCombinedOutput());
         WriteArtifact("device-getprop.txt", InvokeAdbCapture(new List<string> { "shell", "getprop" }, true));
         WriteArtifact("device-build.txt", InvokeAdbCapture(new List<string> { "shell", "dumpsys", "package", PackageName }, true));
 
@@ -646,7 +646,7 @@ dotnet run --project build/Build.csproj -- --target CollectAndroidCrashArtifacts
         if (IncludeBugreport)
         {
             var bugreportBase = Path.Combine(effectiveOutputRoot, "bugreport");
-            var bugreportResult = InvokeProcess("adb", new List<string> { "-s", serial, "bugreport", bugreportBase }, RepoRootPath, false);
+            var bugreportResult = InvokeProcess(ResolveAdbPath(), new List<string> { "-s", serial, "bugreport", bugreportBase }, RepoRootPath, false);
             WriteArtifact("bugreport-command-output.txt", bugreportResult.GetCombinedOutput());
         }
     }