Address release readiness review feedback

Author: Telli

.github/scripts/Set-RepositorySecurity.ps1

@@ -0,0 +1,27 @@
+param(
+    [string]$Branch = "main"
+)
+
+$ErrorActionPreference = "Stop"
+$repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot "../..")).Path
+$repository = (& gh repo view --json nameWithOwner --jq .nameWithOwner).Trim()
+if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($repository)) {
+    throw "Could not resolve the GitHub repository. Authenticate gh and run this script from the checkout."
+}
+
+$branchProtectionPath = Join-Path $repositoryRoot ".github/branch-protection.json"
+$securitySettingsPath = Join-Path $repositoryRoot ".github/security-settings.json"
+
+& gh api --method PUT "repos/$repository/branches/$Branch/protection" --input $branchProtectionPath --silent
+if ($LASTEXITCODE -ne 0) { throw "Could not apply branch protection to '$Branch'." }
+
+& gh api --method PATCH "repos/$repository" --input $securitySettingsPath --silent
+if ($LASTEXITCODE -ne 0) { throw "Could not apply repository security settings." }
+
+& gh api --method PUT "repos/$repository/vulnerability-alerts" --silent
+if ($LASTEXITCODE -ne 0) { throw "Could not enable vulnerability alerts." }
+
+& gh api --method PUT "repos/$repository/automated-security-fixes" --silent
+if ($LASTEXITCODE -ne 0) { throw "Could not enable Dependabot security updates." }
+
+Write-Host "Applied branch protection and repository security settings to $repository ($Branch)."

.github/scripts/Test-Packages.ps1

@@ -9,6 +9,7 @@ $scratchRoot = Join-Path ([System.IO.Path]::GetTempPath()) ("sharpclaw-package-s
 $packageOutput = Join-Path $scratchRoot "packages"
 $toolPath = Join-Path $scratchRoot "tool"
 $consumerPath = Join-Path $scratchRoot "consumer"
+$nugetConfigPath = Join-Path $scratchRoot "NuGet.Config"
 
 try {
     New-Item -ItemType Directory -Path $packageOutput -Force | Out-Null
@@ -24,7 +25,16 @@ try {
     if ($LASTEXITCODE -ne 0) { throw "Could not create package smoke consumer." }
     & dotnet add (Join-Path $consumerPath "consumer.csproj") package SharpClaw.Code --version $PackageVersion --no-restore
     if ($LASTEXITCODE -ne 0) { throw "Could not add the aggregate SDK package." }
-    & dotnet restore (Join-Path $consumerPath "consumer.csproj") --source $packageOutput --source https://api.nuget.org/v3/index.json
+
+    [System.IO.File]::WriteAllText(
+        $nugetConfigPath,
+        '<?xml version="1.0" encoding="utf-8"?><configuration><packageSources><clear /></packageSources></configuration>')
+    & dotnet nuget add source $packageOutput --name sharpclaw-local --configfile $nugetConfigPath
+    if ($LASTEXITCODE -ne 0) { throw "Could not configure the local package source." }
+    & dotnet nuget add source "https://api.nuget.org/v3/index.json" --name nuget.org --configfile $nugetConfigPath
+    if ($LASTEXITCODE -ne 0) { throw "Could not configure the NuGet.org package source." }
+
+    & dotnet restore (Join-Path $consumerPath "consumer.csproj") --configfile $nugetConfigPath
     if ($LASTEXITCODE -ne 0) { throw "Could not restore the aggregate SDK package." }
     & dotnet build (Join-Path $consumerPath "consumer.csproj") --configuration $Configuration --no-restore
     if ($LASTEXITCODE -ne 0) { throw "The aggregate SDK package failed to build in a clean consumer." }

.github/scripts/Test-VulnerablePackages.ps1

@@ -0,0 +1,33 @@
+param(
+    [string]$Target = "SharpClawCode.sln"
+)
+
+$ErrorActionPreference = "Stop"
+$reportJson = (& dotnet list $Target package --vulnerable --include-transitive --format json) -join [Environment]::NewLine
+if ($LASTEXITCODE -ne 0) { throw "NuGet vulnerability inspection failed." }
+
+$report = $reportJson | ConvertFrom-Json
+$vulnerablePackages = @(
+    foreach ($project in @($report.projects)) {
+        foreach ($framework in @($project.frameworks)) {
+            foreach ($package in @($framework.topLevelPackages) + @($framework.transitivePackages)) {
+                if ($null -ne $package -and @($package.vulnerabilities).Count -gt 0) {
+                    [PSCustomObject]@{
+                        Project = $project.path
+                        Framework = $framework.framework
+                        Package = $package.id
+                        ResolvedVersion = $package.resolvedVersion
+                        Vulnerabilities = @($package.vulnerabilities)
+                    }
+                }
+            }
+        }
+    }
+)
+
+if ($vulnerablePackages.Count -gt 0) {
+    $vulnerablePackages | ConvertTo-Json -Depth 8 | Write-Error
+    throw "NuGet reported $($vulnerablePackages.Count) vulnerable package occurrence(s)."
+}
+
+Write-Host "NuGet vulnerability audit passed for $($report.projects.Count) projects."

.github/workflows/provider-smoke.yml

@@ -35,12 +35,17 @@ jobs:
       - run: dotnet build src/SharpClaw.Code.Cli/SharpClaw.Code.Cli.csproj --configuration Release --warnaserror
       - name: Select credential reference
         shell: pwsh
+        env:
+          PROVIDER: ${{ inputs.provider }}
         run: |
-          $provider = '${{ inputs.provider }}'
+          $provider = $env:PROVIDER
           $variableName = if ($provider -eq 'anthropic') { 'ANTHROPIC_API_KEY' } else { 'OPENAI_API_KEY' }
           if ([string]::IsNullOrWhiteSpace([Environment]::GetEnvironmentVariable($variableName))) {
             throw "The $variableName repository secret is required for this smoke test."
           }
           dotnet run --project src/SharpClaw.Code.Cli/SharpClaw.Code.Cli.csproj --no-build --configuration Release -- auth set-key --provider $provider --env-var $variableName
       - name: Run real provider prompt
-        run: dotnet run --project src/SharpClaw.Code.Cli/SharpClaw.Code.Cli.csproj --no-build --configuration Release -- --output-format json --model '${{ inputs.provider }}/${{ inputs.model }}' prompt 'Reply with exactly SHARPCLAW_PROVIDER_OK.'
+        env:
+          PROVIDER: ${{ inputs.provider }}
+          MODEL: ${{ inputs.model }}
+        run: dotnet run --project src/SharpClaw.Code.Cli/SharpClaw.Code.Cli.csproj --no-build --configuration Release -- --output-format json --model "$PROVIDER/$MODEL" prompt 'Reply with exactly SHARPCLAW_PROVIDER_OK.'

.github/workflows/release.yml

@@ -16,8 +16,10 @@ jobs:
       - name: Validate semantic version tag
         id: version
         shell: pwsh
+        env:
+          REF_NAME: ${{ github.ref_name }}
         run: |
-          $version = "${{ github.ref_name }}" -replace '^v', ''
+          $version = $env:REF_NAME -replace '^v', ''
           if ($version -notmatch '^\d+\.\d+\.\d+([-.][0-9A-Za-z.-]+)?$') { throw "Tag is not a supported semantic version." }
           "value=$version" >> $env:GITHUB_OUTPUT
       - name: Setup .NET
@@ -27,7 +29,8 @@ jobs:
       - name: Restore
         run: dotnet restore SharpClawCode.sln
       - name: Audit dependencies
-        run: dotnet list SharpClawCode.sln package --vulnerable --include-transitive
+        shell: pwsh
+        run: ./.github/scripts/Test-VulnerablePackages.ps1 -Target SharpClawCode.sln
       - name: Build
         run: dotnet build SharpClawCode.sln --no-restore --configuration Release --warnaserror
       - name: Test

SECURITY.md

@@ -9,3 +9,13 @@ Until the first stable release, security fixes are applied to the latest preview
 Use GitHub's private vulnerability reporting for this repository. Do not open a public issue or include live credentials, private prompts, session files, or exploit details in public logs. Include the affected version, impact, reproduction conditions, and any suggested mitigation. Maintainers will acknowledge a complete report within five business days and coordinate remediation and disclosure.
 
 Local provider credentials are protected for the current operating-system user. On Windows this uses DPAPI; on macOS and Linux it uses an AES-GCM key stored with user-only file permissions under the user SharpClaw directory. This protects against accidental disclosure at rest, but it does not protect against another process already running as the same user.
+
+## Repository security administration
+
+Maintainers with repository administration access can idempotently apply the checked-in branch protection, secret scanning, push protection, vulnerability alerts, and Dependabot security-update settings with:
+
+```powershell
+./.github/scripts/Set-RepositorySecurity.ps1 -Branch main
+```
+
+The JSON files under `.github` are inputs to that script; committing them alone does not change GitHub settings.

src/SharpClaw.Code.Agents/Internal/ProviderBackedAgentKernel.cs

@@ -78,7 +78,11 @@ internal async Task<ProviderInvocationResult> ExecuteAsync(
             ProviderExecutionException? lastCandidateFailure = null;
             foreach (var candidate in resolvedCandidates)
             {
-                var candidateModel = ResolveCandidateModel(providerCatalogOptions.Value, candidate.ProviderName, requestedModel);
+                var candidateModel = ResolveCandidateModel(
+                    providerCatalogOptions.Value,
+                    resolvedProviderName,
+                    candidate.ProviderName,
+                    requestedModel);
                 try
                 {
                     var authStatus = string.Equals(candidate.ProviderName, resolvedProviderName, StringComparison.OrdinalIgnoreCase)
@@ -144,7 +148,11 @@ internal async Task<ProviderInvocationResult> ExecuteAsync(
 
             var activeProviderIndex = 0;
             var activeProviderName = providerCandidates[0].ProviderName;
-            var activeModel = ResolveCandidateModel(providerCatalogOptions.Value, activeProviderName, requestedModel);
+            var activeModel = ResolveCandidateModel(
+                providerCatalogOptions.Value,
+                resolvedProviderName,
+                activeProviderName,
+                requestedModel);
 
             // --- Build initial conversation messages ---
             // Do not add request.Instructions as a shared "system" chat message here.
@@ -185,7 +193,11 @@ internal async Task<ProviderInvocationResult> ExecuteAsync(
                 for (var candidateIndex = activeProviderIndex; candidateIndex < providerCandidates.Count; candidateIndex++)
                 {
                     var provider = providerCandidates[candidateIndex];
-                    var candidateModel = ResolveCandidateModel(providerCatalogOptions.Value, provider.ProviderName, requestedModel);
+                    var candidateModel = ResolveCandidateModel(
+                        providerCatalogOptions.Value,
+                        resolvedProviderName,
+                        provider.ProviderName,
+                        requestedModel);
                     var providerRequest = providerRequestPreflight.Prepare(new ProviderRequest(
                         Id: $"provider-request-{Guid.NewGuid():N}",
                         SessionId: request.Context.SessionId,
@@ -451,8 +463,14 @@ private static string CreateProviderFailedEventMessage(string providerName, Prov
         return $"Provider '{providerName}' stream failed: {detail}";
     }
 
-    private static string ResolveCandidateModel(ProviderCatalogOptions options, string providerName, string primaryModel)
-        => options.FallbackModels.TryGetValue(providerName, out var fallbackModel) && !string.IsNullOrWhiteSpace(fallbackModel)
+    private static string ResolveCandidateModel(
+        ProviderCatalogOptions options,
+        string primaryProviderName,
+        string candidateProviderName,
+        string primaryModel)
+        => !string.Equals(candidateProviderName, primaryProviderName, StringComparison.OrdinalIgnoreCase)
+            && options.FallbackModels.TryGetValue(candidateProviderName, out var fallbackModel)
+            && !string.IsNullOrWhiteSpace(fallbackModel)
             ? fallbackModel
             : primaryModel;
 }

src/SharpClaw.Code.Infrastructure/Services/PlatformSecretProtector.cs

@@ -112,33 +112,56 @@ private string UnprotectWithAes(string encodedPayload)
 
     private byte[] GetOrCreateUnixKey()
     {
+        if (OperatingSystem.IsWindows())
+        {
+            throw new PlatformNotSupportedException("AES key-file protection is available only on macOS and Linux.");
+        }
+
         var root = userProfilePaths.GetUserSharpClawRoot();
-        Directory.CreateDirectory(root);
+        var directoryMode = UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute;
+        Directory.CreateDirectory(root, directoryMode);
+        File.SetUnixFileMode(root, directoryMode);
         var keyPath = Path.Combine(root, KeyFileName);
 
         if (!File.Exists(keyPath))
         {
+            var temporaryKeyPath = Path.Combine(root, $".{KeyFileName}.{Guid.NewGuid():N}.tmp");
             var generatedKey = RandomNumberGenerator.GetBytes(32);
             try
             {
-                using var stream = new FileStream(keyPath, FileMode.CreateNew, FileAccess.Write, FileShare.None);
+                using var stream = new FileStream(temporaryKeyPath, new FileStreamOptions
+                {
+                    Mode = FileMode.CreateNew,
+                    Access = FileAccess.Write,
+                    Share = FileShare.None,
+                    Options = FileOptions.WriteThrough,
+                    UnixCreateMode = UnixFileMode.UserRead | UnixFileMode.UserWrite,
+                });
                 stream.Write(generatedKey);
+                stream.Flush(flushToDisk: true);
+                File.Move(temporaryKeyPath, keyPath, overwrite: false);
             }
             catch (IOException) when (File.Exists(keyPath))
             {
                 // Another process created the same user-scoped key first.
             }
             finally
             {
+                if (File.Exists(temporaryKeyPath))
+                {
+                    File.Delete(temporaryKeyPath);
+                }
+
                 CryptographicOperations.ZeroMemory(generatedKey);
             }
         }
 
-        if (!OperatingSystem.IsWindows())
+        if ((File.GetAttributes(keyPath) & FileAttributes.ReparsePoint) != 0)
         {
-            File.SetUnixFileMode(keyPath, UnixFileMode.UserRead | UnixFileMode.UserWrite);
+            throw new CryptographicException($"The local secret-protection key at '{keyPath}' cannot be a symbolic link.");
         }
 
+        File.SetUnixFileMode(keyPath, UnixFileMode.UserRead | UnixFileMode.UserWrite);
         var key = File.ReadAllBytes(keyPath);
         return key.Length == 32
             ? key

src/SharpClaw.Code.Providers/Resilience/ResilientProviderDecorator.cs

@@ -50,9 +50,11 @@ private async IAsyncEnumerable<ProviderEvent> ExecuteWithResilienceAsync(
         [EnumeratorCancellation] CancellationToken callerCancellationToken)
     {
         Exception? lastException = null;
+        var attemptsMade = 0;
 
         for (var attempt = 0; attempt <= _options.MaxRetries; attempt++)
         {
+            attemptsMade = attempt + 1;
             callerCancellationToken.ThrowIfCancellationRequested();
             using var timeoutCts = new CancellationTokenSource(_options.RequestTimeout);
             using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(callerCancellationToken, timeoutCts.Token);
@@ -140,7 +142,7 @@ private async IAsyncEnumerable<ProviderEvent> ExecuteWithResilienceAsync(
 
             lastException = attemptException;
             RecordFailureAndOpenCircuitIfNeeded();
-            if (emittedEvent || attempt >= _options.MaxRetries)
+            if (emittedEvent || attempt >= _options.MaxRetries || IsCircuitOpen())
             {
                 break;
             }
@@ -160,7 +162,7 @@ private async IAsyncEnumerable<ProviderEvent> ExecuteWithResilienceAsync(
             ProviderName,
             request.Model,
             ProviderFailureKind.StreamFailed,
-            $"Provider '{ProviderName}' failed while streaming after {_options.MaxRetries + 1} attempt(s).",
+            $"Provider '{ProviderName}' failed while streaming after {attemptsMade} attempt(s).",
             lastException);
     }
 
@@ -205,7 +207,7 @@ private static bool IsTransient(Exception exception)
         }
 
         return exception is not ArgumentException
-            && exception is HttpRequestException or TaskCanceledException or TimeoutException or IOException;
+            && exception is HttpRequestException or OperationCanceledException or TimeoutException or IOException;
     }
 
     private TimeSpan ComputeDelay(int attempt, Exception exception)
@@ -237,6 +239,14 @@ private void ResetCircuit()
         }
     }
 
+    private bool IsCircuitOpen()
+    {
+        lock (_lock)
+        {
+            return _circuitOpen;
+        }
+    }
+
     private void RecordFailureAndOpenCircuitIfNeeded()
     {
         lock (_lock)

src/SharpClaw.Code.Sessions/Storage/SqliteSessionStore.cs

@@ -59,15 +59,16 @@ ON CONFLICT(session_id) DO UPDATE SET
             .ConfigureAwait(false);
         await using var command = connection.CreateCommand();
         command.CommandText = """
-            SELECT payload_json
+            SELECT session_id, payload_json
             FROM sessions
             ORDER BY updated_at_utc DESC;
             """;
         await using var reader = await command.ExecuteReaderAsync(cancellationToken).ConfigureAwait(false);
         while (await reader.ReadAsync(cancellationToken).ConfigureAwait(false))
         {
-            var payload = reader.IsDBNull(0) ? null : reader.GetString(0);
-            var session = Deserialize(payload, sessionId: null);
+            var sessionId = reader.IsDBNull(0) ? null : reader.GetString(0);
+            var payload = reader.IsDBNull(1) ? null : reader.GetString(1);
+            var session = Deserialize(payload, sessionId);
             if (session is not null)
             {
                 return session;
@@ -85,7 +86,7 @@ public async Task<IReadOnlyList<ConversationSession>> ListAllAsync(string worksp
             .ConfigureAwait(false);
         await using var command = connection.CreateCommand();
         command.CommandText = """
-            SELECT payload_json
+            SELECT session_id, payload_json
             FROM sessions
             ORDER BY updated_at_utc DESC;
             """;
@@ -94,8 +95,9 @@ FROM sessions
         await using var reader = await command.ExecuteReaderAsync(cancellationToken).ConfigureAwait(false);
         while (await reader.ReadAsync(cancellationToken).ConfigureAwait(false))
         {
-            var payload = reader.IsDBNull(0) ? null : reader.GetString(0);
-            var session = Deserialize(payload, sessionId: null);
+            var sessionId = reader.IsDBNull(0) ? null : reader.GetString(0);
+            var payload = reader.IsDBNull(1) ? null : reader.GetString(1);
+            var session = Deserialize(payload, sessionId);
             if (session is not null)
             {
                 sessions.Add(session);