@danmoisan/drm-copilot-mcp 1.1.18 → 1.1.19

package/resources/claude-customizations/.claude/hooks/enforce-parallel-cohort-barrier.ps1

@@ -13,24 +13,29 @@
     conflict_edges[], and position is read from the current cohort coloring.
 
     Resolution and decision procedure:
-      1. Resolve the target item's feature folder from the prompt text by scanning for a
-         docs/features/active/<token> path, mirroring the epic hook's technique
-         (longest match wins; a .md-suffixed match uses its parent directory).
-      2. Resolve the worktree whose parallel checkpoint records the prompt's
-         parallel_slug: value (issue #690), deny an unresolved or ambiguous target, then
-         read artifacts/orchestration/parallel-orchestrator-state.json beneath that
-         worktree and locate the items[] record whose feature_folder resolves to the same
-         basename.
-      3. Project the cohort coloring to the cohorts[] rows whose generation equals the
+      1. Resolve the worktree whose parallel checkpoint records the prompt's
+         parallel_slug: value (issue #690) and deny an unresolved or ambiguous target.
+      2. Collect the cited feature-folder candidates with the shared resolver
+         (feature-folder-resolution.ps1, issue #565): every docs/features/active/<token>
+         path is truncated to its feature-folder segment, so a nested research/ or
+         evidence/ citation names its own folder. No candidate denies.
+      3. Read artifacts/orchestration/parallel-orchestrator-state.json beneath that
+         worktree and select the target among the candidates with
+         Select-FeatureFolderTarget. The canonical issue-number line, when it names exactly
+         one number, breaks a tie among the cited run items; two or more remaining
+         candidates otherwise deny as ambiguous. Neither string length nor prompt position
+         takes part in the selection. Then locate the items[] record whose feature_folder
+         resolves to the selected basename.
+      4. Project the cohort coloring to the cohorts[] rows whose generation equals the
          top-level recolor_generation, and read the target item's cohort index from that
          projection.
-      4. Collect every conflict_edges[] neighbor of the target item.
-      5. Deny with reason PARALLEL_COHORT_BARRIER_BLOCKED unless every neighbor that sits
+      5. Collect every conflict_edges[] neighbor of the target item.
+      6. Deny with reason PARALLEL_COHORT_BARRIER_BLOCKED unless every neighbor that sits
          in a strictly prior current-generation cohort has merge_status in
          {merged, worktree_removed}. ci_green does NOT satisfy the barrier: an item whose
          CI is green has not merged, so its worktree is still live and its contention is
          unresolved. Same-cohort and later-cohort neighbors do not block Layer 1.
-      6. A missing or unparseable checkpoint, an unresolved feature-folder token, a
+      7. A missing or unparseable checkpoint, an unresolved feature-folder token, a
          missing items[] record, a target with no current-generation cohort assignment, a
          missing neighbor record, and a missing merge_status all deny (fail-closed).
 
@@ -43,24 +48,33 @@
     SubagentStop time.
 
 .NOTES
-    Compatible with PowerShell 7+. Depends on WorktreeRunResolution.psm1 (issue #690),
-    imported inside a guard: a failed import is recorded and the decision denies naming
-    the module. Filesystem reads go through an injectable wrapper function so tests can
-    mock the boundary without writing temporary files.
+    Compatible with PowerShell 7+. Depends on WorktreeItemResolution.psm1 and
+    WorktreeRunResolution.psm1 (issue #690) and the pure sibling
+    feature-folder-resolution.ps1 (issue #565), each loaded inside a guard: the first
+    failure is recorded and the decision denies naming the dependency. Filesystem reads go
+    through an injectable wrapper function so tests can mock the boundary without writing
+    temporary files.
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
 
-Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force
+try { Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'HookPayload.psm1' -ErrorRecord $_ }
 
-# Import guard (issue #690): a failed import denies instead of failing open.
+try { Import-Module (Join-Path $PSScriptRoot '../lib/worktree-resolution/WorktreeItemResolution.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'WorktreeItemResolution.psm1' -ErrorRecord $_ }
+try { Import-Module (Join-Path $PSScriptRoot '../lib/worktree-resolution/WorktreeRunResolution.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'WorktreeRunResolution.psm1' -ErrorRecord $_ }
 $script:ParallelCohortBarrierResolutionImportFailure = $null
+
+# Shared feature-folder resolution (issue #565). Guarded so a failed dot-source denies
+# rather than failing open; an earlier recorded failure is kept.
 try {
-    Import-Module (Join-Path $PSScriptRoot '../lib/worktree-resolution/WorktreeRunResolution.psm1') -Force -ErrorAction Stop
+    . (Join-Path $PSScriptRoot 'feature-folder-resolution.ps1')
 }
 catch {
-    $script:ParallelCohortBarrierResolutionImportFailure = 'WorktreeRunResolution.psm1'
+    if (-not $script:ParallelCohortBarrierResolutionImportFailure) {
+        $script:ParallelCohortBarrierResolutionImportFailure = 'feature-folder-resolution.ps1'
+    }
 }
 
 $script:AllowedMergeStatuses = @('merged', 'worktree_removed')
@@ -68,7 +82,7 @@ $script:ParallelModeMarker = 'Parallel mode: true'
 
 # Dot-source the record-resolution and barrier helpers. Guarded so dot-sourcing this
 # hook in tests loads the helpers too (issue #501 headroom split).
-. (Join-Path $PSScriptRoot 'enforce-parallel-cohort-barrier-helpers.ps1')
+try { . (Join-Path $PSScriptRoot 'enforce-parallel-cohort-barrier-helpers.ps1') } catch { Add-HookDependencyFailure -Name 'enforce-parallel-cohort-barrier-helpers.ps1' -ErrorRecord $_ }
 
 function Get-ParallelCohortBarrierCheckpointContent {
     <#
@@ -147,43 +161,27 @@ function Get-ParallelCohortBarrierFolderBasename {
 function Find-ParallelCohortBarrierFeatureFolderFromPrompt {
     <#
     .SYNOPSIS
-        Scans a prompt string for docs/features/active/<...> path tokens and returns the
-        longest unique match's basename. Returns $null when no match is found.
+        Returns the distinct feature-folder basenames cited in a prompt, in first-occurrence
+        order. Returns no output when no folder is cited.
     .DESCRIPTION
-        Mirrors the epic wave-barrier hook's technique: forward- or backslash-separated
-        path tokens are accepted, the longest match wins, and a .md-suffixed match resolves
-        to its parent directory before the basename is extracted.
+        Delegates to Find-FeatureFolderCandidate in the shared resolver (issue #565): each
+        docs/features/active/<token> path, in either separator style, is truncated to its
+        feature-folder segment, so a nested research/ or evidence/ citation names its own
+        folder. Selection among several candidates is made by Select-FeatureFolderTarget.
     .PARAMETER Prompt
         The delegation prompt text under evaluation.
     .OUTPUTS
-        System.String or $null
+        System.String[]
     #>
     [CmdletBinding()]
-    [OutputType([string])]
+    [OutputType([string[]])]
     param(
         [Parameter(Mandatory)]
         [AllowEmptyString()]
         [string] $Prompt
     )
 
-    if (-not $Prompt) {
-        return $null
-    }
-
-    $pattern = 'docs[\\/]+features[\\/]+active[\\/]+[^\s"''`]+'
-    $matchList = [regex]::Matches($Prompt, $pattern)
-    if ($matchList.Count -eq 0) {
-        return $null
-    }
-
-    $unique = @{}
-    foreach ($m in $matchList) {
-        $normalized = ($m.Value -replace '\\', '/').TrimEnd('/')
-        $unique[$normalized] = $true
-    }
-
-    $candidates = @(@($unique.Keys) | Sort-Object -Property Length -Descending)
-    return (Get-ParallelCohortBarrierFolderBasename -FolderPath $candidates[0])
+    return [string[]]@(Find-FeatureFolderCandidate -Text $Prompt)
 }
 
 function Get-ParallelCohortBarrierAllowDecision {
@@ -230,11 +228,13 @@ function Invoke-ParallelCohortBarrierDecision {
     param(
         [string] $ToolInputRaw
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'PARALLEL_COHORT_BARRIER_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
-    # A failed worktree-resolution import denies before any other logic (issue #690).
+    # A failed dependency import denies before any other logic (issue #565).
     if ($script:ParallelCohortBarrierResolutionImportFailure) {
         return Get-ParallelCohortBarrierBlockDecision -Reason (
-            "PARALLEL_COHORT_BARRIER_BLOCKED: the worktree-resolution module '$($script:ParallelCohortBarrierResolutionImportFailure)' " +
+            "PARALLEL_COHORT_BARRIER_BLOCKED: the dependency '$($script:ParallelCohortBarrierResolutionImportFailure)' " +
             'failed to import, so the parallel checkpoint that governs this delegation cannot be located; the gate fails closed.')
     }
 
@@ -262,8 +262,8 @@ function Invoke-ParallelCohortBarrierDecision {
         return Get-ParallelCohortBarrierBlockDecision -Reason "PARALLEL_COHORT_BARRIER_BLOCKED: $($target.ReasonCode): $($target.Detail)"
     }
 
-    $featureFolder = Find-ParallelCohortBarrierFeatureFolderFromPrompt -Prompt $prompt
-    if (-not $featureFolder) {
+    $candidates = @(Find-ParallelCohortBarrierFeatureFolderFromPrompt -Prompt $prompt)
+    if ($candidates.Count -eq 0) {
         return Get-ParallelCohortBarrierBlockDecision -Reason 'PARALLEL_COHORT_BARRIER_BLOCKED: a parallel-mode orchestrator delegation must reference the target item feature folder path (docs/features/active/<folder>) in the prompt so its conflict edges and cohort position can be verified.'
     }
 
@@ -277,6 +277,18 @@ function Invoke-ParallelCohortBarrierDecision {
         }
     }
 
+    # The target is selected among the cited candidates (issue #565). The canonical
+    # issue-number line breaks a tie only when it names exactly one number.
+    $records = if ($null -ne $checkpoint -and @($checkpoint.PSObject.Properties.Name) -contains 'items') { @($checkpoint.items) } else { @() }
+    $selectionArguments = @{ Records = $records; Candidate = $candidates }
+    $declared = Find-WorktreeItemIssueSignal -Text $prompt
+    if (@($declared).Count -eq 1) { $selectionArguments['DeclaredIssueNumber'] = [int]@($declared)[0] }
+    $selection = Select-FeatureFolderTarget @selectionArguments
+    if ($selection.Status -eq 'Ambiguous') {
+        return Get-ParallelCohortBarrierBlockDecision -Reason "PARALLEL_COHORT_BARRIER_BLOCKED: $($selection.Detail)."
+    }
+    $featureFolder = $selection.Basename
+
     $itemRecord = Find-ParallelCohortBarrierItemRecord -Checkpoint $checkpoint -FeatureFolder $featureFolder
     if (Test-ParallelCohortBarrierClear -Checkpoint $checkpoint -ItemRecord $itemRecord) {
         return Get-ParallelCohortBarrierAllowDecision
@@ -327,5 +339,8 @@ function Invoke-ParallelCohortBarrierEntryPoint {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('PARALLEL_COHORT_BARRIER_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'PARALLEL_COHORT_BARRIER_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 exit (Invoke-ParallelCohortBarrierEntryPoint)

package/resources/claude-customizations/.claude/hooks/enforce-parallel-drift-gate.ps1

@@ -8,13 +8,14 @@
     parallel-mode kickoff marker defined in the "Parallel-Mode Kickoff Parameter" section
     of .claude/skills/parallel-orchestrate/SKILL.md, matched byte-for-byte (ordinal).
 
-    Decision procedure: resolve the target item's feature folder from the prompt by scanning
-    for a docs/features/active/<token> path, the shape the parallel kickoff contract emits
-    for exactly this purpose (adapted from enforce-epic-wave-barrier.ps1's
-    Find-EpicWaveBarrierFeatureFolderFromPrompt: longest match wins, a .md-suffixed match
-    uses its parent directory); read the parallel checkpoint and locate the items[] record
-    whose feature_folder basename matches; derive which item keys have an unresolved latest
-    drift event; deny with PARALLEL_DRIFT_GATE_BLOCKED when the resolved item is one of them
+    Decision procedure: collect the cited feature-folder candidates with the shared resolver
+    (feature-folder-resolution.ps1, issue #565), which truncates every docs/features/active/
+    path to its feature-folder segment; read the parallel checkpoint and select the target
+    among the candidates with Select-FeatureFolderTarget, using the canonical issue-number
+    line as a tie-break when it names exactly one number and denying an unresolved tie as
+    ambiguous; locate the items[] record whose feature_folder basename matches the selected
+    basename, which is also the folder the finding probe inspects; derive which item keys
+    have an unresolved latest drift event; deny with PARALLEL_DRIFT_GATE_BLOCKED when the resolved item is one of them
     and no synthetic Blocking finding file dated at or after that item's latest drift event has
     been written. Allowed: a non-feature-review target, a prompt without the marker, a resolved
     latest event, and an unresolved event whose finding file is dated at or after it, so the
@@ -50,8 +51,10 @@
     ambiguous target denies after the subagent and marker filter and before the folder check.
 
 .NOTES
-    PowerShell 7+. Depends on WorktreeRunResolution.psm1 (issue #690), imported inside a
-    guard: a failed import is recorded and the decision denies naming the module. Both read
+    PowerShell 7+. Depends on WorktreeItemResolution.psm1 and WorktreeRunResolution.psm1
+    (issue #690) and the pure sibling feature-folder-resolution.ps1 (issue #565), each
+    loaded inside a guard: the first failure is recorded and the decision denies naming
+    the dependency. Both read
     boundaries -- the checkpoint read and the finding-file existence check -- are injectable
     wrapper functions, so tests mock them without writing temporary files.
 
@@ -65,23 +68,27 @@
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
 
-Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force
+try { Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'HookPayload.psm1' -ErrorRecord $_ }
 
-# Import guard (issue #690): a failed import denies instead of failing open.
+try { Import-Module (Join-Path $PSScriptRoot '../lib/worktree-resolution/WorktreeItemResolution.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'WorktreeItemResolution.psm1' -ErrorRecord $_ }
+try { Import-Module (Join-Path $PSScriptRoot '../lib/worktree-resolution/WorktreeRunResolution.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'WorktreeRunResolution.psm1' -ErrorRecord $_ }
 $script:ParallelDriftGateResolutionImportFailure = $null
+
+# Shared feature-folder resolution (issue #565). Guarded so a failed dot-source denies
+# rather than failing open; an earlier recorded failure is kept.
 try {
-    Import-Module (Join-Path $PSScriptRoot '../lib/worktree-resolution/WorktreeRunResolution.psm1') -Force -ErrorAction Stop
+    . (Join-Path $PSScriptRoot 'feature-folder-resolution.ps1')
 }
 catch {
-    $script:ParallelDriftGateResolutionImportFailure = 'WorktreeRunResolution.psm1'
+    if (-not $script:ParallelDriftGateResolutionImportFailure) { $script:ParallelDriftGateResolutionImportFailure = 'feature-folder-resolution.ps1' }
 }
 
 # Dot-source the shape-and-derivation helpers. Guarded so a missing file produces a clear error
 # and so dot-sourcing this hook in tests loads the helpers too.
-$script:ParallelDriftGateHelpersPath = Join-Path $PSScriptRoot 'enforce-parallel-drift-gate-helpers.ps1'
-. $script:ParallelDriftGateHelpersPath
+try { . (Join-Path $PSScriptRoot 'enforce-parallel-drift-gate-helpers.ps1') } catch { Add-HookDependencyFailure -Name 'enforce-parallel-drift-gate-helpers.ps1' -ErrorRecord $_ }
 
 $script:ParallelModeMarker = 'Parallel mode: true'
 $script:ReviewSubagentType = 'feature-review'
@@ -209,32 +216,16 @@ function Test-ParallelDriftFindingPresent {
 function Find-ParallelDriftGateFeatureFolderFromPrompt {
     <#
     .SYNOPSIS
-        Scan a delegation prompt for docs/features/active/<...> path tokens and return the
-        longest unique match's basename, or $null when none is found.
+        Return the distinct feature-folder basenames cited in a delegation prompt, in
+        first-occurrence order, through the shared Find-FeatureFolderCandidate (issue #565).
+        A nested research/ or evidence/ citation names its own folder. No output when no
+        folder is cited; selection among several is made by Select-FeatureFolderTarget.
     #>
     [CmdletBinding()]
-    [OutputType([string])]
+    [OutputType([string[]])]
     param([Parameter(Mandatory)][AllowEmptyString()][string] $Prompt)
 
-    if (-not $Prompt) {
-        return $null
-    }
-    $matchList = [regex]::Matches($Prompt, 'docs[\\/]+features[\\/]+active[\\/]+[^\s"''`]+')
-    if ($matchList.Count -eq 0) {
-        return $null
-    }
-
-    # Collect distinct normalized tokens so the longest, most specific one can be selected.
-    $unique = @{}
-    foreach ($found in $matchList) {
-        $unique[($found.Value -replace '\\', '/').TrimEnd('/')] = $true
-    }
-
-    $best = @(@($unique.Keys) | Sort-Object -Property Length -Descending)[0]
-    if ($best -match '\.md$') {
-        $best = $best -replace '/[^/]+\.md$', ''
-    }
-    return ($best -split '/')[-1]
+    return [string[]]@(Find-FeatureFolderCandidate -Text $Prompt)
 }
 
 function Find-ParallelDriftGateItemRecord {
@@ -318,11 +309,13 @@ function Invoke-ParallelDriftGateDecision {
         [AllowEmptyString()]
         [string] $ToolInputRaw
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'PARALLEL_DRIFT_GATE_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
-    # A failed worktree-resolution import denies before any other logic (issue #690).
+    # A failed dependency import denies before any other logic (issue #565).
     if ($script:ParallelDriftGateResolutionImportFailure) {
         return Get-ParallelDriftGateBlockDecision -Reason (
-            "PARALLEL_DRIFT_GATE_BLOCKED: the worktree-resolution module '$($script:ParallelDriftGateResolutionImportFailure)' " +
+            "PARALLEL_DRIFT_GATE_BLOCKED: the dependency '$($script:ParallelDriftGateResolutionImportFailure)' " +
             'failed to import, so the parallel checkpoint that governs this review cannot be located; the gate fails closed.')
     }
 
@@ -352,8 +345,8 @@ function Invoke-ParallelDriftGateDecision {
         return Get-ParallelDriftGateBlockDecision -Reason "PARALLEL_DRIFT_GATE_BLOCKED: $($target.ReasonCode): $($target.Detail)"
     }
 
-    $featureFolder = Find-ParallelDriftGateFeatureFolderFromPrompt -Prompt $prompt
-    if (-not $featureFolder) {
+    $candidates = @(Find-ParallelDriftGateFeatureFolderFromPrompt -Prompt $prompt)
+    if ($candidates.Count -eq 0) {
         return Get-ParallelDriftGateBlockDecision -Reason 'PARALLEL_DRIFT_GATE_BLOCKED: a parallel-mode feature-review delegation must reference the target item feature folder in the prompt so its drift state can be verified.'
     }
 
@@ -367,8 +360,19 @@ function Invoke-ParallelDriftGateDecision {
         }
     }
     if ($null -eq $checkpoint) {
-        return Get-ParallelDriftGateBlockDecision -Reason "PARALLEL_DRIFT_GATE_BLOCKED: the parallel checkpoint 'artifacts/orchestration/parallel-orchestrator-state.json' in worktree '$($target.WorktreeRoot)' is missing or unreadable, so the drift state of '$featureFolder' cannot be verified."
+        return Get-ParallelDriftGateBlockDecision -Reason "PARALLEL_DRIFT_GATE_BLOCKED: the parallel checkpoint 'artifacts/orchestration/parallel-orchestrator-state.json' in worktree '$($target.WorktreeRoot)' is missing or unreadable, so the drift state of '$($candidates -join ', ')' cannot be verified."
+    }
+
+    # The target is selected among the cited candidates (issue #565). The canonical
+    # issue-number line breaks a tie only when it names exactly one number.
+    $selectionArguments = @{ Records = @($checkpoint.items | Where-Object { $null -ne $_ }); Candidate = $candidates }
+    $declared = Find-WorktreeItemIssueSignal -Text $prompt
+    if (@($declared).Count -eq 1) { $selectionArguments['DeclaredIssueNumber'] = [int]@($declared)[0] }
+    $selection = Select-FeatureFolderTarget @selectionArguments
+    if ($selection.Status -eq 'Ambiguous') {
+        return Get-ParallelDriftGateBlockDecision -Reason "PARALLEL_DRIFT_GATE_BLOCKED: $($selection.Detail)."
     }
+    $featureFolder = $selection.Basename
 
     $item = Find-ParallelDriftGateItemRecord -Checkpoint $checkpoint -FeatureFolder $featureFolder
     if ($null -eq $item -or -not (Test-ParallelDriftGateItemKey -Value $item.issue_num)) {
@@ -440,5 +444,8 @@ function Invoke-ParallelDriftGateEntryPoint {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('PARALLEL_DRIFT_GATE_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'PARALLEL_DRIFT_GATE_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 exit (Invoke-ParallelDriftGateEntryPoint)

package/resources/claude-customizations/.claude/hooks/enforce-parallel-worktree-removal-gate.ps1

@@ -32,27 +32,21 @@
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
 
-Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force
+try { Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'HookPayload.psm1' -ErrorRecord $_ }
 # Sanctioned-removal manifest reader (issue #635), consumed by the manifest branch in
 # Invoke-ParallelWorktreeRemovalGateDecision. Same module the epic gate imports.
-Import-Module (Join-Path $PSScriptRoot '../lib/cleanup-manifest/CleanupWorktreeManifest.psm1') -Force
+try { Import-Module (Join-Path $PSScriptRoot '../lib/cleanup-manifest/CleanupWorktreeManifest.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'CleanupWorktreeManifest.psm1' -ErrorRecord $_ }
 # Shared command-line parser (issue #545), consumed by the scope filter in
-# Invoke-ParallelWorktreeRemovalGateDecision and by Get-ParallelWorktreeRemovalCommandPath.
+# Invoke-ParallelWorktreeRemovalGateDecision and by Resolve-CommandLineInvocationTarget.
 # Both call sites are byte-for-byte the calls the epic gate makes, so the duplicated
 # concern now has one implementation.
-. (Join-Path $PSScriptRoot 'hook-command-scanner.ps1')
-. (Join-Path $PSScriptRoot 'hook-command-invocation.ps1')
+try { . (Join-Path $PSScriptRoot 'hook-command-scanner.ps1') } catch { Add-HookDependencyFailure -Name 'hook-command-scanner.ps1' -ErrorRecord $_ }
+try { . (Join-Path $PSScriptRoot 'hook-command-invocation.ps1') } catch { Add-HookDependencyFailure -Name 'hook-command-invocation.ps1' -ErrorRecord $_ }
 
-# Import guard (issue #690): a failed import denies instead of failing open.
-$script:ParallelWorktreeGateResolutionImportFailure = $null
-try {
-    Import-Module (Join-Path $PSScriptRoot '../lib/worktree-resolution/WorktreeRunResolution.psm1') -Force -ErrorAction Stop
-}
-catch {
-    $script:ParallelWorktreeGateResolutionImportFailure = 'WorktreeRunResolution.psm1'
-}
+try { Import-Module (Join-Path $PSScriptRoot '../lib/worktree-resolution/WorktreeRunResolution.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'WorktreeRunResolution.psm1' -ErrorRecord $_ }
 
 $script:AllowedMergeStatuses = @('merged', 'worktree_removed')
 # Sanctioned-removal manifest location. Recorded here so every hook-read document this
@@ -164,52 +158,6 @@ function Read-ParallelWorktreeGateRunCheckpoint {
     }
 }
 
-function Get-ParallelWorktreeRemovalCommandPath {
-    <#
-    .SYNOPSIS
-        Extract the target worktree path argument from a git worktree remove command.
-    .DESCRIPTION
-        The operand comes from the segment that structurally invokes git worktree remove,
-        so a 'cd <path> &&' segment chained before the removal contributes nothing and a
-        quoted mention of the phrase resolves to no operand at all. Quotes around the path
-        are already stripped by the tokenizer.
-
-        '--force' is a zero-argument flag, so it never contributes an operand and may be
-        written on either side of the target path. Its presence is read structurally through
-        Test-CommandLineFlag rather than by searching the raw text, so a '--force' spelling
-        that appears inside an unrelated quoted argument cannot change how the operand list
-        is read. When no operand resolves, a present '--force' is reported in its place, so
-        the checkpoint lookup fails closed on a value that matches no recorded worktree_path
-        - the same value the previous raw-text pattern returned for that input.
-
-        This body is identical to Get-EpicWorktreeRemovalCommandPath in
-        enforce-epic-worktree-removal-gate.ps1. The two gates fire on the same command and
-        now delegate the shared concern to one parser rather than to two patterns that had
-        already diverged from the Codex copy.
-    .PARAMETER CommandText
-        The Bash command text under evaluation.
-    .OUTPUTS
-        System.String or $null
-    #>
-    [CmdletBinding()]
-    [OutputType([string])]
-    param(
-        [Parameter(Mandatory)]
-        [string] $CommandText
-    )
-
-    $hasForce = Test-CommandLineFlag -CommandText $CommandText -CommandWord 'git' -SubcommandPath @('worktree', 'remove') -FlagName '--force'
-    $operands = @(Get-CommandLineOperand -CommandText $CommandText -CommandWord 'git' -SubcommandPath @('worktree', 'remove'))
-
-    if ($operands.Count -gt 0) {
-        return $operands[0]
-    }
-    if ($hasForce) {
-        return '--force'
-    }
-    return $null
-}
-
 function Find-ParallelWorktreeItemRecord {
     <#
     .SYNOPSIS
@@ -334,13 +282,8 @@ function Invoke-ParallelWorktreeRemovalGateDecision {
     param(
         [string] $ToolInputRaw
     )
-
-    # A failed worktree-resolution import denies before any other logic (issue #690).
-    if ($script:ParallelWorktreeGateResolutionImportFailure) {
-        return Get-ParallelWorktreeGateBlockDecision -Reason (
-            "PARALLEL_WORKTREE_REMOVAL_BLOCKED: the worktree-resolution module '$($script:ParallelWorktreeGateResolutionImportFailure)' " +
-            'failed to import, so the run checkpoint that governs this removal cannot be located; the gate fails closed.')
-    }
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'PARALLEL_WORKTREE_REMOVAL_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
     $payload = Resolve-ClaudeHookToolInput -Raw $ToolInputRaw
     if (-not $payload.IsValid) {
@@ -362,7 +305,43 @@ function Invoke-ParallelWorktreeRemovalGateDecision {
         return Get-ParallelWorktreeGateAllowDecision
     }
 
-    $worktreePath = Get-ParallelWorktreeRemovalCommandPath -CommandText $commandText
+    # Issue #824: the removal targets are derived structurally from every invocation.
+    # A target that cannot be derived denies before any checkpoint is read, and every
+    # derived target must be authorized on its own.
+    $resolution = Resolve-CommandLineInvocationTarget -CommandText $commandText -CommandWord 'git' -SubcommandPath @('worktree', 'remove')
+    if ($resolution.Status -eq 'NoMatch') {
+        return Get-ParallelWorktreeGateAllowDecision
+    }
+    if ($resolution.Status -ne 'Targets') {
+        return Get-ParallelWorktreeGateBlockDecision -Reason 'PARALLEL_WORKTREE_REMOVAL_BLOCKED: TARGET_WORKTREE_NOT_DERIVABLE: the git worktree remove target cannot be derived from the command text. No checkpoint can authorize this removal.'
+    }
+    foreach ($target in @($resolution.Targets)) {
+        $denial = Get-ParallelWorktreeRemovalTargetDenial -WorktreePath $target
+        if ($null -ne $denial) {
+            return $denial
+        }
+    }
+    return Get-ParallelWorktreeGateAllowDecision
+}
+
+function Get-ParallelWorktreeRemovalTargetDenial {
+    <#
+    .SYNOPSIS
+        Evaluate one derived removal target and return its deny decision, or $null when authorized.
+    .DESCRIPTION
+        Holds the per-path authorization cascade (parallel checkpoint, epic checkpoint,
+        sanctioned-removal manifest) for a single worktree path (issue #824).
+    .PARAMETER WorktreePath
+        One removal target derived by Resolve-CommandLineInvocationTarget.
+    .OUTPUTS
+        System.Collections.Specialized.OrderedDictionary or $null
+    #>
+    [CmdletBinding()]
+    [OutputType([System.Collections.Specialized.OrderedDictionary])]
+    param(
+        [Parameter(Mandatory)]
+        [string] $WorktreePath
+    )
 
     # Each run checkpoint is read beneath the worktree that records this path (issue #690),
     # parallel kind first; an ambiguous target denies before any allow or manifest check.
@@ -377,7 +356,7 @@ function Invoke-ParallelWorktreeRemovalGateDecision {
 
     $itemRecord = Find-ParallelWorktreeItemRecord -Checkpoint $checkpoint -WorktreePath $worktreePath
     if (Test-ParallelWorktreeRemovalAllowed -ItemRecord $itemRecord) {
-        return Get-ParallelWorktreeGateAllowDecision
+        return $null
     }
 
     # Epic-authorization branch (issue #688). It runs after the parallel allow above and
@@ -394,7 +373,7 @@ function Invoke-ParallelWorktreeRemovalGateDecision {
 
     $featureRecord = Find-ParallelWorktreeItemRecord -Checkpoint $epicCheckpoint -WorktreePath $worktreePath -RecordArrayName 'features'
     if (Test-ParallelWorktreeRemovalAllowed -ItemRecord $featureRecord) {
-        return Get-ParallelWorktreeGateAllowDecision
+        return $null
     }
 
     # Sanctioned-removal manifest branch (issue #635). It runs last, so a
@@ -409,15 +388,15 @@ function Invoke-ParallelWorktreeRemovalGateDecision {
     # only; the epic gate covers the features array with its own exclusion.
     if (-not (Test-CleanupManifestCheckpointCoversPath -Checkpoint $checkpoint -RecordArrayName 'items' -WorktreePath $worktreePath) -and
         (Test-CleanupWorktreeManifestAuthorizesRemoval -WorktreePath $worktreePath)) {
-        return Get-ParallelWorktreeGateAllowDecision
+        return $null
     }
 
     # When neither kind resolved, the deny names the resolution reason first (issue #690).
     $prefix = ''
     if ($parallelRead.Target.Status -eq 'NoTarget' -and $epicRead.Target.Status -eq 'NoTarget') {
-        $prefix = "PARALLEL_WORKTREE_REMOVAL_BLOCKED: $($parallelRead.Target.ReasonCode): $($parallelRead.Target.Detail). "
+        $prefix = "$($parallelRead.Target.ReasonCode): $($parallelRead.Target.Detail). "
     }
-    return Get-ParallelWorktreeGateBlockDecision -Reason ($prefix + "PARALLEL_WORKTREE_REMOVAL_BLOCKED: git worktree remove for '$worktreePath' requires a matching parallel checkpoint items[] record with merge_status in {merged, worktree_removed}. The checkpoint was unreadable, no matching record was found, or merge_status was not yet safe for removal.")
+    return Get-ParallelWorktreeGateBlockDecision -Reason ('PARALLEL_WORKTREE_REMOVAL_BLOCKED: ' + $prefix + "git worktree remove for '$worktreePath' requires a matching parallel checkpoint items[] record with merge_status in {merged, worktree_removed}. The checkpoint was unreadable, no matching record was found, or merge_status was not yet safe for removal.")
 }
 
 function Invoke-ParallelWorktreeRemovalGateEntryPoint {
@@ -462,6 +441,9 @@ function Invoke-ParallelWorktreeRemovalGateEntryPoint {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('PARALLEL_WORKTREE_REMOVAL_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'PARALLEL_WORKTREE_REMOVAL_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 # The entry point returns its [int] exit code as the last pipeline element and the
 # decision JSON before it. `exit (<call>)` would capture BOTH into the exit

package/resources/claude-customizations/.claude/hooks/enforce-powershell-batch-budget.ps1

@@ -57,10 +57,11 @@
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
 
-Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force
-. (Join-Path $PSScriptRoot 'enforce-batch-budget-route.ps1')
+try { Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force -ErrorAction Stop } catch { Add-HookDependencyFailure -Name 'HookPayload.psm1' -ErrorRecord $_ }
+try { . (Join-Path $PSScriptRoot 'enforce-batch-budget-route.ps1') } catch { Add-HookDependencyFailure -Name 'enforce-batch-budget-route.ps1' -ErrorRecord $_ }
 
 function Test-PowerShellBatchBudgetPathInRoot {
     <#
@@ -277,6 +278,8 @@ function Invoke-PowerShellBatchBudgetDecision {
         [AllowEmptyString()]
         [string] $ObservedRoute = ''
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'POWERSHELL_LARGE_PATH_REQUIRED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
     $normalized = $FilePath -replace '\\', '/'
     if ($normalized -notmatch '\.(ps1|psm1|psd1)$') {
@@ -474,6 +477,9 @@ function Invoke-PowerShellBatchBudgetEntryPoint {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('POWERSHELL_LARGE_PATH_REQUIRED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'POWERSHELL_LARGE_PATH_REQUIRED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 # The entry point returns its [int] exit code as the last pipeline element and the
 # decision JSON before it. `exit (<call>)` would capture BOTH into the exit