@danmoisan/drm-copilot-mcp 1.1.9 → 1.1.11

package/package.json

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

package/resources/claude-customizations/.claude/agents/parallel-orchestrator.md

@@ -18,6 +18,10 @@ tools:
   - "Bash(bash .claude/lib/bash/compute-cohorts.sh*)"
   - "Bash(bash .claude/lib/bash/compute-concurrency-batches.sh*)"
   - "Bash(bash .claude/lib/bash/validate-parallel-manifest.sh*)"
+  - "Bash(pwsh -NoProfile -File .claude/lib/project-file-merge/Resolve-MergeableConflict.ps1*)"
+  - "Bash(dotnet tool restore*)"
+  - "Bash(dotnet csharpier check *)"
+  - "Bash(dotnet build *)"
   - "mcp__drm-copilot__collect_pr_context"
   - "mcp__drm-copilot__validate_orchestration_artifacts"
 skills:
@@ -222,12 +226,21 @@ and `mcp_call_receipts[]` populated with the `parallel` route's required names f
 
 The checkpoint schema is owned by F3 and is defined once in
 `.claude/rules/parallel-orchestration.md`, enforced by
-`scripts/dev_tools/validate_parallel_orchestrator_state.py`. You consume that schema and add no
-field to it. The `parallel-orchestrate` skill's `## Parallel-Level Checkpoint` section carries the
+`scripts/dev_tools/validate_parallel_orchestrator_state.py`. You consume that schema and
+add no field to it that the rule file does not declare.
+`mergeable_conflicts_resolved` is the one declared optional item field.
+The `parallel-orchestrate` skill's `## Parallel-Level Checkpoint` section carries the
 full enumeration, the `merge_status` transition chain you write, and the arrays that are read-only
 to you. Validate through `mcp__drm-copilot__validate_orchestration_artifacts` with
 `artifact_type: "parallel-orchestrator-state"`.
 
+You run the project-file merge step of the `parallel-orchestrate` skill yourself rather than
+delegating it. The four entries added to your `tools:` list above for the resolution script and
+for the three .NET verification commands are scoped to that step and to no other, and they are the
+only reason those commands appear in your allowlist at all. That step's one optional item field is
+`mergeable_conflicts_resolved`, declared in the rule file and appended to an item after a
+parent-side resolution.
+
 ## Documentation Maintenance
 
 Maintain `docs/features/parallel/<slug>/parallel-status.md` as a human-readable projection of the

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

@@ -160,6 +160,9 @@ The facade exports `Get-PlanPaths`, `Get-BlastRadius`, `Get-BlastRadiusFromObser
 `Test-BlastRadius`, and `Test-BlastRadiusConflict`. Its truth table is
 `config/blast-radius.json`, which push-down publishes alongside `.claude`.
 
+`Test-BlastRadiusConflict` reads that table's optional `mergeable_paths` list and contributes no
+`path_overlap` edge for a path matching it, while the path stays in the declared radius.
+
 **Cohort seeding and concurrency batching — bash entry points.** The bash library is granted as
 four entry-point-specific allowlist entries — `"Bash(bash .claude/lib/bash/compute-cohorts.sh*)"`,
 `"Bash(bash .claude/lib/bash/compute-concurrency-batches.sh*)"`,

package/resources/claude-customizations/.claude/hooks/enforce-epic-merge-gate.ps1

@@ -40,6 +40,10 @@
 param()
 
 Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force
+# Shared command-line parser (issue #545), consumed by the scope filter in
+# Invoke-EpicMergeGateDecision and by Get-EpicMergeGateCommandPrNumber.
+. (Join-Path $PSScriptRoot 'hook-command-scanner.ps1')
+. (Join-Path $PSScriptRoot 'hook-command-invocation.ps1')
 
 $script:ChildCheckpointPath = 'artifacts/orchestration/orchestrator-state.json'
 $script:EpicCheckpointPath = 'artifacts/orchestration/epic-orchestrator-state.json'
@@ -128,6 +132,22 @@ function Get-EpicMergeGateCommandPrNumber {
     <#
     .SYNOPSIS
         Extract an explicit PR number argument from a gh pr merge command, or $null.
+    .DESCRIPTION
+        Both spellings are read from the segment that structurally invokes gh pr merge,
+        never from the whole command line. The positional form ("gh pr merge 410 --merge")
+        resolves through Get-CommandLineOperand and takes the first all-digit operand; the
+        flag-led forms ("gh pr merge --merge 410" and "gh pr merge --merge=410") resolve
+        through Get-CommandLineFlagValue. A bare "gh pr merge --merge" yields $null, which
+        the parallel branch treats as fail-closed.
+
+        The deleted unanchored branch scanned the WHOLE command text for the first run of
+        digits once "gh pr merge" appeared anywhere in it, and that failed in both
+        directions. Fail-closed: a leading "cd <path>" whose path carries a timestamp
+        component supplied a digit run that was not a pull request number, so an authorized
+        merge was blocked. False-allow: with authorized item 501 and unauthorized item 777,
+        "cd /repo/worktrees/501 && gh pr merge --merge 777" extracted 501, matched the
+        authorized item, and permitted the merge of PR 777. Taking the number from the
+        matched segment's own operand or flag value closes both directions.
     .PARAMETER CommandText
         The Bash command text under evaluation.
     .OUTPUTS
@@ -140,20 +160,17 @@ function Get-EpicMergeGateCommandPrNumber {
         [string] $CommandText
     )
 
-    # Original form: the PR number appears immediately after "merge"
-    # (e.g. "gh pr merge 410 --merge"). Preserved verbatim so epic-path outcomes
-    # for the forms the epic path uses are unchanged.
-    if ($CommandText -match '(?i)\bgh\s+pr\s+merge\s+(\d+)\b') {
-        return [int]$Matches[1]
+    foreach ($operand in @(Get-CommandLineOperand -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('pr', 'merge'))) {
+        if ($operand -match '^\d+$') {
+            return [int]$operand
+        }
     }
-    # Broadened, additive form: the parallel command places the flag before the
-    # number (e.g. "gh pr merge --merge 410"). Once "gh pr merge" is confirmed,
-    # capture the first standalone run of digits that is not preceded by "-" or a
-    # word character, so a flag token such as "--merge" is not treated as a number
-    # and a bare "gh pr merge --merge" still yields $null.
-    if ($CommandText -match '(?i)\bgh\s+pr\s+merge\b' -and $CommandText -match '(?<![-\w])(\d+)\b') {
-        return [int]$Matches[1]
+
+    $flagValue = Get-CommandLineFlagValue -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('pr', 'merge') -FlagName '--merge'
+    if ($null -ne $flagValue -and $flagValue -match '^\d+$') {
+        return [int]$flagValue
     }
+
     return $null
 }
 
@@ -373,8 +390,26 @@ function Invoke-EpicMergeGateDecision {
     }
 
     # Only a gh pr merge invocation carrying --merge is in scope for this gate; every
-    # other Bash command is unaffected.
-    if ($commandText -notmatch '(?i)\bgh\s+pr\s+merge\b' -or $commandText -notmatch '--merge\b') {
+    # other Bash command is unaffected. Both legs are read structurally from the segment
+    # that invokes the command, so a quoted mention of the phrase and a --merge token
+    # belonging to some other segment no longer bring 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. The fallback reads only the segments the
+    # scanner already scans raw, so a masked mention in a non-wrapper segment stays out.
+    $isMergeInvocation = Test-CommandLineInvocation -CommandText $commandText -CommandWord 'gh' -SubcommandPath @('pr', 'merge')
+    $hasMergeFlag = Test-CommandLineFlag -CommandText $commandText -CommandWord 'gh' -SubcommandPath @('pr', 'merge') -FlagName '--merge'
+    if (-not $hasMergeFlag) {
+        foreach ($segment in @(Read-CommandLineSegment -CommandText $commandText)) {
+            if ((Test-CommandLineSegmentRawScan -Segment $segment) -and
+                $segment.ScanText.IndexOf('--merge', [System.StringComparison]::OrdinalIgnoreCase) -ge 0) {
+                $hasMergeFlag = $true
+                break
+            }
+        }
+    }
+    if (-not $isMergeInvocation -or -not $hasMergeFlag) {
         return Get-EpicMergeGateAllowDecision
     }
 

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

@@ -60,9 +60,20 @@ param()
 
 
 Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force
+# Sanctioned-removal manifest reader (issue #635), consumed by the manifest branch in
+# Invoke-EpicWorktreeRemovalGateDecision.
+Import-Module (Join-Path $PSScriptRoot '../lib/cleanup-manifest/CleanupWorktreeManifest.psm1') -Force
+# Shared command-line parser (issue #545), consumed by the scope filter in
+# Invoke-EpicWorktreeRemovalGateDecision and by Get-EpicWorktreeRemovalCommandPath.
+. (Join-Path $PSScriptRoot 'hook-command-scanner.ps1')
+. (Join-Path $PSScriptRoot 'hook-command-invocation.ps1')
 $script:EpicCheckpointPath = 'artifacts/orchestration/epic-orchestrator-state.json'
 $script:ParallelCheckpointPath = 'artifacts/orchestration/parallel-orchestrator-state.json'
 $script:AllowedMergeStatuses = @('merged', 'worktree_removed')
+# Sanctioned-removal manifest location. Recorded here beside the two checkpoint paths
+# so every hook-read document this gate consults is named in one place; the module
+# owns the read itself.
+$script:CleanupWorktreeManifestPath = 'artifacts/orchestration/cleanup-worktrees-manifest.json'
 
 function Get-EpicWorktreeGateCheckpointContent {
     <#
@@ -132,6 +143,19 @@ function Get-EpicWorktreeRemovalCommandPath {
     <#
     .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.
     .PARAMETER CommandText
         The Bash command text under evaluation.
     .OUTPUTS
@@ -144,8 +168,14 @@ function Get-EpicWorktreeRemovalCommandPath {
         [string] $CommandText
     )
 
-    if ($CommandText -match '(?i)\bgit\s+worktree\s+remove\s+(?<path>\S+)') {
-        return $Matches['path'].Trim('"''')
+    $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
 }
@@ -344,7 +374,10 @@ function Invoke-EpicWorktreeRemovalGateDecision {
         return Get-EpicWorktreeGateAllowDecision
     }
 
-    if ($commandText -notmatch '(?i)\bgit\s+worktree\s+remove\b') {
+    # Scope filter. The test is structural, so a relocating spelling such as
+    # 'git -C <dir> worktree remove <path>' is now in scope and quoted prose that merely
+    # mentions the phrase is not (issue #545).
+    if (-not (Test-CommandLineInvocation -CommandText $commandText -CommandWord 'git' -SubcommandPath @('worktree', 'remove'))) {
         return Get-EpicWorktreeGateAllowDecision
     }
 
@@ -362,6 +395,22 @@ function Invoke-EpicWorktreeRemovalGateDecision {
         return Get-EpicWorktreeGateAllowDecision
     }
 
+    # Sanctioned-removal manifest branch (issue #635). It runs last, so an
+    # epic-checkpoint-authorized or parallel-checkpoint-authorized removal still allows
+    # at the same decision point it does today and no transcript attribution changes.
+    #
+    # The two coverage tests are PRESENCE tests, deliberately not authorization tests.
+    # A target either checkpoint records at all is excluded from this branch regardless
+    # of that record's merge_status, so a removal no checkpoint authorizes still reaches
+    # the unchanged deny below. That exclusion is the only path by which the manifest
+    # could widen what the gates protect, which is why it is required rather than
+    # advisory, and why it is evaluated before the manifest predicate.
+    if (-not (Test-CleanupManifestCheckpointCoversPath -Checkpoint $checkpoint -RecordArrayName 'features' -WorktreePath $worktreePath) -and
+        -not (Test-CleanupManifestCheckpointCoversPath -Checkpoint $parallelCheckpoint -RecordArrayName 'items' -WorktreePath $worktreePath) -and
+        (Test-CleanupWorktreeManifestAuthorizesRemoval -WorktreePath $worktreePath)) {
+        return Get-EpicWorktreeGateAllowDecision
+    }
+
     return Get-EpicWorktreeGateBlockDecision -Reason "EPIC_WORKTREE_REMOVAL_BLOCKED: git worktree remove for '$worktreePath' requires either an epic checkpoint features[] record with merge_status in {merged, worktree_removed}, or a parallel-orchestrator checkpoint with route_id == ""parallel"" whose matching items[] record (matched by worktree_path) has merge_status in {merged, worktree_removed}. No checkpoint authorized this removal."
 }
 

package/resources/claude-customizations/.claude/hooks/enforce-orchestration-preimplementation-gate.ps1

@@ -19,6 +19,10 @@ Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -
 # proof the issue #539 exemption is behaviourally unchanged.
 . (Join-Path $PSScriptRoot 'enforce-orchestration-preimplementation-gate-modes.ps1')
 
+# Shared command-line parser (issue #545): per-segment scan text and structural matching.
+. (Join-Path $PSScriptRoot 'hook-command-scanner.ps1')
+. (Join-Path $PSScriptRoot 'hook-command-invocation.ps1')
+
 # The readiness checkpoint this gate reads and names in its block message.
 $script:CheckpointPath = 'artifacts/orchestration/orchestrator-state.json'
 
@@ -132,9 +136,11 @@ function Test-ImplementationCommand {
         '(^|\s)npx\s+(prettier|eslint|tsc|jest)\b',
         '(^|\s)pwsh\s+.*(Invoke-Pester|tests/scripts/)'
     )
+    $scanText = @(Read-CommandLineSegment -CommandText $normalizedCommand).ScanText
+    $isStaging = @('add', 'commit').Where({ Test-CommandLineInvocation -CommandText $normalizedCommand -CommandWord 'git' -SubcommandPath @($_) }).Count -gt 0
 
     for ($index = 0; $index -lt $implementationCommandPatterns.Count; $index++) {
-        if ($normalizedCommand -notmatch $implementationCommandPatterns[$index]) {
+        if (-not (($scanText | Where-Object { $_ -match $implementationCommandPatterns[$index] }) -or ($index -eq 0 -and $isStaging))) {
             continue
         }
         # Allow-side only (issue #539). Index 0 is the git staging trigger, whose pattern

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

@@ -44,6 +44,13 @@ $script:AbandonConfirmToken = '--confirm-abandon'
 # Literal prefix on the deny reason, so the reason code is greppable in transcripts.
 $script:AbandonBlockedReasonCode = 'PARALLEL_ABANDON_BLOCKED'
 
+# Shared command-line parser (issue #545). Dot-sourced BELOW the two token assignments
+# rather than above them, deliberately: the assignments keep their existing line numbers,
+# so the diff shows no change at either line. Both are still declared before any function
+# body runs, because the file executes top to bottom before any of its functions is called.
+. (Join-Path $PSScriptRoot 'hook-command-scanner.ps1')
+. (Join-Path $PSScriptRoot 'hook-command-invocation.ps1')
+
 function Get-ParallelAbandonGateToolInput {
     <#
     .SYNOPSIS
@@ -85,10 +92,77 @@ function Get-ParallelAbandonNormalizedCommand {
     return ($CommandText -replace '\s+', ' ').Trim()
 }
 
+function Test-ParallelAbandonSegmentDisposition {
+    <#
+    .SYNOPSIS
+        Report whether one segment's tokens request the abandon disposition.
+    .DESCRIPTION
+        The option name and its value are derived from $script:AbandonDispositionToken by
+        splitting it on whitespace, so this function restates neither literal and the seam
+        test's single-source-of-truth property is preserved. Both spellings the producer's
+        argparse registration accepts are recognized: the separated pair
+        '--disposition' 'abandon' as two adjacent tokens, and the equals-joined single token
+        '--disposition=abandon'.
+
+        Comparison is by whole-token equality, which is case-insensitive in PowerShell and
+        therefore preserves the OrdinalIgnoreCase behaviour of the containment test it
+        replaces. Because a quoted span is one token, a grep whose quoted search term is the
+        disposition token no longer requests an abandon.
+
+        A raw-scan leg runs after the token loop, on the segments the scanner itself scans
+        raw, so a disposition carried inside a wrapper's quoted argument is still recognized.
+    .PARAMETER Segment
+        One segment record produced by Read-CommandLineSegment.
+    .OUTPUTS
+        System.Boolean
+    #>
+    [CmdletBinding()]
+    [OutputType([bool])]
+    param([Parameter(Mandatory)][AllowNull()] $Segment)
+
+    $parts = @($script:AbandonDispositionToken -split '\s+' | Where-Object { $_ })
+    if ($parts.Count -lt 2) {
+        return $false
+    }
+    $optionName = $parts[0]
+    $optionValue = $parts[1]
+    $joined = $optionName + '=' + $optionValue
+
+    $token = @($Segment.Tokens)
+
+    for ($index = 0; $index -lt $token.Count; $index++) {
+        if ($token[$index] -eq $joined) {
+            return $true
+        }
+        if ($token[$index] -eq $optionName -and
+            $index + 1 -lt $token.Count -and
+            $token[$index + 1] -eq $optionValue) {
+            return $true
+        }
+    }
+
+    if (-not (Test-CommandLineSegmentRawScan -Segment $Segment)) {
+        return $false
+    }
+
+    # A wrapper's quoted argument is a nested command line and collapses into ONE token, so
+    # neither the adjacent pair nor the equals-joined token can form inside it. Both accepted
+    # spellings are reconstructed from the split constant rather than restated, so the
+    # single-source-of-truth seam test still finds each literal exactly once in this file.
+    $scanText = [string]$Segment.ScanText
+    $comparison = [System.StringComparison]::OrdinalIgnoreCase
+    return ($scanText.IndexOf($joined, $comparison) -ge 0 -or
+        $scanText.IndexOf(($optionName + ' ' + $optionValue), $comparison) -ge 0)
+}
+
 function Test-ParallelAbandonCommandInScope {
     <#
     .SYNOPSIS
         Report whether a command carries the abandon disposition token at all.
+    .DESCRIPTION
+        Evaluated per segment through the shared parser rather than as a containment test
+        over the whole command string. In scope when ANY segment requests the abandon
+        disposition in either accepted spelling.
     .PARAMETER NormalizedCommand
         The whitespace-normalized command text.
     .OUTPUTS
@@ -105,15 +179,25 @@ function Test-ParallelAbandonCommandInScope {
     if ([string]::IsNullOrWhiteSpace($NormalizedCommand)) {
         return $false
     }
-    return $NormalizedCommand.Contains(
-        $script:AbandonDispositionToken,
-        [System.StringComparison]::OrdinalIgnoreCase)
+
+    foreach ($segment in @(Read-CommandLineSegment -CommandText $NormalizedCommand)) {
+        if (Test-ParallelAbandonSegmentDisposition -Segment $segment) {
+            return $true
+        }
+    }
+
+    return $false
 }
 
 function Test-ParallelAbandonCommandConfirmed {
     <#
     .SYNOPSIS
         Report whether a command carries the confirmation marker.
+    .DESCRIPTION
+        Confirmed only when a SINGLE segment carries both the abandon disposition and the
+        confirmation marker. The confirmation is the caller's deliberate acknowledgement of
+        this abandon, so a marker echoed in an unrelated segment is not an acknowledgement
+        of the command that follows it.
     .PARAMETER NormalizedCommand
         The whitespace-normalized command text.
     .OUTPUTS
@@ -130,9 +214,22 @@ function Test-ParallelAbandonCommandConfirmed {
     if ([string]::IsNullOrWhiteSpace($NormalizedCommand)) {
         return $false
     }
-    return $NormalizedCommand.Contains(
-        $script:AbandonConfirmToken,
-        [System.StringComparison]::OrdinalIgnoreCase)
+
+    foreach ($segment in @(Read-CommandLineSegment -CommandText $NormalizedCommand)) {
+        $tokens = @($segment.Tokens)
+        if (-not (Test-ParallelAbandonSegmentDisposition -Segment $segment)) {
+            continue
+        }
+        if ($tokens -contains $script:AbandonConfirmToken) {
+            return $true
+        }
+        if ((Test-CommandLineSegmentRawScan -Segment $segment) -and
+            ([string]$segment.ScanText).IndexOf($script:AbandonConfirmToken, [System.StringComparison]::OrdinalIgnoreCase) -ge 0) {
+            return $true
+        }
+    }
+
+    return $false
 }
 
 function Get-ParallelAbandonGateAllowDecision {

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

@@ -30,8 +30,21 @@ param()
 
 
 Import-Module (Join-Path $PSScriptRoot '../lib/hook-payload/HookPayload.psm1') -Force
+# 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
+# Shared command-line parser (issue #545), consumed by the scope filter in
+# Invoke-ParallelWorktreeRemovalGateDecision and by Get-ParallelWorktreeRemovalCommandPath.
+# 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')
 $script:ParallelCheckpointPath = 'artifacts/orchestration/parallel-orchestrator-state.json'
 $script:AllowedMergeStatuses = @('merged', 'worktree_removed')
+# Sanctioned-removal manifest location. Recorded here beside the checkpoint path so
+# every hook-read document this gate consults is named in one place; the module owns
+# the read itself.
+$script:CleanupWorktreeManifestPath = 'artifacts/orchestration/cleanup-worktrees-manifest.json'
 
 function Get-ParallelWorktreeRemovalGateCheckpointContent {
     <#
@@ -55,6 +68,24 @@ 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
@@ -67,8 +98,14 @@ function Get-ParallelWorktreeRemovalCommandPath {
         [string] $CommandText
     )
 
-    if ($CommandText -match '(?i)\bgit\s+worktree\s+remove\s+(?<path>\S+)') {
-        return $Matches['path'].Trim('"''')
+    $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
 }
@@ -203,7 +240,10 @@ function Invoke-ParallelWorktreeRemovalGateDecision {
         return Get-ParallelWorktreeGateAllowDecision
     }
 
-    if ($commandText -notmatch '(?i)\bgit\s+worktree\s+remove\b') {
+    # Scope filter. The test is structural, so a relocating spelling such as
+    # 'git -C <dir> worktree remove <path>' is now in scope and quoted prose that merely
+    # mentions the phrase is not (issue #545). This is the same call the epic gate makes.
+    if (-not (Test-CommandLineInvocation -CommandText $commandText -CommandWord 'git' -SubcommandPath @('worktree', 'remove'))) {
         return Get-ParallelWorktreeGateAllowDecision
     }
 
@@ -224,6 +264,21 @@ function Invoke-ParallelWorktreeRemovalGateDecision {
         return Get-ParallelWorktreeGateAllowDecision
     }
 
+    # Sanctioned-removal manifest branch (issue #635). It runs last, so a
+    # checkpoint-authorized removal still allows at the same decision point it does
+    # today and no transcript attribution changes.
+    #
+    # The coverage test is a PRESENCE test, deliberately not an authorization test. A
+    # target this checkpoint records at all is excluded from this branch regardless of
+    # that record's merge_status, so a removal the checkpoint does not authorize still
+    # reaches the unchanged deny below. This gate defines only the parallel checkpoint
+    # seam and has no epic-checkpoint seam, so its exclusion covers the items array
+    # 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 Get-ParallelWorktreeGateBlockDecision -Reason "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."
 }
 

package/resources/claude-customizations/.claude/hooks/enforce-pr-author-skill-helpers.ps1

@@ -26,6 +26,11 @@
 [CmdletBinding()]
 param()
 
+# Shared command-line parser (issue #545). Dot-sourced here as well as from the parent hook
+# so this file keeps working when a test dot-sources it directly.
+. (Join-Path $PSScriptRoot 'hook-command-scanner.ps1')
+. (Join-Path $PSScriptRoot 'hook-command-invocation.ps1')
+
 function Test-PrAuthorReceiptVerification {
     <#
     .SYNOPSIS
@@ -166,16 +171,43 @@ function Get-PrAuthorBypassReason {
         [bool] $ContextExists
     )
 
-    # Only act on gh pr create or gh pr edit subcommands.
-    $isPrCreate = $CommandText -match '(?i)\bgh\s+pr\s+create\b'
-    $isPrEdit = $CommandText -match '(?i)\bgh\s+pr\s+edit\b'
+    # Only act on gh pr create or gh pr edit subcommands. The test is structural: a segment
+    # must INVOKE gh with the subcommand path, so quoted prose that merely mentions the
+    # phrase no longer triggers the gate, and a relocating spelling that carries a gh global
+    # option between the command word and the subcommand now does.
+    $isPrCreate = Test-CommandLineInvocation -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('pr', 'create')
+    $isPrEdit = Test-CommandLineInvocation -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('pr', 'edit')
 
     if (-not $isPrCreate -and -not $isPrEdit) {
         return $null
     }
 
-    $hasBodyFile = $CommandText -match '(?i)--body-file\b'
-    $hasInlineBody = $CommandText -match '(?i)--body(?!-file)\b'
+    # Flag presence comes from the matched segment's tokens. Exact token comparison is what
+    # keeps '--body' from matching '--body-file'; the previous negative lookahead expressed
+    # the same distinction over raw text.
+    $subcommandPath = if ($isPrCreate) { @('pr', 'create') } else { @('pr', 'edit') }
+    $hasBodyFile = Test-CommandLineFlag -CommandText $CommandText -CommandWord 'gh' -SubcommandPath $subcommandPath -FlagName '--body-file'
+    $hasInlineBody = Test-CommandLineFlag -CommandText $CommandText -CommandWord 'gh' -SubcommandPath $subcommandPath -FlagName '--body'
+
+    # Raw-scan fallback for a wrapper-led, live-substitution, or unbalanced segment. A
+    # wrapper's quoted argument collapses into ONE token, so both flags read absent there and
+    # the gh pr edit no-body branch below allowed bash -c "gh pr edit 42 --body 'x'". The
+    # --body-file test runs first and wins, so a --body-file carried inside a wrapper is never
+    # misread as an inline body. That ordering restores the pre-parser routing, in which one
+    # whole-text --body-file match set $hasBodyFile for exactly this input.
+    if (-not $hasBodyFile -and -not $hasInlineBody) {
+        $comparison = [System.StringComparison]::OrdinalIgnoreCase
+        foreach ($segment in @(Read-CommandLineSegment -CommandText $CommandText)) {
+            if (-not (Test-CommandLineSegmentRawScan -Segment $segment)) {
+                continue
+            }
+            if ($segment.ScanText.IndexOf('--body-file', $comparison) -ge 0) {
+                $hasBodyFile = $true
+            } elseif ($segment.ScanText.IndexOf('--body', $comparison) -ge 0) {
+                $hasInlineBody = $true
+            }
+        }
+    }
 
     # Case A: gh pr create OR gh pr edit with inline --body (not --body-file). Evaluated before the
     # gh pr edit no-body allow short-circuit so inline-body edits are blocked, not allowed.

package/resources/claude-customizations/.claude/hooks/enforce-pr-author-skill.epic-base-branch.ps1

@@ -9,6 +9,11 @@
     structural extraction only: no logic, decision behavior, or reason-string wording changed.
 #>
 
+# Shared command-line parser (issue #545). Dot-sourced here as well as from the parent hook
+# so this file keeps working when a test dot-sources it directly.
+. (Join-Path $PSScriptRoot 'hook-command-scanner.ps1')
+. (Join-Path $PSScriptRoot 'hook-command-invocation.ps1')
+
 function Get-PrAuthorCheckpointContent {
     <#
     .SYNOPSIS
@@ -64,7 +69,9 @@ function Test-EpicBaseBranchOverride {
 
     # The epic-mode base-branch override only constrains gh pr create; gh pr edit does not
     # re-target the base branch, so non-create commands are out of scope for this check.
-    if ($CommandText -notmatch '(?i)\bgh\s+pr\s+create\b') {
+    # The test is structural, so a quoted mention of the phrase is out of scope and a
+    # relocating spelling carrying a gh global option is in scope (issue #545).
+    if (-not (Test-CommandLineInvocation -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('pr', 'create'))) {
         return $null
     }
 
@@ -96,7 +103,11 @@ function Test-EpicBaseBranchOverride {
         return "EPIC_BASE_BRANCH_MISMATCH: checkpoint has epic_mode == true but no ``epic_context.integration_branch`` is recorded; ``gh pr create`` cannot be verified against the required ``--base`` value."
     }
 
-    if ($CommandText -cnotmatch [regex]::Escape("--base $integrationBranch")) {
+    # The --base value is taken from the matched segment's tokens, so a chained segment that
+    # happens to carry a --base token contributes nothing here. The comparison stays
+    # case-sensitive, as the previous -cnotmatch form was, because a branch name is.
+    $baseValue = Get-CommandLineFlagValue -CommandText $CommandText -CommandWord 'gh' -SubcommandPath @('pr', 'create') -FlagName '--base'
+    if ($null -eq $baseValue -or $baseValue -cne $integrationBranch) {
         return "EPIC_BASE_BRANCH_MISMATCH: ``gh pr create`` must pass ``--base $integrationBranch`` (``epic_context.integration_branch``) under ``epic_mode``; the command does not carry a matching ``--base`` argument."
     }