@danmoisan/drm-copilot-mcp 1.1.6 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danmoisan/drm-copilot-mcp",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Stdio MCP server exposing drm-copilot repo-automation tools.",
   "license": "MIT",
   "type": "commonjs",

package/resources/claude-customizations/.claude/agents/atomic-planner.md

@@ -57,6 +57,8 @@ Generate plans using the atomic plan contract defined in the `atomic-plan-contra
 
 ## Preflight Validation
 
+Before handing the plan to executor preflight, return the exact bounded line record defined in `atomic-plan-contract`, starting with `PLANNER-INTERNAL-REVIEW: PASS` and ending with the required `PREFLIGHT:` signal. The bounded record must include exactly one passing `CITATION-TO-TREE`, `AC-TRACEABILITY`, and `SCOPE-BOUNDARY` declaration; one or more current-tree `CITATION: <repository-relative path> | <locator>` records; one complete unique `AC-INVENTORY:`; one complete `AC-MAPPING: <ID> | IMPLEMENTATION: <identifier> | TESTS: <identifier> | EVIDENCE: <identifier>` for every and only inventory ID; and exactly one `UNRESOLVED-GAPS: NONE`. A missing, duplicate, malformed, failed, blocked, or out-of-bounds record declaration requires `SELF-REVIEW: BLOCKED` and stops handoff.
+
 Return the finalized plan for validation-only preflight through `atomic-executor` and preserve the same target file path across revision loops. Do not claim nested worker delegation from within planner execution.
 
 ## Output

package/resources/claude-customizations/.claude/agents/prd-feature.md

@@ -16,6 +16,8 @@ hooks:
       hooks:
         - type: command
           command: pwsh -NoProfile -File .claude/hooks/validate-required-artifact-output.ps1 -AgentName prd-feature -RequiredArtifact 'spec-path|^docs/features/active/.+/spec\.md$|feature spec artifact' -RequiredArtifact 'user-story-path|^docs/features/active/.+/user-story\.md$|feature user story artifact'
+        - type: command
+          command: pwsh -NoProfile -File .claude/hooks/validate-prd-feature-output.ps1
 ---
 
 # PRD Feature Agent
@@ -27,12 +29,15 @@ Produce feature-document outputs for the active feature folder.
 - `docs/features/active/<feature>/spec.md`
 - `docs/features/active/<feature>/user-story.md`
 
+When an approved `spec.md` acceptance criterion contains a numeric count, enumeration, or population, require the supplied research record to include complete `## Numeric Derivation Evidence`: `Complete Family`, `Exhaustive Search Scope`, `Inclusion Rules`, `Exclusion Rules`, `Primary Search Strategy or Query Expression`, `Primary Member Set`, `Primary Count`, `Cross-check Search Strategy or Query Expression`, `Cross-check Member Set`, `Cross-check Count`, and `Member-set Comparison`. The two derivations must be non-empty, independently constructed, use distinct search strategies or query expressions, independently enumerate member sets, and explicitly compare those sets. The exhaustive scope must cover the complete family, including all relevant overloads and members. Omit the numeric assertion when the record is missing, repeated, incomplete, non-exhaustive, narrow, or disagrees; equal totals, distinct query text, or equal member sets alone are insufficient.
+
 ## Output Reporting
 
 Report the final artifact paths as:
 
 - `spec-path: docs/features/active/<feature>/spec.md`
 - `user-story-path: docs/features/active/<feature>/user-story.md`
+- `research-path: docs/features/active/<feature>/research/<timestamp>-<short-name>-research.md` when numeric acceptance criteria are present
 
 ## Evidence Location Invariant
 

package/resources/claude-customizations/.claude/agents/task-researcher.md

@@ -64,6 +64,8 @@ The orchestrator resolves which root to use from whether an active feature folde
 ### 4. Requirements Mapping
 
 - Map acceptance criteria into a concrete design with proposed state model, transitions, and required file changes.
+- Before a numeric count, enumeration, or population can be proposed for an approved `spec.md` acceptance criterion, add a complete `## Numeric Derivation Evidence` section. For each numeric claim, record `Complete Family`, `Exhaustive Search Scope`, `Inclusion Rules`, `Exclusion Rules`, `Primary Search Strategy or Query Expression`, `Primary Member Set`, `Primary Count`, `Cross-check Search Strategy or Query Expression`, `Cross-check Member Set`, `Cross-check Count`, and `Member-set Comparison`.
+- The primary and cross-check records must both be non-empty, independently enumerate their member sets, and name distinct search strategies or query expressions. The exhaustive scope must cover the complete family, including every relevant overload or member; a single grep or query that matches only one named pattern in the declared family is insufficient even if it yields the same count. Explicitly compare the normalized primary and cross-check member sets before proposing the numeric assertion. Withhold the assertion if either record is missing, incomplete, duplicated, non-exhaustive, narrow, or disagrees.
 
 ### 5. Testing Implications
 
@@ -75,6 +77,7 @@ The orchestrator resolves which root to use from whether an active feature folde
 - Ground all findings in verified evidence.
 - Keep discussion of non-selected approaches brief.
 - Do not claim nested worker delegation.
+- Do not present a numeric `spec.md` acceptance criterion when the required numeric derivation evidence is absent, incomplete, or has disagreeing counts.
 
 ## Evidence Location Invariant
 

package/resources/claude-customizations/.claude/hooks/validate-planner-output.ps1

@@ -110,6 +110,123 @@ function Test-HasPreflightSignal {
     )
 }
 
+function Get-PlannerInternalReviewValidation {
+    [CmdletBinding()]
+    [OutputType([hashtable])]
+    param([Parameter(Mandatory = $true)][string] $AgentOutput)
+
+    $lines = @($AgentOutput -split "`r?`n")
+    $labelPattern = '^\s*(?:PLANNER-INTERNAL-REVIEW|CITATION-TO-TREE|AC-TRACEABILITY|SCOPE-BOUNDARY|CITATION|AC-INVENTORY|AC-MAPPING|UNRESOLVED-GAPS|PREFLIGHT)\s*:'
+    $headerPattern = '^\s*PLANNER-INTERNAL-REVIEW\s*:\s*(?<Value>.*?)\s*$'
+    $preflightPattern = '^\s*PREFLIGHT\s*:\s*(?:ALL CLEAR|REVISIONS REQUIRED)\s*$'
+    $labelIndexes = [System.Collections.Generic.List[int]]::new()
+    $headerIndexes = [System.Collections.Generic.List[int]]::new()
+    $preflightIndexes = [System.Collections.Generic.List[int]]::new()
+
+    for ($index = 0; $index -lt $lines.Count; $index++) {
+        if ($lines[$index] -match $labelPattern) {
+            $labelIndexes.Add($index)
+        }
+        if ($lines[$index] -match $headerPattern) {
+            $headerIndexes.Add($index)
+        }
+        if ($lines[$index] -match $preflightPattern) {
+            $preflightIndexes.Add($index)
+        }
+    }
+
+    if ($headerIndexes.Count -ne 1) {
+        return @{ Ok = $false; Message = 'planner internal review must contain exactly one `PLANNER-INTERNAL-REVIEW:` declaration.' }
+    }
+
+    $headerIndex = $headerIndexes[0]
+    $headerMatch = [regex]::Match($lines[$headerIndex], $headerPattern)
+    if ($headerMatch.Groups['Value'].Value.Trim() -ne 'PASS') {
+        return @{ Ok = $false; Message = 'planner internal review header must be exactly `PLANNER-INTERNAL-REVIEW: PASS`.' }
+    }
+
+    $preflightAfterHeader = @($preflightIndexes | Where-Object { $_ -gt $headerIndex })
+    if ($preflightAfterHeader.Count -ne 1) {
+        return @{ Ok = $false; Message = 'planner internal review must terminate at exactly one required `PREFLIGHT:` signal after its header.' }
+    }
+
+    $preflightIndex = $preflightAfterHeader[0]
+    foreach ($labelIndex in $labelIndexes) {
+        if ($labelIndex -lt $headerIndex -or $labelIndex -gt $preflightIndex) {
+            return @{ Ok = $false; Message = 'planner internal review declarations must not occur outside the bounded record.' }
+        }
+    }
+
+    $recordLines = @($lines[$headerIndex..$preflightIndex])
+    $requiredDeclarations = @('CITATION-TO-TREE', 'AC-TRACEABILITY', 'SCOPE-BOUNDARY')
+    foreach ($declaration in $requiredDeclarations) {
+        $declarationMatches = @($recordLines | Where-Object { $_ -match "^\s*$declaration\s*:" })
+        if ($declarationMatches.Count -ne 1) {
+            return @{ Ok = $false; Message = "planner internal review must contain exactly one `$declaration: PASS` declaration." }
+        }
+        if ($declarationMatches[0] -notmatch "^\s*$declaration\s*:\s*PASS\s*$") {
+            return @{ Ok = $false; Message = "planner internal review declaration `$declaration must be exactly PASS." }
+        }
+    }
+
+    $citationLines = @($recordLines | Where-Object { $_ -match '^\s*CITATION\s*:' })
+    if ($citationLines.Count -eq 0) {
+        return @{ Ok = $false; Message = 'planner internal review must contain at least one `CITATION:` record.' }
+    }
+    foreach ($citationLine in $citationLines) {
+        $citation = [regex]::Match($citationLine, '^\s*CITATION\s*:\s*(?<Path>[^|\s]+)\s*\|\s*(?<Locator>.+?\S)\s*$')
+        if (-not $citation.Success -or $citation.Groups['Path'].Value -notmatch '^(?![A-Za-z]:)(?!/)(?!\\)(?:\.?[^/\\|\s]+)(?:/[^/\\|\s]+)+$') {
+            return @{ Ok = $false; Message = 'planner internal review citations require a repository-relative path and nonblank locator.' }
+        }
+    }
+
+    $inventoryLines = @($recordLines | Where-Object { $_ -match '^\s*AC-INVENTORY\s*:' })
+    if ($inventoryLines.Count -ne 1) {
+        return @{ Ok = $false; Message = 'planner internal review must contain exactly one nonblank `AC-INVENTORY:` declaration.' }
+    }
+    $inventoryValue = ($inventoryLines[0] -replace '^\s*AC-INVENTORY\s*:\s*', '').Trim()
+    if ([string]::IsNullOrWhiteSpace($inventoryValue)) {
+        return @{ Ok = $false; Message = 'planner internal review `AC-INVENTORY:` must contain nonblank unique IDs.' }
+    }
+    $inventoryIds = @($inventoryValue -split ',' | ForEach-Object { $_.Trim() })
+    if ((@($inventoryIds | Where-Object { [string]::IsNullOrWhiteSpace($_) }).Count -gt 0) -or
+        (@($inventoryIds | Select-Object -Unique).Count -ne $inventoryIds.Count)) {
+        return @{ Ok = $false; Message = 'planner internal review `AC-INVENTORY:` must contain nonblank unique IDs.' }
+    }
+
+    $mappingLines = @($recordLines | Where-Object { $_ -match '^\s*AC-MAPPING\s*:' })
+    if ($mappingLines.Count -eq 0) {
+        return @{ Ok = $false; Message = 'planner internal review must contain one `AC-MAPPING:` record for every inventory ID.' }
+    }
+    $mappingIds = [System.Collections.Generic.List[string]]::new()
+    foreach ($mappingLine in $mappingLines) {
+        $mapping = [regex]::Match($mappingLine, '^\s*AC-MAPPING\s*:\s*(?<Id>[^|]*?)\s*\|\s*IMPLEMENTATION\s*:\s*(?<Implementation>[^|]*?)\s*\|\s*TESTS\s*:\s*(?<Tests>[^|]*?)\s*\|\s*EVIDENCE\s*:\s*(?<Evidence>.*?)\s*$')
+        if (-not $mapping.Success -or
+            [string]::IsNullOrWhiteSpace($mapping.Groups['Id'].Value) -or
+            [string]::IsNullOrWhiteSpace($mapping.Groups['Implementation'].Value) -or
+            [string]::IsNullOrWhiteSpace($mapping.Groups['Tests'].Value) -or
+            [string]::IsNullOrWhiteSpace($mapping.Groups['Evidence'].Value)) {
+            return @{ Ok = $false; Message = 'planner internal review `AC-MAPPING:` requires nonblank ID, IMPLEMENTATION, TESTS, and EVIDENCE fields.' }
+        }
+        $mappingIds.Add($mapping.Groups['Id'].Value.Trim())
+    }
+    if (@($mappingIds | Select-Object -Unique).Count -ne $mappingIds.Count) {
+        return @{ Ok = $false; Message = 'planner internal review `AC-MAPPING:` identifiers must be unique.' }
+    }
+    if ($inventoryIds.Count -ne $mappingIds.Count -or
+        (@($inventoryIds | Where-Object { $_ -notin $mappingIds }).Count -gt 0) -or
+        (@($mappingIds | Where-Object { $_ -notin $inventoryIds }).Count -gt 0)) {
+        return @{ Ok = $false; Message = 'planner internal review AC inventory and mapping identifiers must match exactly.' }
+    }
+
+    $gapLines = @($recordLines | Where-Object { $_ -match '^\s*UNRESOLVED-GAPS\s*:' })
+    if ($gapLines.Count -ne 1 -or $gapLines[0] -notmatch '^\s*UNRESOLVED-GAPS\s*:\s*NONE\s*$') {
+        return @{ Ok = $false; Message = 'planner internal review must contain exactly one `UNRESOLVED-GAPS: NONE` declaration.' }
+    }
+
+    return @{ Ok = $true; Message = $null }
+}
+
 function Get-PlanStructureValidationReport {
     [CmdletBinding()]
     [OutputType([string[]])]
@@ -272,6 +389,11 @@ function Invoke-PlannerOutputValidation {
         return @{ Ok = $false; Message = $message }
     }
 
+    $review = Get-PlannerInternalReviewValidation -AgentOutput $agentOutput
+    if (-not $review.Ok) {
+        return @{ Ok = $false; Message = "atomic-planner hook: $($review.Message)" }
+    }
+
     return @{ Ok = $true; Message = $null }
 }
 

package/resources/claude-customizations/.claude/hooks/validate-prd-feature-output.ps1

@@ -0,0 +1,91 @@
+<#
+.SYNOPSIS
+    Validates numeric acceptance criteria produced by the prd-feature worker.
+#>
+
+[CmdletBinding()]
+param()
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+function Get-ArtifactPathFromOutput {
+    [CmdletBinding()]
+    [OutputType([string])]
+    param([Parameter(Mandatory = $true)][string] $Output, [Parameter(Mandatory = $true)][string] $Label)
+
+    $match = [regex]::Match($Output, "(?im)^\s*$([regex]::Escape($Label))\s*:\s*(?<path>\S+)")
+    if ($match.Success) { return $match.Groups['path'].Value }
+    return $null
+}
+
+function Test-NumericDerivationEvidence {
+    [CmdletBinding()]
+    [OutputType([hashtable])]
+    param([Parameter(Mandatory = $true)][AllowEmptyString()][string] $Content)
+
+    $section = [regex]::Match($Content, '(?ims)^##\s+Numeric\s+Derivation\s+Evidence\s*$.*?(?=^##\s|\z)')
+    if (-not $section.Success) { return @{ Ok = $false; Message = 'prd-feature hook: numeric criterion requires ## Numeric Derivation Evidence.' } }
+    $requiredLabels = @(
+        'Complete Family', 'Exhaustive Search Scope', 'Inclusion Rules', 'Exclusion Rules',
+        'Primary Search Strategy or Query Expression', 'Primary Member Set', 'Primary Count',
+        'Cross-check Search Strategy or Query Expression', 'Cross-check Member Set', 'Cross-check Count',
+        'Member-set Comparison'
+    )
+    $values = @{}
+    foreach ($label in $requiredLabels) {
+        $match = [regex]::Match($section.Value, "(?im)^[\t ]*[-*]?[\t ]*$([regex]::Escape($label))[\t ]*:[\t ]*(?<value>\S(?:.*\S)?)[\t ]*$")
+        if (-not $match.Success) { return @{ Ok = $false; Message = "prd-feature hook: numeric derivation evidence is missing $label." } }
+        $values[$label] = $match.Groups['value'].Value.Trim()
+    }
+    if ($values['Exhaustive Search Scope'] -notmatch '(?i)\b(entire|all|complete)\b.*\b(repository|repo|source tree|tree)\b') { return @{ Ok = $false; Message = 'prd-feature hook: numeric derivation evidence does not declare an exhaustive repository search scope.' } }
+    $primaryStrategy = $values['Primary Search Strategy or Query Expression']
+    $crossCheckStrategy = $values['Cross-check Search Strategy or Query Expression']
+    if ($primaryStrategy -match '(?i)\b(single|narrow|named[- ]?pattern)\b' -or $crossCheckStrategy -match '(?i)\b(single|narrow|named[- ]?pattern)\b') { return @{ Ok = $false; Message = 'prd-feature hook: numeric derivation evidence uses a narrow named-pattern search.' } }
+    if ([regex]::Replace($primaryStrategy, '\s+', '').ToLowerInvariant() -eq [regex]::Replace($crossCheckStrategy, '\s+', '').ToLowerInvariant()) { return @{ Ok = $false; Message = 'prd-feature hook: numeric derivation cross-check repeats the primary search strategy or query expression.' } }
+    $familyMembers = @($values['Complete Family'].Split(',') | ForEach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrWhiteSpace($_) })
+    foreach ($familyMember in $familyMembers) {
+        if ($primaryStrategy -notmatch [regex]::Escape($familyMember) -or $crossCheckStrategy -notmatch [regex]::Escape($familyMember)) { return @{ Ok = $false; Message = "prd-feature hook: numeric derivation search does not cover complete family member '$familyMember'." } }
+    }
+    if ($values['Primary Count'] -notmatch '^\d+$' -or $values['Cross-check Count'] -notmatch '^\d+$') { return @{ Ok = $false; Message = 'prd-feature hook: numeric derivation counts must be numeric.' } }
+    $primaryMembers = @($values['Primary Member Set'].Split(',') | ForEach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrWhiteSpace($_) })
+    $crossCheckMembers = @($values['Cross-check Member Set'].Split(',') | ForEach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrWhiteSpace($_) })
+    if ([int]$values['Primary Count'] -ne $primaryMembers.Count -or [int]$values['Cross-check Count'] -ne $crossCheckMembers.Count) { return @{ Ok = $false; Message = 'prd-feature hook: numeric derivation count does not match its independently enumerated member set.' } }
+    $normalizedPrimaryMembers = @($primaryMembers | ForEach-Object { $_.ToLowerInvariant() } | Sort-Object -Unique) -join '|'
+    $normalizedCrossCheckMembers = @($crossCheckMembers | ForEach-Object { $_.ToLowerInvariant() } | Sort-Object -Unique) -join '|'
+    if ($normalizedPrimaryMembers -ne $normalizedCrossCheckMembers) { return @{ Ok = $false; Message = 'prd-feature hook: numeric derivation primary and cross-check member sets disagree.' } }
+    if ($values['Member-set Comparison'] -notmatch '(?i)\b(equal|match|identical)\b') { return @{ Ok = $false; Message = 'prd-feature hook: numeric derivation evidence is missing an explicit member-set comparison.' } }
+    return @{ Ok = $true; Message = $null }
+}
+
+function Test-SpecNumericCriterion {
+    [CmdletBinding()]
+    [OutputType([bool])]
+    param([Parameter(Mandatory = $true)][AllowEmptyString()][string] $SpecContent)
+
+    $section = [regex]::Match($SpecContent, '(?ims)^##\s+Acceptance\s+Criteria\s*$.*?(?=^##\s|\z)')
+    return $section.Success -and [regex]::IsMatch($section.Value, '(?m)^\s*[-*]\s*\[.\].*\b\d+\b')
+}
+
+function Invoke-PrdFeatureOutputValidation {
+    [CmdletBinding()]
+    [OutputType([hashtable])]
+    param([string] $RawPayload)
+
+    if ([string]::IsNullOrWhiteSpace($RawPayload)) { return @{ Ok = $false; Message = 'prd-feature hook: CLAUDE_HOOK_INPUT is empty.' } }
+    try { $payload = $RawPayload | ConvertFrom-Json -ErrorAction Stop } catch { return @{ Ok = $false; Message = "prd-feature hook: failed to parse CLAUDE_HOOK_INPUT as JSON: $($_.Exception.Message)" } }
+    $output = if ($null -ne $payload.PSObject.Properties['output']) { $payload.output } else { $null }
+    if ([string]::IsNullOrWhiteSpace($output)) { return @{ Ok = $false; Message = 'prd-feature hook: agent output is empty.' } }
+    $specPath = Get-ArtifactPathFromOutput -Output $output -Label 'spec-path'
+    if ([string]::IsNullOrWhiteSpace($specPath) -or -not (Test-Path -LiteralPath $specPath -PathType Leaf)) { return @{ Ok = $false; Message = 'prd-feature hook: spec-path is required and must exist.' } }
+    $specContent = Get-Content -LiteralPath $specPath -Raw -ErrorAction Stop
+    if (-not (Test-SpecNumericCriterion -SpecContent $specContent)) { return @{ Ok = $true; Message = $null } }
+    $researchPath = Get-ArtifactPathFromOutput -Output $output -Label 'research-path'
+    if ([string]::IsNullOrWhiteSpace($researchPath) -or -not (Test-Path -LiteralPath $researchPath -PathType Leaf)) { return @{ Ok = $false; Message = 'prd-feature hook: numeric acceptance criterion requires an existing research-path.' } }
+    return Test-NumericDerivationEvidence -Content (Get-Content -LiteralPath $researchPath -Raw -ErrorAction Stop)
+}
+
+if ($MyInvocation.InvocationName -eq '.') { return }
+$result = Invoke-PrdFeatureOutputValidation -RawPayload $env:CLAUDE_HOOK_INPUT
+if (-not $result.Ok) { Write-Error $result.Message; exit 1 }
+exit 0

package/resources/claude-customizations/.claude/hooks/validate-task-researcher-output.ps1

@@ -161,6 +161,68 @@ function Test-AutomationFeasibilitySection {
     return @{ Ok = $true; Message = $null }
 }
 
+function Test-NumericDerivationEvidence {
+    [CmdletBinding()]
+    [OutputType([hashtable])]
+    param(
+        [Parameter(Mandatory = $true)]
+        [AllowEmptyString()]
+        [string] $Content
+    )
+
+    $numericClaimPattern = '(?im)^\s*[-*]\s*Numeric\s+spec\.md\s+acceptance\s+criterion:\s*.*\b\d+\b'
+    if (-not [regex]::IsMatch($Content, $numericClaimPattern)) {
+        return @{ Ok = $true; Message = $null }
+    }
+
+    $section = [regex]::Match($Content, '(?ims)^##\s+Numeric\s+Derivation\s+Evidence\s*$.*?(?=^##\s|\z)')
+    if (-not $section.Success) {
+        return @{ Ok = $false; Message = 'task-researcher hook: numeric spec.md acceptance criterion is missing ## Numeric Derivation Evidence.' }
+    }
+
+    $requiredLabels = @(
+        'Complete Family', 'Exhaustive Search Scope', 'Inclusion Rules', 'Exclusion Rules',
+        'Primary Search Strategy or Query Expression', 'Primary Member Set', 'Primary Count',
+        'Cross-check Search Strategy or Query Expression', 'Cross-check Member Set', 'Cross-check Count',
+        'Member-set Comparison'
+    )
+    $values = @{}
+    foreach ($label in $requiredLabels) {
+        $match = [regex]::Match($section.Value, "(?im)^[\t ]*[-*]?[\t ]*$([regex]::Escape($label))[\t ]*:[\t ]*(?<value>\S(?:.*\S)?)[\t ]*$")
+        if (-not $match.Success) { return @{ Ok = $false; Message = "task-researcher hook: numeric derivation evidence is missing $label." } }
+        $values[$label] = $match.Groups['value'].Value.Trim()
+    }
+    if ($values['Exhaustive Search Scope'] -notmatch '(?i)\b(entire|all|complete)\b.*\b(repository|repo|source tree|tree)\b') {
+        return @{ Ok = $false; Message = 'task-researcher hook: numeric derivation evidence does not declare an exhaustive repository search scope.' }
+    }
+    $primaryStrategy = $values['Primary Search Strategy or Query Expression']
+    $crossCheckStrategy = $values['Cross-check Search Strategy or Query Expression']
+    if ($primaryStrategy -match '(?i)\b(single|narrow|named[- ]?pattern)\b' -or $crossCheckStrategy -match '(?i)\b(single|narrow|named[- ]?pattern)\b') {
+        return @{ Ok = $false; Message = 'task-researcher hook: numeric derivation evidence uses a narrow named-pattern search.' }
+    }
+    if ([regex]::Replace($primaryStrategy, '\s+', '').ToLowerInvariant() -eq [regex]::Replace($crossCheckStrategy, '\s+', '').ToLowerInvariant()) {
+        return @{ Ok = $false; Message = 'task-researcher hook: numeric derivation cross-check repeats the primary search strategy or query expression.' }
+    }
+    $familyMembers = @($values['Complete Family'].Split(',') | ForEach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrWhiteSpace($_) })
+    foreach ($familyMember in $familyMembers) {
+        if ($primaryStrategy -notmatch [regex]::Escape($familyMember) -or $crossCheckStrategy -notmatch [regex]::Escape($familyMember)) {
+            return @{ Ok = $false; Message = "task-researcher hook: numeric derivation search does not cover complete family member '$familyMember'." }
+        }
+    }
+    if ($values['Primary Count'] -notmatch '^\d+$' -or $values['Cross-check Count'] -notmatch '^\d+$') { return @{ Ok = $false; Message = 'task-researcher hook: numeric derivation counts must be numeric.' } }
+    $primaryMembers = @($values['Primary Member Set'].Split(',') | ForEach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrWhiteSpace($_) })
+    $crossCheckMembers = @($values['Cross-check Member Set'].Split(',') | ForEach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrWhiteSpace($_) })
+    if ([int]$values['Primary Count'] -ne $primaryMembers.Count -or [int]$values['Cross-check Count'] -ne $crossCheckMembers.Count) {
+        return @{ Ok = $false; Message = 'task-researcher hook: numeric derivation count does not match its independently enumerated member set.' }
+    }
+    $normalizedPrimaryMembers = @($primaryMembers | ForEach-Object { $_.ToLowerInvariant() } | Sort-Object -Unique) -join '|'
+    $normalizedCrossCheckMembers = @($crossCheckMembers | ForEach-Object { $_.ToLowerInvariant() } | Sort-Object -Unique) -join '|'
+    if ($normalizedPrimaryMembers -ne $normalizedCrossCheckMembers) { return @{ Ok = $false; Message = 'task-researcher hook: numeric derivation primary and cross-check member sets disagree.' } }
+    if ($values['Member-set Comparison'] -notmatch '(?i)\b(equal|match|identical)\b') { return @{ Ok = $false; Message = 'task-researcher hook: numeric derivation evidence is missing an explicit member-set comparison.' } }
+
+    return @{ Ok = $true; Message = $null }
+}
+
 function Invoke-TaskResearcherOutputValidation {
     [CmdletBinding()]
     [OutputType([hashtable])]
@@ -209,6 +271,13 @@ function Invoke-TaskResearcherOutputValidation {
         return @{ Ok = $false; Message = $feasibilityResult.Message }
     }
 
+    if (Test-Path -LiteralPath $researchPath -PathType Leaf) {
+        $numericEvidenceResult = Test-NumericDerivationEvidence -Content (Get-Content -LiteralPath $researchPath -Raw -ErrorAction Stop)
+        if (-not $numericEvidenceResult.Ok) {
+            return $numericEvidenceResult
+        }
+    }
+
     return @{ Ok = $true; Message = $null }
 }
 
@@ -223,4 +292,3 @@ if (-not $result.Ok) {
 }
 
 exit 0
-

package/resources/claude-customizations/.claude/lib/requirements/GeneratedDocumentCounters.psm1

@@ -0,0 +1,32 @@
+Set-StrictMode -Version Latest
+
+<#
+.SYNOPSIS
+Counts markdown checkbox items contained by a named heading section.
+#>
+function Get-NamedSectionCheckboxCount {
+    [CmdletBinding()]
+    [OutputType([int])]
+    param(
+        [Parameter(Mandatory = $true)][AllowEmptyString()][string] $Document,
+        [Parameter(Mandatory = $true)][string] $Heading
+    )
+
+    $headingPattern = '^(?<marks>#{1,6})\s+' + [regex]::Escape($Heading) + '\s*$'
+    $inside = $false
+    $level = 0
+    $count = 0
+    foreach ($line in ($Document -split "`r?`n")) {
+        if (-not $inside) {
+            $match = [regex]::Match($line, $headingPattern)
+            if ($match.Success) { $inside = $true; $level = $match.Groups['marks'].Value.Length }
+            continue
+        }
+        $nextHeading = [regex]::Match($line, '^(?<marks>#{1,6})\s+')
+        if ($nextHeading.Success -and $nextHeading.Groups['marks'].Value.Length -le $level) { break }
+        if ($line -match '^\s*[-*]\s+\[[ xX]\]\s+') { $count++ }
+    }
+    return $count
+}
+
+Export-ModuleMember -Function Get-NamedSectionCheckboxCount

package/resources/claude-customizations/.claude/settings.json

@@ -239,6 +239,15 @@
           }
         ]
       },
+      {
+        "matcher": "prd-feature",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "pwsh -NoProfile -File .claude/hooks/validate-prd-feature-output.ps1"
+          }
+        ]
+      },
       {
         "matcher": "pr-author",
         "hooks": [

package/resources/claude-customizations/.claude/skills/acceptance-criteria-tracking/SKILL.md

@@ -35,6 +35,8 @@ When multiple AC source files exist, track checkboxes in **each** applicable fil
 
 ## AC Identification
 
+For generated-document summaries, call `.claude/lib/requirements/GeneratedDocumentCounters.psm1` and supply `Acceptance Criteria` as the named section. The counter begins after that heading and ends at the next equal-or-shallower heading. Do not use `scripts/dev_tools/plan_progress_report.py`, which counts plan tasks rather than generated requirements criteria.
+
 Acceptance criteria are markdown checkbox items within AC source files.
 
 Deterministic heading rule:

package/resources/claude-customizations/.claude/skills/atomic-plan-contract/SKILL.md

@@ -155,6 +155,10 @@ Declaration requirement. Every plan handoff MUST carry exactly one of these two
 
 ## Preflight Validation (Planner ↔ Executor)
 
+### Planner Internal Review Record
+
+Before executor preflight, the planner must emit exactly one bounded record between `PLANNER-INTERNAL-REVIEW: PASS` and the existing `PREFLIGHT:` signal. The record requires exactly one passing declaration each for `CITATION-TO-TREE`, `AC-TRACEABILITY`, and `SCOPE-BOUNDARY`; one or more `CITATION: <repository-relative path> | <nonblank locator>` entries; exactly one `AC-INVENTORY:` declaration containing unique nonblank IDs; one `AC-MAPPING: <ID> | IMPLEMENTATION: <nonblank> | TESTS: <nonblank> | EVIDENCE: <nonblank>` for every and only inventory ID; and exactly one `UNRESOLVED-GAPS: NONE`. Missing, blank, duplicate, non-passing, out-of-bounds, or inventory/mapping-disagreeing declarations block handoff. If review cannot pass, emit `SELF-REVIEW: BLOCKED` and do not hand the plan to preflight. `SELF-REVIEW: RE-DERIVED THIS PASS` remains distinct and does not replace executor clearance.
+
 When validating or handing off plans for execution:
 - Use the directive line: `DIRECTIVE: PREFLIGHT VALIDATION ONLY`.
 - Require one of the exact signals:

package/resources/claude-customizations/.claude/skills/fill-feature-docs/SKILL.md

@@ -12,6 +12,8 @@ This direct-use wrapper delegates feature-document work to the `prd-feature` wor
 - Feature folder issue and research context
 - Existing spec and user-story files when present
 
+For a numeric `spec.md` acceptance criterion, the research context must contain complete `## Numeric Derivation Evidence` with `Complete Family`, `Exhaustive Search Scope`, `Inclusion Rules`, `Exclusion Rules`, `Primary Search Strategy or Query Expression`, `Primary Member Set`, `Primary Count`, `Cross-check Search Strategy or Query Expression`, `Cross-check Member Set`, `Cross-check Count`, and `Member-set Comparison`. The two derivations must be non-empty, independently constructed, distinct in strategy or query expression, exhaustive across the complete family, independently enumerated, and explicitly compared. The worker must withhold a numeric assertion for missing, copied, incomplete, non-exhaustive, narrow, or disagreeing evidence; a single grep, a named-pattern-only query, matching totals, distinct query text, or equal member sets alone does not approve a number.
+
 ## Output Paths
 
 - `docs/features/active/<feature>/spec.md`
@@ -20,3 +22,4 @@ This direct-use wrapper delegates feature-document work to the `prd-feature` wor
 ## Worker Routing
 
 - Worker: `prd-feature`
+- Require the worker to report the authoritative `research-path` when a numeric acceptance criterion is written.

package/resources/claude-customizations/.claude/skills/parallel-add/SKILL.md

@@ -21,6 +21,8 @@ this operation may and may not disturb. Read that section before applying anythi
 
 ## Prerequisites
 
+- Reject a pending or not-started run with guidance to consolidate the initial set through `/parallel-plan`. Admit exactly one item only after execution has started in an open run; closed runs are not eligible.
+
 - A parallel run is in progress and `artifacts/orchestration/parallel-orchestrator-state.json`
   tracks its `parallel_slug`. This skill does not start a run; use `/parallel-plan` and
   `/parallel-run` for that.

package/resources/claude-customizations/.claude/skills/parallel-plan/SKILL.md

@@ -32,6 +32,8 @@ Before proceeding, `parallel-planner` must:
 
 ## Item Intake
 
+Initial intake must provide the complete item set in one `/parallel-plan <slug> <item> [<item> ...]` invocation before waves are calculated. `/parallel-add` is not an initial-intake path.
+
 Invocation shape: `/parallel-plan <slug> <item> [<item> ...]`, where each `<item>` is either a
 GitHub issue number (already-promoted work) or a potential-entry path (unpromoted work). This is
 the same intake domain as `/parallel-add`, so initial intake here and F6's add operation accept

package/resources/claude-customizations/.claude/skills/remediation-handoff-atomic-planner/SKILL.md

@@ -106,6 +106,8 @@ After the plan is authored, `atomic-executor` runs preflight under the directive
 
 The orchestrator records the preflight outcome in `remediation_loop.cycles[current_cycle].preflight` with `iterations` (counter) and `final_status` (`clear|changes_requested|pending`).
 
+For a well-scoped item where `preflight.iterations > 1`, record a process-defect investigation that identifies the incomplete planner internal-review dimension. Treat excess rounds as a process signal, not routine iteration.
+
 The exhaustive-pass, defect-enumeration, and delta-self-check rules that govern how `atomic-executor` conducts preflight are defined in the `## Preflight Validation (Planner ↔ Executor)` section of `.claude/skills/atomic-plan-contract/SKILL.md` and are not restated here.
 
 Alongside `iterations` and `final_status`, the orchestrator also records in `remediation_loop.cycles[current_cycle].preflight` the convergence line `atomic-executor` returned on that round, which is one of `CONVERGENCE: NO FURTHER ROUNDS EXPECTED` or `CONVERGENCE: FURTHER ROUNDS LIKELY`. This convergence field extends the field set already recorded at `remediation_loop.cycles[current_cycle].preflight` rather than replacing it: `iterations` and `final_status` continue to be recorded exactly as stated above, and the convergence field is written in addition to them.

package/resources/claude-customizations/.claude/skills/research-issue/SKILL.md

@@ -55,6 +55,8 @@ Create or update a single research file at one of the two tracked research roots
 
 - Map acceptance criteria into a concrete design.
 - Propose state model, transitions, internal API boundaries, and required file changes.
+- For every numeric count, enumeration, or population proposed for an approved `spec.md` acceptance criterion, add complete `## Numeric Derivation Evidence`. Each record must identify `Complete Family`, `Exhaustive Search Scope`, `Inclusion Rules`, `Exclusion Rules`, `Primary Search Strategy or Query Expression`, `Primary Member Set`, `Primary Count`, `Cross-check Search Strategy or Query Expression`, `Cross-check Member Set`, `Cross-check Count`, and `Member-set Comparison`.
+- Both derivations must be non-empty and independently constructed. They must use distinct search strategies or query expressions, independently enumerate the member sets, and explicitly compare normalized member sets. The scope must cover the entire declared family, including all relevant overloads and members; reject a single grep, a narrow named-pattern search, or a query that covers only one family member even when totals and member sets appear equal. Withhold the numeric assertion if the records are incomplete, duplicated, non-exhaustive, narrow, or disagree.
 
 ### 5. Testing Implications
 
@@ -67,3 +69,4 @@ Create or update a single research file at one of the two tracked research roots
 - Ground all findings in verified evidence from the codebase and authoritative external sources.
 - Keep discussion of non-selected approaches brief.
 - Do not claim or perform nested worker delegation.
+- Omit numeric acceptance-criterion facts when the numeric derivation record is absent, incomplete, or disagrees.

package/resources/claude-customizations/pack-manifests/core.json

@@ -53,6 +53,7 @@
     ".claude/hooks/validate-feature-review-coverage.ps1",
     ".claude/hooks/validate-orchestrator-output.ps1",
     ".claude/hooks/validate-planner-output.ps1",
+    ".claude/hooks/validate-prd-feature-output.ps1",
     ".claude/hooks/validate-required-artifact-output.ps1",
     ".claude/hooks/validate-task-researcher-output.ps1",
     ".claude/rules/architecture-boundaries.md",
@@ -110,6 +111,7 @@
     ".claude/skills/translate-copilot-to-claude/SKILL.md",
     ".claude/skills/update-status/SKILL.md",
     ".claude/lib/hook-payload/HookPayload.psm1",
+    ".claude/lib/requirements/GeneratedDocumentCounters.psm1",
     ".claude/lib/model-routing/ModelRouting.psm1",
     ".claude/lib/orchestrator-state/OrchestratorState.psm1",
     ".claude/lib/orchestrator-state/OrchestratorStateCompletion.psm1",

package/resources/codex-and-agents-customizations/.codex/config.toml

@@ -2,7 +2,7 @@ default_permissions = ":danger-full-access"
 
 [mcp_servers.drm-copilot]
 command = "npx"
-args = ["-y", "@danmoisan/drm-copilot-mcp@1.1.6"]
+args = ["-y", "@danmoisan/drm-copilot-mcp@1.1.7"]
 required = true
 enabled_tools = [
     "collect_commit_context",