Skip to content

Commit 03873b2

Browse files
ToolboxAidToolboxAid
committed
Merge remote-tracking branch 'origin/main' into codex/pr-26171-040-idea-board-production-copy-cleanup
# Conflicts: # docs_build/dev/reports/codex_changed_files.txt # docs_build/dev/reports/codex_review.diff
2 parents acbc5b1 + 7393b65 commit 03873b2

5 files changed

Lines changed: 560 additions & 9 deletions

File tree

‎docs_build/dev/reports/PR_26171_059-manual-validation-notes.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# PR_26171_059 Manual Validation Notes
2+
3+
## Manual Review
4+
5+
- Confirmed this PR only documents the rollback restore plan.
6+
- Confirmed the restore list keeps Local API sign-in recovery, env diagnostics, toolbox image restoration, Text To Speech rebuild, and Game Journey corrections as separate future scoped PRs.
7+
- Confirmed this PR does not reapply implementation.
8+
- Confirmed this PR excludes disconnected PC branch reuse, broad cherry-picks, wrong-path `tools/text2speech/` work, placeholder Text To Speech shell work, and unrelated report churn.
9+
10+
## Runtime Notes
11+
12+
- No browser sign-in flow was manually exercised for this PR.
13+
- No Local API runtime was started for this PR.
14+
- No Project Workspace runtime validation was run for this PR.
15+
- No Text To Speech runtime validation was run for this PR.
16+
- No toolbox image runtime validation was run for this PR.
17+
- No Game Journey runtime validation was run for this PR.
18+
19+
Runtime validation must happen in the future scoped implementation PRs listed in `PR_26171_059-rollback-restore-plan.md`.

‎docs_build/dev/reports/PR_26171_059-rollback-restore-plan.md‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# PR_26171_059 Rollback Restore Plan
2+
3+
## Purpose
4+
5+
Commit the clean recovery state from latest `main` and document the work that must be restored after rollback.
6+
7+
This PR is documentation-only. It does not reapply implementation work, does not reuse the disconnected PC branch, and does not cherry-pick broad contaminated history.
8+
9+
## Baseline Evidence
10+
11+
- Verified starting branch: `main`.
12+
- Removed leftover local-only PR_26171_057 report artifacts before branching.
13+
- Pulled latest `origin/main` with a fast-forward update.
14+
- Recovery baseline commit used for this PR branch: `20fd280c608917b960b3080484a5d28c51990ccb`.
15+
- Created scoped branch: `pr/26171-059-rollback-restore-plan`.
16+
- No runtime, toolbox, engine, API, or test implementation files are changed by this PR.
17+
18+
## Restore List After Rollback
19+
20+
1. Local API sign-in recovery
21+
- Inspect the sign-in page and its external JavaScript first.
22+
- Remove preview-disabled sign-in behavior.
23+
- Use the configured API URL instead of hardcoded preview-disabled behavior.
24+
- Submit email and password to the Local API session auth endpoint used by `npm run dev:local-api`.
25+
- On valid DEV credentials, create a Local API session and redirect to the expected signed-in destination.
26+
- On invalid credentials, show a visible actionable error.
27+
- Keep Continue Browsing for guest browsing.
28+
- Do not create fake login.
29+
- Do not use browser-owned auth as the source of truth.
30+
- Do not create custom password tables.
31+
- Do not change Create Account or Password Reset beyond keeping placeholders safe.
32+
33+
2. Env diagnostics and runtime ports
34+
- Print all env keys one per row.
35+
- Mask secrets.
36+
- Print the active site, API, and database ports.
37+
38+
3. Toolbox image restoration
39+
- Restore valid toolbox images.
40+
- Remove excessive `image-missing.svg` fallbacks.
41+
- Keep image restoration scoped to real existing assets or approved replacements.
42+
43+
4. Text To Speech engine/audio rebuild
44+
- Use `old_text2speech-V2` as the functionality sample.
45+
- Move reusable Text To Speech engine code to `src/engine/audio/`.
46+
- Make `toolbox/text-to-speech/` consume the reusable engine module.
47+
- Restore old controls, options, and features from the working sample.
48+
- Do not use the wrong `tools/text2speech/` path.
49+
- Do not ship placeholder Text To Speech shell work that does not restore functionality.
50+
51+
5. Game Journey table correction
52+
- Add row under the table.
53+
- Support inline edit row behavior.
54+
- Treat Note Tree as a subtable.
55+
- Show metadata in table columns.
56+
- Ensure system notes cannot be deleted.
57+
58+
6. Game Journey post-rollback verification
59+
- Confirm friendly descriptions.
60+
- Confirm dashboard, targets, and insights only if those surfaces are still present on clean `main`.
61+
- Reapply missing approved Journey work only from clean `main`.
62+
63+
## Reapply Rules
64+
65+
- Every reapply PR starts from clean `main`.
66+
- Every reapply PR gets its own branch.
67+
- Every reapply PR is scoped to one approved purpose.
68+
- Do not reuse the disconnected branch.
69+
- Do not merge the disconnected branch.
70+
- Do not cherry-pick broad PC commits.
71+
- Prefer file-level or diff-level reapplication for approved scoped changes.
72+
- Exclude wrong-path work such as `tools/text2speech/`.
73+
- Exclude placeholder Text To Speech shell work.
74+
- Exclude unrelated report churn.
75+
- Run targeted validation only after each reapply PR implements its scoped change.
76+
77+
## Approved Reapply Order
78+
79+
1. Local API sign-in recovery.
80+
2. Env diagnostics and runtime ports.
81+
3. Toolbox image restoration.
82+
4. Text To Speech engine/audio rebuild from the old working Text To Speech sample.
83+
5. Game Journey table corrections if still missing.
84+
6. Game Journey post-rollback verification and approved follow-up only if still needed.
85+
86+
## Discarded Contaminated Work
87+
88+
- Disconnected PC branch history.
89+
- Broad cherry-picks from contaminated commits.
90+
- Wrong-path `tools/text2speech/` work.
91+
- Placeholder Text To Speech shell work.
92+
- Unrelated report churn.
93+
- Any implementation work not revalidated from clean `main`.
94+
95+
## Validation Boundary
96+
97+
This PR is limited to docs/static validation. It intentionally does not run Local API sign-in validation, Text To Speech runtime validation, toolbox image runtime validation, or Project Workspace validation because implementation reapply is out of scope for PR_26171_059.

‎docs_build/dev/reports/PR_26171_059-validation.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# PR_26171_059 Validation Report
2+
3+
## Scope
4+
5+
Validation is docs/static only for this rollback restore plan PR.
6+
7+
Implementation validation is intentionally deferred until each approved restore item is reapplied in its own scoped PR from clean `main`.
8+
9+
## Commands
10+
11+
- `git status --short --branch`
12+
- PASS: starting branch was `main`.
13+
- PASS: leftover PR_26171_057 local-only report artifacts were removed before branching.
14+
- PASS: PR branch was created from clean latest `main`.
15+
- `git pull --ff-only origin main`
16+
- PASS: local `main` fast-forwarded to `20fd280c608917b960b3080484a5d28c51990ccb`.
17+
- `npm run test:playwright:static`
18+
- PASS: static-only validation completed successfully.
19+
- Note: the command refreshed generated validation reports; those generated report changes were restored because they are unrelated to this rollback plan PR.
20+
- `git diff --check`
21+
- PASS: no whitespace errors.
22+
23+
## Not Run
24+
25+
- `npm run dev:local-api`
26+
- `npm run test:workspace-v2`
27+
- Runtime sign-in validation
28+
- Text To Speech runtime validation
29+
- Toolbox image runtime validation
30+
- Game Journey runtime validation
31+
32+
These commands are intentionally out of scope for this docs/static rollback plan PR.

‎docs_build/dev/reports/codex_changed_files.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
- Current branch: `codex/pr-26171-040-idea-board-production-copy-cleanup`.
55
- Expected starting branch: `main` (PASS before branch creation).
66
- Created branch: `codex/pr-26171-040-idea-board-production-copy-cleanup`.
7-
- Push result: pending until after commit.
8-
- PR URL: pending until after push.
7+
- Commit before conflict resolution: `acbc5b113e9e90a4051e810897415ea222040ddd`.
8+
- Initial push result: PASS, branch pushed to `origin/codex/pr-26171-040-idea-board-production-copy-cleanup`.
9+
- PR URL: `https://github.com/ToolboxAid/HTML-JavaScript-Gaming/pull/15`.
10+
- Conflict resolution: merged `origin/main` at `7393b650228c84d266701cc3f4ce3696029dd47e`; conflicts were limited to `codex_changed_files.txt` and `codex_review.diff`.
11+
- Conflict resolution push result: pending until after merge-validation commit.
912
- Merge result: pending until after PR validation/merge.
10-
- Final main commit: pending until after merge and final pull.
13+
- Final main sync: pending until after merge and final pull.
1114

1215
## Changed Files
1316
- docs_build/dev/reports/codex_changed_files.txt
@@ -38,13 +41,14 @@
3841
- PASS: `npx playwright test tests/playwright/tools/IdeaBoardTableNotes.spec.mjs --project=playwright --workers=1 --reporter=line`.
3942
- PASS: `npx playwright test tests/playwright/tools/ToolboxRoutePages.spec.mjs --project=playwright --workers=1 --reporter=line -g "Idea Board launches"`.
4043
- PASS: `git diff --check`.
44+
- PASS: Post-conflict rerun completed after merging `origin/main` at `7393b650228c84d266701cc3f4ce3696029dd47e`.
4145
- PASS: Playwright V8 coverage report produced because runtime JavaScript changed.
4246
- WARN: Coverage report marks `src/dev-runtime/server/local-api-router.mjs` and `src/shared/toolbox/tool-metadata-inventory.js` as not collected by browser V8 coverage; advisory only per project instructions.
4347
- SKIPPED: Full samples smoke was not run per request.
4448

4549
## ZIP
4650
- Path: `tmp/PR_26171_040-idea-board-production-copy-cleanup_delta.zip`.
47-
- Size: `86984` bytes before final report refresh; final size reported in the delivery summary.
51+
- Size: final size reported in the delivery summary after conflict-resolution ZIP refresh.
4852
- Contents:
4953
- docs_build/dev/reports/codex_changed_files.txt
5054
- docs_build/dev/reports/codex_review.diff

0 commit comments

Comments
 (0)