@danmoisan/drm-copilot-mcp 1.1.18 → 1.1.20

package/resources/codex-and-agents-customizations/.codex/hooks/enforce-epic-merge-gate-command.ps1

@@ -0,0 +1,190 @@
+<#
+.SYNOPSIS
+    Scope predicate and pull-request selector reader for the epic merge gate (issue #952).
+.DESCRIPTION
+    Dot-sourced by enforce-epic-merge-gate.ps1 on both runtimes; this file is byte-identical in
+    .claude/hooks and .codex/hooks. Under a merge queue every gh pr merge spelling (--merge, -m,
+    --squash, -s, --rebase, -r, --auto, --admin, or no method flag) adds the pull request to the
+    queue, and the gh api mutations enqueuePullRequest, enablePullRequestAutoMerge, and
+    mergePullRequest and the REST pulls/<n>/merge endpoint also reach the base branch. All of
+    them are in scope. A gh pr merge whose only action flag is --disable-auto is out of scope.
+
+    Pure string logic only: no disk, process, network, clock, or environment access. The file
+    dot-sources and imports nothing; it consumes Get-CommandLineInvocation and
+    Get-CommandLineStructuralMatch, which the gate loads from hook-command-invocation.ps1 first.
+
+    Known limitation (issue #952 code review CR-5): the gh api scope reads the command text
+    only. A GraphQL mutation supplied from a file (gh api graphql -F query=@mutation.graphql,
+    or gh api --input payload.json) is not visible to this text-based scope and is not gated.
+#>
+
+# gh pr merge flags that perform or schedule a merge. Any of them keeps a command in scope even
+# when it also carries --disable-auto.
+$script:EpicMergeGateActionFlags = @('--merge', '-m', '--squash', '-s', '--rebase', '-r', '--auto', '--admin')
+
+# gh pr merge flags, including the inherited --repo, that consume the following token as a value.
+$script:EpicMergeGateValueFlags = @('-b', '--body', '-F', '--body-file', '-t', '--subject', '-A', '--author-email', '--match-head-commit', '-R', '--repo')
+
+# GraphQL mutations that merge, enqueue, or schedule the merge of a pull request.
+$script:EpicMergeGateMutationNames = @('enqueuePullRequest', 'enablePullRequestAutoMerge', 'mergePullRequest')
+
+# The REST merge endpoint path; group 1 is the pull-request number.
+$script:EpicMergeGateRestMergePattern = '(?:^|/)pulls/(\d+)/merge(?:$|[^\w-])'
+
+function Get-EpicMergeGateFlagName {
+    <#
+    .SYNOPSIS
+        Return the flag name of a dash-led token without any '=value' suffix.
+    .OUTPUTS
+        System.String
+    #>
+    [CmdletBinding()]
+    [OutputType([string])]
+    param([Parameter(Mandatory)][AllowEmptyString()][string] $Token)
+
+    $split = $Token.IndexOf('=')
+    if ($split -gt 0) { return $Token.Substring(0, $split) }
+    return $Token
+}
+
+function ConvertFrom-EpicMergeGateSelector {
+    <#
+    .SYNOPSIS
+        Convert a gh pr merge selector to a pull-request number, or $null.
+    .DESCRIPTION
+        Accepts an all-digit selector or a URL whose path ends in /pull/<n>. A branch-name
+        selector carries no number and yields $null.
+    .OUTPUTS
+        System.Nullable[int]
+    #>
+    [CmdletBinding()]
+    [OutputType([int])]
+    param([Parameter(Mandatory)][AllowEmptyString()][string] $Selector)
+
+    $digits = $null
+    if ($Selector -match '^\d+$') {
+        $digits = $Selector
+    } elseif ($Selector -match '/pull/(\d+)/?(?:[?#].*)?$') {
+        $digits = $Matches[1]
+    }
+    $number = 0
+    if ($null -ne $digits -and [int]::TryParse($digits, [ref] $number)) { return $number }
+    return $null
+}
+
+function Test-EpicMergeGateDisableAutoOnly {
+    <#
+    .SYNOPSIS
+        Report whether a Structural gh pr merge match carries --disable-auto and no action flag.
+    .OUTPUTS
+        System.Boolean
+    #>
+    [CmdletBinding()]
+    [OutputType([bool])]
+    param([Parameter(Mandatory)][pscustomobject] $Match)
+
+    $tokens = [string[]]@($Match.Segment.Tokens)
+    $hasDisableAuto = $false
+    for ($index = $Match.OperandIndex; $index -lt $tokens.Count; $index++) {
+        $name = Get-EpicMergeGateFlagName -Token $tokens[$index]
+        if ($script:EpicMergeGateActionFlags -ccontains $name) { return $false }
+        if ($name -ceq '--disable-auto') { $hasDisableAuto = $true }
+    }
+    return $hasDisableAuto
+}
+
+function Test-EpicMergeGateApiMutationText {
+    <#
+    .SYNOPSIS
+        Report whether gh api text names a merge or enqueue mutation or the REST merge endpoint.
+    .OUTPUTS
+        System.Boolean
+    #>
+    [CmdletBinding()]
+    [OutputType([bool])]
+    param([Parameter(Mandatory)][AllowEmptyString()][AllowNull()][string] $Text)
+
+    if ([string]::IsNullOrEmpty($Text)) { return $false }
+    foreach ($name in $script:EpicMergeGateMutationNames) {
+        if ($Text.IndexOf($name, [System.StringComparison]::OrdinalIgnoreCase) -ge 0) { return $true }
+    }
+    return [regex]::IsMatch($Text, $script:EpicMergeGateRestMergePattern)
+}
+
+function Test-EpicMergeGateCommandInScope {
+    <#
+    .SYNOPSIS
+        Report whether a command line is a gated merge or enqueue action (issue #952).
+    .DESCRIPTION
+        True for any gh pr merge match, Structural or Indeterminate, unless the match is Structural
+        and its only action flag is --disable-auto; true for any gh api match whose tokens name a
+        merge or enqueue mutation or a pulls/<n>/merge path. Text that only mentions these words
+        produces no match and stays out of scope. An Indeterminate gh pr merge match stays in scope
+        (fail closed).
+    .OUTPUTS
+        System.Boolean
+    #>
+    [CmdletBinding()]
+    [OutputType([bool])]
+    param([Parameter(Mandatory)][AllowEmptyString()][AllowNull()][string] $CommandText)
+
+    foreach ($match in @(Get-CommandLineInvocation -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('pr', 'merge'))) {
+        if ($match.Status -ne 'Structural' -or -not (Test-EpicMergeGateDisableAutoOnly -Match $match)) { return $true }
+    }
+    foreach ($match in @(Get-CommandLineInvocation -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('api'))) {
+        if (Test-EpicMergeGateApiMutationText -Text (@($match.Segment.Tokens) -join ' ')) { return $true }
+    }
+    return $false
+}
+
+function Get-EpicMergeGateSelectorPrNumber {
+    <#
+    .SYNOPSIS
+        Resolve the pull-request number of a gated merge or enqueue command, or $null.
+    .DESCRIPTION
+        For gh pr merge, only the first Structural match is read. Value flags are skipped with
+        their values, other flags are skipped, an equals-joined --merge=<digits> yields its
+        digits (an equals-joined value that is not a number is skipped like any other flag),
+        and the first non-flag token (or the token after a bare '--') is the selector.
+        For gh api, the number comes from a pulls/<n>/merge token. Any other command yields
+        $null, which the gate handles through its no-number branches.
+    .OUTPUTS
+        System.Nullable[int]
+    #>
+    [CmdletBinding()]
+    [OutputType([int])]
+    param([Parameter(Mandatory)][AllowEmptyString()][AllowNull()][string] $CommandText)
+
+    $match = Get-CommandLineStructuralMatch -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('pr', 'merge')
+    if ($null -ne $match) {
+        $tokens = [string[]]@($match.Segment.Tokens)
+        $index = $match.OperandIndex
+        while ($index -lt $tokens.Count) {
+            $token = $tokens[$index]
+            if ($token -ceq '--') {
+                if ($index + 1 -lt $tokens.Count) { return ConvertFrom-EpicMergeGateSelector -Selector $tokens[$index + 1] }
+                return $null
+            }
+            if ($token.StartsWith('-') -and $token.Length -gt 1) {
+                $name = Get-EpicMergeGateFlagName -Token $token
+                if ($name -ceq '--merge' -and $token.Length -gt $name.Length) {
+                    $equalsNumber = ConvertFrom-EpicMergeGateSelector -Selector $token.Substring($name.Length + 1)
+                    if ($null -ne $equalsNumber) { return $equalsNumber }
+                }
+                $index += if ($script:EpicMergeGateValueFlags -ccontains $token) { 2 } else { 1 }
+                continue
+            }
+            return ConvertFrom-EpicMergeGateSelector -Selector $token
+        }
+        return $null
+    }
+
+    foreach ($apiMatch in @(Get-CommandLineInvocation -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('api'))) {
+        foreach ($token in @($apiMatch.Segment.Tokens)) {
+            $rest = [regex]::Match([string]$token, $script:EpicMergeGateRestMergePattern)
+            $number = 0
+            if ($rest.Success -and [int]::TryParse($rest.Groups[1].Value, [ref] $number)) { return $number }
+        }
+    }
+    return $null
+}

package/resources/codex-and-agents-customizations/.codex/hooks/enforce-epic-merge-gate.ps1

@@ -1,15 +1,40 @@
 <#
 .SYNOPSIS
     Gates epic child and integration PR merges behind checkpointed green state.
+
+.DESCRIPTION
+    Trigger scope (issue #952): every gh pr merge invocation (any merge method, --auto, --admin,
+    or no method flag) and every gh api merge or enqueue mutation is gated, because under a merge
+    queue each of them reaches the base branch; only a pure --disable-auto is out of scope. The
+    predicate and the PR selector reader live in enforce-epic-merge-gate-command.ps1.
+
+    Docs-only branch (issue #927): after the standalone branch denies an explicit PR number,
+    and only when no checkpoint is present at the repository root (both checkpoint texts are
+    blank; operator decision OD-1, stricter than the Claude per-PR rule), the gate calls
+    Get-DocsOnlyMergeExemption from hook-docs-only-diff.ps1 with the repository root. That
+    function runs gh pr view and git there and allows the merge when its conditions M1-M9
+    hold; otherwise the deny gains " (docs-only exemption not applied: <Reason>)", where the
+    reason may be DOCS_ONLY_EXEMPTION_PR_UNRESOLVED. A blank RepositoryRoot denies at M2
+    before any process starts. The hook never fetches; --match-head-commit, when present,
+    must equal headRefOid (OD-2). Residual limits: an ambient GH_REPO or GH_HOST is not
+    visible in the command text; gh and git run in the repository root, so a cd made by an
+    earlier shell call is not visible either; a push after the lookup can change the head
+    unless --match-head-commit is passed; and the control is policy-level, not cryptographic.
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
 # Shared command-line parser (issue #545). The scope filter and the PR-number resolver below
 # both run against the segment that structurally invokes `gh pr merge`, which is what keeps
 # the two runtimes on one implementation of the same concern.
-. (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 $_ }
+# Merge and enqueue scope predicate and the PR selector reader (issue #952), byte-identical to the
+# Claude copy.
+try { . (Join-Path $PSScriptRoot 'enforce-epic-merge-gate-command.ps1') } catch { Add-HookDependencyFailure -Name 'enforce-epic-merge-gate-command.ps1' -ErrorRecord $_ }
+# Shared docs-only diff classification and the merge-side docs-only exemption (issue #927).
+try { . (Join-Path $PSScriptRoot 'hook-docs-only-diff.ps1') } catch { Add-HookDependencyFailure -Name 'hook-docs-only-diff.ps1' -ErrorRecord $_ }
 
 # Reason codes for the standalone-merge authorization branch (issue #670), spelled
 # byte-identically to the Claude helpers file. Each of the four assignments below is the only
@@ -44,15 +69,11 @@ function Get-CodexMergeCommandPrNumber {
     .SYNOPSIS
         Resolve the explicit pull-request number of a gh pr merge invocation, or $null.
     .DESCRIPTION
-        The number is taken from the segment that structurally invokes `gh pr merge` and
-        from nowhere else: the positional spelling through Get-CommandLineOperand, the
-        flag-led and equals-joined spellings through Get-CommandLineFlagValue. A leading
-        `cd <path>` segment contributes no operand and no flag value, so no digit run
+        The number is resolved by Get-EpicMergeGateSelectorPrNumber in
+        enforce-epic-merge-gate-command.ps1 (issue #952), the file shared byte-identically with
+        the Claude runtime, from the segment that structurally invokes gh pr merge or gh api and
+        from nowhere else. A leading cd <path> segment contributes no selector, so no digit run
         outside the merge segment can be mistaken for a pull-request number.
-
-        This copy has never carried the Claude copy's unanchored whole-text digit scan and
-        deliberately does not acquire one. No regular expression matching a bare digit run
-        is introduced here; the only pattern below anchors an all-digit token end to end.
     .OUTPUTS
         System.Nullable[int]
     #>
@@ -60,18 +81,7 @@ function Get-CodexMergeCommandPrNumber {
     [OutputType([int])]
     param([Parameter(Mandatory)][string] $Command)
 
-    foreach ($operand in @(Get-CommandLineOperand -CommandText $Command -CommandWord 'gh' -SubcommandPath @('pr', 'merge'))) {
-        if ($operand -match '^\d+$') {
-            return [int]$operand
-        }
-    }
-
-    $flagValue = Get-CommandLineFlagValue -CommandText $Command -CommandWord 'gh' -SubcommandPath @('pr', 'merge') -FlagName '--merge'
-    if ($null -ne $flagValue -and $flagValue -match '^\d+$') {
-        return [int]$flagValue
-    }
-
-    return $null
+    return Get-EpicMergeGateSelectorPrNumber -CommandText $Command
 }
 
 function Test-CodexChildMergeReady {
@@ -125,31 +135,20 @@ function Invoke-CodexEpicMergeDecision {
     param(
         [Parameter(Mandatory)][string] $PayloadRaw,
         [AllowNull()][AllowEmptyString()][string] $ChildCheckpointRaw,
-        [AllowNull()][AllowEmptyString()][string] $EpicCheckpointRaw
+        [AllowNull()][AllowEmptyString()][string] $EpicCheckpointRaw,
+        [AllowNull()][AllowEmptyString()][string] $RepositoryRoot
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_MERGE_GATE_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
     $payload = ConvertFrom-CodexMergeJson -Raw $PayloadRaw -Name 'PreToolUse input'
     if ([string]$payload.tool_name -ne 'Bash') {
         return $null
     }
     $command = [string]$payload.tool_input.command
-    # Both legs are read structurally from the segment that invokes the command, so a
-    # quoted mention of the phrase no longer brings a command into scope. The flag leg needs
-    # a raw-scan fallback: a wrapper's quoted argument collapses into ONE token, so a flag
-    # inside it is never read as a token, and the token-only read took
-    # bash -c "gh pr merge --merge 688" out of scope.
-    $isMergeInvocation = Test-CommandLineInvocation -CommandText $command -CommandWord 'gh' -SubcommandPath @('pr', 'merge')
-    $hasMergeFlag = Test-CommandLineFlag -CommandText $command -CommandWord 'gh' -SubcommandPath @('pr', 'merge') -FlagName '--merge'
-    if (-not $hasMergeFlag) {
-        foreach ($segment in @(Read-CommandLineSegment -CommandText $command)) {
-            if ((Test-CommandLineSegmentRawScan -Segment $segment) -and
-                $segment.ScanText.IndexOf('--merge', [System.StringComparison]::OrdinalIgnoreCase) -ge 0) {
-                $hasMergeFlag = $true
-                break
-            }
-        }
-    }
-    if (-not $isMergeInvocation -or -not $hasMergeFlag) {
+    # Scope (issue #952): every gh pr merge invocation except a pure --disable-auto, and every gh api
+    # merge or enqueue mutation, is gated; Test-EpicMergeGateCommandInScope holds the predicate.
+    if (-not (Test-EpicMergeGateCommandInScope -CommandText $command)) {
         return $null
     }
 
@@ -172,11 +171,20 @@ function Invoke-CodexEpicMergeDecision {
         if ($verdict.Allowed) {
             return $null
         }
+        # Docs-only branch (issue #927, OD-1): only when no checkpoint is present at the root.
+        $docsOnlySuffix = ''
+        if ([string]::IsNullOrWhiteSpace($ChildCheckpointRaw) -and [string]::IsNullOrWhiteSpace($EpicCheckpointRaw)) {
+            $docsOnly = Get-DocsOnlyMergeExemption -CommandText $command -PrNumber $prNumber -WorktreeRoot $RepositoryRoot
+            if ($docsOnly.Exempt) {
+                return $null
+            }
+            $docsOnlySuffix = ' (docs-only exemption not applied: ' + $docsOnly.Reason + ')'
+        }
         return [ordered]@{
             hookSpecificOutput = [ordered]@{
                 hookEventName            = 'PreToolUse'
                 permissionDecision       = 'deny'
-                permissionDecisionReason = 'EPIC_MERGE_GATE_BLOCKED: ' + $verdict.ReasonCode + ': ' + $verdict.Message
+                permissionDecisionReason = 'EPIC_MERGE_GATE_BLOCKED: ' + $verdict.ReasonCode + ': ' + $verdict.Message + $docsOnlySuffix
             }
         }
     }
@@ -185,7 +193,7 @@ function Invoke-CodexEpicMergeDecision {
         hookSpecificOutput = [ordered]@{
             hookEventName            = 'PreToolUse'
             permissionDecision       = 'deny'
-            permissionDecisionReason = 'EPIC_MERGE_GATE_BLOCKED: gh pr merge --merge requires a safe epic child checkpoint or a successful final epic CI gate with a matching PR number.'
+            permissionDecisionReason = 'EPIC_MERGE_GATE_BLOCKED: a pull-request merge or merge-queue enqueue (gh pr merge with any method, --auto, or --admin, or a gh api merge or enqueue mutation) requires a safe epic child checkpoint or a successful final epic CI gate with a matching PR number.'
         }
     }
 }
@@ -360,6 +368,9 @@ function Test-CodexStandaloneMergeAuthorization {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('EPIC_MERGE_GATE_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_MERGE_GATE_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 try {
     $payloadRaw = [Console]::In.ReadToEnd()
@@ -368,7 +379,7 @@ try {
     $epicPath = Join-Path $repositoryRoot 'artifacts/orchestration/epic-orchestrator-state.json'
     $childRaw = if (Test-Path -LiteralPath $childPath -PathType Leaf) { Get-Content -Raw -LiteralPath $childPath } else { '' }
     $epicRaw = if (Test-Path -LiteralPath $epicPath -PathType Leaf) { Get-Content -Raw -LiteralPath $epicPath } else { '' }
-    $decision = Invoke-CodexEpicMergeDecision -PayloadRaw $payloadRaw -ChildCheckpointRaw $childRaw -EpicCheckpointRaw $epicRaw
+    $decision = Invoke-CodexEpicMergeDecision -PayloadRaw $payloadRaw -ChildCheckpointRaw $childRaw -EpicCheckpointRaw $epicRaw -RepositoryRoot $repositoryRoot
     if ($null -ne $decision) {
         $decision | ConvertTo-Json -Compress -Depth 5 | Write-Output
     }

package/resources/codex-and-agents-customizations/.codex/hooks/enforce-epic-planning-only.ps1

@@ -9,6 +9,7 @@
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
 $script:AllowedPreparationMcpTools = @(
     'mcp__drm-copilot__new_potential_entry',
@@ -209,6 +210,8 @@ function Invoke-EpicPlanningOnlyDecision {
         [AllowNull()][AllowEmptyString()][string] $CurrentBranch,
         [string] $RegistryPath = (Join-Path $script:EpicPlanningRepositoryRoot 'config/orchestration-handoff-registry.json')
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_PLANNING_ONLY_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
     $payload = ConvertFrom-EpicPlanningJson -Raw $PayloadRaw -Name 'PreToolUse input'
     $attestedPreparation = $EpicExecutionContext -eq 'epic_preparation_child'
@@ -325,6 +328,9 @@ function Get-EpicPlanningCurrentBranch {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('EPIC_PLANNING_ONLY_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_PLANNING_ONLY_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 try {
     $payloadRaw = [Console]::In.ReadToEnd()

package/resources/codex-and-agents-customizations/.codex/hooks/enforce-epic-root-invocation.ps1

@@ -8,8 +8,9 @@
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
-. (Join-Path $PSScriptRoot 'codex-authority-store.ps1')
+try { . (Join-Path $PSScriptRoot 'codex-authority-store.ps1') } catch { Add-HookDependencyFailure -Name 'codex-authority-store.ps1' -ErrorRecord $_ }
 
 function ConvertFrom-EpicRootGatePayload {
     [CmdletBinding()]
@@ -54,6 +55,8 @@ function Invoke-EpicRootInvocationDecision {
         [Parameter(Mandatory)][string] $PayloadRaw,
         [AllowNull()][AllowEmptyString()][string] $AttestationRaw
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_INVOCATION_ORIGIN_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
     $payload = ConvertFrom-EpicRootGatePayload -Raw $PayloadRaw -Name 'PreToolUse input'
     if ([string]::IsNullOrWhiteSpace($AttestationRaw)) {
@@ -87,6 +90,9 @@ function Invoke-EpicRootInvocationDecision {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('EPIC_INVOCATION_ORIGIN_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_INVOCATION_ORIGIN_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 try {
     $payloadRaw = [Console]::In.ReadToEnd()

package/resources/codex-and-agents-customizations/.codex/hooks/enforce-epic-wave-barrier.ps1

@@ -10,8 +10,9 @@
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
-. (Join-Path $PSScriptRoot 'codex-epic-child-launch-attestation.ps1')
+try { . (Join-Path $PSScriptRoot 'codex-epic-child-launch-attestation.ps1') } catch { Add-HookDependencyFailure -Name 'codex-epic-child-launch-attestation.ps1' -ErrorRecord $_ }
 
 $script:AllowedDependencyStatuses = @('merged', 'worktree_removed')
 
@@ -178,6 +179,8 @@ function Invoke-CodexEpicWaveDecision {
         [AllowEmptyString()][string] $RepositoryRoot = '',
         [datetimeoffset] $Now = [datetimeoffset]::UtcNow
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_WAVE_BARRIER_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
     $payload = ConvertFrom-CodexWaveJson -Raw $PayloadRaw -Name 'PreToolUse input'
     if (-not (Test-CodexWaveMutation -Payload $payload)) {
@@ -252,6 +255,9 @@ function Get-CodexPrimaryWorktreeRoot {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('EPIC_WAVE_BARRIER_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_WAVE_BARRIER_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 try {
     $payloadRaw = [Console]::In.ReadToEnd()

package/resources/codex-and-agents-customizations/.codex/hooks/enforce-epic-worktree-removal-gate.ps1

@@ -4,12 +4,13 @@
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
 # Shared command-line parser (issue #545). The scope filter and the operand extractor below
 # both run against the segment that structurally invokes `git worktree remove`, which is what
 # keeps the two runtimes on one implementation of the same concern.
-. (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 $_ }
 
 $script:SafeWorktreeStatuses = @('merged', 'worktree_removed')
 
@@ -33,40 +34,6 @@ function ConvertFrom-CodexWorktreeJson {
     }
 }
 
-function Get-CodexWorktreeRemovalPath {
-    <#
-    .SYNOPSIS
-        Extract the target worktree path from a git worktree remove command.
-    .DESCRIPTION
-        The operand comes from the segment that structurally invokes git worktree remove, so
-        a chained 'cd <path> &&' segment contributes nothing and a quoted mention of the
-        phrase resolves to no operand. The tokenizer strips balanced double and single
-        quotes, which is what the previous pattern's `double` and `single` alternatives did.
-
-        The previous pattern accepted '--force' only immediately after 'remove'. That
-        spelling is preserved and the trailing spelling now works too, because '--force' is a
-        zero-argument flag that never contributes an operand wherever it is written. Its
-        presence is read structurally through Test-CommandLineFlag rather than by a raw-text
-        search. The empty-string-on-miss contract is unchanged: callers test `if ($target)`.
-    .OUTPUTS
-        System.String
-    #>
-    [CmdletBinding()]
-    [OutputType([string])]
-    param([Parameter(Mandatory)][AllowEmptyString()][string] $Command)
-
-    $hasForce = Test-CommandLineFlag -CommandText $Command -CommandWord 'git' -SubcommandPath @('worktree', 'remove') -FlagName '--force'
-    $operands = @(Get-CommandLineOperand -CommandText $Command -CommandWord 'git' -SubcommandPath @('worktree', 'remove'))
-
-    if ($operands.Count -gt 0) {
-        return [string]$operands[0]
-    }
-    if ($hasForce) {
-        return '--force'
-    }
-    return ''
-}
-
 function Get-NormalizedCodexWorktreePath {
     [CmdletBinding()]
     [OutputType([string])]
@@ -114,6 +81,8 @@ function Invoke-CodexWorktreeRemovalDecision {
         [Parameter(Mandatory)][string] $PayloadRaw,
         [AllowNull()][AllowEmptyString()][string] $EpicCheckpointRaw
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_WORKTREE_REMOVAL_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
     $payload = ConvertFrom-CodexWorktreeJson -Raw $PayloadRaw -Name 'PreToolUse input'
     if ([string]$payload.tool_name -ne 'Bash') {
@@ -126,18 +95,59 @@ function Invoke-CodexWorktreeRemovalDecision {
     if (-not (Test-CommandLineInvocation -CommandText $command -CommandWord 'git' -SubcommandPath @('worktree', 'remove'))) {
         return $null
     }
-    $target = Get-CodexWorktreeRemovalPath -Command $command
+    # Issue #824: the removal targets are derived structurally from every invocation. A
+    # target that cannot be derived denies before the checkpoint is read, and every derived
+    # target must be authorized on its own.
+    $resolution = Resolve-CommandLineInvocationTarget -CommandText $command -CommandWord 'git' -SubcommandPath @('worktree', 'remove')
+    if ($resolution.Status -eq 'NoMatch') {
+        return $null
+    }
+    if ($resolution.Status -ne 'Targets') {
+        return [ordered]@{
+            hookSpecificOutput = [ordered]@{
+                hookEventName            = 'PreToolUse'
+                permissionDecision       = 'deny'
+                permissionDecisionReason = 'EPIC_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.'
+            }
+        }
+    }
     $checkpoint = ConvertFrom-CodexWorktreeJson -Raw $EpicCheckpointRaw -Name 'epic checkpoint' -Optional
     $workingDirectory = if ([string]::IsNullOrWhiteSpace([string]$payload.cwd)) {
         (Get-Location).Path
     } else {
         [string]$payload.cwd
     }
-    $feature = if ($target) {
-        Find-CodexWorktreeFeature -Checkpoint $checkpoint -TargetPath $target -WorkingDirectory $workingDirectory
-    } else {
-        $null
+    foreach ($target in @($resolution.Targets)) {
+        $denial = Get-CodexWorktreeRemovalTargetDenial -Target $target -Checkpoint $checkpoint -WorkingDirectory $workingDirectory
+        if ($null -ne $denial) {
+            return $denial
+        }
     }
+    return $null
+}
+
+function Get-CodexWorktreeRemovalTargetDenial {
+    <#
+    .SYNOPSIS
+        Evaluate one derived removal target and return its deny decision, or $null when authorized.
+    .PARAMETER Target
+        One removal target derived by Resolve-CommandLineInvocationTarget.
+    .PARAMETER Checkpoint
+        The parsed epic checkpoint, or $null when absent or unreadable.
+    .PARAMETER WorkingDirectory
+        The directory a relative target resolves against.
+    .OUTPUTS
+        System.Collections.Specialized.OrderedDictionary or $null
+    #>
+    [CmdletBinding()]
+    [OutputType([System.Collections.Specialized.OrderedDictionary])]
+    param(
+        [Parameter(Mandatory)][string] $Target,
+        [AllowNull()] $Checkpoint,
+        [Parameter(Mandatory)][string] $WorkingDirectory
+    )
+
+    $feature = Find-CodexWorktreeFeature -Checkpoint $Checkpoint -TargetPath $Target -WorkingDirectory $WorkingDirectory
     if ($null -ne $feature -and
         @($feature.PSObject.Properties.Name) -contains 'merge_status' -and
         $script:SafeWorktreeStatuses -contains [string]$feature.merge_status) {
@@ -156,6 +166,9 @@ function Invoke-CodexWorktreeRemovalDecision {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('EPIC_WORKTREE_REMOVAL_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EPIC_WORKTREE_REMOVAL_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 try {
     $payloadRaw = [Console]::In.ReadToEnd()

package/resources/codex-and-agents-customizations/.codex/hooks/enforce-evidence-locations.ps1

@@ -40,10 +40,11 @@
 #>
 [CmdletBinding()]
 param()
+$script:HookDependencyGuardLoadFailed = $false; try { . (Join-Path $PSScriptRoot 'hook-dependency-guard.ps1') } catch { $script:HookDependencyGuardLoadFailed = $true }
 
 # Shared Codex PreToolUse transport: stdin payload parsing and tool_input-to-file
 # mapping for every tool name the ^(apply_patch|Edit|Write)$ matcher admits.
-. (Join-Path $PSScriptRoot 'codex-pretooluse-file-mapping.ps1')
+try { . (Join-Path $PSScriptRoot 'codex-pretooluse-file-mapping.ps1') } catch { Add-HookDependencyFailure -Name 'codex-pretooluse-file-mapping.ps1' -ErrorRecord $_ }
 
 function Test-EvidenceLocationForbidden {
     <#
@@ -122,6 +123,8 @@ function Invoke-EvidenceLocationDecision {
     param(
         [string] $ToolInputRaw
     )
+    $dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EVIDENCE_LOCATION_BLOCKED:'
+    if ($null -ne $dependencyDecision) { return $dependencyDecision }
 
     if (-not $ToolInputRaw) {
         return [ordered]@{ hookSpecificOutput = [ordered]@{ hookEventName = 'PreToolUse'; permissionDecision = 'allow' } }
@@ -192,5 +195,8 @@ function Invoke-EvidenceLocationEntryPoint {
 if ($MyInvocation.InvocationName -eq '.') {
     return
 }
+if ($script:HookDependencyGuardLoadFailed) { [Console]::Error.WriteLine('EVIDENCE_LOCATION_BLOCKED: hook-dependency-guard.ps1 failed to load; the gate fails closed.'); exit 2 }
+$dependencyDecision = Get-HookDependencyFailureDecision -HookEvent PreToolUse -ReasonPrefix 'EVIDENCE_LOCATION_BLOCKED:'
+if ($null -ne $dependencyDecision) { $dependencyDecision | ConvertTo-Json -Compress -Depth 5 | Write-Output; exit 0 }
 
 exit (Invoke-EvidenceLocationEntryPoint -PayloadRaw ([Console]::In.ReadToEnd()))