Merge remote-tracking branch 'origin/opensrc/main' into open-main

Author: ljcollins25

src/Codex.Application/CodexProgram.cs

@@ -1,28 +1,49 @@
 using System.Reflection;
 using Codex.Application.Verbs;
 using Codex.Storage;
+using Codex.Utilities;
 
 namespace Codex.Application;
 
-public record CodexProgram : OperationBase
+public sealed record CodexProgram : CodexProgramBase
+{
+    public override async ValueTask<int?> TryRunSpecialAsync(string[] args)
+    {
+        if (CodexLegacyProgram.LegacyVerbNames.Contains(args.FirstOrDefault()))
+        {
+            var program = new CodexLegacyProgram();
+            return await program.RunAsync(args);
+        }
+
+        return null;
+    }
+}
+
+public record CodexProgramBase : OperationBase
 {
     public static Task<int> Main(params string[] args)
     {
         return new CodexProgram().RunAsync(args);
     }
 
+    public virtual ValueTask<int?> TryRunSpecialAsync(string[] args)
+    {
+        return ValueTask.FromResult<int?>(null);
+    }
+
     public async Task<int> RunAsync(params string[] args)
     {
         Arguments = args;
-        Console.WriteLine(Environment.CommandLine);
-        Console.WriteLine("Args");
-        Console.WriteLine(String.Join("\n", args));
-        if (CodexLegacyProgram.LegacyVerbNames.Contains(args.FirstOrDefault()))
+        if (!MiscUtilities.TryGetEnvironmentVariable("CODEX_DISABLE_PRINT_ARGS", out _))
         {
-            var program = new CodexLegacyProgram();
-            return await program.RunAsync(args);
+            Console.WriteLine(Environment.CommandLine);
+            Console.WriteLine("Args");
+            Console.WriteLine(String.Join("\n", args));
         }
 
+        var result = await TryRunSpecialAsync(args);
+        if (result.HasValue) return result.Value;
+
         ParserResult<object> parsedArgs = ParseArgs();
 
         if (parsedArgs.Tag == ParserResultType.NotParsed)

src/Codex.Automation.Workflow/Cli/CliProgram.cs

@@ -1,13 +1,8 @@
-using System;
-using System.Collections;
-using System.Collections.ObjectModel;
 using Codex.Application;
-using Codex.Utilities;
-using CommandLine;
 
 namespace Codex.Automation.Workflow;
 
-public record CliProgram : CodexProgram
+public record CliProgram : CodexProgramBase
 {
-    
+
 }

src/Codex.Integration.Tests/UtilitiesTests.cs

@@ -30,6 +30,17 @@ public partial record UtilitiesTests(ITestOutputHelper output) : CodexTestBase(o
 {
     private static ISpanSerializer<SmallIntArray> ValueArraySerializer = new BinaryItemSerializer<SmallIntArray>();
 
+    [Fact]
+    public void UriCombine()
+    {
+        test("https://local:234?hello=world", "relative/index", "https://local:234/relative/index?hello=world");
+
+        void test(string baseUri, string relativeUri, string expected, bool preserveBaseQuery = true, bool forcePreserveBaseQuery = false)
+        {
+            var actual = PathUtilities.Combine(baseUri, relativeUri, preserveBaseQuery, forcePreserveBaseQuery);
+            actual.ToString().Should().Be(expected);
+        }
+    }
 
     [Fact]
     public void AsymmetricEncryptionRoundtrip()

src/Codex.ObjectModel/Utilities/PathUtilities.cs

@@ -41,23 +41,40 @@ public static bool ToUriOrPath(Uri candidateUri, out Uri uri, out string path, s
             }
         }
 
-        public static Url Combine(this Url uri, string relativeUri)
+        public static Url Combine(this Url baseUri, string relativeUri, bool preserveBaseQuery = true, bool forcePreserveBaseQuery = false)
         {
-            var builder = uri.UriBuilder;
-            builder.Path = UriCombine(builder.Path, relativeUri);
-            return builder.Uri;
+            return baseUri.Uri.Combine(relativeUri, preserveBaseQuery, forcePreserveBaseQuery);
         }
 
-        public static Uri Combine(this Uri uri, string relativeUri)
+        public static Uri Combine(this Uri baseUri, string relativeUri, bool preserveBaseQuery = true, bool forcePreserveBaseQuery = false)
         {
-            var builder = new UriBuilder(uri);
-            builder.Path = UriCombine(builder.Path, relativeUri);
-            return builder.Uri;
+            if ((!forcePreserveBaseQuery || string.IsNullOrEmpty(baseUri.Query))
+                && relativeUri?.Contains(":") == true)
+            {
+                return new Uri(relativeUri);
+            }
+
+            var result = new Uri(baseUri.EnsureTrailingSlash(), relativeUri);
+            if (preserveBaseQuery && !string.IsNullOrEmpty(baseUri.Query))
+            {
+                var builder = new UriBuilder(result);
+                builder.Query = CombineQuery(baseUri.Query, builder.Query);
+                return builder.Uri;
+            }
+
+            return result;
+        }
+
+        public static string CombineQuery(string query1, string query2)
+        {
+            if (string.IsNullOrEmpty(query1)) return query2;
+            else if (string.IsNullOrEmpty(query2)) return query1;
+            else return $"{query1}&{query2.AsSpan().TrimStart('?')}";
         }
 
         public static Uri RemoveQuery(Url uri)
         {
-            return new Uri(uri.Uri.GetLeftPart(UriPartial.Path));
+            return new Uri(uri.UriString.AsSpan().SubstringBeforeFirstIndexOfAny("?").ToString());
         }
 
         public static Uri WithoutQuery(this Uri uri)