@danmoisan/drm-copilot-mcp 1.1.22 → 1.1.23

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

@@ -248,6 +248,10 @@ carries exactly these five elements.
    The token `Parallel mode: true` must appear exactly: it is the marker F7's Layer 1 barrier hook
    matches on. The clause `PR base branch MUST be main` is the child's explicit base-branch
    instruction, recorded as prompt text rather than left to a base-branch ancestry heuristic.
+   The prompt also instructs the child to record top-level `parallel_mode: true` and
+   `parallel_slug: <slug>` in its first per-feature checkpoint write (issue #997). Both keys are
+   unvalidated; the merge gate's green-CI branch declines a checkpoint that carries either, so a
+   parallel child that records them cannot merge its own pull request through that branch; the exclusion is best-effort when the keys are omitted.
 2. The item's active feature folder path, written literally as `docs/features/active/<basename>`.
    The child needs it for its own operation, and F7's Layer 1 hook resolves the target item by
    scanning the prompt for exactly that path shape, so the path is emitted as a bare path token.
@@ -263,7 +267,12 @@ carries exactly these five elements.
    with origin `filed_before_orchestration` unless the issue was transferred, waiving
    `potential_to_issue` and the promotion-entry tool for the checkpoint's promotion-type. When a
    lifecycle record for the item exists under `docs/features/potential/promoted/`, the child cites
-   it as `potential_record`.
+   it as `potential_record`. The preparation child already created and committed the item's feature
+   folder, so the prompt also instructs the execution child not to call
+   `new_active_feature_folder`, to confirm the folder read-only
+   (`git cat-file -t HEAD:<feature-folder>` prints `tree`), to add `new_active_feature_folder` to
+   `waived_tools`, and to record `issue_adoption.feature_folder_record` with `path` equal to the
+   checkpoint `feature-folder`, `verified_via` `git_cat_file_head`, `verified_at`, and `evidence`.
 5. The model-budget marker line `model_budget.fable_policy: <disabled|available|preferred>.`
 
 Spawn parameters, passed on the `Agent` call and never written into the prompt text:
@@ -358,9 +367,11 @@ delegations, not to fork-routed skill invocations.
 ## Per-Item Merge to Main (Merge-on-Green)
 
 The parent — `parallel-orchestrator` — performs each item's merge to `main`. The child contract is
-unchanged: `.claude/skills/orchestrate/SKILL.md` is **not modified by this feature**. There is no
-`parallel_mode` clause in its step 9, no `parallel_merge` object in the child checkpoint, and no
-additional condition on the child's PR Creation Gate.
+unchanged: `.claude/skills/orchestrate/SKILL.md` is **not modified by this feature**.
+Issue #997 amends `.claude/skills/orchestrate/SKILL.md` for standalone runs only: a standalone run with a green S9 gate merges its own pull request, and a parallel child never merges its own pull request.
+Its step 9 mentions `parallel_mode` only to exclude a parallel child from that standalone merge.
+There is no `parallel_merge` object in the child checkpoint and no parallel-specific condition on
+the child's PR Creation Gate.
 
 Issue #744 later amended two parts of that child contract for CI-dependent acceptance criteria,
 whose verification requires the result of CI on the item's pull-request head: PR Creation Gate
@@ -416,20 +427,32 @@ Procedure, per item:
 `gh pr merge` spelling except a pure `--disable-auto`, and every `gh api` merge or enqueue
 mutation; issue #952) unless a checkpoint satisfies
 one of its allow conditions; its block reason is `EPIC_MERGE_GATE_BLOCKED`. The gate has
-four allow conditions
+five allow conditions
 which it evaluates in this order: a per-feature checkpoint with `epic_mode == true` and
 `step9_status == "passed"`; an epic checkpoint whose `epic_merge_pr.ci_gate.conclusion` is
-`success` with a matching `pr_number`; the parallel condition described next; and a standalone
-merge authorization record, described after it. The parallel condition authorizes a per-item merge
+`success` with a matching `pr_number`; the parallel condition described next; the green-CI
+standalone condition (issue #997), evaluated after the parallel condition and before the
+authorization record; and a standalone merge authorization record, described after it. The parallel condition authorizes a per-item merge
 when the parallel-orchestrator checkpoint has `route_id == "parallel"`, the target item's
 `merge_status == "ci_green"`, and, when a PR number is named, it matches the item's `pr_number`.
 Step 3 above is therefore permitted for a legitimate parallel merge; a missing, unreadable, or
 invalid parallel checkpoint, a target item whose `merge_status` is not `ci_green`, or a PR number
 that matches no item still fails closed with `EPIC_MERGE_GATE_BLOCKED`.
 
-The standalone condition (issue #670) is the only route for merging a pull request that is not a
-parallel item, such as a standalone fix that unblocks the run. It is evaluated last and never
-overrides the other three. Writer procedure for the coordinating session:
+The green-CI condition (issue #997) lets a standalone run merge its own pull request after S9
+step 7 of `.claude/skills/orchestrate/SKILL.md`: the command names the PR number, no epic or
+parallel checkpoint records that number or the item worktree, the per-feature checkpoint carries
+no `parallel_mode` or `parallel_slug` marker and records `step9_status == "passed"`,
+`ci_gate.conclusion == "success"`, and a matching `pr_gate.pr_number`, and the live PR head
+equals `ci_gate.head_sha` (and `--match-head-commit`, when passed). Its parallel exclusion is
+best-effort: the `Parallel mode: true` marker is in the delegation prompt, not in a Bash payload,
+so a parallel child whose PR number and worktree are not yet recorded by this checkpoint, and
+which omits the `parallel_mode` key, is not excluded by the hook. A parallel child still never
+merges its own pull request; that rule is enforced by the kickoff contract above.
+
+The standalone authorization condition (issue #670) is the route for merging a pull request that
+is not a parallel item and has no green S9 gate, such as a standalone fix that unblocks the run.
+It is evaluated last and never overrides the other four. Writer procedure for the coordinating session:
 
 1. Write the record into a top-level `standalone_merge_authorizations` array in the
    parallel-orchestrator checkpoint (`artifacts/orchestration/parallel-orchestrator-state.json`);
@@ -531,8 +554,9 @@ against the observed radius, and requeue of the later-started item to F8.
 ## Worktree Cleanup
 
 After an item reaches `merge_status: merged` and that state is durably confirmed by
-`gh pr view --json state,mergedAt,headRefOid`, the parent — running from the main repository
-checkout, never from inside a child worktree — issues `git worktree remove <worktree_path>`. On
+`gh pr view --json state,mergedAt,headRefOid`, the parent removes the item's worktree through
+substep 1 of `### Run Closing` below, which takes the absolute path from
+`git worktree list --porcelain` rather than from the relative `items[].worktree_path`. On
 success it records `merge_status: worktree_removed` and `worktree_removed_at`, then regenerates
 `docs/features/parallel/<slug>/parallel-status.md`.
 
@@ -550,7 +574,56 @@ non-authorizing `merge_status` still denies on both branches. The coordination m
 `PreToolUse` denials are conjunctive: a new allow-hook alone could not have overridden the epic
 gate's independent deny, which is why the epic gate itself had to gain the parallel branch.
 The parallel-orchestrator-surface feature (F7) shipped no hook file and made no
-`.claude/settings.json` change of its own.
+`.claude/settings.json` change of its own. Both gates compare a recorded `worktree_path` to the
+removal target through `Test-WorktreeRunRecordedPathMatchesTarget`, so a relative record is joined
+to the main checkout root and to the root that holds the checkpoint (issue #995).
+
+### Run Closing
+
+Run Closing runs once per run, after every non-withdrawn item has `merge_status` of `merged` or
+`worktree_removed` and before completion is reported (issue #995). It re-derives state from
+`git worktree list --porcelain`, `git`, and `gh` rather than from the checkpoint, so it is safe to
+repeat: a substep whose outcome already holds is skipped. The five substeps run in order.
+
+1. **Item worktrees.** For each item whose `merge_status` is `merged`, take the absolute worktree
+   path from `git worktree list --porcelain`, never from the relative `items[].worktree_path`. When
+   that registration is locked, run `git worktree unlock <path>` only when the lock reason names
+   the item's own agent; leave any other lock in place. Run `git worktree remove <path>` with no
+   force flag. On success, set `merge_status: worktree_removed` and `worktree_removed_at`. On
+   refusal, leave `merge_status: merged`, append a `completed_steps` entry naming the path and the
+   refusal reason as a deferral, and continue with the next item.
+2. **Final status.** Regenerate `docs/features/parallel/<slug>/parallel-status.md` so it shows the
+   closing state.
+3. **Run documents.** Stage the run folder and the promoted lifecycle files created for this run by
+   literal path only, in commands of the form
+   `git add -- docs/features/parallel/<slug>/parallel-status.md docs/features/potential/promoted/<promoted-file>.md`
+   and
+   `git commit -m "docs(parallel): close run <slug>" -- docs/features/parallel/<slug>/parallel-status.md docs/features/potential/promoted/<promoted-file>.md`,
+   in which every pathspec begins with `docs/features/`. The `artifacts/` tree is gitignored, so Run
+   Closing never stages it. Never use
+   `git add -A` or `git add .`, and never stage a `docs/features/active/<item>/` folder: each item
+   folder lands through that item's own pull request. Before pushing, require that
+   `git diff --name-only origin/main...HEAD` lists only `docs/` paths; when it lists any other
+   path, stop and report without forcing, rebasing, or splitting the branch. The coordinator holds
+   no `artifacts/orchestration/orchestrator-state.json`, so the existing documentation-only
+   exemptions apply to these commands. Push the branch, delegate the pull request to
+   `Agent(pr-author)` with a `branch:` label in place of an issue number, merge it with
+   `gh pr merge <PR> --merge` naming the pull request number, and confirm the merge with the step 3
+   procedure of `## Per-Item Merge to Main (Merge-on-Green)`.
+4. **Scratch worktrees.** After the merge of the run-document pull request is confirmed, run the
+   `cleanup-merged-worktrees` report with
+   `bash .claude/skills/cleanup-merged-worktrees/scripts/cleanup-worktrees.sh`. Run the same script
+   with `--apply` only when every row the report marks delete-eligible is a worktree this run
+   created: an item worktree, or a planner scratch worktree named in the run's manifest, kickoff,
+   or checkpoint. Otherwise apply nothing and report each remaining scratch worktree as a deferral,
+   because apply mode is repository-wide and can classify a concurrent session's clean,
+   zero-commit worktree as merged. Add no hook allow for scratch worktrees.
+5. **Report.** Report every deferral. The named deferral cases are LV1, an item worktree whose
+   removal was refused after unlock because the item's harness process still holds it; LV2, a
+   run-document pull request still open because the merge queue has not merged it or `origin/main`
+   was absent when the merge gate evaluated it; and LV3, a run-document pull request that needs
+   manual authoring because the `Agent(pr-author)` delegation without an issue number failed its
+   model-routing receipt check. Each scratch worktree left in place is also a deferral.
 
 ## Documentation Maintenance Boundaries
 
@@ -660,6 +733,8 @@ hold:
    source files by that item's own run, per the `acceptance-criteria-tracking` skill.
    A CI-dependent criterion is checked off and pushed by that item's own run before its DONE, so
    the head the parent merges already contains the check-off; the parent never commits it.
+5. `### Run Closing` (under `## Worktree Cleanup`) has run, and its run-document pull request is
+   merged or reported as a deferral.
 
 In `open` mode there is no automatic completion. The run is a standing queue and terminates only via
 `/parallel-close`, which is owned by F6 and is neither specified nor shipped by this feature. Do not
@@ -667,7 +742,8 @@ synthesize a completion condition for an `open`-mode run.
 
 No completion condition involves a run-level pull request. There is no final integration pull
 request on this surface, so completion keys on the per-item terminal states above and on nothing
-else.
+else. The Run Closing run-document pull request is a bookkeeping pull request that lands the run's
+generated documents; it is not a run-level integration pull request and merges no item work.
 
 ## Mutation Protocol (F6)
 

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

@@ -140,7 +140,9 @@ the model-budget marker line, and is omitted for a potential-entry item, whose c
 The line carries no mode marker, no digits, and no active feature-folder path, so hook target
 resolution and mode classification are unchanged. The preparation checkpoint does not carry over
 to execution, so the execution child records its own adoption (see
-`.claude/skills/parallel-orchestrate/SKILL.md`, kickoff element 4).
+`.claude/skills/parallel-orchestrate/SKILL.md`, kickoff element 4). Because the preparation child
+creates and commits the feature folder, the execution child's adoption also waives
+`new_active_feature_folder` and records `feature_folder_record` for that committed folder.
 
 **No edit to shared surfaces.** No edit is made to `.claude/skills/orchestrate/SKILL.md` or to
 `config/orchestration-routing.json`, including the `preparation` route. The route mechanism is

package/resources/claude-customizations/.claude/skills/pr-author/SKILL.md

@@ -40,7 +40,7 @@ Use these sections in this order:
 8. **Risks and Mitigations** — realistic risks with mitigations and rollback notes
 9. **Review Guide** — suggested order, noisy mechanical moves, large diffs
 10. **Follow-ups** — known TODOs, deferred cleanup, next PRs
-11. **GitHub Auto-close** — `- Closes #NNN` only from verified autoclose lists; do not invent issue numbers
+11. **GitHub Auto-close** — `- Closes #NNN` from the three sources in Issue/PR Reference Rules (the PR-context "Issues to autoclose" list, the PR-context "Author-asserted autoclose issues" list, and an issue named as author-asserted in the delegation prompt); `- None` only when no source has an entry; do not invent issue numbers
 
 ## Output Artifact
 
@@ -74,22 +74,52 @@ writes and the `gh pr create` / `gh pr edit --body-file` handoff.
 
 ## Issue/PR Reference Rules
 
-- Only mention an issue/PR number if it appears verbatim in the provided context.
+- Only mention an issue/PR number if it appears verbatim in the provided context or in the delegation prompt.
 - Do not treat PR numbers as issues.
-- Auto-close bullets must use exactly `- Closes #NNN` format, sourced only from "Issues to autoclose" or "Author-asserted autoclose issues."
-- If GitHub validation is unavailable/unverified, do not emit `Closes`; use the fallback `None` bullet.
+- Auto-close bullets must use exactly `- Closes #NNN` format. Three sources are valid:
+  1. the PR-context "Issues to autoclose" list;
+  2. the PR-context "Author-asserted autoclose issues" list (rendered from the PR Intent);
+  3. an issue named as author-asserted in the delegation prompt, on the line
+     `Author-asserted autoclose issues: #NNN`. This source is valid even when the PR context
+     lists no verified autoclose issues.
+- Emit the fallback `- None` bullet only when no source has an entry.
+- GitHub validation applies to the two PR-context lists: if it is unavailable or unverified for
+  an entry on those lists, do not emit `Closes` for that entry. An issue named as author-asserted
+  in the delegation prompt is emitted without that validation; the closing-reference
+  verification below confirms it after the pull request exists.
+
+## Closing-Reference Verification
+
+The pr-author agent MUST run `gh pr view <N> --json closingIssuesReferences,body` as a single
+command (no chaining, no extra flags) after every `gh pr create` or `gh pr edit` it issues, where
+`<N>` is the pull request number. It reports the closing issue numbers that
+`closingIssuesReferences` lists, and reports any mismatch with the author-asserted list: an
+author-asserted issue that GitHub does not list as closing, or a closing issue that no source
+named. The command is read-only, and this exact form is the only pull-request view form the
+agent's allowlist hook permits.
 
 ## Required `--head` on `gh pr create` (issue #687)
 
 Every `gh pr create` command this agent issues MUST carry an explicit
-`--head <branch>` naming the branch the pull request is opened from.
+`--head <branch>` naming the branch the pull request is opened from, for example
+`gh pr create --head <branch> --body-file artifacts/pr_body_<N>.md`.
 
 This is what makes the call's target derivable. `enforce-pr-author-skill.ps1` resolves the
 worktree the call pertains to from the command text, and validates the orchestrator checkpoint
 belonging to that worktree. Without `--head`, `gh pr create` infers its head branch from the
-current checkout and the command carries no signal at all, so the gate denies with
-`TARGET_WORKTREE_NOT_DERIVABLE` rather than validating against whichever checkpoint occupies the
-session root, which in a parallel or epic topology belongs to a different item.
+current checkout and the command carries no signal at all, so the gate falls back to the branch
+checked out in its own working directory (issue #989) and denies with
+`TARGET_WORKTREE_NOT_DERIVABLE` when that checkout is detached or unreadable, rather than
+validating against whichever checkpoint occupies the session root, which in a parallel or epic
+topology belongs to a different item.
 
 Pass `--head` even when the branch is the current one: the gate resolves it to the session root
-and behaves exactly as before, and the command stays correct if it is ever replayed elsewhere.
+and behaves exactly as before, and the command stays correct if it is ever replayed elsewhere.
+
+`gh pr edit` takes no head-branch flag, and --head is not valid for gh pr edit. Name the target of
+an edit in one of two ways:
+
+- Run `gh pr edit <N> --body-file artifacts/pr_body_<N>.md` from the item worktree. The gate
+  derives the branch from that worktree's checkout.
+- When running outside the item worktree, append the shell comment `# branch: <branch>` to the
+  command, and pass the absolute canonical body path beneath the item worktree.

package/resources/claude-customizations/.claude-variants/csharp-legacy/agents/csharp-typed-engineer.md

@@ -54,7 +54,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate or an in-flight batch would exceed the 3-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

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

@@ -35,11 +35,13 @@
     ".claude/hooks/enforce-epic-merge-gate-authorization.ps1",
     ".claude/hooks/enforce-epic-merge-gate-resolution.ps1",
     ".claude/hooks/enforce-epic-merge-gate-command.ps1",
+    ".claude/hooks/enforce-epic-merge-gate-green-ci.ps1",
     ".claude/hooks/enforce-epic-wave-barrier.ps1",
     ".claude/hooks/enforce-epic-worktree-removal-gate.ps1",
     ".claude/hooks/enforce-epic-worktree-removal-gate-resolution.ps1",
     ".claude/hooks/enforce-evidence-locations.ps1",
     ".claude/hooks/enforce-feature-folder-order.ps1",
+    ".claude/hooks/enforce-file-size-limit.ps1",
     ".claude/hooks/enforce-model-routing-receipt.ps1",
     ".claude/hooks/enforce-orchestration-preimplementation-gate.ps1",
     ".claude/hooks/enforce-orchestration-preimplementation-gate-epic-scope.ps1",
@@ -55,6 +57,7 @@
     ".claude/hooks/enforce-powershell-batch-budget.ps1",
     ".claude/hooks/enforce-pr-author-command-allowlist.ps1",
     ".claude/hooks/enforce-pr-author-skill.artifact-root.ps1",
+    ".claude/hooks/enforce-pr-author-skill.current-branch.ps1",
     ".claude/hooks/enforce-pr-author-skill.docs-only.ps1",
     ".claude/hooks/enforce-pr-author-skill.epic-base-branch.ps1",
     ".claude/hooks/enforce-pr-author-skill.ps1",
@@ -84,6 +87,7 @@
     ".claude/hooks/validate-feature-review-coverage.ps1",
     ".claude/hooks/validate-orchestrator-output-resolution.ps1",
     ".claude/hooks/validate-orchestrator-output-routing.ps1",
+    ".claude/hooks/validate-orchestrator-output-feature-folder.ps1",
     ".claude/hooks/validate-orchestrator-output.ps1",
     ".claude/hooks/validate-planner-output.ps1",
     ".claude/hooks/validate-pr-author-output.ps1",
@@ -157,6 +161,7 @@
     ".claude/skills/translate-copilot-to-claude/SKILL.md",
     ".claude/skills/update-status/SKILL.md",
     ".claude/lib/hook-payload/HookPayload.psm1",
+    ".claude/lib/file-size-policy/FileSizePolicy.psm1",
     ".claude/lib/requirements/GeneratedDocumentCounters.psm1",
     ".claude/lib/model-routing/ModelRouting.psm1",
     ".claude/lib/orchestrator-state/OrchestratorState.psm1",
@@ -171,6 +176,7 @@
     ".claude/lib/orchestrator-state/OrchestratorStateCompletionChecks.psm1",
     ".claude/lib/orchestrator-state/OrchestratorStateRoutingContract.psm1",
     ".claude/lib/orchestrator-state/OrchestratorStateIssueAdoption.psm1",
+    ".claude/lib/orchestrator-state/OrchestratorStateFeatureFolderRecord.psm1",
     ".claude/lib/orchestrator-state/OrchestratorStateUnconditional.psm1",
     ".claude/lib/orchestrator-state/OrchestratorStateEpicWaveBarrier.psm1",
     ".claude/lib/discovery-validation/DiscoveryValidation.psm1",
@@ -228,6 +234,7 @@
     ".claude/lib/worktree-resolution/WorktreeItemResolution.psm1",
     ".claude/lib/worktree-resolution/EpicScopeResolution.psm1",
     ".claude/lib/worktree-resolution/EpicScopeReadiness.psm1",
+    ".claude/lib/worktree-resolution/WorktreeRunRecordPath.psm1",
     ".claude/lib/worktree-resolution/WorktreeRunResolution.psm1",
     ".claude/skills/mermaid-diagram/references/flowchart.md",
     ".claude/skills/mermaid-diagram/references/sequence.md",

package/resources/codex-and-agents-customizations/.agents/skills/execution-environment/SKILL.md

@@ -122,7 +122,7 @@ These pass every validator rule and are found only by reading the plan against t
 - Python: measure a module with `--cov=<dotted.module>`, `--cov-branch`, `--cov-report=term-missing`, and `--cov-report=json:<path>`; read branch figures from the JSON report.
 - TypeScript: a new production file needs its own entry in the `coverageThreshold` map of `extensions/drm-copilot/jest.config.cjs`; Jest runs through `node run-jest.cjs` in `extensions/drm-copilot/`.
 - PowerShell: per-file line coverage is read from `artifacts/pester/powershell-coverage.xml` written by the self-hosted PoshQC module.
-- No production, test, or reusable script file exceeds 500 physical lines; Markdown is exempt. Files at or near the limit are not extended; new logic goes into a new module and a new test file.
+- File size follows three tiers for production, test, and reusable script files, counted in logical lines (a trailing terminator adds no line): at 500 lines look for a logical split (guidance); at 700 lines split more aggressively, and reviewers report a non-blocking Warning (advisory); above 800 lines a split is enforced regardless of logical separability (hard limit; exactly 800 passes). The hard limit is enforced by `tests/scripts/ci/FileSizePolicy.RepoGate.Tests.ps1` in the existing PowerShell shards against `config/file-size-baseline.json`, where legacy files above 800 may shrink (with the entry tightened) or stay equal but may not grow, and by the PreToolUse hook `.claude/hooks/enforce-file-size-limit.ps1` (`.codex/hooks/enforce-file-size-limit.ps1`). New logic in a file near a tier goes into a new module and a new test file. Markdown is exempt.
 
 ## Test Isolation Checks
 

package/resources/codex-and-agents-customizations/.agents/skills/feature-promotion-lifecycle/SKILL.md

@@ -83,7 +83,7 @@ Lifecycle guardrails:
 
 4) Create the potential entry through `mcp__drm-copilot__new_potential_entry` or `mcp__drm-copilot__new_potential_bug_entry`.
 
-5) Promote the potential document through `mcp__drm-copilot__potential_to_issue` with the selected `${work-mode}` and capture the numeric `${issue-num}`. When the issue already exists, do not call `potential_to_issue`; verify the issue read-only and record `issue_adoption` with the existing number as `${issue-num}`.
+5) Promote the potential document through `mcp__drm-copilot__potential_to_issue` with the selected `${work-mode}` and capture the numeric `${issue-num}`. When the issue already exists, do not call `potential_to_issue`; verify the issue read-only and record `issue_adoption` with the existing number as `${issue-num}`. When the feature folder for that issue was also created and committed before this run, do not call `new_active_feature_folder` again in step 7; waive it in `issue_adoption.waived_tools` and record `issue_adoption.feature_folder_record` (`path` equal to `${feature-folder}`, `verified_via`, `verified_at`, `evidence`) after confirming the folder is in `HEAD`.
 
 6) Rename the branch to the final branch:
 - `${final-branch}`

package/resources/codex-and-agents-customizations/.agents/skills/feature-review/SKILL.md

@@ -121,6 +121,14 @@ When remediation is required:
   - MUST contain `## Summary`.
   - MUST contain `## Acceptance Criteria Check-off`.
 
+## File Size Advisory
+
+The tiered file-size policy (`## File Size Limit` in `.agents/skills/general-code-change/SKILL.md`) sets a 500-line guidance tier, a 700-line advisory tier, and an 800-line hard limit. Measure the logical line count of every added or modified covered file in the branch diff. Covered files have one of the extensions `.py`, `.ps1`, `.psm1`, `.ts`, `.tsx`, `.js`, `.cjs`, `.mjs`, `.cs`, `.sh`, or `.bats` and are not under a build, cache, dependency, virtual-environment, or `docs` directory. A logical line count splits the content on line terminators, and a trailing terminator does not add a line; it equals `@(Get-Content -LiteralPath <path>).Count`. Do not use `wc -l` or `Measure-Object -Line`.
+
+- Report each covered file at or above 700 lines as a non-blocking `Warning` row in the Findings Table of `code-review.<timestamp>.md`, naming the file and its line count. Do not write the Warning to `remediation-inputs.<timestamp>.md`, and do not give it a remediation severity label.
+- Report a covered file above 800 lines that has no entry in `config/file-size-baseline.json`, and any added or increased entry in `config/file-size-baseline.json`, as a blocking policy finding.
+- Produce no finding for the 500-line guidance tier.
+
 ## Review Constraints
 
 - Do not silently fix code during review.

package/resources/codex-and-agents-customizations/.agents/skills/general-code-change/SKILL.md

@@ -49,7 +49,10 @@ Mutation testing and golden tests run in pre-merge or nightly pipelines, not the
 
 ## File Size Limit
 
-- No production code, test code, or reusable script file may exceed **500 lines**.
+- File size follows three tiers for production code, test code, and reusable script files, counted in logical lines (a trailing line terminator does not add a line):
+  - **500 lines (guidance):** look for a logical way to divide the file into multiple files, provided the parts can be separated logically. No gate fails at this tier.
+  - **700 lines (advisory):** look for a split more aggressively. Reviewers and `feature-review` report a non-blocking Warning for a file at or above 700 lines. No gate fails at this tier.
+  - **Above 800 lines (hard block):** split the file regardless of logical separability. The repository CI check and the PreToolUse hook block a file of 801 lines or more; a file of exactly 800 lines passes. Legacy files above 800 lines are listed in `config/file-size-baseline.json` and may shrink (with the entry tightened) or stay the same size, but may not grow.
 - Exceptions: temporary throwaway scripts created and deleted within an agent session; raw text fixtures for language-processing test data; Markdown documentation files.
 
 ## Error Handling and Logging

package/resources/codex-and-agents-customizations/.agents/skills/powershell/SKILL.md

@@ -29,7 +29,7 @@ Run the toolchain in order: format → analyze → test. Restart from step 1 if
 - Avoid `Invoke-Expression`, plaintext secrets, and hard-coded credentials/paths.
 - Use `Write-Error`/`throw` for failures; avoid silent catch-alls.
 - Use approved verbs and descriptive nouns for function names (PSScriptAnalyzer enforces this).
-- Keep scripts cohesive and under 500 lines.
+- Keep scripts cohesive and within the tiered file-size policy in `.agents/skills/general-code-change/SKILL.md` (`## File Size Limit`).
 
 ## Change Budget
 

package/resources/codex-and-agents-customizations/.codex/agents/csharp-typed-engineer-c1.toml

@@ -83,7 +83,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate or an in-flight batch would exceed the 3-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/csharp-typed-engineer-c2.toml

@@ -83,7 +83,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate or an in-flight batch would exceed the 3-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/csharp-typed-engineer-c3-elevated.toml

@@ -83,7 +83,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate or an in-flight batch would exceed the 3-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/csharp-typed-engineer-c3.toml

@@ -83,7 +83,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate or an in-flight batch would exceed the 3-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/csharp-typed-engineer-c4.toml

@@ -83,7 +83,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate or an in-flight batch would exceed the 3-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/csharp-typed-engineer.toml

@@ -83,7 +83,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate or an in-flight batch would exceed the 3-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/feature-review.toml

@@ -137,6 +137,14 @@ For each language that has changed files in the feature branch:
 
 The agent does NOT rerun coverage generation. Evidence verification from existing artifacts is the required model.
 
+## File Size Advisory
+
+The tiered file-size policy (`## File Size Limit` in `.agents/skills/general-code-change/SKILL.md`) sets a 500-line guidance tier, a 700-line advisory tier, and an 800-line hard limit. Measure the logical line count of every added or modified covered file in the branch diff. Covered files have one of the extensions `.py`, `.ps1`, `.psm1`, `.ts`, `.tsx`, `.js`, `.cjs`, `.mjs`, `.cs`, `.sh`, or `.bats` and are not under a build, cache, dependency, virtual-environment, or `docs` directory. A logical line count splits the content on line terminators, and a trailing terminator does not add a line; it equals `@(Get-Content -LiteralPath <path>).Count`. Do not use `wc -l` or `Measure-Object -Line`.
+
+- Report each covered file at or above 700 lines as a non-blocking `Warning` row in the Findings Table of `code-review.<timestamp>.md`, naming the file and its line count. Do not write the Warning to `remediation-inputs.<timestamp>.md`, and do not give it a remediation severity label.
+- Report a covered file above 800 lines that has no entry in `config/file-size-baseline.json`, and any added or increased entry in `config/file-size-baseline.json`, as a blocking policy finding.
+- Produce no finding for the 500-line guidance tier.
+
 ## Evidence Location Invariant
 
 All evidence artifacts this agent produces (baselines, QA gates, regression results, coverage) MUST be written to `<FEATURE>/evidence/<kind>/` as defined in `.agents/skills/evidence-and-timestamp-conventions/SKILL.md`.

package/resources/codex-and-agents-customizations/.codex/agents/powershell-typed-engineer-c1.toml

@@ -93,7 +93,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds the 2-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/powershell-typed-engineer-c2.toml

@@ -93,7 +93,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds the 2-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/powershell-typed-engineer-c3-elevated.toml

@@ -93,7 +93,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds the 2-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/powershell-typed-engineer-c3.toml

@@ -93,7 +93,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds the 2-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/powershell-typed-engineer-c4.toml

@@ -93,7 +93,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds the 2-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/powershell-typed-engineer.toml

@@ -93,7 +93,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds the 2-production-file cap in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - orchestrator handoff mode is requested but the required context package is incomplete,

package/resources/codex-and-agents-customizations/.codex/agents/python-typed-engineer-c1.toml

@@ -87,7 +87,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds 3 production files in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - policy instructions conflict.

package/resources/codex-and-agents-customizations/.codex/agents/python-typed-engineer-c2.toml

@@ -87,7 +87,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds 3 production files in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - policy instructions conflict.

package/resources/codex-and-agents-customizations/.codex/agents/python-typed-engineer-c3-elevated.toml

@@ -87,7 +87,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds 3 production files in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - policy instructions conflict.

package/resources/codex-and-agents-customizations/.codex/agents/python-typed-engineer-c3.toml

@@ -87,7 +87,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds 3 production files in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - policy instructions conflict.

package/resources/codex-and-agents-customizations/.codex/agents/python-typed-engineer-c4.toml

@@ -87,7 +87,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds 3 production files in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - policy instructions conflict.

package/resources/codex-and-agents-customizations/.codex/agents/python-typed-engineer.toml

@@ -87,7 +87,7 @@ If the marker is missing or malformed, fail closed to `full-feature`.
 Stop implementation and return to the user when:
 
 - the scope estimate exceeds 3 production files in direct mode,
-- a file is near or would exceed the 500-line limit,
+- a file is above or would exceed the 800-line hard limit of the tiered file-size policy (split it before proceeding; at 500 lines look for a logical split, and at 700 lines split more aggressively),
 - any QA gate delta is non-zero after self-correction,
 - the toolchain cannot be executed in the current environment (mark the change **unverified**),
 - policy instructions conflict.