From 7f808be1b2e9b8996043c3a03c94dd41a5592442 Mon Sep 17 00:00:00 2001 From: Alfa Team Date: Sat, 27 Jun 2026 23:48:09 -0400 Subject: [PATCH] OWNER 012 simplify gitignore environment rules --- .gitignore | 4 +- ..._OWNER_012-gitignore-env-simplification.md | 42 +++++++ ...nv-simplification_requirement-checklist.md | 22 ++++ ...re-env-simplification_validation-report.md | 32 ++++++ dev/reports/codex_changed_files.txt | 19 +--- dev/reports/codex_review.diff | 106 +++--------------- 6 files changed, 118 insertions(+), 107 deletions(-) create mode 100644 dev/reports/PR_26179_OWNER_012-gitignore-env-simplification.md create mode 100644 dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_requirement-checklist.md create mode 100644 dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_validation-report.md diff --git a/.gitignore b/.gitignore index 3ac762a04..1207a12fc 100644 --- a/.gitignore +++ b/.gitignore @@ -48,8 +48,8 @@ docs/dev/reports/playwright_v8_coverage_report.txt *.mp4 *.mkv -.env -.env.* +# Environment files +.env* !.env.example !.env.sample !.env.template diff --git a/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification.md b/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification.md new file mode 100644 index 000000000..3263be27c --- /dev/null +++ b/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification.md @@ -0,0 +1,42 @@ +# PR_26179_OWNER_012-gitignore-env-simplification + +Updated: 2026-06-28T03:47:16Z +Team: Owner +Branch: PR_26179_OWNER_012-gitignore-env-simplification +Scope: .gitignore only plus required reports and outcome ZIP. No runtime code or production pages changed. + +## Summary +- Replaced the two-line environment ignore rule with a single `.env*` rule. +- Preserved exceptions for `.env.example`, `.env.sample`, and `.env.template`. + +## Changed Files +```text +M .gitignore +M dev/reports/codex_changed_files.txt +M dev/reports/codex_review.diff +A dev/reports/PR_26179_OWNER_012-gitignore-env-simplification.md +A dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_requirement-checklist.md +A dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_validation-report.md +``` + +## Validation Matrix +| Path | Result | Status | +| --- | --- | --- | +| .env | ignored | PASS | +| .env.dev | ignored | PASS | +| .env.ist | ignored | PASS | +| .env.uat | ignored | PASS | +| .env.prd | ignored | PASS | +| .env.local | ignored | PASS | +| .env.example | tracked and not ignored | PASS | +| .env.sample | not ignored by exception; file not present/tracked in repo | PASS_WITH_SCOPE_NOTE | +| .env.template | not ignored by exception; file not present/tracked in repo | PASS_WITH_SCOPE_NOTE | + +Scope note: `.env.sample` and `.env.template` are not currently tracked files in this repository, so the validation confirms the requested exception behavior without adding files outside the .gitignore-only scope. + +## Validation +- `git diff --check`: PASS. +- Environment ignore matrix: PASS with scope note for absent sample/template files. + +## Blockers +None. diff --git a/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_requirement-checklist.md b/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_requirement-checklist.md new file mode 100644 index 000000000..ed820b39a --- /dev/null +++ b/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_requirement-checklist.md @@ -0,0 +1,22 @@ +# PR_26179_OWNER_012-gitignore-env-simplification Requirement Checklist + +Updated: 2026-06-28T03:47:16Z + +- [x] Current branch started from main. +- [x] Worktree was clean before changes. +- [x] Updated `.gitignore` only for the requested source change. +- [x] Replaced `.env` and `.env.*` with `.env*`. +- [x] Added `# Environment files` comment. +- [x] Preserved `!.env.example`. +- [x] Preserved `!.env.sample`. +- [x] Preserved `!.env.template`. +- [x] `.env` ignored. +- [x] `.env.dev` ignored. +- [x] `.env.ist` ignored. +- [x] `.env.uat` ignored. +- [x] `.env.prd` ignored. +- [x] `.env.local` ignored. +- [x] `.env.example` tracked and not ignored. +- [x] `.env.sample` exception active; file is absent/not tracked in repo. +- [x] `.env.template` exception active; file is absent/not tracked in repo. +- [x] `git diff --check` passed. diff --git a/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_validation-report.md b/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_validation-report.md new file mode 100644 index 000000000..72809d8a9 --- /dev/null +++ b/dev/reports/PR_26179_OWNER_012-gitignore-env-simplification_validation-report.md @@ -0,0 +1,32 @@ +# PR_26179_OWNER_012-gitignore-env-simplification Validation Report + +Updated: 2026-06-28T03:47:16Z + +## Commands +- `git diff --check`: PASS +- `git check-ignore` env matrix: PASS +- `git ls-files --error-unmatch .env.example`: PASS + +## Env Matrix +| Path | Result | Status | +| --- | --- | --- | +| .env | ignored | PASS | +| .env.dev | ignored | PASS | +| .env.ist | ignored | PASS | +| .env.uat | ignored | PASS | +| .env.prd | ignored | PASS | +| .env.local | ignored | PASS | +| .env.example | tracked and not ignored | PASS | +| .env.sample | not ignored by exception; file not present/tracked in repo | PASS_WITH_SCOPE_NOTE | +| .env.template | not ignored by exception; file not present/tracked in repo | PASS_WITH_SCOPE_NOTE | + +## Scope Checks +- Runtime code changed: NO +- Production pages changed: NO +- Source change limited to `.gitignore`: YES + +## Notes +- `.env.sample` and `.env.template` are unignored by the exception rules, but they are not currently tracked files. They were not added because the PR scope allows source changes to `.gitignore` only. + +## Blockers +None. diff --git a/dev/reports/codex_changed_files.txt b/dev/reports/codex_changed_files.txt index a5a455d99..04ad28f6a 100644 --- a/dev/reports/codex_changed_files.txt +++ b/dev/reports/codex_changed_files.txt @@ -1,15 +1,6 @@ -PR_26179_OWNER_010-canonical-project-folder-instructions -Updated: 2026-06-28T02:50:06Z -Branch: PR_26179_OWNER_010-canonical-project-folder-instructions +PR_26179_OWNER_012-gitignore-env-simplification +Updated: 2026-06-28T03:47:16Z +Branch: PR_26179_OWNER_012-gitignore-env-simplification -Changed files staged for this update: -M dev/build/ProjectInstructions/addendums/pr_workflow.md -M dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md -M dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md -M dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md - -Working tree status at report generation: -M dev/build/ProjectInstructions/addendums/pr_workflow.md -M dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md -M dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md -M dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md +Changed files: +M .gitignore diff --git a/dev/reports/codex_review.diff b/dev/reports/codex_review.diff index 711fb8e6e..0b805ea5b 100644 --- a/dev/reports/codex_review.diff +++ b/dev/reports/codex_review.diff @@ -1,91 +1,15 @@ -diff --git a/dev/build/ProjectInstructions/addendums/pr_workflow.md b/dev/build/ProjectInstructions/addendums/pr_workflow.md -index ce6483838..6fadd0789 100644 ---- a/dev/build/ProjectInstructions/addendums/pr_workflow.md -+++ b/dev/build/ProjectInstructions/addendums/pr_workflow.md -@@ -41,7 +41,8 @@ This file owns PR lifecycle governance. It must not duplicate command phase rule - Team-neutral daily workflow: - - - SOD starts from the latest synchronized `main`. --- SOD creates or updates one active team branch/workstream. -+- SOD reports the active team branch/workstream recommendation only. -+- Branch creation or branch updates happen after SOD through the appropriate PR execution phase. - - Work must be committed only to the active team branch. - - PR branches/commits stay on the active team branch/workstream during the day when OWNER assigned a stacked or sequential workstream. - - Do not return to `main` between stacked/sequential PRs in the same active workstream. -diff --git a/dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md b/dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md -index e191f9d7f..1e6a04a87 100644 ---- a/dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md -+++ b/dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md -@@ -88,7 +88,8 @@ At EOD, ChatGPT/Codex must provide: - This standard preserves the existing branch workflow: - - - SOD starts from latest `main`. --- SOD creates or uses the active team branch. -+- SOD reports the recommended active team branch/workstream only. -+- Branch creation or use happens after SOD through the appropriate PR execution phase. - - All commits go to the active team branch, not `main`. - - Sequential PRs stay on the active team branch/workstream during the day. - - EOD merges OWNER-approved work, pushes, returns to `main`, and verifies clean worktree and local/origin sync `0 0`. -diff --git a/dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md b/dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md -index 280abef00..f2eb2787d 100644 ---- a/dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md -+++ b/dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md -@@ -33,7 +33,24 @@ The bootstrap loads: - - Current branch - - Worktree status - --The bootstrap must not create branches, commit files, move files, or run implementation work by itself. -+The bootstrap requires the current branch to be `main`, the worktree to be clean, and local `main` to be synced with `origin/main`. -+ -+Allowed bootstrap sync actions: -+ -+```text -+git fetch origin -+git pull --ff-only origin main -+``` -+ -+If the current branch is not `main`, the bootstrap must HARD STOP and return: -+ -+```text -+git switch main -+git pull --ff-only origin main -+Start of Day {Team} -+``` -+ -+The bootstrap must not create branches, switch branches, commit files, move files, or run implementation work by itself. - - Start-of-Day bootstrap must satisfy the Codex Completion Contract in `dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md` with a review-only ZIP unless a hard stop occurs. - -diff --git a/dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md b/dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md -index 25a403486..c0066966e 100644 ---- a/dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md -+++ b/dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md -@@ -25,9 +25,26 @@ Start of Day Golf - - Commands using non-canonical team names are invalid because active team names are Owner, Alfa, Bravo, Charlie, Delta, and Golf. - --Start of Day is read-only discovery only. -+Start of Day is read-only discovery plus baseline sync only. - --Start of Day must not require the current branch to be `main`. -+Start of Day requires: -+- current branch is `main` -+- worktree is clean -+- `git fetch origin` -+- `git pull --ff-only origin main` -+- local `main` and `origin/main` are synced -+ -+Allowed Start of Day git sync actions: -+- `git fetch origin` -+- `git pull --ff-only origin main` -+ -+If the current branch is not `main`, Start of Day must HARD STOP and return these correction steps: -+ -+```text -+git switch main -+git pull --ff-only origin main -+Start of Day {Team} -+``` - - Start of Day must not: - - create a branch +diff --git a/.gitignore b/.gitignore +index 3ac762a04..1207a12fc 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -48,8 +48,8 @@ docs/dev/reports/playwright_v8_coverage_report.txt + *.mp4 + *.mkv + +-.env +-.env.* ++# Environment files ++.env* + !.env.example + !.env.sample + !.env.template