Add demo gif, modify validator flags, add strict mode, track token usage, improve agent searching and more!

Author: coj337

GitRekt/AiValidation.cs

@@ -40,7 +40,7 @@ internal static class GitRektCli
 
         var validateAiOption = new Option<bool>("--ai", "Validate each displayed result with AI.");
 
-        var aiAgentOption = new Option<bool>("--ai-agent", "Use Microsoft Agent Framework to gather same-repository evidence before AI validation.");
+        var aiAgentOption = new Option<bool>("--ai-agent", "Gather same-repository evidence before AI validation.");
 
         var aiProviderOption = new Option<string?>("--ai-provider", "AI provider for validation. Defaults to ollama. Supported: ollama, gemini, openai.");
 
@@ -50,13 +50,15 @@ internal static class GitRektCli
         aiApiKeyOption.AddAlias("--gemini-api-key");
         aiApiKeyOption.AddAlias("--openai-api-key");
 
-        var aiVerdictOption = new Option<string?>("--ai-verdict", "Only show AI validation verdicts at or above this category. Values: likely/red, possible/yellow, none/green.")
+        var aiVerdictOption = new Option<string?>("--ai-verdict", "Only show AI validation verdicts at or above this category. Values: likely, possible, none.")
         {
             Arity = ArgumentArity.ZeroOrOne
         };
         aiVerdictOption.AddAlias("--ai-category");
         aiVerdictOption.AddAlias("--ai-show");
 
+        var strictOption = new Option<bool>("--strict", "Use stricter AI validation. Ordinary business contact lists are treated as low signal unless stronger sensitive data is present.");
+
         var rootCommand = new RootCommand("""
 Search GitHub code.
 
@@ -67,8 +69,9 @@ Search GitHub code.
   GitRekt --query "Password1" --query "Password2"
   GitRekt --advanced --query "\"Password1\" language:C# path:/src/" --query "\"Password2\" language:C#"
   GitRekt --query "Password1" --ai --ai-model llama3.2
-  GitRekt --query "Password1" --ai --ai-model llama3.2 --ai-verdict yellow
-  GitRekt --query "Password1" --ai --ai-agent --ai-model llama3.2 --ai-verdict yellow
+  GitRekt --query "Password1" --ai --ai-model llama3.2 --ai-verdict possible
+  GitRekt --query "@example.com" --ai --strict --ai-model llama3.2 --ai-verdict possible
+  GitRekt --query "Password1" --ai --ai-agent --ai-model llama3.2 --ai-verdict possible
   GitRekt --query "Password1" --ai-provider gemini --ai-model gemini-2.5-flash
   GitRekt --query "Password1" --ai-provider openai --ai-model gpt-5-mini
   GitRekt --github-app-id 12345 --github-app-private-key-path app.pem --query "Password1"
@@ -88,6 +91,7 @@ Search GitHub code.
         rootCommand.AddOption(aiModelOption);
         rootCommand.AddOption(aiApiKeyOption);
         rootCommand.AddOption(aiVerdictOption);
+        rootCommand.AddOption(strictOption);
         rootCommand.AddValidator(parseResult =>
         {
             if (IsHelpRequested(args))
@@ -109,8 +113,9 @@ Search GitHub code.
             var hasAiModel = parseResult.FindResultFor(aiModelOption) is not null;
             var hasAiApiKey = parseResult.FindResultFor(aiApiKeyOption) is not null;
             var hasAiVerdictFilter = !string.IsNullOrWhiteSpace(parseResult.GetValueForOption(aiVerdictOption));
+            var hasStrict = parseResult.GetValueForOption(strictOption);
 
-            if (!hasAiFlag && !hasAiAgentFlag && !hasAiProvider && !hasAiModel && !hasAiApiKey && !hasAiVerdictFilter)
+            if (!hasAiFlag && !hasAiAgentFlag && !hasAiProvider && !hasAiModel && !hasAiApiKey && !hasAiVerdictFilter && !hasStrict)
             {
                 return;
             }
@@ -131,14 +136,6 @@ Search GitHub code.
                 return;
             }
 
-            if (parseResult.GetValueForOption(aiAgentOption)
-                && !string.IsNullOrWhiteSpace(aiProvider)
-                && !string.Equals(aiProvider, "ollama", StringComparison.OrdinalIgnoreCase))
-            {
-                parseResult.ErrorMessage = "--ai-agent is currently only supported with --ai-provider ollama.";
-                return;
-            }
-
             if (string.Equals(aiProvider, "gemini", StringComparison.OrdinalIgnoreCase))
             {
                 var aiApiKey = parseResult.GetValueForOption(aiApiKeyOption)
@@ -169,7 +166,7 @@ Search GitHub code.
             if (!string.IsNullOrWhiteSpace(aiVerdict)
                 && !TryParseAiValidationVerdict(aiVerdict, out _))
             {
-                parseResult.ErrorMessage = $"Unsupported --ai-verdict value '{aiVerdict}'. Supported values: likely/red, possible/yellow, none/green.";
+                parseResult.ErrorMessage = $"Unsupported --ai-verdict value '{aiVerdict}'. Supported values: likely, possible, none.";
                 return;
             }
         });
@@ -191,13 +188,15 @@ Search GitHub code.
             var aiModel = parseResult.GetValueForOption(aiModelOption);
             var aiApiKey = parseResult.GetValueForOption(aiApiKeyOption);
             var aiVerdicts = parseResult.GetValueForOption(aiVerdictOption);
+            var strictMode = parseResult.GetValueForOption(strictOption);
             var aiVerdictFilter = ParseAiValidationVerdict(aiVerdicts);
             var shouldValidateAi = validateAi
                 || useAiAgent
                 || !string.IsNullOrWhiteSpace(aiProvider)
                 || !string.IsNullOrWhiteSpace(aiModel)
                 || !string.IsNullOrWhiteSpace(aiApiKey)
-                || aiVerdictFilter is not null;
+                || aiVerdictFilter is not null
+                || strictMode;
 
             if (queries.Length == 0)
             {
@@ -216,11 +215,6 @@ Search GitHub code.
 
             aiProvider = string.IsNullOrWhiteSpace(aiProvider) ? "ollama" : aiProvider;
 
-            if (useAiAgent && !string.Equals(aiProvider, "ollama", StringComparison.OrdinalIgnoreCase))
-            {
-                throw new InvalidOperationException("--ai-agent is currently only supported with --ai-provider ollama.");
-            }
-
             aiApiKey ??= string.Equals(aiProvider, "gemini", StringComparison.OrdinalIgnoreCase)
                 ? Environment.GetEnvironmentVariable("GEMINI_API_KEY") ?? Environment.GetEnvironmentVariable("GOOGLE_API_KEY")
                 : string.Equals(aiProvider, "openai", StringComparison.OrdinalIgnoreCase)
@@ -269,6 +263,7 @@ Search GitHub code.
                         aiProvider,
                         aiModel!,
                         useAiAgent,
+                        strictMode,
                         aiApiKey)
                     : null,
                 aiVerdictFilter);
@@ -312,7 +307,7 @@ Search GitHub code.
 
         return TryParseAiValidationVerdict(value, out var verdict)
             ? verdict
-            : throw new InvalidOperationException($"Unsupported --ai-verdict value '{value}'. Supported values: likely/red, possible/yellow, none/green.");
+            : throw new InvalidOperationException($"Unsupported --ai-verdict value '{value}'. Supported values: likely, possible, none.");
     }
 
     private static bool TryParseAiValidationVerdict(string? value, out AiValidationVerdict verdict)
@@ -449,12 +444,13 @@ Search GitHub code.
   -o, --output <path>                         Write output to a file.
   --advanced, --raw-query                     Pass each query to GitHub code search unchanged.
   --ai                                        Validate each displayed result with AI.
-  --ai-agent                                  Use Microsoft Agent Framework to gather same-repository evidence before AI validation.
+  --ai-agent                                  Gather same-repository evidence before AI validation.
   --ai-provider <provider>                    AI provider for validation. Supported: ollama, gemini, openai.
   --ai-model <model>                          Model name used for AI validation.
   --ai-api-key, --gemini-api-key, --openai-api-key <key>
                                                AI provider API key. For Gemini, defaults to GEMINI_API_KEY or GOOGLE_API_KEY. For OpenAI, defaults to OPENAI_API_KEY.
-  --ai-verdict <verdict>                      Only show AI verdicts at or above likely/red, possible/yellow, or none/green.
+  --ai-verdict <verdict>                      Only show AI verdicts at or above likely, possible, or none.
+  --strict                                    Use stricter AI validation. Ordinary business contact lists and low value PII are ignored.
   -h, --help                                  Show help.
 
 Examples:

GitRekt/GitRektCli.cs

@@ -727,7 +727,10 @@ internal sealed record GithubCodeSearchRepository(
     string FullName,
 
     [property: JsonPropertyName("html_url")]
-    string? HtmlUrl);
+    string? HtmlUrl,
+
+    [property: JsonPropertyName("default_branch")]
+    string? DefaultBranch = null);
 
 internal sealed record GithubTextMatch(
     [property: JsonPropertyName("object_type")]

GitRekt/GithubClient.cs

@@ -1,4 +1,5 @@
 using GitRekt;
+using System.Security.Cryptography;
 using System.Text;
 
 Console.OutputEncoding = Encoding.UTF8;
@@ -37,6 +38,7 @@
     var hasAiVerdictFilter = cliArguments.AiValidationVerdictFilter is not null;
     var useAiAgent = cliArguments.AiValidation?.UseAgent == true;
     var aiValidationCache = new Dictionary<string, AiValidationCacheValue>(StringComparer.OrdinalIgnoreCase);
+    var totalDisplayedResults = 0;
 
     foreach (var (query, queryIndex) in cliArguments.Queries.Select((query, index) => (query, index)))
     {
@@ -45,6 +47,7 @@
         var validatedResultIndex = 0;
         var hasSearchResults = false;
         var hasDisplayedResults = false;
+        var duplicateSignatures = new HashSet<string>(StringComparer.Ordinal);
 
         if (isMultiQuery)
         {
@@ -64,13 +67,20 @@
 
             while (resultIndex < searchPage.Items.Count)
             {
+                if (IsDuplicateResult(searchPage.Items[resultIndex], duplicateSignatures))
+                {
+                    resultIndex++;
+                    continue;
+                }
+
                 var chunkValidationOutcomes = await ValidateNextSearchResultChunkAsync(
                     aiValidationClient,
                     query,
                     cliArguments.UseAdvancedQuery,
                     searchPage,
                     resultIndex,
                     validatedResultIndex,
+                    duplicateSignatures,
                     aiValidationCache);
                 validatedResultIndex = chunkValidationOutcomes.ValidatedResultIndex;
 
@@ -88,6 +98,7 @@
                     }
 
                     displayedResultIndex++;
+                    totalDisplayedResults++;
                     hasDisplayedResults = true;
                     var header = hasAiVerdictFilter
                         ? $"Result {validationOutcome?.ValidatedIndex ?? displayedResultIndex}/{searchPage.AvailableCount}"
@@ -123,6 +134,8 @@ await WriteSearchResultAsync(
         }
     }
 
+    WriteCompletionSummary(totalDisplayedResults, aiValidationClient?.TokenUsage, outputWriter, statusLine);
+
     return 0;
 }
 catch (Exception ex)
@@ -150,13 +163,44 @@ await WriteSearchResultAsync(
     return new StreamWriter(fullPath, append: false);
 }
 
+static void WriteCompletionSummary(int displayedResultCount, AiTokenUsage? tokenUsage, TextWriter? outputWriter, ConsoleStatusLine statusLine)
+{
+    var resultText = displayedResultCount == 1
+        ? "1 result"
+        : $"{displayedResultCount.ToString(System.Globalization.CultureInfo.InvariantCulture)} results";
+
+    if (tokenUsage is null)
+    {
+        WriteColoredLine($"Done. Displayed {resultText}.", ConsoleColor.Cyan, outputWriter, statusLine);
+        return;
+    }
+
+    if (!tokenUsage.HasUsage)
+    {
+        WriteColoredLine($"Done. Displayed {resultText}. AI token usage was not reported by the provider.", ConsoleColor.Cyan, outputWriter, statusLine);
+        return;
+    }
+
+    WriteColoredLine(
+        $"Done. Displayed {resultText}. AI tokens: {FormatTokenCount(tokenUsage.TotalTokens)} total ({FormatTokenCount(tokenUsage.InputTokens)} input, {FormatTokenCount(tokenUsage.OutputTokens)} output).",
+        ConsoleColor.Cyan,
+        outputWriter,
+        statusLine);
+}
+
+static string FormatTokenCount(long tokenCount)
+{
+    return tokenCount.ToString("N0", System.Globalization.CultureInfo.InvariantCulture);
+}
+
 static async Task<AiValidationPageOutcomes> ValidateNextSearchResultChunkAsync(
     IAiValidationClient? aiValidationClient,
     string query,
     bool useAdvancedQuery,
     GithubCodeSearchPage searchPage,
     int startIndex,
     int validatedResultIndex,
+    HashSet<string> duplicateSignatures,
     Dictionary<string, AiValidationCacheValue> aiValidationCache)
 {
     const int MaxStreamingRepositoryBatchSize = 8;
@@ -199,6 +243,7 @@ [new AiValidationOutcome(cacheValue.Validation, cacheValue.Error, validatedResul
         searchPage,
         startIndex,
         MaxStreamingRepositoryBatchSize,
+        duplicateSignatures,
         aiValidationCache);
 
     if (pendingResults.Count > 1)
@@ -260,6 +305,7 @@ static List<PendingAiValidationResult> CollectStreamingRepositoryBatch(
     GithubCodeSearchPage searchPage,
     int startIndex,
     int maxBatchSize,
+    HashSet<string> duplicateSignatures,
     Dictionary<string, AiValidationCacheValue> aiValidationCache)
 {
     var firstResult = searchPage.Items[startIndex];
@@ -281,6 +327,11 @@ static List<PendingAiValidationResult> CollectStreamingRepositoryBatch(
             break;
         }
 
+        if (index != startIndex && IsDuplicateResult(result, duplicateSignatures))
+        {
+            break;
+        }
+
         var cacheKey = CreateAiValidationCacheKey(query, useAdvancedQuery, result);
 
         if (aiValidationCache.ContainsKey(cacheKey))
@@ -412,6 +463,34 @@ static string NormalizeSnippet(string snippet)
     return string.Join(' ', snippet.Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries));
 }
 
+static string CreateResultDuplicateSignature(GithubCodeSearchResult result)
+{
+    var snippetSignature = CreateSnippetSignature(result);
+
+    if (string.IsNullOrWhiteSpace(snippetSignature))
+    {
+        return string.Empty;
+    }
+
+    var signatureBytes = Encoding.UTF8.GetBytes(string.Join('\n', result.Repository.FullName, snippetSignature));
+    var signatureHash = SHA256.HashData(signatureBytes);
+    return Convert.ToHexString(signatureHash.AsSpan(0, 16));
+}
+
+static bool IsDuplicateResult(GithubCodeSearchResult result, HashSet<string> duplicateSignatures)
+{
+    const int maxTrackedSignatures = 2048;
+
+    if (duplicateSignatures.Count >= maxTrackedSignatures)
+    {
+        return false;
+    }
+
+    var signature = CreateResultDuplicateSignature(result);
+
+    return !string.IsNullOrWhiteSpace(signature) && !duplicateSignatures.Add(signature);
+}
+
 static void WriteLine(string value, TextWriter? outputWriter, ConsoleStatusLine statusLine)
 {
     statusLine.Clear();
@@ -485,7 +564,10 @@ static async Task WriteAdditionalLeadsAsync(GithubClient client, IReadOnlyList<A
         };
 
         WriteColoredLine($"  • {verdictLabel}: {url}", GetAiValidationColor(item.Verdict), outputWriter, statusLine);
-        WriteLabeledLine("    Why", item.Reason, outputWriter, statusLine, ConsoleColor.Gray);
+        if (HasMeaningfulSensitiveItemReason(item.Reason))
+        {
+            WriteLabeledLine("    Why", item.Reason, outputWriter, statusLine, ConsoleColor.Gray);
+        }
 
         if (!string.IsNullOrWhiteSpace(item.Snippet))
         {
@@ -494,6 +576,13 @@ static async Task WriteAdditionalLeadsAsync(GithubClient client, IReadOnlyList<A
     }
 }
 
+static bool HasMeaningfulSensitiveItemReason(string? reason)
+{
+    return !string.IsNullOrWhiteSpace(reason)
+        && !string.Equals(reason.Trim(), "Agent marked this item as sensitive.", StringComparison.OrdinalIgnoreCase)
+        && !reason.StartsWith("No item-specific reason was returned", StringComparison.OrdinalIgnoreCase);
+}
+
 static void WriteSectionLine(string title, TextWriter? outputWriter, ConsoleStatusLine statusLine, ConsoleColor color)
 {
     WriteColoredLine(title, color, outputWriter, statusLine);
@@ -602,8 +691,12 @@ static string CreateRepositoryFileUrl(GithubCodeSearchRepository repository, str
     var repositoryUrl = !string.IsNullOrWhiteSpace(repository.HtmlUrl)
         ? repository.HtmlUrl
         : $"https://github.com/{repository.FullName}";
+    var branch = !string.IsNullOrWhiteSpace(repository.DefaultBranch)
+        ? repository.DefaultBranch
+        : "main";
+    var encodedBranch = string.Join('/', branch.Split('/', StringSplitOptions.RemoveEmptyEntries).Select(Uri.EscapeDataString));
     var encodedPath = string.Join('/', path.Split('/', StringSplitOptions.RemoveEmptyEntries).Select(Uri.EscapeDataString));
-    return AppendLineAnchor($"{repositoryUrl.TrimEnd('/')}/blob/HEAD/{encodedPath}", lineNumber);
+    return AppendLineAnchor($"{repositoryUrl.TrimEnd('/')}/blob/{encodedBranch}/{encodedPath}", lineNumber);
 }
 
 static string AppendLineAnchor(string url, int? lineNumber)

GitRekt/Program.cs

@@ -2,7 +2,7 @@
   "profiles": {
     "GitRekt": {
       "commandName": "Project",
-      "commandLineArgs": "--ai --ai-agent --ai-model \"gemma4:31b-cloud\" --ai-verdict yellow --github-app-id 3562299 --github-app-installation-id 128570455 -q \"@example.com\""
+      "commandLineArgs": "--ai --ai-agent --ai-model \"gemma4:31b-cloud\" --ai-verdict possible --github-app-id 3562299 --github-app-installation-id 128570455 --strict -q \"@example.com\""
     }
   }
 }