chore: post-Phase-3 source cleanup + modernization (pre-Phase-4 prep)

.planning/backlog/client-requirements-pre-beta.md

@@ -39,7 +39,11 @@
 
 ---
 
-## Recommended integration (after Phase 3)
-1. `/gsd-new-milestone` OR extend the current milestone: add these as REQUIREMENTS.md entries (finalize IDs).
-2. Insert a **new engine phase** (collections + validation) before the beta; renumber: current Phase 4 (AOT/docs) and Phase 5 (beta) shift out so the beta stays last.
-3. Discuss-phase for the new phase (COLL-02/03 sequencing, VAL-01 pipeline hook point, the S1 re-verification gate for COLL-03).
+## Integration decision — APPROVED 2026-07-14 (owner)
+**Chosen: new engine phase before the beta** (renumber, beta stays last). Phase 3 shipped separately as PR #31.
+
+1. Add these as `REQUIREMENTS.md` entries (finalize IDs COLL-02/COLL-03/VAL-01/VAL-02/API-02).
+2. Insert as **new Phase 4 "Collection & Validation Binding"** via `/gsd-phase`; renumber current Phase 4 (AOT/docs) → **Phase 5**, current Phase 5 (beta) → **Phase 6**.
+3. `/gsd-discuss-phase 4` → plan → execute. Discussion must cover: COLL-02/03 sequencing, VAL-01 pipeline hook point, the **S1 secret-redaction re-verification gate for COLL-03** (it edits `BindPropertySettings`), and the load-bearing comma-scalar compatibility.
+
+Staged on branch `gsd/phase-4-collection-validation-binding` (forked off the Phase 3 tip; rebase onto `master` after PR #31 merges).

src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinder.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ExistForAll.SimpleSettings;
-using ExistForAll.SimpleSettings.Binders;
-
 namespace ExistForAll.SimpleSettings.Binders
 {
    public class CommandLineSettingsBinder : ISectionBinder
@@ -26,6 +20,7 @@ public CommandLineSettingsBinder(string[] args, CommandLineSettingsBinderOptions
 
       public void BindPropertySettings(BindingContext context)
       {
+
          var key = _options.NameFormatter != null ? _options.NameFormatter(context.Section, context.Key) : context.Key;
 
          if(_argumentStore.TryGetValue(key, out var value))
@@ -34,7 +29,7 @@ public void BindPropertySettings(BindingContext context)
          }
       }
 
-      private void Parse(string[] args)
+      private void Parse(string[]? args)
       {
          _argumentStore.Clear();
 
@@ -61,47 +56,39 @@ private void Parse(string[] args)
             if (!tokenWasPrefixed || index + 1 >= args.Length) continue;
 
             var next = args[index + 1];
-            if (next is null) continue;
             if (next.Length > 0 && Array.IndexOf(prefixes, next[0]) >= 0) continue;
 
             _argumentStore[name] = next;
             index++;
          }
       }
 
-      private static Tuple<string, string?>? SplitByDelimiter(string str, CommandLineSettingsBinderOptions options)
+      private static Tuple<string, string?>? SplitByDelimiter(string? str, CommandLineSettingsBinderOptions options)
       {
          if (str == null)
             return null;
 
          string key;
          string? value;
 
-         if (!options.Delimiters.Any())
+         if (!options.Delimiters.Any()) 
+            return new Tuple<string, string?>(str.Trim(), null);
+
+         var indices = options.Delimiters
+            .Select(d => str.IndexOf(d, StringComparison.Ordinal))
+            .Where(d => d != -1).ToList();
+
+         if (indices.Count == 0)
          {
             key = str.Trim();
             value = null;
          }
          else
          {
-
-            var indices = options.Delimiters.Where(delimiter => delimiter != null)
-               .Select(d => str.IndexOf(d))
-               .Where(d => d != -1).ToList();
-
-            if (indices.Count == 0)
-            {
-               key = str.Trim();
-               value = null;
-            }
-            else
-            {
-               var idx = indices.OrderBy(i => i).First();
-               key = str.Substring(0, idx);
-               value = str.Substring(idx + 1);
-            }
+            var idx = indices.OrderBy(i => i).First();
+            key = str[..idx];
+            value = str[(idx + 1)..];
          }
-
          return new Tuple<string, string?>(key, value);
       }
    }

src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinderOptions.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using ExistForAll.SimpleSettings.Binder;
 
 namespace ExistForAll.SimpleSettings.Binders

src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinder.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 
 namespace ExistForAll.SimpleSettings.Binders

src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinderOptions.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.Binders
 {
     public class EnvironmentVariableBinderOptions

src/Core/ExistForAll.SimpleSettings.Extensions.Binders/SettingsBuilderFactoryExtensions.cs

@@ -1,4 +1,3 @@
-using System;
 using Microsoft.Extensions.Configuration;
 
 namespace ExistForAll.SimpleSettings.Binders

src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsBuilderOptions.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost

src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsProvider.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Extensions.GenericHost
+namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {
     public interface ISettingsProvider
     {

src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ServicesSettingsBuilderExtensions.cs

@@ -1,5 +1,4 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {

src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptions.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {

src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptionsExtensions.cs

@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {

src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsProvider.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {
     internal class SettingsProvider : ISettingsProvider

src/Core/ExistForAll.SimpleSettings/Binder/InMemoryCollection.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace ExistForAll.SimpleSettings.Binder
+namespace ExistForAll.SimpleSettings.Binder
 {
 	public class InMemoryCollection : IInMemoryCollection
 	{

src/Core/ExistForAll.SimpleSettings/BindingContext.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings

src/Core/ExistForAll.SimpleSettings/Conversion/ArrayTypeConverter.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Conversion
+namespace ExistForAll.SimpleSettings.Conversion
 {
 	internal class ArrayTypeConverter : CollectionTypeConverter
 	{

src/Core/ExistForAll.SimpleSettings/Conversion/CollectionTypeConverter.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.Conversion
 {
 	// Shared conversion for the two collection shapes — arrays and IEnumerable<T> properties. Both split a

src/Core/ExistForAll.SimpleSettings/Conversion/DateTimeTypeConverter.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace ExistForAll.SimpleSettings.Conversion
 {

src/Core/ExistForAll.SimpleSettings/Conversion/DefaultTypeConverter.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace ExistForAll.SimpleSettings.Conversion
 {

src/Core/ExistForAll.SimpleSettings/Conversion/EnumTypeConverter.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Conversion
 {

src/Core/ExistForAll.SimpleSettings/Conversion/EnumerableTypeConverter.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using ExistForAll.SimpleSettings.Core.Reflection;
 
 namespace ExistForAll.SimpleSettings.Conversion

src/Core/ExistForAll.SimpleSettings/Conversion/ISettingsTypeConverter.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Conversion
+namespace ExistForAll.SimpleSettings.Conversion
 {
 	/// <summary>
 	/// Converts a bound settings value to a property's target type.

src/Core/ExistForAll.SimpleSettings/Conversion/PropertyConversion.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.Conversion
 {
 	// A per-property conversion resolved once (at plan build) instead of on every populate: the chosen

src/Core/ExistForAll.SimpleSettings/Conversion/TypeConvertersCollections.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace ExistForAll.SimpleSettings.Conversion
+namespace ExistForAll.SimpleSettings.Conversion
 {
 	internal class TypeConvertersCollections : LinkedList<ISettingsTypeConverter>
 	{

src/Core/ExistForAll.SimpleSettings/Conversion/UriTypeConvertor.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Conversion
+namespace ExistForAll.SimpleSettings.Conversion
 {
 	internal class UriTypeConvertor : ISettingsTypeConverter
 	{

src/Core/ExistForAll.SimpleSettings/Core/ISettingsTypesExtractor.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core
 {

src/Core/ExistForAll.SimpleSettings/Core/Reflection/EqualityCompererCreator.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 

src/Core/ExistForAll.SimpleSettings/Core/Reflection/IEqualityCompererCreator.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 using System.Reflection.Emit;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection

src/Core/ExistForAll.SimpleSettings/Core/Reflection/IPropertyCreator.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 

src/Core/ExistForAll.SimpleSettings/Core/Reflection/ISettingsClassGenerator.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Core.Reflection
+namespace ExistForAll.SimpleSettings.Core.Reflection
 {
 	internal interface ISettingsClassGenerator
 	{

src/Core/ExistForAll.SimpleSettings/Core/Reflection/ITypePropertiesExtractor.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection

src/Core/ExistForAll.SimpleSettings/Core/Reflection/PropertyCreator.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 using System.Reflection.Emit;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection

src/Core/ExistForAll.SimpleSettings/Core/Reflection/SettingsClassGenerator.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Reflection;
 using System.Reflection.Emit;
 

src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeConverter.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Conversion;
 

src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeExtensions.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection
 {

src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypePropertiesExtractor.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection

src/Core/ExistForAll.SimpleSettings/Core/SettingsOptionsValidator.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core

src/Core/ExistForAll.SimpleSettings/Core/SettingsTypesExtractor.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core

src/Core/ExistForAll.SimpleSettings/ISettingsCollection.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	public interface ISettingsCollection : IEnumerable<KeyValuePair<Type, object>>
 	{

src/Core/ExistForAll.SimpleSettings/ISettingsHolder.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	internal interface ISettingsHolder
 	{

src/Core/ExistForAll.SimpleSettings/IValuesPopulator.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace ExistForAll.SimpleSettings
 {
 	internal interface IValuesPopulator

src/Core/ExistForAll.SimpleSettings/Resources.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings

src/Core/ExistForAll.SimpleSettings/SettingsBindingException.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	// Raised when an ISectionBinder throws while binding a property. It carries the binder type, section, and
 	// key as primitives and deliberately does NOT retain the BindingContext — the context holds the bound value

src/Core/ExistForAll.SimpleSettings/SettingsBuilder.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Core;
 using ExistForAll.SimpleSettings.Core.Reflection;

src/Core/ExistForAll.SimpleSettings/SettingsBuilderExtensions.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings

src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactory.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace ExistForAll.SimpleSettings
 {
     internal class SettingsBuilderFactory : ISettingsBuilderFactory