Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,16 @@ Optional:

Generated non-report artifacts must live under `dev/workspace/`.

## Codex Reports

- `dev/reports/` contains the authoritative Codex reports for the repository.
- Reports committed to `main` are the official record.
- Reports generated during a PR are expected to be committed as part of that PR.
- Once merged into `main`, those report versions become the canonical repository history.
- Do not delete report files solely to obtain a clean worktree.
- Do not add `dev/reports/` to `.gitignore`.
- Continue storing ZIPs under `dev/workspace/zips/`.

## Completion Reporting

Codex responses must include:
Expand Down
3 changes: 2 additions & 1 deletion dev/build/ProjectInstructions/addendums/pr_workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Closed gates:
- PR merged and changes pushed.
- Current branch is `main`.
- `main` includes the merge commit or recorded final commit.
- Worktree clean.
- Worktree clean, including intended `dev/reports/` updates committed and merged.
- Local/origin sync is `0/0`.
- No untracked files.
- Branch disposition is recorded as `retained`.
Expand All @@ -132,6 +132,7 @@ Closed gates:
- If OWNER decision is required, stop and report.
- Every PR lifecycle state must satisfy the Codex Completion Contract when Codex executes work for that state.
- ZIP artifacts belong under `dev/workspace/zips/` and must not replace required reports under `dev/reports/`.
- Reports generated during a PR are expected to be committed as part of that PR. Do not delete report files solely to obtain a clean worktree, and do not add `dev/reports/` to `.gitignore`.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Clarify how post-merge reports get committed

When APPLY_PR/post-merge closeout generates required reports after the PR has already been merged and the runner is back on main, this rule leaves no valid path to close the same PR: the new reports cannot be committed “as part of that PR”, while direct commits to main are prohibited unless OWNER explicitly approves. That makes post-merge closeout runs either leave dev/reports/ dirty or require an undocumented follow-up PR, so the workflow should explicitly exempt/route post-merge closeout reports.

Useful? React with 👍 / 👎.

- Stacked PR chains produce one final outcome ZIP per attempted PR and stop before later PRs after failure or hard stop.

## Batch Governance Mode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Dev workspace ownership:
- dev/archive/ owns historical reference material only.
- dev/build/ owns active Project Instructions, architecture, database DDL/DML/seed docs, standards, backlog, PR planning, and governance.
- dev/config/ owns development-only runner and tooling configuration.
- dev/reports/ owns active and historical generated reports.
- dev/reports/ owns authoritative Codex reports for the repository. Reports committed to `main` are the official record.
- dev/scripts/ owns development-only scripts and runners.
- dev/templates/ owns reusable development templates.
- dev/tests/ owns non-deployable test suites.
Expand Down
9 changes: 9 additions & 0 deletions dev/reports/PR277-post-merge-closeout_branch-validation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# PR277 Post-Merge Branch Validation

Status: PASS

- Current branch is `main`: PASS
- HEAD is `994b844cb6f5ddae29239962a751da997e207d9e`: PASS
- `main...origin/main` is `0 0`: PASS
- Worktree was clean before closeout report generation: PASS
- No code changes were made: PASS
12 changes: 12 additions & 0 deletions dev/reports/PR277-post-merge-closeout_manual-validation-notes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# PR277 Post-Merge Manual Validation Notes

Manual validation status: READY

This closeout package is documentation/artifact only. No code, runtime behavior, database schema, or DEV identity data changed during this packaging step.

Manual review:

- Confirm PR #277 is merged in GitHub.
- Confirm local `main` remains on merge commit `994b844cb6f5ddae29239962a751da997e207d9e`.
- Confirm the closeout ZIP exists under `dev/workspace/zips/`.
- DEV identity sync was intentionally not run in this packaging step.
25 changes: 25 additions & 0 deletions dev/reports/PR277-post-merge-closeout_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# PR277 Post-Merge Closeout

## Summary

Post-merge closeout package for GitHub PR #277, `PR_26179_OWNER_035-dev-auth-user-key-db-authority`.

No runtime code, database code, tests, product UI, or DEV identity data was changed during this packaging step.

## Repository Gate

- Branch: `main`
- HEAD: `994b844cb6f5ddae29239962a751da997e207d9e`
- `main...origin/main`: `0 0`
- Worktree before packaging: clean
- PR #277 merged: yes
- Merge commit: `994b844cb6f5ddae29239962a751da997e207d9e`

## Validation

- `git diff --check`: PASS
- `npm run validate:canonical-structure`: PASS

## Notes

DEV identity sync was not run in this packaging step.
14 changes: 14 additions & 0 deletions dev/reports/PR277-post-merge-closeout_requirement-checklist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# PR277 Post-Merge Requirement Checklist

Status: PASS

- Confirm branch is `main`: PASS
- Confirm HEAD is `994b844cb6f5ddae29239962a751da997e207d9e`: PASS
- Confirm `main...origin/main = 0 0`: PASS
- Confirm worktree clean before packaging: PASS
- Run `git diff --check`: PASS
- Run `npm run validate:canonical-structure`: PASS
- Create reports under `dev/reports/`: PASS
- Create repo-structured ZIP under `dev/workspace/zips/`: PASS
- Do not change code: PASS
- Do not run DEV identity sync: PASS
25 changes: 25 additions & 0 deletions dev/reports/PR277-post-merge-closeout_validation-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# PR277 Post-Merge Validation Report

Status: PASS

## Commands

```text
git diff --check
```

Result: PASS

```text
npm run validate:canonical-structure
```

Result: PASS

Output summary:

```text
Canonical repository structure guardrail: PASS
Blocking violations: 0
Approved legacy exceptions: 500
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# PR_26179_OWNER_036-reports-are-tracked-source Branch Validation

Status: PASS

- Source branch: `PR_26179_OWNER_036-reports-are-tracked-source`
- Base branch: `main`
- Latest `origin/main`: `742245d454b1be1fdfc923f1bcf4089199b85d90`
- Branch rebased onto latest `origin/main`: PASS
- Existing generated report artifacts preserved: PASS
- Scope limited to governance docs and reports: PASS
- Merge conflict resolved: PASS
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# PR_26179_OWNER_036-reports-are-tracked-source EOD Report

## Summary

PR #280 conflict resolution and merge closeout for `PR_26179_OWNER_036-reports-are-tracked-source`.

## Scope

- Governance documentation only.
- Preserved approved Codex Reports wording.
- Updated PR reports and repo-structured ZIP.
- No runtime changes.
- No auth changes.
- No Local API changes.
- No seed data changes.
- No `.gitignore` changes.

## Conflict Resolution

- Latest `origin/main` was merged/rebased into the PR branch.
- Conflicts were limited to generated report artifacts.
- `dev/reports/codex_changed_files.txt` and `dev/reports/codex_review.diff` were regenerated from the final PR diff.

## Validation

- `git diff --check`: PASS
- `npm run validate:canonical-structure`: PASS
- GitHub checks: to be verified on PR #280 after the updated branch push

## Closeout

- PR branch: `PR_26179_OWNER_036-reports-are-tracked-source`
- PR: #280
- ZIP: `dev/workspace/zips/PR_26179_OWNER_036-reports-are-tracked-source_delta.zip`
- Final main verification is recorded in the Codex final response after merge and pull.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# PR_26179_OWNER_036-reports-are-tracked-source Manual Validation Notes

Manual validation status: READY

Review the governance wording in:

- `dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md`
- `dev/build/ProjectInstructions/repository/canonical_repository_structure.md`
- `dev/build/ProjectInstructions/addendums/pr_workflow.md`

Confirm the policy says `dev/reports/` contains authoritative Codex reports, reports committed to `main` are the official record, and PR-generated reports are expected to be committed as part of that PR.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# PR_26179_OWNER_036-reports-are-tracked-source

## Summary

This governance PR clarifies that `dev/reports/` contains the authoritative Codex reports for the repository and that reports committed to `main` are the official record. Reports generated during a PR are expected to be committed as part of that PR, while repository authority remains the report state committed to `main`.

## Scope

- Updated Codex artifact/reporting governance.
- Updated canonical repository structure wording for `dev/reports/`.
- Updated PR workflow clean-main guidance for intended report updates.
- Preserved the existing PR277 post-merge closeout report artifacts instead of deleting them.
- No runtime code changes.
- No auth changes.
- No Local API changes.
- No `.gitignore` changes.

## Policy Added

- `dev/reports/` contains the authoritative Codex reports for the repository.
- Reports committed to `main` are the official record.
- Reports generated during a PR are expected to be committed as part of that PR.
- Once merged into `main`, those report versions become the canonical repository history.
- Do not delete report files solely to obtain a clean worktree.
- Do not add `dev/reports/` to `.gitignore`.
- Continue storing ZIPs under `dev/workspace/zips/`.

## Validation

PASS:

- `git diff --check`
- `npm run validate:canonical-structure`
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# PR_26179_OWNER_036-reports-are-tracked-source Requirement Checklist

Status: PASS

- Update Project Instructions/governance docs only: PASS
- Declare `dev/reports/` contains authoritative Codex reports: PASS
- Declare reports committed to `main` are the official record: PASS
- Require PR-generated reports to be committed as part of the PR: PASS
- Clarify repository authority is the report state committed to `main`: PASS
- Warn not to delete report files solely to clean worktree: PASS
- Warn not to add `dev/reports/` to `.gitignore`: PASS
- Preserve `dev/reports/` and `dev/workspace/zips/` as canonical paths: PASS
- No runtime code changes: PASS
- No auth changes: PASS
- No Local API changes: PASS
- No unrelated cleanup: PASS
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# PR_26179_OWNER_036-reports-are-tracked-source Validation Report

Status: PASS

Conflict resolution:

- Rebasing onto latest `origin/main` produced conflicts in generated report files only: `dev/reports/codex_changed_files.txt` and `dev/reports/codex_review.diff`.
- The approved Codex Reports governance wording was preserved.
- Generated report files were regenerated from the final post-rebase diff against `742245d454b1be1fdfc923f1bcf4089199b85d90`.

Commands run:

```text
git diff --check
```

Result: PASS

```text
npm run validate:canonical-structure
```

Result: PASS

Output summary:

```text
Canonical repository structure guardrail: PASS
Blocking violations: 0
Approved legacy exceptions: 501
```

No runtime, auth, Local API, seed, or `.gitignore` changes were made.
52 changes: 17 additions & 35 deletions dev/reports/codex_changed_files.txt
Original file line number Diff line number Diff line change
@@ -1,37 +1,19 @@
# git diff --name-status merge-base(origin/main, HEAD)..working-tree
M dev/build/ProjectInstructions/PROJECT_INSTRUCTIONS.md
M dev/build/ProjectInstructions/PROJECT_INSTRUCTIONS_VERSION.md
M dev/build/ProjectInstructions/TEAM_START_COMMANDS.md
M dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md
M dev/build/ProjectInstructions/addendums/team_start_and_release.md
M dev/build/ProjectInstructions/backlog/BACKLOG_MASTER.md
M dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md
M dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md
A dev/reports/PR_26180_OWNER_003-backlog-startup-assignment-policy_branch-validation.md
A dev/reports/PR_26180_OWNER_003-backlog-startup-assignment-policy_manual-validation-notes.md
A dev/reports/PR_26180_OWNER_003-backlog-startup-assignment-policy_report.md
A dev/reports/PR_26180_OWNER_003-backlog-startup-assignment-policy_requirement-checklist.md
A dev/reports/PR_26180_OWNER_003-backlog-startup-assignment-policy_validation-report.md
M dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md
M dev/build/ProjectInstructions/addendums/pr_workflow.md
M dev/build/ProjectInstructions/repository/canonical_repository_structure.md
A dev/reports/PR277-post-merge-closeout_branch-validation.md
A dev/reports/PR277-post-merge-closeout_manual-validation-notes.md
A dev/reports/PR277-post-merge-closeout_report.md
A dev/reports/PR277-post-merge-closeout_requirement-checklist.md
A dev/reports/PR277-post-merge-closeout_validation-report.md
A dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_branch-validation.md
A dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_eod-report.md
A dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_manual-validation-notes.md
A dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_report.md
A dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_requirement-checklist.md
A dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_validation-report.md
M dev/reports/codex_changed_files.txt
M dev/reports/codex_review.diff

# git diff --stat merge-base(origin/main, HEAD)..working-tree
.../ProjectInstructions/PROJECT_INSTRUCTIONS.md | 4 +-
.../PROJECT_INSTRUCTIONS_VERSION.md | 3 +-
.../ProjectInstructions/TEAM_START_COMMANDS.md | 17 +
.../addendums/team_backlog_sod_eod_standard.md | 69 +
.../addendums/team_start_and_release.md | 28 +-
.../ProjectInstructions/backlog/BACKLOG_MASTER.md | 39 +-
.../bootstrap/codex_start_of_day_bootstrap.md | 27 +
.../standards/CODEX_WORKFLOW_COMMANDS.md | 9 +
...-startup-assignment-policy_branch-validation.md | 13 +
...up-assignment-policy_manual-validation-notes.md | 14 +
...003-backlog-startup-assignment-policy_report.md | 105 ++
...rtup-assignment-policy_requirement-checklist.md | 29 +
...-startup-assignment-policy_validation-report.md | 39 +
dev/reports/codex_changed_files.txt | 47 +-
dev/reports/codex_review.diff | 1555 +++++++++-----------
15 files changed, 1105 insertions(+), 893 deletions(-)

# merge-base
8c332fc82aeeed6508170363f04e04beaf67db28
M dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_branch-validation.md
M dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_eod-report.md
M dev/reports/PR_26179_OWNER_036-reports-are-tracked-source_validation-report.md
Loading
Loading